Conflict fix?

code/game/gamemodes/epidemic/epidemic.dm

@@ -124,14 +124,15 @@
 
 	for(var/i = 0, i < lethal_amount, i++)
 		var/mob/living/carbon/human/H = pick(crew)
-		if(H.virus2)
+		if(lethal.uniqueID in H.virus2)
 			i--
 			continue
-		H.virus2 = lethal.getcopy()
+		H.virus2["[lethal.uniqueID]"] = lethal.getcopy()
 		infectees += H
 
 	var/mob/living/carbon/human/patient_zero = pick(infectees)
-	patient_zero.virus2.stage = 3
+	var/datum/disease2/disease/V = patient_zero.virus2["[lethal.uniqueID]"]
+	V.stage = 3
 
 	cruiser_arrival = world.time + (10 * 90 * 60)
 	stage = 1
@@ -169,7 +170,7 @@
 	var/sick = 0
 	for(var/mob/living/carbon/human/H in world)
 		if(H.key && H.stat != 2) alive++
-		if(H.virus2 && H.stat != 2) sick++
+		if(H.virus2.len && H.stat != 2) sick++
 
 	if(alive == 0)
 		finished = 2

code/game/gamemodes/events/VirusEpidemic.dm

@@ -8,7 +8,7 @@
 	Announce()
 		if(!virus)
 			for(var/mob/living/carbon/human/H in world)
-				if((H.virus2) || (H.stat == 2) || prob(30))
+				if((H.virus2.len) || (H.stat == 2) || prob(30))
 					continue
 				if(prob(100))	// no lethal diseases outside virus mode!
 					infect_mob_random_lesser(H)

code/game/machinery/Sleeper.dm

@@ -61,6 +61,9 @@
 					t1 = "<font color='red'>*dead*</font>"
 				else
 			dat += text("[]\tHealth %: [] ([])</FONT><BR>", (occupant.health > 50 ? "<font color='blue'>" : "<font color='red'>"), occupant.health, t1)
+			if(iscarbon(occupant))
+				var/mob/living/carbon/C = occupant
+				dat += text("[]\t-Pulse, bpm: []</FONT><BR>", (C.pulse == PULSE_NONE || C.pulse == PULSE_THREADY ? "<font color='red'>" : "<font color='blue'>"), C.get_pulse(GETPULSE_TOOL))
 			dat += text("[]\t-Brute Damage %: []</FONT><BR>", (occupant.getBruteLoss() < 60 ? "<font color='blue'>" : "<font color='red'>"), occupant.getBruteLoss())
 			dat += text("[]\t-Respiratory Damage %: []</FONT><BR>", (occupant.getOxyLoss() < 60 ? "<font color='blue'>" : "<font color='red'>"), occupant.getOxyLoss())
 			dat += text("[]\t-Toxin Content %: []</FONT><BR>", (occupant.getToxLoss() < 60 ? "<font color='blue'>" : "<font color='red'>"), occupant.getToxLoss())

code/game/machinery/adv_med.dm

@@ -235,7 +235,7 @@
 				else
 					dat += text("[]\tHealth %: [] ([])</FONT><BR>", (occupant.health > 50 ? "<font color='blue'>" : "<font color='red'>"), occupant.health, t1)
 
-					if(occupant.virus2)
+					if(occupant.virus2.len)
 						dat += text("<font color='red'>Viral pathogen detected in blood stream.</font><BR>")
 
 					dat += text("[]\t-Brute Damage %: []</FONT><BR>", (occupant.getBruteLoss() < 60 ? "<font color='blue'>" : "<font color='red'>"), occupant.getBruteLoss())

code/game/machinery/computer/Operating.dm

@@ -55,6 +55,7 @@
 <B>Fire Damage:</B> [src.victim.getFireLoss()]<BR>
 <B>Suffocation Damage:</B> [src.victim.getOxyLoss()]<BR>
 <B>Patient Status:</B> [src.victim.stat ? "Non-Responsive" : "Stable"]<BR>
