Merge remote-tracking branch 'upstream/master'

code/WorkInProgress/SkyMarshal/eraser.dm

@@ -0,0 +1,9 @@
+/obj/item/weapon/stamperaser
+	name = "Eraser"
+	desc = "Some type of eraser, you guess."
+	flags = FPRINT | TABLEPASS
+	icon = 'items.dmi'
+	icon_state = "zippo"
+	item_state = "zippo"
+	w_class = 1.0
+	m_amt = 80

code/WorkInProgress/virus2/base.dm

@@ -441,12 +441,6 @@
 	activate(var/mob/living/carbon/mob,var/multiplier)
 		mob.brainloss = 20
 
-/datum/disease2/effect/lesser/drowsy
-	name = "Bedroom Syndrome"
-	stage = 2
-	activate(var/mob/living/carbon/mob,var/multiplier)
-		mob.drowsyness = 5
-
 /datum/disease2/effect/lesser/deaf
 	name = "Hard of hearing syndrome"
 	stage = 3

code/WorkInProgress/virus2/curer.dm

@@ -68,6 +68,9 @@
 
 		if(B)
 			dat = "Blood sample inserted."
+			var/code = ""
+			for(var/V in ANTIGENS) if(text2num(V) & B.data["antibodies"]) code += ANTIGENS[V]
+			dat += "<BR>Antibodies: [code]"
 			dat += "<BR><A href='?src=\ref[src];antibody=1'>Begin antibody production</a>"
 		else
 			dat += "<BR>Please check container contents."