shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixes allinone tcomms machine

Browse Source
This commit is contained in:
CitadelStationBot
2017-08-28 02:20:51 -05:00
parent 65d4c6f938
commit a6cc400a4b
1 changed files with 49 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
code/game/machinery/telecomms/machines/allinone.dm.rej Normal file
View File

@@ -0,0 +1,49 @@
diff a/code/game/machinery/telecomms/machines/allinone.dm b/code/game/machinery/telecomms/machines/allinone.dm (rejected hunks)
@@ -12,7 +12,7 @@
use_power = NO_POWER_USE
idle_power_usage = 0
machinetype = 6
- var/intercept = FALSE // if TRUE, broadcasts all (non-syndie) messages to syndicate channel
+ var/intercept = FALSE // if TRUE, broadcasts all syndie messages to syndicate channel
/obj/machinery/telecomms/allinone/receive_signal(datum/signal/signal)
@@ -32,17 +32,11 @@
if(signal.data["slow"] > 0)
sleep(signal.data["slow"]) // simulate the network lag if necessary
- /* ###### Broadcast a message using signal.data ###### */
- Broadcast_Message(signal.data["mob"],
- signal.data["vmask"],
- signal.data["radio"], signal.data["message"],
- signal.data["name"], signal.data["job"],
- signal.data["realname"],, signal.data["compression"], list(0, z), signal.frequency, signal.data["spans"],
- signal.data["verb_say"], signal.data["verb_ask"], signal.data["verb_exclaim"], signal.data["verb_yell"],
- signal.data["language"])
-
- /* ###### Copy all non-syndie communications to the Syndicate Frequency ###### */
- if(intercept && signal.frequency != GLOB.SYND_FREQ)
+
+
+
+ /* ###### Copy all syndie communications to the Syndicate Frequency ###### */
+ if(intercept && signal.frequency == GLOB.SYND_FREQ)
Broadcast_Message(signal.data["mob"],
signal.data["vmask"],
signal.data["radio"], signal.data["message"],
@@ -50,6 +44,15 @@
signal.data["realname"],, signal.data["compression"], list(0, z), GLOB.SYND_FREQ, signal.data["spans"],
signal.data["verb_say"], signal.data["verb_ask"], signal.data["verb_exclaim"], signal.data["verb_yell"],
signal.data["language"])
+ /* ###### Broadcast a message using signal.data ###### */
+ else if(!intercept)
+ Broadcast_Message(signal.data["mob"],
+ signal.data["vmask"],
+ signal.data["radio"], signal.data["message"],
+ signal.data["name"], signal.data["job"],
+ signal.data["realname"],, signal.data["compression"], list(0, z), signal.frequency, signal.data["spans"],
+ signal.data["verb_say"], signal.data["verb_ask"], signal.data["verb_exclaim"], signal.data["verb_yell"],
+ signal.data["language"])
/obj/machinery/telecomms/allinone/attackby(obj/item/P, mob/user, params)