[READY]Makes addtimer use callbacks (#22660)

* Makes addtimer use callbacks

* I broke the comment

* I fucked up the regex

* this was a silly idea.
This commit is contained in:
Kyle Spier-Swenson
2017-01-04 16:02:56 +13:00
committed by oranges
parent fd337f0741
commit bee4b132a3
183 changed files with 358 additions and 376 deletions
+1 -1
View File
@@ -72,7 +72,7 @@
D.safe = !D.safe
for(var/D in open_or_close)
addtimer(D, doors_need_closing ? "close" : "open",0, TIMER_NORMAL)
addtimer(CALLBACK(D, doors_need_closing ? /obj/machinery/door/airlock.proc/close : /obj/machinery/door/airlock.proc/open), 0)
sleep(10)
cooldown = 0
+3 -3
View File
@@ -204,7 +204,7 @@
I.owner << "<span class='warning'>Your photon projector implant overheats and deactivates!</span>"
I.Retract()
overheat = FALSE
addtimer(src, "cooldown", flashcd * 2)
addtimer(CALLBACK(src, .proc/cooldown), flashcd * 2)
/obj/item/device/assembly/flash/armimplant/try_use_flash(mob/user = null)
if(overheat)
@@ -212,7 +212,7 @@
I.owner << "<span class='warning'>Your photon projector is running too hot to be used again so quickly!</span>"
return FALSE
overheat = TRUE
addtimer(src, "cooldown", flashcd)
addtimer(CALLBACK(src, .proc/cooldown), flashcd)
playsound(src.loc, 'sound/weapons/flash.ogg', 100, 1)
update_icon(1)
return TRUE
@@ -275,7 +275,7 @@
else if(flash)
item_state = "flashshield_flash"
item_state = "flashshield_flash"
addtimer(src, "update_icon", 5)
addtimer(CALLBACK(src, .proc/update_icon), 5)
if(holder)
holder.update_icon()
+1 -1
View File
@@ -78,7 +78,7 @@
/obj/item/device/assembly/prox_sensor/dropped()
..()
if(scanning)
addtimer(src, "sense", 0)
addtimer(CALLBACK(src, .proc/sense), 0)
/obj/item/device/assembly/prox_sensor/Destroy()
remove_from_proximity_list(src, sensitivity)