Merge pull request #1024 from Citadel-Station-13/upstream-merge-27360

[MIRROR] Prepends object names with 'The' in speech
2017-05-17 10:45:04 -04:00
parent ee47d17a7e 242bff4288
commit ce925fa04c
2 changed files with 1 additions and 2 deletions
--- 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
--- 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