Merge pull request #18729 from coiax/remove-spawn-3

Remove spawn III
This commit is contained in:
oranges
2016-06-21 20:11:08 +12:00
committed by GitHub
39 changed files with 64 additions and 127 deletions
+1 -3
View File
@@ -102,9 +102,7 @@
pulse(0)
audible_message("\icon[src] *beep* *beep*", null, 3)
cooldown = 2
spawn(10)
process_cooldown()
return
addtimer(src, "process_cooldown", 10)
/obj/item/device/assembly/infra/interact(mob/user)//TODO: change this this to the wire control panel
if(is_secured(user))
+2 -4
View File
@@ -64,8 +64,7 @@
pulse(0)
audible_message("\icon[src] *beep* *beep*", null, 3)
cooldown = 2
spawn(10)
process_cooldown()
addtimer(src, "process_cooldown", 10)
/obj/item/device/assembly/prox_sensor/process()
@@ -80,8 +79,7 @@
/obj/item/device/assembly/prox_sensor/dropped()
..()
if(scanning)
spawn(0)
sense()
addtimer(src, "sense", 0)
/obj/item/device/assembly/prox_sensor/toggle_scan(scan)