From a6cc400a4b66ef8850741de90ff1cbd349b42c18 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Mon, 28 Aug 2017 02:20:51 -0500 Subject: [PATCH 1/3] Fixes allinone tcomms machine --- .../telecomms/machines/allinone.dm.rej | 49 +++++++++++++++++++ 1 file changed, 49 insertions(+) create mode 100644 code/game/machinery/telecomms/machines/allinone.dm.rej diff --git a/code/game/machinery/telecomms/machines/allinone.dm.rej b/code/game/machinery/telecomms/machines/allinone.dm.rej new file mode 100644 index 0000000000..98feaf1b33 --- /dev/null +++ b/code/game/machinery/telecomms/machines/allinone.dm.rej @@ -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) + From 472e39693f0ad4308e343a209a2bf3cd5fc372e5 Mon Sep 17 00:00:00 2001 From: LetterJay Date: Mon, 28 Aug 2017 09:02:35 -0500 Subject: [PATCH 2/3] Update allinone.dm --- .../machinery/telecomms/machines/allinone.dm | 20 +++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/code/game/machinery/telecomms/machines/allinone.dm b/code/game/machinery/telecomms/machines/allinone.dm index 8c73b96932..f881e18d35 100644 --- a/code/game/machinery/telecomms/machines/allinone.dm +++ b/code/game/machinery/telecomms/machines/allinone.dm @@ -12,7 +12,7 @@ use_power = NO_POWER_USE idle_power_usage = 0 machinetype = 6 - var/intercept = 0 // if nonzero, broadcasts all 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,15 +32,27 @@ if(signal.data["slow"] > 0) sleep(signal.data["slow"]) // simulate the network lag if necessary - /* ###### Broadcast a message using signal.data ###### */ - if(signal.frequency == GLOB.SYND_FREQ) // if syndicate broadcast, just + + + + /* ###### 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), signal.frequency, signal.data["spans"], + 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) From 2b5d584c67e48675657ef926f32d2aedb7c00bc1 Mon Sep 17 00:00:00 2001 From: kevinz000 Date: Tue, 29 Aug 2017 20:15:33 -0700 Subject: [PATCH 3/3] sync --- .../machinery/telecomms/machines/allinone.dm | 1 - .../telecomms/machines/allinone.dm.rej | 49 ------------------- 2 files changed, 50 deletions(-) delete mode 100644 code/game/machinery/telecomms/machines/allinone.dm.rej diff --git a/code/game/machinery/telecomms/machines/allinone.dm b/code/game/machinery/telecomms/machines/allinone.dm index bfca6099b9..f881e18d35 100644 --- a/code/game/machinery/telecomms/machines/allinone.dm +++ b/code/game/machinery/telecomms/machines/allinone.dm @@ -14,7 +14,6 @@ machinetype = 6 var/intercept = FALSE // if TRUE, broadcasts all syndie messages to syndicate channel - /obj/machinery/telecomms/allinone/receive_signal(datum/signal/signal) if(!on) // has to be on to receive messages diff --git a/code/game/machinery/telecomms/machines/allinone.dm.rej b/code/game/machinery/telecomms/machines/allinone.dm.rej deleted file mode 100644 index 98feaf1b33..0000000000 --- a/code/game/machinery/telecomms/machines/allinone.dm.rej +++ /dev/null @@ -1,49 +0,0 @@ -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) -