diff --git a/code/game/gamemodes/cult/cult_structures.dm b/code/game/gamemodes/cult/cult_structures.dm index ed07797e2c6..bd6315d7271 100644 --- a/code/game/gamemodes/cult/cult_structures.dm +++ b/code/game/gamemodes/cult/cult_structures.dm @@ -155,7 +155,7 @@ var/list/blacklisted_pylon_turfs = typecacheof(list( else var/turf/open/floor/engine/cult/F = safepick(cultturfs) if(F) - PoolOrNew(/obj/effect/overlay/temp/cult/turf/open/floor, F) + PoolOrNew(/obj/effect/overlay/temp/cult/turf/floor, F) else // Are we in space or something? No cult turfs or // convertable turfs? diff --git a/code/game/objects/effects/overlays.dm b/code/game/objects/effects/overlays.dm index b5d68edb0fa..654ede990a9 100644 --- a/code/game/objects/effects/overlays.dm +++ b/code/game/objects/effects/overlays.dm @@ -146,24 +146,6 @@ mouse_opacity = 0 animate(src, alpha = 0, time = duration) -/obj/effect/overlay/cult - mouse_opacity = 0 - var/atom/linked - -/obj/effect/overlay/cult/ex_act() - return FALSE - -/obj/effect/overlay/cult/Destroy() - if(linked) - linked = null - ..() - return QDEL_HINT_PUTINPOOL - -/obj/effect/overlay/cult/floor - icon = 'icons/turf/floors.dmi' - icon_state = "cult" - layer = TURF_LAYER - /obj/effect/overlay/temp/cult randomdir = 0 duration = 10 @@ -203,7 +185,7 @@ icon_state = "wallglow" layer = ABOVE_NORMAL_TURF_LAYER -/obj/effect/overlay/temp/cult/turf/open/floor +/obj/effect/overlay/temp/cult/turf/floor icon_state = "floorglow" duration = 5 diff --git a/code/game/turfs/simulated/floor/plating.dm b/code/game/turfs/simulated/floor/plating.dm index a7895b526d4..5db78340987 100644 --- a/code/game/turfs/simulated/floor/plating.dm +++ b/code/game/turfs/simulated/floor/plating.dm @@ -151,14 +151,17 @@ /turf/open/floor/engine/cult name = "engraved floor" icon_state = "plating" - var/obj/effect/clockwork/overlay/floor/realappearence + var/obj/effect/clockwork/overlay/floor/bloodcult/realappearence /turf/open/floor/engine/cult/New() ..() - PoolOrNew(/obj/effect/overlay/temp/cult/turf/open/floor, src) - realappearence = PoolOrNew(/obj/effect/overlay/cult/floor, src) + PoolOrNew(/obj/effect/overlay/temp/cult/turf/floor, src) + realappearence = PoolOrNew(/obj/effect/clockwork/overlay/floor/bloodcult, src) realappearence.linked = src +/obj/effect/clockwork/overlay/floor/bloodcult + icon_state = "cult" + /turf/open/floor/engine/cult/Destroy() be_removed() return ..() @@ -172,10 +175,6 @@ qdel(realappearence) realappearence = null -/turf/open/floor/engine/cult/New() - PoolOrNew(/obj/effect/overlay/temp/cult/turf/open/floor, src) - ..() - /turf/open/floor/engine/cult/narsie_act() return