unga

Author: warface1234455

code/modules/mob/living/say.dm

@@ -385,13 +385,22 @@ GLOBAL_LIST_INIT(special_radio_keys, list(
 
 /mob/living/proc/radio(message, list/message_mods = list(), list/spans, language)
 	var/obj/item/implant/radio/imp = locate() in src
+	var/obj/item/radio/radio = get_item_by_slot(ITEM_SLOT_EARS)
 	if(imp && imp.radio.on)
 		if(message_mods[MODE_HEADSET])
-			imp.radio.talk_into(src, message, null, spans, language, message_mods)
-			return ITALICS | REDUCE_RANGE
+			if(radio?.use_command)
+				radio.radio.talk_into(src, message, null, spans, language, message_mods)
+				return ITALICS | REDUCE_RANGE
+			else
+				imp.radio.talk_into(src, message, null, spans, language, message_mods)
+				return ITALICS | REDUCE_RANGE
 		if(message_mods[RADIO_EXTENSION] == MODE_DEPARTMENT || (message_mods[RADIO_EXTENSION] in imp.radio.channels))
-			imp.radio.talk_into(src, message, message_mods[RADIO_EXTENSION], spans, language, message_mods)
-			return ITALICS | REDUCE_RANGE
+			if(radio?.use_command)
+				radio.radio.talk_into(src, message, message_mods[RADIO_EXTENSION], spans, language, message_mods)
+				return ITALICS | REDUCE_RANGE
+			else
+				imp.radio.talk_into(src, message, message_mods[RADIO_EXTENSION], spans, language, message_mods)
+				return ITALICS | REDUCE_RANGE
 
 	switch(message_mods[RADIO_EXTENSION])
 		if(MODE_RADIO)