From c3caf5c40383389bb0bc7860805cd332f56e16a8 Mon Sep 17 00:00:00 2001
From: Atlantiscze <git@stepanekjakub.cz>
Date: Wed, 30 Jul 2014 12:15:15 +0200
Subject: [PATCH] Fixes #5827

- Drones can now use .d to access Drone chat
- Cleaner and nicer check for dronechat, uses proper data from say.dm shortcut list.
- MISSING: .d alternative for "Russian localization" (Does anyone actually use that?)
---
 code/modules/mob/living/say.dm                       | 2 ++
 code/modules/mob/living/silicon/robot/drone/drone.dm | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/code/modules/mob/living/say.dm b/code/modules/mob/living/say.dm
index ffb1602fc80..9d0de237799 100644
--- a/code/modules/mob/living/say.dm
+++ b/code/modules/mob/living/say.dm
@@ -14,6 +14,7 @@ var/list/department_radio_keys = list(
 	  ":t" = "Syndicate",	"#t" = "Syndicate",		".t" = "Syndicate",
 	  ":u" = "Supply",		"#u" = "Supply",		".u" = "Supply",
 	  ":g" = "changeling",	"#g" = "changeling",	".g" = "changeling",
+	  ":d" = "dronechat",	"#d" = "dronechat",		".d" = "dronechat",
 
 
 	  ":R" = "right ear",	"#R" = "right ear",		".R" = "right ear", "!R" = "fake right ear",
@@ -31,6 +32,7 @@ var/list/department_radio_keys = list(
 	  ":T" = "Syndicate",	"#T" = "Syndicate",		".T" = "Syndicate",
 	  ":U" = "Supply",		"#U" = "Supply",		".U" = "Supply",
 	  ":G" = "changeling",	"#G" = "changeling",	".G" = "changeling",
+	  ":D" = "dronechat",	"#D" = "dronechat",		".D" = "dronechat",
 
 	  //kinda localization -- rastaf0
 	  //same keys as above, but on russian keyboard layout. This file uses cp1251 as encoding.
diff --git a/code/modules/mob/living/silicon/robot/drone/drone.dm b/code/modules/mob/living/silicon/robot/drone/drone.dm
index e8c4d78e9ba..5942e7a1f03 100644
--- a/code/modules/mob/living/silicon/robot/drone/drone.dm
+++ b/code/modules/mob/living/silicon/robot/drone/drone.dm
@@ -108,7 +108,7 @@
 		return emote(copytext(message,2))
 	else if(length(message) >= 2)
 
-		if(copytext(message, 1 ,3) == ":d" || copytext(message, 1 ,3) == ":D")
+		if(parse_message_mode(message, "NONE") == "dronechat")
 
 			if(!is_component_functioning("radio"))
 				src << "\red Your radio transmitter isn't functional."