From 459d4f35c730f7747d632e1c4ea748cdf3a0f181 Mon Sep 17 00:00:00 2001
From: MoreRobustThanYou <MoreRobustThanYou@users.noreply.github.com>
Date: Fri, 29 Dec 2017 11:07:34 -0500
Subject: [PATCH 1/2] Monkeymode fixes (#33796)

* Monkey fixes

* Update say.dm
---
 code/datums/antagonists/monkey.dm |  3 +--
 code/modules/mob/living/say.dm    | 16 +++-------------
 2 files changed, 4 insertions(+), 15 deletions(-)

diff --git a/code/datums/antagonists/monkey.dm b/code/datums/antagonists/monkey.dm
index b1c5642a39..518161b51b 100644
--- a/code/datums/antagonists/monkey.dm
+++ b/code/datums/antagonists/monkey.dm
@@ -16,8 +16,7 @@
 
 	var/datum/disease/D = new /datum/disease/transformation/jungle_fever/monkeymode
 	if(!owner.current.HasDisease(D))
-		D.affected_mob = owner
-		owner.current.viruses += D
+		owner.current.AddDisease(D)
 	else
 		QDEL_NULL(D)
 
diff --git a/code/modules/mob/living/say.dm b/code/modules/mob/living/say.dm
index fa315068ac..6eb4f0b77c 100644
--- a/code/modules/mob/living/say.dm
+++ b/code/modules/mob/living/say.dm
@@ -20,11 +20,6 @@ GLOBAL_LIST_INIT(department_radio_keys, list(
 	"t" = "Syndicate",
 	"y" = "CentCom",
 
-	// Species
-	"b" = "binary",
-	"g" = "changeling",
-	"a" = "alientalk",
-
 	// Admin
 	"p" = "admin",
 	"d" = "deadmin",
@@ -55,11 +50,6 @@ GLOBAL_LIST_INIT(department_radio_keys, list(
 	"å" = "Syndicate",
 	"í" = "CentCom",
 
-	// Species
-	"è" = "binary",
-	"ï" = "changeling",
-	"ô" = "alientalk",
-
 	// Admin
 	"ç" = "admin",
 	"â" = "deadmin",
@@ -81,13 +71,14 @@ GLOBAL_LIST_INIT(department_radio_keys, list(
 	if(!message || message == "")
 		return
 
+	var/datum/saymode/saymode = SSradio.saymodes[talk_key]
 	var/message_mode = get_message_mode(message)
 	var/original_message = message
 	var/in_critical = InCritical()
 
 	if(one_character_prefix[message_mode])
 		message = copytext(message, 2)
-	else if(message_mode)
+	else if(message_mode || saymode)
 		message = copytext(message, 3)
 	if(findtext(message, " ", 1, 2))
 		message = copytext(message, 2)
@@ -135,8 +126,7 @@ GLOBAL_LIST_INIT(department_radio_keys, list(
 	// AIs use inherent channels for the holopad. Most inherent channels
 	// ignore the language argument however.
 
-	var/datum/saymode/SM = SSradio.saymodes[talk_key]
-	if(SM && !SM.handle_message(src, message, language))
+	if(saymode && !saymode.handle_message(src, message, language))
 		return
 
 	if(!can_speak_vocal(message))