Merge branch 'master' into upstream-merge-34894

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

@@ -1281,3 +1281,19 @@ All effects don't start immediately, but rather get worse over time; the rate is
 	glass_icon_state = "glass_yellow"
 	glass_name = "eggnog"
 	glass_desc = "For enjoying the most wonderful time of the year."
+
+/datum/reagent/consumable/ethanol/narsour
+	name = "Nar'Sour"
+	id = "narsour"
+	description = "Side effects include self-mutilation and hoarding plasteel."
+	color = RUNE_COLOR_DARKRED
+	boozepwr = 10
+	taste_description = "bloody"
+	glass_icon_state = "narsour"
+	glass_name = "Nar'Sour"
+	glass_desc = "A new hit cocktail inspired by THE ARM Breweries will have you shouting Fuu ma'jin in no time!"
+
+/datum/reagent/consumable/ethanol/narsour/on_mob_life(mob/living/M)
+	M.cultslurring = min(M.cultslurring + 3, 3)
+	M.stuttering = min(M.stuttering + 3, 3)
+	..()

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

@@ -1147,6 +1147,8 @@
 	addiction_threshold = 5
 
 /datum/reagent/medicine/ketrazine/on_mob_life(mob/living/M)
+	M.status_flags |= IGNORESLOWDOWN
+	M.status_flags |= GOTTAGOFAST
 	M.adjustToxLoss(-3*REM, 0)
 	M.adjustBruteLoss(-5*REM, 0)
 	M.adjustFireLoss(-5*REM, 0)
@@ -1243,4 +1245,3 @@
 		M.Dizzy(7)
 		M.Jitter(7)
 	..()
-	

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

@@ -244,8 +244,10 @@
 	toxpwr = 1
 
 /datum/reagent/toxin/spore/on_mob_life(mob/living/M)
-	M.damageoverlaytemp = 60
-	M.update_damage_hud()
+	if(iscarbon(M))
+		var/mob/living/carbon/C = M
+		C.damageoverlaytemp = 60
+		C.update_damage_hud()
 	M.blur_eyes(3)
 	return ..()
 

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

@@ -232,4 +232,13 @@
 	id = "morphine"
 	results = list("morphine" = 3)
 	required_reagents = list("carbon" = 2, "hydrogen" = 2, "nitrogen" = 1, "oxygen" = 1)
-	required_temp = 480
+	required_temp = 480
+
+/datum/chemical_reaction/ketrazine
+	name = "Ketrazine"
+	id = "ketrazine"
+	results = list("ketrazine" = 3)
+	required_reagents = list("epinephrine" = 1, "ephedrine" = 1, "tricordazine" = 1, "atropine" = 1)
+	required_catalysts = list("gold" = 1)
+	required_temp = 520
+	mix_message = "The solution fizzes and then settles into an oily, smooth, purple liquid."