Merge remote-tracking branch 'upstream/master' into TGUI_Updoot

code/datums/accents.dm

@@ -94,6 +94,7 @@
 
 /datum/accent/robot/modify_speech(list/speech_args)
 	speech_args[SPEECH_SPANS] = SPAN_ROBOT
+	return speech_args
 
 /datum/accent/dullahan/modify_speech(list/speech_args, datum/source, mob/living/carbon/owner)
 	if(owner)

code/datums/components/chasm.dm

@@ -76,19 +76,11 @@
 				return FALSE
 		if(M.is_flying())
 			return FALSE
-		if(ishuman(AM))
-			var/mob/living/carbon/human/H = AM
-			if(istype(H.belt, /obj/item/wormhole_jaunter))
-				var/obj/item/wormhole_jaunter/J = H.belt
-				//To freak out any bystanders
-				H.visible_message("<span class='boldwarning'>[H] falls into [parent]!</span>")
-				J.chasm_react(H)
-				return FALSE
 	return TRUE
 
 /datum/component/chasm/proc/drop(atom/movable/AM)
 	//Make sure the item is still there after our sleep
-	if(!AM || QDELETED(AM))
+	if(!AM || QDELETED(AM) || SEND_SIGNAL(AM, COMSIG_MOVABLE_CHASM_DROP, src))
 		return
 	falling_atoms[AM] = (falling_atoms[AM] || 0) + 1
 	var/turf/T = target_turf

code/datums/diseases/advance/symptoms/fire.dm

@@ -112,9 +112,9 @@ Bonus
 	symptom_delay_max = 90
 	var/chems = FALSE
 	var/explosion_power = 1
-	threshold_desc = list( "Resistance 9: Doubles the intensity of the effect, but reduces its frequency.",
-					  "Stage Speed 8: Increases explosion radius when the host is wet.",
-					  "Transmission 8: Additionally synthesizes chlorine trifluoride and napalm inside the host.")
+	threshold_desc = list("Resistance 9" = "Doubles the intensity of the effect, but reduces its frequency.",
+					  "Stage Speed 8" = "Increases explosion radius when the host is wet.",
+					  "Transmission 8" = "Additionally synthesizes chlorine trifluoride and napalm inside the host.")
 
 /datum/symptom/alkali/Start(datum/disease/advance/A)
 	if(!..())