Merge branch 'master' into findnreplace

code/modules/reagents/chemistry/reagents.dm

@@ -26,7 +26,7 @@
 	var/last_addiction_dose = 0
 	var/overdosed = 0 // You fucked up and this is now triggering it's overdose effects, purge that shit quick.
 	var/current_cycle = 1
-	var/drink_icon = "glass_brown" // what icon state/name/description a drinking glass will use if this is the master reagent.
+	var/drink_icon = null
 	var/drink_name = "Glass of ..what?"
 	var/drink_desc = "You can't really tell what this is."
 

code/modules/reagents/chemistry/reagents/medicine.dm

@@ -635,7 +635,6 @@
 					M.visible_message("<span class='warning'>[M]'s body starts convulsing!</span>")
 					M.gib()
 					return
-				M.adjustCloneLoss(50)
 				var/mob/dead/observer/ghost = M.get_ghost()
 				if(ghost)
 					to_chat(ghost, "<span class='ghostalert'>You are attempting to be revived with Strange Reagent. Return to your body if you want to be revived!</span> (Verbs -> Ghost -> Re-enter corpse)")
@@ -645,6 +644,7 @@
 				if(!M.suiciding && !ghost && !(NOCLONE in M.mutations))
 					var/time_dead = world.time - M.timeofdeath
 					M.visible_message("<span class='warning'>[M] seems to rise from the dead!</span>")
+					M.adjustCloneLoss(50)
 					M.setOxyLoss(0)
 					M.adjustBruteLoss(rand(0,15))
 					M.adjustToxLoss(rand(0,15))

code/modules/reagents/chemistry/reagents/toxins.dm

@@ -269,7 +269,7 @@
 						M.take_organ_damage(0,20)
 
 /datum/reagent/sacid/reaction_obj(obj/O, volume)
-	if((istype(O,/obj/item) || istype(O,/obj/effect/glowshroom)) && prob(40))
+	if((istype(O,/obj/item) || istype(O,/obj/structure/glowshroom)) && prob(40))
 		if(!O.unacidable)
 			var/obj/effect/decal/cleanable/molten_object/I = new/obj/effect/decal/cleanable/molten_object(O.loc)
 			I.desc = "Looks like this was \an [O] some time ago."
@@ -615,7 +615,7 @@
 					H.status_flags |= DISFIGURED
 
 /datum/reagent/facid/reaction_obj(obj/O, volume)
-	if((istype(O, /obj/item) || istype(O, /obj/effect/glowshroom)))
+	if((istype(O, /obj/item) || istype(O, /obj/structure/glowshroom)))
 		if(!O.unacidable)
 			var/obj/effect/decal/cleanable/molten_object/I = new/obj/effect/decal/cleanable/molten_object(O.loc)
 			I.desc = "Looks like this was \an [O] some time ago."
@@ -924,10 +924,10 @@
 		var/obj/structure/alien/weeds/alien_weeds = O
 		alien_weeds.health -= rand(15,35) // Kills alien weeds pretty fast
 		alien_weeds.healthcheck()
-	else if(istype(O, /obj/effect/glowshroom)) //even a small amount is enough to kill it
+	else if(istype(O, /obj/structure/glowshroom)) //even a small amount is enough to kill it
 		qdel(O)
-	else if(istype(O,/obj/effect/spacevine))
-		var/obj/effect/spacevine/SV = O
+	else if(istype(O,/obj/structure/spacevine))
+		var/obj/structure/spacevine/SV = O
 		SV.on_chem_effect(src)
 
 /datum/reagent/glyphosate/reaction_mob(mob/living/M, method=TOUCH, volume)