Merge branch 'master' into cool-ipcs

code/modules/reagents/chemistry/holder.dm

@@ -326,19 +326,18 @@
 				var/datum/reagent/R = addiction
 				if(C && R)
 					R.addiction_stage++
-					switch(R.addiction_stage)
-						if(1 to R.addiction_stage1_end)
-							need_mob_update += R.addiction_act_stage1(C)
-						if(R.addiction_stage1_end to R.addiction_stage2_end)
-							need_mob_update += R.addiction_act_stage2(C)
-						if(R.addiction_stage2_end to R.addiction_stage3_end)
-							need_mob_update += R.addiction_act_stage3(C)
-						if(R.addiction_stage3_end to R.addiction_stage4_end)
-							need_mob_update += R.addiction_act_stage4(C)
-						if(R.addiction_stage4_end to INFINITY)
-							remove_addiction(R)
-						else
-							SEND_SIGNAL(C, COMSIG_CLEAR_MOOD_EVENT, "[R.type]_overdose")
+					if(1 <= R.addiction_stage && R.addiction_stage <= R.addiction_stage1_end)
+						need_mob_update += R.addiction_act_stage1(C)
+					else if(R.addiction_stage1_end < R.addiction_stage && R.addiction_stage <= R.addiction_stage2_end)
+						need_mob_update += R.addiction_act_stage2(C)
+					else if(R.addiction_stage2_end < R.addiction_stage && R.addiction_stage <= R.addiction_stage3_end)
+						need_mob_update += R.addiction_act_stage3(C)
+					else if(R.addiction_stage3_end < R.addiction_stage && R.addiction_stage <= R.addiction_stage4_end)
+						need_mob_update += R.addiction_act_stage4(C)
+					else if(R.addiction_stage4_end < R.addiction_stage)
+						remove_addiction(R)
+					else
+						SEND_SIGNAL(C, COMSIG_CLEAR_MOOD_EVENT, "[R.type]_overdose")
 		addiction_tick++
 	if(C && need_mob_update) //some of the metabolized reagents had effects on the mob that requires some updates.
 		C.updatehealth()

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

@@ -32,7 +32,7 @@
 	for (var/x in 1 to PILL_STYLE_COUNT)
 		var/list/SL = list()
 		SL["id"] = x
-		SL["htmltag"] = assets.icon_tag("pill[x]")
+		SL["htmltag"] = assets.icon_class_name("pill[x]")
 		pillStyles += list(SL)
 
 	. = ..()

code/modules/reagents/chemistry/reagents/food_reagents.dm

@@ -859,3 +859,13 @@
 	taste_mult = 2.5 //sugar's 1.5, capsacin's 1.5, so a good middle ground.
 	taste_description = "smokey sweetness"
 	value = REAGENT_VALUE_COMMON
+
+/datum/reagent/consumable/laughsyrup
+	name = "Laughin' Syrup"
+	description = "The product of juicing Laughin' Peas. Fizzy, and seems to change flavour based on what it's used with!"
+	nutriment_factor = 5 * REAGENTS_METABOLISM
+	color = "#803280"
+	taste_mult = 2
+	taste_description = "fizzy sweetness"
+	value = REAGENT_VALUE_COMMON
+	

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

@@ -250,7 +250,7 @@
 	if(istype(O, /obj/item/stack/medical/gauze))
 		var/obj/item/stack/medical/gauze/G = O
 		reac_volume = min((reac_volume / 10), G.amount)
-		new/obj/item/stack/medical/ointment(get_turf(G), reac_volume)
+		new/obj/item/stack/medical/mesh(get_turf(G), reac_volume)
 		G.use(reac_volume)
 
 /datum/reagent/medicine/silver_sulfadiazine/reaction_mob(mob/living/M, method=TOUCH, reac_volume, show_message = 1)
@@ -336,7 +336,7 @@
 	if(istype(O, /obj/item/stack/medical/gauze))
 		var/obj/item/stack/medical/gauze/G = O
 		reac_volume = min((reac_volume / 10), G.amount)
-		new/obj/item/stack/medical/bruise_pack(get_turf(G), reac_volume)
+		new/obj/item/stack/medical/suture(get_turf(G), reac_volume)
 		G.use(reac_volume)
 
 /datum/reagent/medicine/styptic_powder/on_mob_life(mob/living/carbon/M)
@@ -1563,3 +1563,20 @@
 	M.adjustOrganLoss(ORGAN_SLOT_LUNGS, 0.5)
 	..()
 	. = 1
+
+/datum/reagent/medicine/liquid_wisdom
+	name = "liquid wisdom"
+	description = "the physical representation of wisdom, in liquid form"
+	taste_mult = 4
+	can_synth = FALSE
+	overdose_threshold = 30
+	value = REAGENT_VALUE_UNCOMMON // while it's 'rare', it can be milked from the wisdom cow
+
+/datum/reagent/medicine/liquid_wisdom/on_mob_life(mob/living/carbon/C) //slightly stronger mannitol, from the wisdom cow
+	C.adjustOrganLoss(ORGAN_SLOT_BRAIN, -3*REM)
+	if(prob(20))
+		C.cure_trauma_type(resilience = TRAUMA_RESILIENCE_BASIC)
+	if(prob(3))
+		to_chat(C, "[pick(GLOB.wisdoms)]") //give them a random wisdom
+	..()
+

code/modules/reagents/chemistry/reagents/other_reagents.dm

@@ -2284,3 +2284,4 @@
 		S = new(T)
 	if(data["blood_DNA"])
 		S.add_blood_DNA(list(data["blood_DNA"] = data["blood_type"]))
+