From 322843523767669b2074fe6e5f9143168c93e43f Mon Sep 17 00:00:00 2001
From: silicons <2003111+silicons@users.noreply.github.com>
Date: Sat, 26 Dec 2020 20:33:16 -0800
Subject: [PATCH] errors

---
 .../subsystem/persistence/cleanable_debris.dm   | 17 ++++++++---------
 code/game/objects/effects/decals/crayon.dm      |  2 +-
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/code/controllers/subsystem/persistence/cleanable_debris.dm b/code/controllers/subsystem/persistence/cleanable_debris.dm
index dccc609ed3..a08c4c4964 100644
--- a/code/controllers/subsystem/persistence/cleanable_debris.dm
+++ b/code/controllers/subsystem/persistence/cleanable_debris.dm
@@ -39,27 +39,26 @@
 		for(var/x in L1)
 			var/list/L2 = data[z][x]
 			for(var/y in L2)
-				var/turf/tile = locate(x, y, z)
+				var/turf/tile = locate(x, y, actual_z)
 				if(!tile)
 					continue
 				var/list/objects = data[z][x][y]
 				for(var/_L in objects)
-					var/list/data
+					var/list/objdata
 					var/path
 					if(islist(_L))
-						data = _L
-						path = data["__PATH__"]
+						objdata = _L
+						path = objdata["__PATH__"]
 					else
 						path = _L
-						data = objects[_L]
+						objdata = objects[_L]
 					if(!IsValidDebrisLocation(tile, allowed_turf_typecache, allowed_z_cache, path, TRUE))
 						continue
-					var/path = data["__PATH__"]
 					if(!path)
 						continue
 					var/obj/effect/decal/cleanable/instantiated = new path(tile)
-					if(data)
-						instantiated.PersistenceLoad(data)
+					if(objdata)
+						instantiated.PersistenceLoad(objdata)
 
 /datum/controller/subsystem/persistence/proc/SaveMapDebris()
 	if(fexists("[get_map_persistence_path()]/debris.json"))
@@ -82,7 +81,7 @@
 			continue
 		var/text_z = num2text(saving.z)
 		var/text_y = num2text(saving.y)
-		var/text_x = num2text(saving.x)
+		var/text_x = num2text(z_lookup[num2text(saving.x)])
 		LAZYINITLIST(data[text_z])
 		LAZYINITLIST(data[text_z][text_x])
 		LAZYINITLIST(data[text_z][text_x][text_y])
diff --git a/code/game/objects/effects/decals/crayon.dm b/code/game/objects/effects/decals/crayon.dm
index 6ebd798e40..ad9abe10b1 100644
--- a/code/game/objects/effects/decals/crayon.dm
+++ b/code/game/objects/effects/decals/crayon.dm
@@ -48,7 +48,7 @@
 		name = data["name"]
 	if(do_icon_rotate && data["rotation"])
 		var/matrix/M = matrix()
-		M.turn(data["rotation"])
+		M.Turn(data["rotation"])
 		transform = M
 	if(data["paint_color"])
 		paint_colour = data["paint_color"]