cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2025-12-25 17:42:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #542 from SkyMarshal/master

Browse Source 
Fixed a derp regarding telecomms, fixed mapping error.
This commit is contained in:
Albert Iordache
2012-02-28 09:14:22 -08:00
parent 27fd036c87 90c976a8e4
commit 65963960bb
2 changed files with 8705 additions and 8707 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
code/game/machinery/telecomms/broadcaster.dm
View File

@@ -97,32 +97,26 @@ var
var/datum/radio_frequency/connection = signal.data["connection"]
if(!intercept || (nuke && connection.frequency == NUKE_FREQ)) // if syndicate broadcast, just
if(!intercept) // if syndicate broadcast, just
if(connection.frequency == frequency && !nuke)
Broadcast_Message(signal.data["connection"], signal.data["mob"],
signal.data["vmask"], signal.data["vmessage"],
signal.data["radio"], signal.data["message"],
signal.data["name"], signal.data["job"],
signal.data["realname"], signal.data["vname"],, signal.data["compression"])
else if(connection.frequency == NUKE_FREQ && !nuke)
Broadcast_Message(signal.data["connection"], signal.data["mob"],
signal.data["vmask"], signal.data["vmessage"],
signal.data["radio"], signal.data["message"],
signal.data["name"], signal.data["job"],
signal.data["realname"], signal.data["vname"],, signal.data["compression"])
else
Broadcast_Message(signal.data["connection"], signal.data["mob"],
signal.data["vmask"], signal.data["vmessage"],
signal.data["radio"], signal.data["message"],
signal.data["name"], signal.data["job"],
signal.data["realname"], signal.data["vname"],, signal.data["compression"])
else
if(nuke)
if(nuke && connection.frequency != NUKE_FREQ)
Broadcast_Message(signal.data["connection"], signal.data["mob"],
signal.data["vmask"], signal.data["vmessage"],
signal.data["radio"], signal.data["message"],
signal.data["name"], signal.data["job"],
signal.data["realname"], signal.data["vname"], 3, signal.data["compression"])
else if(nuke)
Broadcast_Message(signal.data["connection"], signal.data["mob"],
signal.data["vmask"], signal.data["vmessage"],
signal.data["radio"], signal.data["message"],
signal.data["name"], signal.data["job"],
signal.data["realname"], signal.data["vname"],, signal.data["compression"])
else
Broadcast_Message(signal.data["connection"], signal.data["mob"],
signal.data["vmask"], signal.data["vmessage"],