Merge branch 'master' into disgustport

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

@@ -46,10 +46,11 @@
 		var/list/this = list()
 		this["name"] = D.name
 		if(istype(D, /datum/disease/advance))
-			var/datum/disease/advance/A = SSdisease.archive_diseases[D.GetDiseaseID()]
-			if(A.name == "Unknown")
+			var/datum/disease/advance/A = D
+			var/datum/disease/advance/archived = SSdisease.archive_diseases[D.GetDiseaseID()]
+			if(archived.name == "Unknown")
 				this["can_rename"] = TRUE
-			this["name"] = A.name
+			this["name"] = archived.name
 			this["is_adv"] = TRUE
 			this["resistance"] = A.totalResistance()
 			this["stealth"] = A.totalStealth()

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

@@ -407,7 +407,7 @@
 		return
 	to_chat(H, "<span class='warning'><b>You crumple in agony as your flesh wildly morphs into new forms!</b></span>")
 	H.visible_message("<b>[H]</b> falls to the ground and screams as [H.p_their()] skin bubbles and froths!") //'froths' sounds painful when used with SKIN.
-	H.Knockdown(60, 0)
+	H.Knockdown(60)
 	addtimer(CALLBACK(src, .proc/mutate, H), 30)
 	return
 

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

@@ -283,13 +283,17 @@
 			. = 1
 	..()
 
-/datum/reagent/toxin/chloralhydrate/delayed
+/datum/reagent/toxin/chloralhydratedelayed
+	name = "Chloral Hydrate"
 	id = "chloralhydrate2"
+	description = "A powerful sedative that induces confusion and drowsiness before putting its target to sleep."
+	reagent_state = SOLID
+	color = "#000067" // rgb: 0, 0, 103
+	toxpwr = 0
+	metabolization_rate = 1.5 * REAGENTS_METABOLISM
 
-/datum/reagent/toxin/chloralhydrate/delayed/on_mob_life(mob/living/M)
+/datum/reagent/toxin/chloralhydratedelayed/on_mob_life(mob/living/M)
 	switch(current_cycle)
-		if(1 to 10)
-			return
 		if(10 to 20)
 			M.confused += 1
 			M.drowsyness += 1