Merge pull request #3257 from Citadel-Station-13/upstream-merge-31468

[MIRROR] Gets rid of spawns in buttons
This commit is contained in:
LetterJay
2017-10-10 01:05:21 -04:00
committed by GitHub
+5 -16
View File
@@ -13,7 +13,6 @@
if(id)
to_chat(user, "<span class='notice'>Its channel ID is '[id]'.</span>")
/obj/item/device/assembly/control/activate()
cooldown = 1
var/openclose
@@ -21,13 +20,7 @@
if(M.id == src.id)
if(openclose == null)
openclose = M.density
spawn(0)
if(M)
if(openclose)
M.open()
else
M.close()
return
INVOKE_ASYNC(M, openclose ? /obj/machinery/door/poddoor.proc/open : /obj/machinery/door/poddoor.proc/close)
sleep(10)
cooldown = 0
@@ -86,8 +79,7 @@
cooldown = 1
for(var/obj/machinery/door/poddoor/M in GLOB.machines)
if (M.id == src.id)
spawn( 0 )
M.open()
INVOKE_ASYNC(M, /obj/machinery/door/poddoor.proc/open)
sleep(10)
@@ -99,8 +91,7 @@
for(var/obj/machinery/door/poddoor/M in GLOB.machines)
if (M.id == src.id)
spawn( 0 )
M.close()
INVOKE_ASYNC(M, /obj/machinery/door/poddoor.proc/close)
sleep(10)
cooldown = 0
@@ -114,8 +105,7 @@
cooldown = 1
for(var/obj/machinery/sparker/M in GLOB.machines)
if (M.id == src.id)
spawn( 0 )
M.ignite()
INVOKE_ASYNC(M, /obj/machinery/sparker.proc/ignite)
for(var/obj/machinery/igniter/M in GLOB.machines)
if(M.id == src.id)
@@ -135,8 +125,7 @@
cooldown = 1
for(var/obj/machinery/flasher/M in GLOB.machines)
if(M.id == src.id)
spawn(0)
M.flash()
INVOKE_ASYNC(M, /obj/machinery/flasher.proc/flash)
sleep(50)
cooldown = 0