Merge branch 'master' into upstream-merge-32311

code/modules/reagents/chemistry/machinery/chem_dispenser.dm

@@ -222,7 +222,7 @@
 	if(beaker && beaker.reagents)
 		beaker.reagents.remove_all()
 	cell.use(total/powerefficiency)
-	cell.emp_act()
+	cell.emp_act(severity)
 	visible_message("<span class='danger'>[src] malfunctions, spraying chemicals everywhere!</span>")
 	..()
 
@@ -400,4 +400,4 @@
 		"cryoxadone",
 		"ammonia",
 		"ash",
-		"diethylamine")
+		"diethylamine")

code/modules/reagents/chemistry/reagents/alcohol_reagents.dm

@@ -51,9 +51,9 @@ All effects don't start immediately, but rather get worse over time; the rate is
 		if(reac_volume >= 5)
 			var/obj/item/book/affectedbook = O
 			affectedbook.dat = null
-			to_chat(usr, "<span class='notice'>Through thorough application, you wash away [affectedbook]'s writing.</span>")
+			O.visible_message("<span class='notice'>[O]'s writing is washed away by [name]!</span>")
 		else
-			to_chat(usr, "<span class='warning'>The ink smears, but doesn't wash away!</span>")
+			O.visible_message("<span class='warning'>[O]'s ink is smeared by [name], but doesn't wash away!</span>")
 	return
 
 /datum/reagent/consumable/ethanol/reaction_mob(mob/living/M, method=TOUCH, reac_volume)//Splashing people with ethanol isn't quite as good as fuel.

code/modules/reagents/chemistry/reagents/drink_reagents.dm

@@ -70,7 +70,7 @@
 			//nothing
 		if(21 to INFINITY)
 			if(prob(current_cycle-10))
-				M.cure_nearsighted(list(EYE_DAMAGE))
+				M.cure_nearsighted()
 	..()
 	return
 
@@ -172,22 +172,6 @@
 	M.emote("laugh")
 	..()
 
-/datum/reagent/consumable/superlaughter
-	name = "Super Laughter"
-	id = "superlaughter"
-	description = "Funny until you're the one laughing."
-	metabolization_rate = 1.5 * REAGENTS_METABOLISM
-	color = "#FF4DD2"
-	taste_description = "laughter"
-
-/datum/reagent/consumable/superlaughter/on_mob_life(mob/living/carbon/M)
-	if(!iscarbon(M))
-		return
-	if(prob(30))
-		M.visible_message("<span class='danger'>[M] bursts out into a fit of uncontrollable laughter!</span>", "<span class='userdanger'>You burst out in a fit of uncontrollable laughter!</span>")
-		M.Stun(5)
-	..()
-
 /datum/reagent/consumable/potato_juice
 	name = "Potato Juice"
 	id = "potato"

code/modules/reagents/chemistry/reagents/medicine_reagents.dm

@@ -44,7 +44,7 @@
 	M.adjustToxLoss(-5, 0)
 	M.hallucination = 0
 	M.setBrainLoss(0)
-	M.remove_all_disabilities()
+	M.disabilities = 0
 	M.set_blurriness(0)
 	M.set_blindness(0)
 	M.SetKnockdown(0, 0)
@@ -667,16 +667,16 @@
 	var/obj/item/organ/eyes/eyes = M.getorganslot(ORGAN_SLOT_EYES)
 	if (!eyes)
 		return
-	if(M.has_disability(BLIND, EYE_DAMAGE))
+	if(M.has_disability(DISABILITY_BLIND, EYE_DAMAGE))
 		if(prob(20))
 			to_chat(M, "<span class='warning'>Your vision slowly returns...</span>")
-			M.cure_blind(EYE_DAMAGE)
-			M.cure_nearsighted(EYE_DAMAGE)
+			M.cure_blind()
+			M.cure_nearsighted()
 			M.blur_eyes(35)
 
-	else if(M.has_disability(NEARSIGHT, EYE_DAMAGE))
+	else if(M.has_disability(DISABILITY_NEARSIGHT, EYE_DAMAGE))
 		to_chat(M, "<span class='warning'>The blackness in your peripheral vision fades.</span>")
-		M.cure_nearsighted(EYE_DAMAGE)
+		M.cure_nearsighted()
 		M.blur_eyes(10)
 	else if(M.eye_blind || M.eye_blurry)
 		M.set_blindness(0)
@@ -765,7 +765,7 @@
 			M.visible_message("<span class='warning'>[M]'s body convulses a bit, and then falls still once more.</span>")
 			return
 		M.visible_message("<span class='warning'>[M]'s body convulses a bit.</span>")
-		if(!M.suiciding && !(M.has_disability(NOCLONE)) && !M.hellbound)
+		if(!M.suiciding && !(M.has_disability(DISABILITY_NOCLONE)) && !M.hellbound)
 			if(!M)
 				return
 			if(M.notify_ghost_cloning(source = M))

code/modules/reagents/chemistry/reagents/toxin_reagents.dm

@@ -141,7 +141,7 @@
 	taste_description = "mint"
 
 /datum/reagent/toxin/minttoxin/on_mob_life(mob/living/M)
-	if(M.has_disability(FAT))
+	if(M.has_disability(DISABILITY_FAT))
 		M.gib()
 	return ..()