Revert "Pandemic"

.gitignore

@@ -16,4 +16,3 @@
 *~
 .#*
 *.swp
-*.db

code/datums/diseases/advance/advance.dm

@@ -273,10 +273,6 @@ var/list/advance_cures = 	list(
 	if(s)
 		AddSymptom(s)
 		Refresh(1)
-
-	if(symptoms.len>2)
-		for(var/datum/symptom/S in symptoms)
-			if(istype(S,/datum/symptom/inert)) src.RemoveSymptom(S) //removes the Inert Symptom
 	return
 
 // Randomly remove a symptom.

code/datums/diseases/advance/presets.dm

@@ -49,12 +49,4 @@
 	if(!D)
 		name = "Reality Impairment"
 		symptoms = list(new/datum/symptom/hallucigen)
-	..(process, D, copy)
-
-//Inert Virus
-
-/datum/disease/advance/inert/New(var/process = 1, var/datum/disease/advance/D, var/copy = 0)
-	if(!D)
-		name = "Inert Virus"
-		symptoms = list(new/datum/symptom/inert)
 	..(process, D, copy)

code/modules/admin/IsBanned.dm

@@ -90,14 +90,14 @@ world/IsBanned(key,address,computer_id)
 			else
 				expires = " The is a permanent ban."
 
+
 			var/desc = "\nReason: You, or another user of this computer or connection ([pckey]) is banned from playing here. The ban reason is:\n[reason]\nThis ban was applied by [ackey] on [bantime], [expires]"
 
 			. = list("reason"="[bantype]", "desc"="[desc]")
 
 
 			log_access("Failed Login: [key] [computer_id] [address] - Banned [.["reason"]]")
 			return .
-
 	. = ..()	//default pager ban stuff
 	if (.)
 		//byond will not trigger isbanned() for "global" host bans,

code/modules/admin/stickyban.dm

@@ -1,4 +1,4 @@
-/datum/admins/proc/stickyban(action,data)
+datum/admins/proc/stickyban(action,data)
 	if(!check_rights(R_BAN))
 		return
 	switch (action)
@@ -142,7 +142,6 @@
 /datum/admins/proc/stickyban_show()
 	if(!check_rights(R_BAN))
 		return
-
 	var/list/bans = sortList(world.GetConfig("ban"))
 	var/banhtml = ""
 	for(var/key in bans)

code/modules/admin/topic.dm

@@ -23,9 +23,9 @@
 
 		message_admins("[key_name_admin(usr)] Rejected [C.key]'s admin help. [C.key]'s Adminhelp verb has been returned to them")
 		log_admin("[key_name(usr)] Rejected [C.key]'s admin help")
-
-	else if(href_list["stickyban"])
+	if(href_list["stickyban"])
 		stickyban(href_list["stickyban"],href_list)
+
 	if(href_list["makeAntag"])
 		switch(href_list["makeAntag"])
 			if("1")

code/modules/food&drinks/kitchen machinery/smartfridge.dm

@@ -360,4 +360,4 @@
 /obj/machinery/smartfridge/chemistry/virology
 	name = "smart virus storage"
 	desc = "A refrigerated storage unit for volatile sample storage."
-	spawn_meds = list(/obj/item/weapon/reagent_containers/syringe/antiviral = 4, /obj/item/weapon/reagent_containers/glass/bottle/inert_virion = 1, /obj/item/weapon/reagent_containers/glass/bottle/cold = 1, /obj/item/weapon/reagent_containers/glass/bottle/flu_virion = 1, /obj/item/weapon/reagent_containers/glass/bottle/mutagen = 1, /obj/item/weapon/reagent_containers/glass/bottle/plasma = 1, /obj/item/weapon/reagent_containers/glass/bottle/synaptizine = 1)
+	spawn_meds = list(/obj/item/weapon/reagent_containers/syringe/antiviral = 4, /obj/item/weapon/reagent_containers/glass/bottle/cold = 1, /obj/item/weapon/reagent_containers/glass/bottle/flu_virion = 1, /obj/item/weapon/reagent_containers/glass/bottle/mutagen = 1, /obj/item/weapon/reagent_containers/glass/bottle/plasma = 1, /obj/item/weapon/reagent_containers/glass/bottle/synaptizine = 1)