From 242bff42888e22515321a5234a8c2b14ac8effba Mon Sep 17 00:00:00 2001
From: CitadelStationBot <CitadelStationBot>
Date: Wed, 17 May 2017 05:13:47 -0500
Subject: [PATCH] Prepends object names with 'The' in speech

---
 code/game/objects/items/devices/radio/radio.dm | 1 -
 code/game/say.dm                               | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/code/game/objects/items/devices/radio/radio.dm b/code/game/objects/items/devices/radio/radio.dm
index de0692d8e7..1f2f86e42a 100644
--- a/code/game/objects/items/devices/radio/radio.dm
+++ b/code/game/objects/items/devices/radio/radio.dm
@@ -296,7 +296,6 @@
 	// --- Cold, emotionless machines. ---
 	else if(isobj(M))
 		jobname = "Machine"
-		voice = capitalize(voice)
 
 	// --- Unidentifiable mob ---
 	else
diff --git a/code/game/say.dm b/code/game/say.dm
index 358fc9698d..fe76000c71 100644
--- a/code/game/say.dm
+++ b/code/game/say.dm
@@ -143,7 +143,7 @@ GLOBAL_LIST_INIT(freqtospan, list(
 	return "0"
 
 /atom/movable/proc/GetVoice()
-	return name
+	return "[src]"	//Returns the atom's name, prepended with 'The' if it's not a proper noun
 
 /atom/movable/proc/IsVocal()
 	return 1