Revert "Revert "Emergency communications hotfix""

This reverts commit 3ea36839a8.
This commit is contained in:
Markolie
2015-02-20 17:59:07 +01:00
parent d8d1670b68
commit c89e3ac1eb
17 changed files with 185 additions and 232 deletions
@@ -48,6 +48,8 @@
signal.data[key4] = value4
frequency.post_signal(src, signal, filter = s_filter)
return
/obj/item/radio/integrated/receive_signal(datum/signal/signal)
/*var/obj/item/device/pda/P = src.loc
@@ -127,7 +127,7 @@
/obj/item/device/radio/headset/heads/captain/alt
name = "\proper the captain's bowman headset"
desc = "The headset of the boss. Protects ears from flashbangs. \nChannels are as follows: :c - command, :s - security, :e - engineering, :u - supply, :zz - service, :m - medical, :n - science."
desc = "The headset of the boss. Protects ears from flashbangs. \nChannels are as follows: :c - command, :s - security, :e - engineering, :u - supply, :z - service, :m - medical, :n - science."
flags = EARBANGPROTECT
icon_state = "com_headset_alt"
item_state = "com_headset_alt"
@@ -4,7 +4,7 @@
icon_state = "intercom"
anchored = 1
w_class = 4.0
canhear_range = 5
canhear_range = 2
flags = CONDUCT | NOBLOODY
var/number = 0
var/anyai = 1
@@ -15,7 +15,7 @@
..()
processing_objects += src
/obj/item/device/radio/intercom/Destroy()
/obj/item/device/radio/intercom/Del()
processing_objects -= src
..()
@@ -24,10 +24,6 @@
spawn (0)
attack_self(user)
/obj/item/device/radio/intercom/attack_paw(mob/user as mob)
return src.attack_hand(user)
/obj/item/device/radio/intercom/attack_hand(mob/user as mob)
src.add_fingerprint(user)
spawn (0)
@@ -36,15 +32,13 @@
/obj/item/device/radio/intercom/receive_range(freq, level)
if (!on)
return -1
if (isWireCut(WIRE_RECEIVE))
return -1
if(!(0 in level))
var/turf/position = get_turf(src)
if(isnull(position) || !(position.z in level))
return -1
if (!src.listening)
return -1
if(freq == SYND_FREQ)
if(freq in ANTAG_FREQS)
if(!(src.syndie))
return -1//Prevents broadcast of messages over devices lacking the encryption
@@ -72,4 +66,4 @@
if(!on)
icon_state = "intercom-p"
else
icon_state = "intercom"
icon_state = "intercom"
+5
View File
@@ -21,6 +21,11 @@
// Reagent ID => friendly name
var/list/reagents_to_log=list()
/obj/New()
..()
if(ticker && ticker.current_state == GAME_STATE_PLAYING)
initialize()
/obj/Topic(href, href_list, var/nowindow = 0, var/checkrange = 1)
// Calling Topic without a corresponding window open causes runtime errors
if(!nowindow && ..())