Skip to content

Commit

Permalink
fixes allinone tcomms machine
Browse files Browse the repository at this point in the history
  • Loading branch information
Shadowlight213 committed Aug 26, 2017
1 parent 90e631f commit ed5662b
Showing 1 changed file with 15 additions and 12 deletions.
27 changes: 15 additions & 12 deletions code/game/machinery/telecomms/machines/allinone.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand All @@ -32,24 +32,27 @@
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"],
signal.data["name"], signal.data["job"],
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)

Expand Down

0 comments on commit ed5662b

Please sign in to comment.