+<B>Heartbeat rate:</B> [victim.get_pulse(GETPULSE_TOOL)]<BR>
 "}
 	else
 		src.victim = null

code/game/machinery/computer/medical.dm

@@ -83,6 +83,7 @@
 					dat += text("\n<A href='?src=\ref[];print_p=1'>Print Record</A><BR>\n<A href='?src=\ref[];screen=2'>Back</A><BR>", src, src)
 				if(5.0)
 					dat += "<CENTER><B>Virus Database</B></CENTER>"
+					/*	Advanced diseases is weak! Feeble! Glory to virus2!
 					for(var/Dt in typesof(/datum/disease/))
 						var/datum/disease/Dis = new Dt(0)
 						if(istype(Dis, /datum/disease/advance))
@@ -90,6 +91,11 @@
 						if(!Dis.desc)
 							continue
 						dat += "<br><a href='?src=\ref[src];vir=[Dt]'>[Dis.name]</a>"
+					*/
+					for (var/ID in virusDB)
+						var/datum/data/record/v = virusDB[ID]
+						dat += "<br><a href='?src=\ref[src];vir=\ref[v]'>[v.fields["name"]]</a>"
+
 					dat += "<br><a href='?src=\ref[src];screen=1'>Back</a>"
 				if(6.0)
 					dat += "<center><b>Medical Robot Monitor</b></center>"
@@ -121,36 +127,56 @@
 /obj/machinery/computer/med_data/Topic(href, href_list)
 	if(..())
 		return
+
 	if (!( data_core.general.Find(src.active1) ))
 		src.active1 = null
+
 	if (!( data_core.medical.Find(src.active2) ))
 		src.active2 = null
+
 	if ((usr.contents.Find(src) || (in_range(src, usr) && istype(src.loc, /turf))) || (istype(usr, /mob/living/silicon)))
 		usr.set_machine(src)
+
 		if (href_list["temp"])
 			src.temp = null
+
 		if (href_list["scan"])
 			if (src.scan)
-				src.scan.loc = src.loc
-				src.scan = null
+
+				if(ishuman(usr))
+					scan.loc = usr.loc
+
+					if(!usr.get_active_hand())
+						usr.put_in_hands(scan)
+
+					scan = null
+
+				else
+					src.scan.loc = src.loc
+					src.scan = null
+
 			else
 				var/obj/item/I = usr.get_active_hand()
 				if (istype(I, /obj/item/weapon/card/id))
 					usr.drop_item()
 					I.loc = src
 					src.scan = I
+
 		else if (href_list["logout"])
 			src.authenticated = null
 			src.screen = null
 			src.active1 = null
 			src.active2 = null
+
 		else if (href_list["login"])
+
 			if (istype(usr, /mob/living/silicon/ai))
 				src.active1 = null
 				src.active2 = null
 				src.authenticated = usr.name
 				src.rank = "AI"
 				src.screen = 1
+
 			else if (istype(usr, /mob/living/silicon/robot))
 				src.active1 = null
 				src.active2 = null
@@ -158,13 +184,16 @@
 				var/mob/living/silicon/robot/R = usr
 				src.rank = R.braintype
 				src.screen = 1
+
 			else if (istype(src.scan, /obj/item/weapon/card/id))
 				src.active1 = null
 				src.active2 = null
+
 				if (src.check_access(src.scan))
 					src.authenticated = src.scan.registered_name
 					src.rank = src.scan.assignment
 					src.screen = 1
+
 		if (src.authenticated)
 
 			if(href_list["screen"])
@@ -176,20 +205,12 @@
 				src.active2 = null
 
 			if(href_list["vir"])
