From b385a5068d7dce8f738f392ca64deb9ed7d41bf0 Mon Sep 17 00:00:00 2001
From: Joan Lung <duorabbit2@gmail.com>
Date: Mon, 22 Aug 2016 21:44:10 -0400
Subject: [PATCH 1/2] robustin fuck you and your copypasting ways

---
 code/game/objects/effects/overlays.dm      | 18 ------------------
 code/game/turfs/simulated/floor/plating.dm |  7 +++++--
 2 files changed, 5 insertions(+), 20 deletions(-)

diff --git a/code/game/objects/effects/overlays.dm b/code/game/objects/effects/overlays.dm
index bb73af6b43f..b6baac4f213 100644
--- a/code/game/objects/effects/overlays.dm
+++ b/code/game/objects/effects/overlays.dm
@@ -145,24 +145,6 @@
 		setDir(mimiced_atom.dir)
 	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
diff --git a/code/game/turfs/simulated/floor/plating.dm b/code/game/turfs/simulated/floor/plating.dm
index a7895b526d4..85446ef351d 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)
+	realappearence = PoolOrNew(/obj/effect/overlay/cult/floor/bloodcult, src)
 	realappearence.linked = src
 
+/obj/effect/clockwork/overlay/floor/bloodcult
+	icon_state = "cult"
+
 /turf/open/floor/engine/cult/Destroy()
 	be_removed()
 	return ..()

From f3ce0b9be26fdcfa95d86886b3a522a8d6e52617 Mon Sep 17 00:00:00 2001
From: Joan Lung <duorabbit2@gmail.com>
Date: Mon, 22 Aug 2016 21:54:47 -0400
Subject: [PATCH 2/2] robustin you massive shitcoder wew i need to rename that
 path

---
 code/game/gamemodes/cult/cult_structures.dm | 2 +-
 code/game/objects/effects/overlays.dm       | 2 +-
 code/game/turfs/simulated/floor/plating.dm  | 8 ++------
 3 files changed, 4 insertions(+), 8 deletions(-)

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 b6baac4f213..8b57c34e98b 100644
--- a/code/game/objects/effects/overlays.dm
+++ b/code/game/objects/effects/overlays.dm
@@ -184,7 +184,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 85446ef351d..5db78340987 100644
--- a/code/game/turfs/simulated/floor/plating.dm
+++ b/code/game/turfs/simulated/floor/plating.dm
@@ -155,8 +155,8 @@
 
 /turf/open/floor/engine/cult/New()
 	..()
-	PoolOrNew(/obj/effect/overlay/temp/cult/turf/open/floor, src)
-	realappearence = PoolOrNew(/obj/effect/overlay/cult/floor/bloodcult, 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
@@ -175,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