From 876e8ec713369c2f2addd0d6b537aa5dbf47c5bd Mon Sep 17 00:00:00 2001 From: Jordan Brown Date: Fri, 1 Jun 2018 10:50:47 -0400 Subject: [PATCH 1/2] Merge pull request #38185 from AutomaticFrenzy/patch/cult-floors Set cult floor effects to be on the floor plane --- code/game/objects/effects/temporary_visuals/cult.dm | 1 + .../modules/antagonists/clockcult/clock_effects/clock_overlay.dm | 1 + 2 files changed, 2 insertions(+) diff --git a/code/game/objects/effects/temporary_visuals/cult.dm b/code/game/objects/effects/temporary_visuals/cult.dm index 3a17494871..0f9d7321af 100644 --- a/code/game/objects/effects/temporary_visuals/cult.dm +++ b/code/game/objects/effects/temporary_visuals/cult.dm @@ -47,6 +47,7 @@ /obj/effect/temp_visual/cult/turf/floor icon_state = "floorglow" duration = 5 + plane = FLOOR_PLANE /obj/effect/temp_visual/cult/portal icon_state = "space" diff --git a/code/modules/antagonists/clockcult/clock_effects/clock_overlay.dm b/code/modules/antagonists/clockcult/clock_effects/clock_overlay.dm index f3de8d04a8..34a986aa97 100644 --- a/code/modules/antagonists/clockcult/clock_effects/clock_overlay.dm +++ b/code/modules/antagonists/clockcult/clock_effects/clock_overlay.dm @@ -44,6 +44,7 @@ icon = 'icons/turf/floors.dmi' icon_state = "clockwork_floor" layer = TURF_LAYER + plane = FLOOR_PLANE /obj/effect/clockwork/overlay/floor/bloodcult //this is used by BLOOD CULT, it shouldn't use such a path... icon_state = "cult" \ No newline at end of file