From 8974fe23fe08092ddc9c05135f4dc1c574be8a64 Mon Sep 17 00:00:00 2001 From: GunHog Date: Sat, 25 Apr 2015 22:31:51 -0500 Subject: [PATCH] Fixes NTSL! Radio transmissions made via NTSL now work again. Moved the Centcom radio checks from 4 to 5 so it does not override other things. --- code/game/machinery/telecomms/broadcasting.dm | 4 ++-- code/game/objects/items/devices/radio/radio.dm | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/code/game/machinery/telecomms/broadcasting.dm b/code/game/machinery/telecomms/broadcasting.dm index b6ab78b9fc1..cc877492b58 100644 --- a/code/game/machinery/telecomms/broadcasting.dm +++ b/code/game/machinery/telecomms/broadcasting.dm @@ -104,7 +104,7 @@ // --- Centcom radio, yo. --- - else if(data == 4) + else if(data == 5) for(var/obj/item/device/radio/R in all_radios["[freq]"]) if(!R.centcom) @@ -219,7 +219,7 @@ // --- Centcom radio, yo. --- - else if(data == 4) + else if(data == 5) for(var/obj/item/device/radio/R in all_radios["[RADIO_CHAT]"]) if(R.centcom) diff --git a/code/game/objects/items/devices/radio/radio.dm b/code/game/objects/items/devices/radio/radio.dm index 978b09390b0..169baa3a259 100644 --- a/code/game/objects/items/devices/radio/radio.dm +++ b/code/game/objects/items/devices/radio/radio.dm @@ -372,7 +372,7 @@ signal.frequency = freqnum // Quick frequency set Broadcast_Message(M, voicemask, src, message, voice, jobname, real_name, - 4, signal.data["compression"], list(position.z, 0), freq, spans, + 5, signal.data["compression"], list(position.z, 0), freq, spans, verb_say, verb_ask, verb_exclaim, verb_yell) return