[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
@@ -160,7 +160,7 @@
src.client.eye = src
src.visible_message("<span class='warning'><B>[src] appears in a firey blaze!</B>")
playsound(get_turf(src), 'sound/magic/exit_blood.ogg', 100, 1, -1)
addtimer(src, "fakefireextinguish", 15, TIMER_UNIQUE)
addtimer(CALLBACK(src, .proc/fakefireextinguish), 15, TIMER_UNIQUE)
/obj/effect/proc_holder/spell/targeted/sintouch
name = "Sin Touch"
@@ -20,7 +20,7 @@
/obj/effect/proc_holder/spell/targeted/ethereal_jaunt/cast(list/targets,mob/user = usr) //magnets, so mostly hardcoded
playsound(get_turf(user), 'sound/magic/Ethereal_Enter.ogg', 50, 1, -1)
for(var/mob/living/target in targets)
addtimer(src, "do_jaunt", 0, TIMER_NORMAL, target)
addtimer(CALLBACK(src, .proc/do_jaunt, target), 0)
/obj/effect/proc_holder/spell/targeted/ethereal_jaunt/proc/do_jaunt(mob/living/target)
target.notransform = 1
+2 -2
View File
@@ -16,9 +16,9 @@
user << sound("sound/magic/Knock.ogg")
for(var/turf/T in targets)
for(var/obj/machinery/door/door in T.contents)
addtimer(src, "open_door", 0, TIMER_NORMAL, door)
addtimer(CALLBACK(src, .proc/open_door, door), 0)
for(var/obj/structure/closet/C in T.contents)
addtimer(src, "open_closet", 0, TIMER_NORMAL, C)
addtimer(CALLBACK(src, .proc/open_closet, C), 0)
/obj/effect/proc_holder/spell/aoe_turf/knock/proc/open_door(var/obj/machinery/door/door)
if(istype(door, /obj/machinery/door/airlock))
@@ -34,7 +34,7 @@
perform(turf_steps,user=user)
/obj/effect/proc_holder/spell/spacetime_dist/after_cast(list/targets)
addtimer(src, "clean_turfs", duration)
addtimer(CALLBACK(src, .proc/clean_turfs), duration)
/obj/effect/proc_holder/spell/spacetime_dist/cast(list/targets, mob/user = usr)
effects = list()