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

code/modules/antagonists/traitor/datum_traitor.dm

@@ -23,6 +23,7 @@
 	owner.special_role = special_role
 	if(give_objectives)
 		forge_traitor_objectives()
+	RegisterSignal(owner.current, COMSIG_MOVABLE_HEAR, .proc/handle_hearing)
 	finalize_traitor()
 	..()
 
@@ -48,6 +49,11 @@
 		A.verbs -= /mob/living/silicon/ai/proc/choose_modules
 		A.malf_picker.remove_malf_verbs(A)
 		qdel(A.malf_picker)
+	UnregisterSignal(owner.current, COMSIG_MOVABLE_HEAR, .proc/handle_hearing)
+	SSticker.mode.traitors -= owner
+	if(!silent && owner.current)
+		to_chat(owner.current,"<span class='userdanger'> You are no longer the [special_role]! </span>")
+	owner.special_role = null
 
 /datum/antagonist/traitor/proc/handle_hearing(datum/source, list/hearing_args)
 	var/message = hearing_args[HEARING_MESSAGE]
@@ -55,12 +61,6 @@
 	message = GLOB.syndicate_code_response_regex.Replace(message, "<span class='red'>$1</span>")
 	hearing_args[HEARING_MESSAGE] = message
 
-	SSticker.mode.traitors -= owner
-	if(!silent && owner.current)
-		to_chat(owner.current,"<span class='userdanger'> You are no longer the [special_role]! </span>")
-	owner.special_role = null
-	..()
-
 /datum/antagonist/traitor/proc/add_objective(datum/objective/O)
 	objectives += O