From 86cc2dd09a0856cd84355aa0c3f9364e39d0cdc5 Mon Sep 17 00:00:00 2001 From: Jack Edge Date: Sat, 25 Jun 2016 18:18:44 +0100 Subject: [PATCH] Ripples are overlay/temp --- code/modules/shuttle/ripple.dm | 11 ++++------- code/modules/shuttle/shuttle.dm | 4 ++-- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/code/modules/shuttle/ripple.dm b/code/modules/shuttle/ripple.dm index a2a0947d5c3..fd6568c1435 100644 --- a/code/modules/shuttle/ripple.dm +++ b/code/modules/shuttle/ripple.dm @@ -1,4 +1,4 @@ -/obj/effect/ripple +/obj/effect/overlay/temp/ripple name = "hyperspace ripple" desc = "Something is coming through hyperspace, you can see the \ visual disturbances. It's probably best not to be on top of these \ @@ -10,11 +10,8 @@ layer = RIPPLE_LAYER alpha = 0 -/obj/effect/ripple/New() + duration = 3 * SHUTTLE_RIPPLE_TIME + +/obj/effect/overlay/temp/ripple/New() . = ..() animate(src, alpha=255, time=SHUTTLE_RIPPLE_TIME) - // In case something goes wrong, delete us in a bit - addtimer(src, "delself", 3 * SHUTTLE_RIPPLE_TIME, FALSE) - -/obj/effect/ripple/proc/delself() - qdel(src) diff --git a/code/modules/shuttle/shuttle.dm b/code/modules/shuttle/shuttle.dm index 5caccb742d3..52958cf63ae 100644 --- a/code/modules/shuttle/shuttle.dm +++ b/code/modules/shuttle/shuttle.dm @@ -373,8 +373,8 @@ /obj/docking_port/mobile/proc/create_ripples(obj/docking_port/stationary/S1) var/list/turfs = ripple_area(S1) - for(var/i in turfs) - ripples += new /obj/effect/ripple(i) + for(var/t in turfs) + ripples += PoolOrNew(/obj/effect/overlay/temp/ripple, t) /obj/docking_port/mobile/proc/ripple_area(obj/docking_port/stationary/S1) var/list/L0 = return_ordered_turfs(x, y, z, dir, areaInstance)