-				var/type = href_list["vir"]
-				var/datum/disease/Dis = new type(0)
-				var/AfS = ""
-				for(var/Str in Dis.affected_species)
-					AfS += " [Str];"
-				src.temp = {"<b>Name:</b> [Dis.name]
-<BR><b>Number of stages:</b> [Dis.max_stages]
-<BR><b>Spread:</b> [Dis.spread] Transmission
-<BR><b>Possible Cure:</b> [(Dis.cure||"none")]
-<BR><b>Affected Species:</b>[AfS]
-<BR>
-<BR><b>Notes:</b> [Dis.desc]
-<BR>
-<BR><b>Severity:</b> [Dis.severity]"}
+				var/datum/data/record/v = locate(href_list["vir"])
+				src.temp = "<center>GNAv2 based virus lifeform V-[v.fields["id"]]</center>"
+				src.temp += "<br><b>Name:</b> <A href='?src=\ref[src];field=vir_name;edit_vir=\ref[v]'>[v.fields["name"]]</A>"
+				src.temp += "<br><b>Antigen:</b> [v.fields["antigen"]]"
+				src.temp += "<br><b>Spread:</b> [v.fields["spread type"]] "
+				src.temp += "<br><b>Details:</b><br> <A href='?src=\ref[src];field=vir_desc;edit_vir=\ref[v]'>[v.fields["description"]]</A>"
 
 			if (href_list["del_all"])
 				src.temp = text("Are you sure you wish to delete all records?<br>\n\t<A href='?src=\ref[];temp=1;del_all2=1'>Yes</A><br>\n\t<A href='?src=\ref[];temp=1'>No</A><br>", src, src)
@@ -279,7 +300,7 @@
 							src.active2.fields["notes"] = t1
 					if("p_stat")
 						if (istype(src.active1, /datum/data/record))
-							src.temp = text("<B>Physical Condition:</B><BR>\n\t<A href='?src=\ref[];temp=1;p_stat=deceased'>*Deceased*</A><BR>\n\t<A href='?src=\ref[];temp=1;p_stat=unconscious'>*Unconscious*</A><BR>\n\t<A href='?src=\ref[];temp=1;p_stat=active'>Active</A><BR>\n\t<A href='?src=\ref[];temp=1;p_stat=unfit'>Physically Unfit</A><BR>", src, src, src, src)
+							src.temp = text("<B>Physical Condition:</B><BR>\n\t<A href='?src=\ref[];temp=1;p_stat=deceased'>*Deceased*</A><BR>\n\t<A href='?src=\ref[];temp=1;p_stat=ssd'>*SSD*</A><BR>\n\t<A href='?src=\ref[];temp=1;p_stat=active'>Active</A><BR>\n\t<A href='?src=\ref[];temp=1;p_stat=unfit'>Physically Unfit</A><BR>\n\t<A href='?src=\ref[];temp=1;p_stat=disabled'>Disabled</A><BR>", src, src, src, src, src)
 					if("m_stat")
 						if (istype(src.active1, /datum/data/record))
 							src.temp = text("<B>Mental Condition:</B><BR>\n\t<A href='?src=\ref[];temp=1;m_stat=insane'>*Insane*</A><BR>\n\t<A href='?src=\ref[];temp=1;m_stat=unstable'>*Unstable*</A><BR>\n\t<A href='?src=\ref[];temp=1;m_stat=watch'>*Watch*</A><BR>\n\t<A href='?src=\ref[];temp=1;m_stat=stable'>Stable</A><BR>", src, src, src, src)
@@ -292,6 +313,20 @@
 							if ((!( t1 ) || !( src.authenticated ) || usr.stat || usr.restrained() || (!in_range(src, usr) && (!istype(usr, /mob/living/silicon))) || src.active1 != a1))
 								return
 							src.active1.fields["dna"] = t1
+					if("vir_name")
+						var/datum/data/record/v = locate(href_list["edit_vir"])
+						if (v)
+							var/t1 = copytext(sanitize(input("Please input pathogen name:", "VirusDB", v.fields["name"], null)  as text),1,MAX_MESSAGE_LEN)
+							if ((!( t1 ) || !( src.authenticated ) || usr.stat || usr.restrained() || (!in_range(src, usr) && (!istype(usr, /mob/living/silicon))) || src.active1 != a1))
+								return
+							v.fields["name"] = t1
+					if("vir_desc")
+						var/datum/data/record/v = locate(href_list["edit_vir"])
+						if (v)
+							var/t1 = copytext(sanitize(input("Please input information about pathogen:", "VirusDB", v.fields["description"], null)  as message),1,MAX_MESSAGE_LEN)
+							if ((!( t1 ) || !( src.authenticated ) || usr.stat || usr.restrained() || (!in_range(src, usr) && (!istype(usr, /mob/living/silicon))) || src.active1 != a1))
+								return
+							v.fields["description"] = t1
 					else
 
 			if (href_list["p_stat"])
@@ -299,12 +334,14 @@
 					switch(href_list["p_stat"])
 						if("deceased")
 							src.active1.fields["p_stat"] = "*Deceased*"
-						if("unconscious")
-							src.active1.fields["p_stat"] = "*Unconscious*"
+						if("ssd")
+							src.active1.fields["p_stat"] = "*SSD*"
 						if("active")
 							src.active1.fields["p_stat"] = "Active"
 						if("unfit")
 							src.active1.fields["p_stat"] = "Physically Unfit"
+						if("disabled")
+							src.active1.fields["p_stat"] = "Disabled"
 
 			if (href_list["m_stat"])
 				if (src.active1)
@@ -466,7 +503,7 @@
 				if(4)
 					R.fields["b_type"] = pick("A-", "B-", "AB-", "O-", "A+", "B+", "AB+", "O+")
 				if(5)
-					R.fields["p_stat"] = pick("*Unconcious*", "Active", "Physically Unfit")
+					R.fields["p_stat"] = pick("*SSD*", "Active", "Physically Unfit", "Disabled")
 				if(6)
 					R.fields["m_stat"] = pick("*Insane*", "*Unstable*", "*Watch*", "Stable")
 			continue

code/game/machinery/cryo.dm

@@ -87,7 +87,7 @@
 		<B>Current cell temperature:</B> [temp_text]K<BR>
 		<B>Cryo status:</B> [ on ? "<A href='?src=\ref[src];start=1'>Off</A> <B>On</B>" : "<B>Off</B> <A href='?src=\ref[src];start=1'>On</A>"]<BR>
 		[beaker_text]<BR><BR>
-		<B>Current occupant:</B> [occupant ? "<BR>Name: [occupant]<BR>Health: [health_text]<BR>Oxygen deprivation: [round(occupant.getOxyLoss(),0.1)]<BR>Brute damage: [round(occupant.getBruteLoss(),0.1)]<BR>Fire damage: [round(occupant.getFireLoss(),0.1)]<BR>Toxin damage: [round(occupant.getToxLoss(),0.1)]<BR>Body temperature: [occupant.bodytemperature]" : "<FONT color=red>None</FONT>"]<BR>
+		<B>Current occupant:</B> [occupant ? "<BR>Name: [occupant]<BR>Health: [health_text]<BR>Oxygen deprivation: [round(occupant.getOxyLoss(),0.1)]<BR>Brute damage: [round(occupant.getBruteLoss(),0.1)]<BR>Fire damage: [round(occupant.getFireLoss(),0.1)]<BR>Toxin damage: [round(occupant.getToxLoss(),0.1)]<BR>Body temperature: [occupant.bodytemperature]<BR>Heartbeat rate: [occupant.get_pulse(GETPULSE_TOOL)]" : "<FONT color=red>None</FONT>"]<BR>
 		"}
 	user.set_machine(src)
 	user << browse(dat, "window=cryo")

code/game/mecha/medical/odysseus.dm

@@ -87,8 +87,11 @@
 			for(var/datum/disease/D in patient.viruses)
 				if(!D.hidden[SCANNER])
 					foundVirus++
-			if(patient.virus2)
-				foundVirus++
+
+			for (var/ID in patient.virus2)
+				if (ID in virusDB)
+					foundVirus = 1
+					break
 
 			holder = patient.hud_list[HEALTH_HUD]
 			if(patient.stat == 2)

code/game/objects/effects/barsign.dm

@@ -1,4 +1,4 @@
-/obj/effect/sign/barsign
+/obj/effect/sign/double/barsign
 	icon = 'barsigns.dmi'
 	icon_state = "empty"
 	anchored = 1

code/game/objects/effects/decals/Cleanable/humans.dm

@@ -11,7 +11,7 @@
 	random_icon_states = list("floor1", "floor2", "floor3", "floor4", "floor5", "floor6", "floor7")
 	var/list/viruses = list()
 	blood_DNA = list()
-	var/datum/disease2/disease/virus2 = null
+	var/list/datum/disease2/disease/virus2 = list()
 	var/amount = 5
 
 /obj/effect/decal/cleanable/blood/Del()
@@ -144,4 +144,4 @@
 	icon = 'blood.dmi'
 	icon_state = "mucus"
 	random_icon_states = list("mucus")
-	var/datum/disease2/disease/virus2 = null
+	var/list/datum/disease2/disease/virus2 = list()

code/game/objects/items.dm

@@ -113,9 +113,10 @@
 		var/datum/organ/external/temp = user:organs_by_name["r_hand"]
 		if (user.hand)
 			temp = user:organs_by_name["l_hand"]
-		if(temp && temp.status & ORGAN_DESTROYED)
-			user << "<span class = 'warning'> Yo- wait a minute."
+		if(temp && !temp.is_usable())
+			user << "<span class='notice'>You try to move your [temp.display_name], but cannot!"
 			return
+
 	if (istype(src.loc, /obj/item/weapon/storage))
 		var/obj/item/weapon/storage/S = src.loc
 		S.remove_from_storage(src)

code/game/objects/items/devices/scanners.dm

@@ -129,8 +129,13 @@ MASS SPECTROMETER
 	if (istype(M, /mob/living/carbon))
 		if(M:reagents.total_volume > 0)
 			user.show_message(text("\red Warning: Unknown substance detected in subject's blood."))
-		if(M:virus2)
-			user.show_message(text("\red Warning: Unknown pathogen detected in subject's blood."))
+		if(M:virus2.len)
+			var/mob/living/carbon/C = M
+			for (var/ID in C.virus2)
+				if (ID in virusDB)
+					var/datum/data/record/V = virusDB[ID]
+					user.show_message(text("\red Warning: Pathogen [V.fields["name"]] detected in subject's blood. Known antigen : [V.fields["antigen"]]"))
+//			user.show_message(text("\red Warning: Unknown pathogen detected in subject's blood."))
 	if (M.getCloneLoss())
 		user.show_message("\red Subject appears to have been imperfectly cloned.")
 	for(var/datum/disease/D in M.viruses)
@@ -174,6 +179,7 @@ MASS SPECTROMETER
 				user.show_message("\red <b>Warning: Blood Level CRITICAL: [blood_percent]% [blood_volume]cl")
 			else
 				user.show_message("\blue Blood Level Normal: [blood_percent]% [blood_volume]cl")
+		user.show_message("\blue Subject's pulse: <font color='[H.pulse == PULSE_THREADY || H.pulse == PULSE_NONE ? "red" : "blue"]'>[H.get_pulse(GETPULSE_TOOL)] bpm.</font>")
 	src.add_fingerprint(user)
 	return
 

code/game/objects/items/robot/robot_upgrades.dm

@@ -32,7 +32,6 @@
 	R.icon_state = "robot"
 	del(R.module)
 	R.module = null
-	R.modtype = "robot"
 	R.updatename("Default")
 	R.status_flags |= CANPUSH
 	R.updateicon()
@@ -52,6 +51,7 @@
 /obj/item/borg/upgrade/rename/action(var/mob/living/silicon/robot/R)
 	if(..()) return 0
 	R.name = heldname
+	R.custom_name = heldname
 	R.real_name = heldname
 
 	return 1

code/game/objects/items/stacks/sheets/mineral.dm

@@ -253,4 +253,4 @@ var/global/list/datum/stack_recipe/silver_recipes = list ( \
 	throw_speed = 3
 	throw_range = 3
 	origin_tech = "materials=4"
-	perunit = 2000
+	perunit = 2000

code/game/objects/items/weapons/power_cells.dm

@@ -111,4 +111,4 @@
 	maxcharge = 10000
 	maxcharge = 10000
 	m_amt = 0
-	g_amt = 0
+	g_amt = 0

code/game/objects/items/weapons/storage/fancy.dm

@@ -201,3 +201,56 @@
 	desc = "A packet of six imported DromedaryCo cancer sticks. A label on the packaging reads, \"Wouldn't a slow death make a change?\""
 	icon_state = "Dpacket"
 	item_state = "Dpacket"
+
+
+/*
+ * Vial Box
+ */
+
+/obj/item/weapon/storage/fancy/vials
+	icon = 'icons/obj/vialbox.dmi'
+	icon_state = "vialbox6"
+	icon_type = "vial"
+	name = "vial storage box"
+	storage_slots = 6
+	can_hold = list("/obj/item/weapon/reagent_containers/glass/beaker/vial")
+
+
+/obj/item/weapon/storage/fancy/vials/New()
+	..()
+	for(var/i=1; i <= storage_slots; i++)
+		new /obj/item/weapon/reagent_containers/glass/beaker/vial(src)
+	return
+
+/obj/item/weapon/storage/lockbox/vials
+	name = "secure vial storage box"
+	desc = "A locked box for keeping things away from children."
+	icon = 'icons/obj/vialbox.dmi'
+	icon_state = "vialbox0"
+	item_state = "syringe_kit"
+	max_w_class = 3
+	can_hold = list("/obj/item/weapon/reagent_containers/glass/beaker/vial")
+	max_combined_w_class = 14 //The sum of the w_classes of all the items in this storage item.
+	storage_slots = 6
+	req_access = list(access_virology)
+
+/obj/item/weapon/storage/lockbox/vials/New()
+	..()
+	update_icon()
+
+/obj/item/weapon/storage/lockbox/vials/update_icon(var/itemremoved = 0)
+	var/total_contents = src.contents.len - itemremoved
+	src.icon_state = "vialbox[total_contents]"
+	src.overlays.Cut()
+	if (!broken)
+		overlays += image(icon, src, "led[locked]")
+		if(locked)
+			overlays += image(icon, src, "cover")
+	else
+		overlays += image(icon, src, "ledb")
+	return
+
+/obj/item/weapon/storage/lockbox/vials/attackby(obj/item/weapon/W as obj, mob/user as mob)
+	..()
+	update_icon()
+

code/game/objects/structures/barsign.dm

@@ -1,4 +1,4 @@
-/obj/structure/sign/barsign
+/obj/structure/sign/double/barsign
 	icon = 'barsigns.dmi'
 	icon_state = "empty"
 	anchored = 1

code/game/objects/structures/crates_lockers/closets/l3closet.dm

@@ -36,6 +36,8 @@
 	contents = list()
 	new /obj/item/clothing/suit/bio_suit/virology( src )
 	new /obj/item/clothing/head/bio_hood/virology( src )
+	new /obj/item/clothing/mask/breath(src)
+	new /obj/item/weapon/tank/oxygen(src)
 
 
 /obj/structure/closet/l3closet/security

code/game/objects/structures/crates_lockers/closets/secure/engineering.dm

@@ -29,6 +29,7 @@
 		new /obj/item/clothing/mask/gas(src)
 		new /obj/item/device/multitool(src)
 		new /obj/item/device/flash(src)
+		new /obj/item/taperoll/engineering(src)
 		return
 
 
@@ -118,4 +119,4 @@
 		new /obj/item/clothing/glasses/meson(src)
 		new /obj/item/taperoll/engineering(src)
 		new /obj/item/taperoll/engineering(src)
-		return
+		return

code/game/objects/structures/crates_lockers/closets/secure/security.dm

@@ -111,6 +111,7 @@
 		new /obj/item/weapon/cartridge/hos(src)
 		new /obj/item/device/radio/headset/heads/hos(src)
 		new /obj/item/clothing/glasses/sunglasses/sechud(src)
+		new /obj/item/taperoll/police(src)
 		new /obj/item/weapon/shield/riot(src)
 		new /obj/item/weapon/storage/lockbox/loyalty(src)
 		new /obj/item/weapon/storage/box/flashbangs(src)
@@ -149,6 +150,7 @@
 //		new /obj/item/weapon/cartridge/security(src)
 		new /obj/item/device/radio/headset/headset_sec(src)
 		new /obj/item/clothing/glasses/sunglasses/sechud(src)
+		new /obj/item/taperoll/police(src)
 		new /obj/item/weapon/storage/box/flashbangs(src)
 		new /obj/item/weapon/storage/belt/security(src)
 		new /obj/item/weapon/reagent_containers/spray/pepper(src)
@@ -252,6 +254,7 @@
 		new /obj/item/clothing/suit/armor/det_suit(src)
 		new /obj/item/ammo_magazine/c38(src)
 		new /obj/item/ammo_magazine/c38(src)
+		new /obj/item/taperoll/police(src)
 		new /obj/item/weapon/gun/projectile/detective(src)
 		new /obj/item/clothing/tie/holster/armpit(src)
 		return

code/game/objects/structures/signs.dm

@@ -19,20 +19,60 @@
 		else
 	return
 
-
 /obj/structure/sign/blob_act()
 	del(src)
 	return
 
+/obj/structure/sign/attackby(obj/item/tool as obj, mob/user as mob)	//deconstruction
+	if(istype(tool, /obj/item/weapon/screwdriver) && !istype(src, /obj/structure/sign/double))
+		user << "You unfasten the sign with your [tool]."
+		var/obj/item/sign/S = new(src.loc)
+		S.name = name
+		S.desc = desc
+		S.icon_state = icon_state
+		//var/icon/I = icon('icons/obj/decals.dmi', icon_state)
+		//S.icon = I.Scale(24, 24)
+		S.sign_state = icon_state
+		del(src)
+	else ..()
 
-/obj/structure/sign/map
+/obj/item/sign
+	name = "sign"
+	desc = ""
+	icon = 'icons/obj/decals.dmi'
+	w_class = 3		//big
+	var/sign_state = ""
+
+/obj/item/sign/attackby(obj/item/tool as obj, mob/user as mob)	//construction
+	if(istype(tool, /obj/item/weapon/screwdriver) && isturf(user.loc))
+		var/direction = input("In which direction?", "Select direction.") in list("North", "East", "South", "West", "Cancel")
+		if(direction == "Cancel") return
+		var/obj/structure/sign/S = new(user.loc)
+		switch(direction)
+			if("North")
+				S.pixel_y = 32
+			if("East")
+				S.pixel_x = 32
+			if("South")
+				S.pixel_y = -32
+			if("West")
+				S.pixel_x = -32
+			else return
+		S.name = name
+		S.desc = desc
+		S.icon_state = sign_state
+		user << "You fasten \the [S] with your [tool]."
+		del(src)
+	else ..()
+
+/obj/structure/sign/double/map
 	name = "station map"
 	desc = "A framed picture of the station."
 
-/obj/structure/sign/map/left
+/obj/structure/sign/double/map/left
 	icon_state = "map-left"
 
-/obj/structure/sign/map/right
+/obj/structure/sign/double/map/right
 	icon_state = "map-right"
 
 /obj/structure/sign/securearea
@@ -75,13 +115,11 @@
 	desc = "A warning sign which reads 'DANGER: FIRE'"
 	icon_state = "fire"
 
-
 /obj/structure/sign/nosmoking_1
 	name = "\improper NO SMOKING"
 	desc = "A warning sign which reads 'NO SMOKING'"
 	icon_state = "nosmoking"
 
-
 /obj/structure/sign/nosmoking_2
 	name = "\improper NO SMOKING"
 	desc = "A warning sign which reads 'NO SMOKING'"
@@ -112,14 +150,14 @@
 	desc = "This plaque commemorates the fall of the Atmos FEA division. For all the charred, dizzy, and brittle men who have died in its hands."
 	icon_state = "atmosplaque"
 
-/obj/structure/sign/maltesefalcon	//The sign is 64x32, so it needs two tiles. ;3
+/obj/structure/sign/double/maltesefalcon	//The sign is 64x32, so it needs two tiles. ;3
 	name = "The Maltese Falcon"
 	desc = "The Maltese Falcon, Space Bar and Grill."
 
-/obj/structure/sign/maltesefalcon/left
+/obj/structure/sign/double/maltesefalcon/left
 	icon_state = "maltesefalcon-left"
 
-/obj/structure/sign/maltesefalcon/right
+/obj/structure/sign/double/maltesefalcon/right
 	icon_state = "maltesefalcon-right"
 
 /obj/structure/sign/science			//These 3 have multiple types, just var-edit the icon_state to whatever one you want on the map

code/game/response_team.dm

@@ -1,7 +1,8 @@
 //STRIKE TEAMS
 
 var/list/response_team_members = list()
-var/global/send_emergency_team = 0
+var/global/send_emergency_team = 0 // Used for automagic response teams
+// 'admin_emergency_team' for admin-spawned response teams
 
 client/verb/JoinResponseTeam()
 	set category = "IC"
@@ -10,6 +11,9 @@ client/verb/JoinResponseTeam()
 		if(!send_emergency_team)
 			usr << "No emergency response team is currently being sent."
 			return
+		if(admin_emergency_team)
+			usr << "An emergency response team has already been sent."
+			return
 		if(jobban_isbanned(usr, "Syndicate") || jobban_isbanned(usr, "Emergency Response Team") || jobban_isbanned(usr, "Security Officer"))
 			usr << "<font color=red><b>You are jobbanned from the emergency reponse team!"
 			return
@@ -65,7 +69,7 @@ proc/percentage_antagonists()
 
 
 proc/trigger_armed_response_team(var/force = 0)
-	if(send_emergency_team)
+	if(send_emergency_team || admin_emergency_team)
 		return
 
 	var/send_team_chance = 20 // base chance that a team will be sent
@@ -78,7 +82,7 @@ proc/trigger_armed_response_team(var/force = 0)
 	// there's only a certain chance a team will be sent
 	if(!prob(send_team_chance)) return
 
-	command_alert("According to our sensors, [station_name()] has entered code red. We will prepare and dispatch an emergency response team to deal with the situation.", "Command Report")
+	command_alert("Sensors indicate that [station_name()] has entered Code Red and is in need of assistance. We will prepare and dispatch an emergency response team to deal with the situation.", "NMV Icarus Command")
 
 	send_emergency_team = 1
 

code/game/turfs/simulated.dm

@@ -107,11 +107,15 @@
 	for(var/obj/effect/decal/cleanable/blood/B in contents)
 		if(!B.blood_DNA[M.dna.unique_enzymes])
 			B.blood_DNA[M.dna.unique_enzymes] = M.dna.b_type
+		if (M.virus2.len)
+			B.virus2 |= virus_copylist(M.virus2)
 		return 1 //we bloodied the floor
 
 	//if there isn't a blood decal already, make one.
 	var/obj/effect/decal/cleanable/blood/newblood = new /obj/effect/decal/cleanable/blood(src)
 	newblood.blood_DNA[M.dna.unique_enzymes] = M.dna.b_type
+	if (M.virus2.len)
+		newblood.virus2 |= virus_copylist(M.virus2)
 	return 1 //we bloodied the floor
 
 
@@ -120,6 +124,8 @@
 	if( istype(M, /mob/living/carbon/monkey) || istype(M, /mob/living/carbon/human))
 		var/obj/effect/decal/cleanable/blood/this = new /obj/effect/decal/cleanable/blood(src)
 		this.blood_DNA[M.dna.unique_enzymes] = M.dna.b_type
+		if (M.virus2.len)
+			this.virus2 = virus_copylist(M.virus2)
 
 	else if( istype(M, /mob/living/carbon/alien ))
 		var/obj/effect/decal/cleanable/xenoblood/this = new /obj/effect/decal/cleanable/xenoblood(src)