cyberpresidentvanellope/S.P.L.U.R.T-Station-13
1
0
Fork 0
mirror of https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13.git synced 2026-08-31 00:26:56 +01:00
Code Issues Packages Projects Releases Wiki Activity

QDEL_IN improvements

Browse Source
This commit is contained in:
Tsurupeta
2023-08-08 14:01:16 +03:00
parent eca4935865
commit d4f3793f8f
8 changed files with 17 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/antagonists/clockcult/clock_effects/spatial_gateway.dm
+5 -5
View File
@@ -35,7 +35,7 @@
clockwork_desc = "A gateway in reality. It can only [sender ? "send" : "receive"] objects."
if(is_stable)
return
timerid = QDEL_IN(src, lifetime) //We only need this if the gateway is not stable
timerid = QDEL_IN_STOPPABLE(src, lifetime) //We only need this if the gateway is not stable
//set up a gateway with another gateway
/obj/effect/clockwork/spatial_gateway/proc/setup_gateway(obj/effect/clockwork/spatial_gateway/gatewayB, set_duration, set_uses, two_way)
@@ -108,12 +108,12 @@
visible_message("<span class='warning'>[src] is disrupted!</span>")
animate(src, alpha = 0, transform = matrix()*2, time = 10, flags = ANIMATION_END_NOW)
deltimer(timerid)
timerid = QDEL_IN(src, 10)
timerid = QDEL_IN_STOPPABLE(src, 10)
linked_gateway.uses = 0
linked_gateway.visible_message("<span class='warning'>[linked_gateway] is disrupted!</span>")
animate(linked_gateway, alpha = 0, transform = matrix()*2, time = 10, flags = ANIMATION_END_NOW)
deltimer(linked_gateway.timerid)
linked_gateway.timerid = QDEL_IN(linked_gateway, 10)
linked_gateway.timerid = QDEL_IN_STOPPABLE(linked_gateway, 10)
return TRUE
return FALSE
@@ -279,8 +279,8 @@
/obj/effect/clockwork/spatial_gateway/stable/proc/start_shutdown()
deltimer(timerid)
deltimer(linked_gateway.timerid)
timerid = QDEL_IN(src, 20)
linked_gateway.timerid = QDEL_IN(linked_gateway, 20)
timerid = QDEL_IN_STOPPABLE(src, 20)
linked_gateway.timerid = QDEL_IN_STOPPABLE(linked_gateway, 20)
animate(src, alpha = 0, transform = matrix()*2, time = 20, flags = ANIMATION_END_NOW)
animate(linked_gateway, alpha = 0, transform = matrix()*2, time = 20, flags = ANIMATION_END_NOW)
src.visible_message("<span class='warning'>[src] begins to destabilise!</span>")
code/modules/antagonists/clockcult/clock_structures/taunting_trail.dm
+1 -1
View File
@@ -16,7 +16,7 @@
/obj/structure/destructible/clockwork/taunting_trail/Initialize(mapload)
. = ..()
timerid = QDEL_IN(src, 15)
timerid = QDEL_IN_STOPPABLE(src, 15)
var/obj/structure/destructible/clockwork/taunting_trail/Tt = locate(/obj/structure/destructible/clockwork/taunting_trail) in loc
if(Tt && Tt != src)
if(!step(src, pick(GLOB.alldirs)))
code/modules/mob/living/simple_animal/hostile/mining_mobs/curse_blob.dm
+1 -1
View File
@@ -30,7 +30,7 @@
/mob/living/simple_animal/hostile/asteroid/curseblob/Initialize(mapload)
. = ..()
timerid = QDEL_IN(src, 600)
timerid = QDEL_IN_STOPPABLE(src, 600)
playsound(src, 'sound/effects/curse1.ogg', 100, 1, -1)
/mob/living/simple_animal/hostile/asteroid/curseblob/Destroy()
code/modules/mob/living/simple_animal/hostile/mining_mobs/goliath.dm
+1 -1
View File
@@ -211,4 +211,4 @@
/obj/effect/temp_visual/goliath_tentacle/proc/retract()
icon_state = "Goliath_tentacle_retract"
deltimer(timerid)
timerid = QDEL_IN(src, 7)
timerid = QDEL_IN_STOPPABLE(src, 7)