Merge branch 'master' of https://github.com/PolarisSS13/Polaris into sync

This commit is contained in:
Arokha Sieyes
2017-02-14 20:29:57 -05:00
63 changed files with 662 additions and 78 deletions
+10 -1
View File
@@ -1,6 +1,6 @@
/obj/item/device/assembly/signaler
name = "remote signaling device"
desc = "Used to remotely activate devices."
desc = "Used to remotely activate devices. Tap against another secured signaler to transfer configuration."
icon_state = "signaller"
item_state = "signaler"
origin_tech = list(TECH_MAGNET = 1)
@@ -98,6 +98,15 @@
return
attackby(obj/item/weapon/W, mob/user, params)
if(issignaler(W))
var/obj/item/device/assembly/signaler/signaler2 = W
if(secured && signaler2.secured)
code = signaler2.code
frequency = signaler2.frequency
user << "You transfer the frequency and code of [signaler2] to [src]"
else
..()
proc/signal()
if(!radio_connection) return