From 76fe5ac63029b263b78c3c97c090f64e33de2cda Mon Sep 17 00:00:00 2001
From: Charlie <69320440+hal9000PR@users.noreply.github.com>
Date: Sat, 14 May 2022 15:07:09 +0100
Subject: [PATCH] fix (#17798)

---
 code/game/turfs/simulated/floor/chasm.dm          | 9 ++++++++-
 code/modules/ruins/lavalandruin_code/sin_ruins.dm | 5 +----
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/code/game/turfs/simulated/floor/chasm.dm b/code/game/turfs/simulated/floor/chasm.dm
index 959dab35e1b..eda73f4e5f3 100644
--- a/code/game/turfs/simulated/floor/chasm.dm
+++ b/code/game/turfs/simulated/floor/chasm.dm
@@ -26,7 +26,7 @@
 		))
 	var/drop_x = 1
 	var/drop_y = 1
-	var/drop_z = 1
+	var/drop_z = 2 // so that it doesn't send you to CC if something fucks up.
 
 /turf/simulated/floor/chasm/Entered(atom/movable/AM)
 	..()
@@ -189,3 +189,10 @@
 
 /turf/simulated/floor/chasm/CanPass(atom/movable/mover, turf/target)
 	return 1
+
+/turf/simulated/floor/chasm/pride/Initialize(mapload)
+	. = ..()
+	drop_x = x
+	drop_y = y
+	var/list/target_z = levels_by_trait(SPAWN_RUINS)
+	drop_z = pick(target_z)
diff --git a/code/modules/ruins/lavalandruin_code/sin_ruins.dm b/code/modules/ruins/lavalandruin_code/sin_ruins.dm
index 907498da76f..762ba796430 100644
--- a/code/modules/ruins/lavalandruin_code/sin_ruins.dm
+++ b/code/modules/ruins/lavalandruin_code/sin_ruins.dm
@@ -123,11 +123,8 @@
 			fool.monkeyize()
 			fool.forceMove(return_turf)
 			return
-	T.ChangeTurf(/turf/simulated/floor/chasm)
+	T.ChangeTurf(/turf/simulated/floor/chasm/pride)
 	var/turf/simulated/floor/chasm/C = T
-	C.drop_x = T.x
-	C.drop_y = T.y
-	C.drop_z = pick(levels)
 	C.drop(user)
 
 // Envy