From d00afdebb9a59d3d7284f4580789af5fe73cb23e Mon Sep 17 00:00:00 2001
From: SkyratBot <59378654+SkyratBot@users.noreply.github.com>
Date: Fri, 2 Jul 2021 17:43:51 +0200
Subject: [PATCH] [MIRROR] Catwalk Flooring (#6647)

* Catwalk Flooring (#59773)

* Catwalk Flooring

* a

Co-authored-by: tralezab <40974010+tralezab@users.noreply.github.com>
Co-authored-by: Gandalf <jzo123@hotmail.com>
---
 code/__DEFINES/footsteps.dm                   |   9 +-
 code/__DEFINES/layers.dm                      |   2 +
 .../~skyrat_defines/icon_smoothing.dm         |   2 -
 .../~skyrat_defines/planes_layers.dm          |   1 -
 code/game/objects/items/stacks/rods.dm        |   5 -
 code/game/objects/structures/lattice.dm       |   4 -
 code/game/turfs/open/floor/catwalk_plating.dm |  42 ++++++++
 icons/turf/floors/catwalk_plating.dmi         | Bin 0 -> 396 bytes
 .../code/game/objects/items/catwalk_items.dm  |  90 ------------------
 .../code/game/objects/structures/lattice.dm   |  14 ---
 .../mapping/code/game/turfs/plated_catwalk.dm |  33 -------
 .../mapping/icons/obj/items/catwalk_item.dmi  | Bin 1144 -> 0 bytes
 .../icons/turf/open/catwalk_plated.dmi        | Bin 7833 -> 0 bytes
 .../icons/turf/open/dark_catwalk_plated.dmi   | Bin 7641 -> 0 bytes
 tgstation.dme                                 |   6 +-
 15 files changed, 53 insertions(+), 155 deletions(-)
 delete mode 100644 code/__DEFINES/~skyrat_defines/icon_smoothing.dm
 delete mode 100644 code/__DEFINES/~skyrat_defines/planes_layers.dm
 create mode 100644 code/game/turfs/open/floor/catwalk_plating.dm
 create mode 100644 icons/turf/floors/catwalk_plating.dmi
 delete mode 100644 modular_skyrat/modules/mapping/code/game/objects/items/catwalk_items.dm
 delete mode 100644 modular_skyrat/modules/mapping/code/game/objects/structures/lattice.dm
 delete mode 100644 modular_skyrat/modules/mapping/code/game/turfs/plated_catwalk.dm
 delete mode 100644 modular_skyrat/modules/mapping/icons/obj/items/catwalk_item.dmi
 delete mode 100644 modular_skyrat/modules/mapping/icons/turf/open/catwalk_plated.dmi
 delete mode 100644 modular_skyrat/modules/mapping/icons/turf/open/dark_catwalk_plated.dmi

diff --git a/code/__DEFINES/footsteps.dm b/code/__DEFINES/footsteps.dm
index 1c6d639ebce..924a4eb7379 100644
--- a/code/__DEFINES/footsteps.dm
+++ b/code/__DEFINES/footsteps.dm
@@ -7,6 +7,7 @@
 #define FOOTSTEP_WATER "water"
 #define FOOTSTEP_LAVA "lava"
 #define FOOTSTEP_MEAT "meat"
+#define FOOTSTEP_CATWALK "catwalk"
 //barefoot sounds
 #define FOOTSTEP_WOOD_BAREFOOT "woodbarefoot"
 #define FOOTSTEP_WOOD_CLAW "woodclaw"
@@ -83,7 +84,13 @@ GLOBAL_LIST_INIT(footstep, list(
 		'sound/effects/footstep/lava2.ogg',
 		'sound/effects/footstep/lava3.ogg'), 100, 0),
 	FOOTSTEP_MEAT = list(list(
-		'sound/effects/meatslap.ogg'), 100, 0)
+		'sound/effects/meatslap.ogg'), 100, 0),
+	FOOTSTEP_CATWALK = list(list(
+		'sound/effects/footstep/catwalk1.ogg',
+		'sound/effects/footstep/catwalk2.ogg',
+		'sound/effects/footstep/catwalk3.ogg',
+		'sound/effects/footstep/catwalk4.ogg',
+		'sound/effects/footstep/catwalk5.ogg'), 100, 1),
 ))
 //bare footsteps lists
 GLOBAL_LIST_INIT(barefootstep, list(
diff --git a/code/__DEFINES/layers.dm b/code/__DEFINES/layers.dm
index 269a67091b3..0407407b7c7 100644
--- a/code/__DEFINES/layers.dm
+++ b/code/__DEFINES/layers.dm
@@ -50,6 +50,8 @@
 #define GAS_FILTER_LAYER 2.48
 #define GAS_PUMP_LAYER 2.49
 #define LOW_OBJ_LAYER 2.5
+///catwalk overlay of /turf/open/floor/plating/plating_catwalk
+#define CATWALK_LAYER 2.51
 #define LOW_SIGIL_LAYER 2.52
 #define SIGIL_LAYER 2.54
 #define HIGH_PIPE_LAYER 2.55
diff --git a/code/__DEFINES/~skyrat_defines/icon_smoothing.dm b/code/__DEFINES/~skyrat_defines/icon_smoothing.dm
deleted file mode 100644
index 21d08b6b5ad..00000000000
--- a/code/__DEFINES/~skyrat_defines/icon_smoothing.dm
+++ /dev/null
@@ -1,2 +0,0 @@
-#define SMOOTH_GROUP_PLATED_CATWALK S_OBJ(73)			///obj/structure/lattice/catwalk/plated
-#define SMOOTH_GROUP_NORMAL_CATWALK S_OBJ(74)			///obj/structure/lattice/catwalk
diff --git a/code/__DEFINES/~skyrat_defines/planes_layers.dm b/code/__DEFINES/~skyrat_defines/planes_layers.dm
deleted file mode 100644
index c8a1d3845d8..00000000000
--- a/code/__DEFINES/~skyrat_defines/planes_layers.dm
+++ /dev/null
@@ -1 +0,0 @@
-#define CATWALK_LAYER 2.465
diff --git a/code/game/objects/items/stacks/rods.dm b/code/game/objects/items/stacks/rods.dm
index 697682c5e03..84b74dd910a 100644
--- a/code/game/objects/items/stacks/rods.dm
+++ b/code/game/objects/items/stacks/rods.dm
@@ -6,11 +6,6 @@ GLOBAL_LIST_INIT(rod_recipes, list ( \
 	new/datum/stack_recipe("railing", /obj/structure/railing, 3, time = 18, window_checks = TRUE), \
 	new/datum/stack_recipe("tank holder", /obj/structure/tank_holder, 2, time = 5, one_per_turf = TRUE, on_floor = FALSE), \
 	new/datum/stack_recipe("ladder", /obj/structure/ladder/crafted, 15, time = 150, one_per_turf = TRUE, on_floor = FALSE), \
-	//SKYRAT EDIT ADDITION BEGIN
-	new/datum/stack_recipe("catwalk", /obj/item/stack/catwalk/normal, 2, 2, 20), \
-	new/datum/stack_recipe("plated catwalk", /obj/item/stack/catwalk/plated, 2, 2, 20), \
-	new/datum/stack_recipe("dark plated catwalk", /obj/item/stack/catwalk/plated/dark, 2, 2, 20), \
-	//SKYRAT EDIT ADDITION END
 	))
 
 /obj/item/stack/rods
diff --git a/code/game/objects/structures/lattice.dm b/code/game/objects/structures/lattice.dm
index 0a82a99276f..087927aff95 100644
--- a/code/game/objects/structures/lattice.dm
+++ b/code/game/objects/structures/lattice.dm
@@ -84,8 +84,6 @@
 /obj/structure/lattice/catwalk/deconstruction_hints(mob/user)
 	return span_notice("The supporting rods look like they could be <b>cut</b>.")
 
-//SKYRAT EDIT REMOVAL BEGIN - Moved To Modular
-/*
 /obj/structure/lattice/catwalk/Move()
 	var/turf/T = loc
 	for(var/obj/structure/cable/C in T)
@@ -97,8 +95,6 @@
 	for(var/obj/structure/cable/C in T)
 		C.deconstruct()
 	..()
-*/
-//SKYRAT EDIT REMOVAL END
 
 /obj/structure/lattice/lava
 	name = "heatproof support lattice"
diff --git a/code/game/turfs/open/floor/catwalk_plating.dm b/code/game/turfs/open/floor/catwalk_plating.dm
new file mode 100644
index 00000000000..486ffba6400
--- /dev/null
+++ b/code/game/turfs/open/floor/catwalk_plating.dm
@@ -0,0 +1,42 @@
+/**
+ * ## catwalk flooring
+ *
+ * They show what's underneath their catwalk flooring (pipes and the like)
+ * you can crowbar it to interact with the underneath stuff without destroying the tile...
+ * unless you want to!
+ */
+/turf/open/floor/plating/catwalk_floor
+	icon = 'icons/turf/floors/catwalk_plating.dmi'
+	icon_state = "catwalk_below"
+	name = "catwalk floor"
+	desc = "Flooring that shows its contents underneath. Engineers love it!"
+	baseturfs = /turf/open/floor/plating
+	footstep = FOOTSTEP_CATWALK
+	barefootstep = FOOTSTEP_CATWALK
+	clawfootstep = FOOTSTEP_CATWALK
+	heavyfootstep = FOOTSTEP_CATWALK
+	var/covered = TRUE
+
+/turf/open/floor/plating/catwalk_floor/Initialize()
+	. = ..()
+	update_icon(UPDATE_OVERLAYS)
+
+/turf/open/floor/plating/catwalk_floor/update_overlays()
+	. = ..()
+	var/static/catwalk_overlay
+	if(isnull(catwalk_overlay))
+		catwalk_overlay = iconstate2appearance(icon, "catwalk_above")
+	if(covered)
+		. += catwalk_overlay
+
+/turf/open/floor/plating/catwalk_floor/screwdriver_act(mob/living/user, obj/item/tool)
+	. = ..()
+	covered = !covered
+	user.balloon_alert(user, "[!covered ? "cover removed" : "cover added"]")
+	update_icon(UPDATE_OVERLAYS)
+
+/turf/open/floor/plating/catwalk_floor/pry_tile(obj/item/crowbar, mob/user, silent)
+	if(covered)
+		user.balloon_alert(user, "remove cover first!")
+		return FALSE
+	. = ..()
diff --git a/icons/turf/floors/catwalk_plating.dmi b/icons/turf/floors/catwalk_plating.dmi
new file mode 100644
index 0000000000000000000000000000000000000000..24954e4a1750d3b11ff73bdcaf4b85fdae67ba5d
GIT binary patch
literal 396
zcmV;70dxL|P)<h;3K|Lk000e1NJLTq002M$001Ba0{{R3P_tvV0000LP)t-s0000}
zTw59-A}upEDK9ZGI6Fp7OXqhD-2eap0d!JMQvg8b*k%9#0D5{<Sad{Xb7OL8aCB*J
zZU6vyoKseCa&`CgQ*iP1<SI)oD$dN$Q?OMq(KF!UEYD0S$pCVUjkq{7QZv&tN+6u#
zlEji!AX6zhv7|gPCp$hVH7CDZiHkEOv#1y-Zpg)%R+N~V3SncYPE5)#OU0#HS;5uM
z1?(6A9{DR<vIE>C0001=Nkl<ZIE`aS6hr|@=zIpTG!!6=&SwxyRzd(}paL{LgP4)A
zG6I<iqw^WWlwC}mT}*;QK%}#pu$VG~0W%z_0Tr0Jq`0}HgoS`eH=qe-3<+#-1Tw)m
z%`6#?fC|v~M3^vY1=I?qBsDm~YDH*jSZJ!7D~Jpmw7wV$RwN@E3CcLAd|=iyMgTKV
q)<fkJ&YNhtIT@YLV2lck(D?v~2<5}-<ZChj0000<MNUMnLSTa943Rtl

literal 0
HcmV?d00001

diff --git a/modular_skyrat/modules/mapping/code/game/objects/items/catwalk_items.dm b/modular_skyrat/modules/mapping/code/game/objects/items/catwalk_items.dm
deleted file mode 100644
index 10917bfcb1b..00000000000
--- a/modular_skyrat/modules/mapping/code/game/objects/items/catwalk_items.dm
+++ /dev/null
@@ -1,90 +0,0 @@
-/obj/item/stack/catwalk
-	name = "broken catwalk"
-	singular_name = "broken catwalk"
-	desc = "A broken catwalk. This should not exist."
-	icon = 'modular_skyrat/modules/mapping/icons/obj/items/catwalk_item.dmi'
-	icon_state = "catwalk"
-	w_class = WEIGHT_CLASS_NORMAL
-	force = 1
-	throwforce = 1
-	throw_speed = 3
-	throw_range = 7
-	max_amount = 60
-	novariants = TRUE
-	var/catwalk_type
-	merge_type = /obj/item/stack/catwalk
-
-/obj/item/stack/catwalk/normal
-	name = "catwalk rods"
-	singular_name = "catwalk rod"
-	desc = "Rods that could be used to make a construction catwalk."
-	icon_state = "catwalk_normal"
-	catwalk_type = /obj/structure/lattice/catwalk
-	merge_type = /obj/item/stack/catwalk/normal
-
-/obj/item/stack/catwalk/plated
-	name = "plated catwalk rods"
-	singular_name = "plated catwalk rod"
-	desc = "Rods that could be used to make a plated catwalk."
-	icon_state = "catwalk_plated"
-	catwalk_type = /obj/structure/lattice/catwalk/plated
-	merge_type = /obj/item/stack/catwalk/plated
-
-/obj/item/stack/catwalk/plated/dark
-	name = "dark plated catwalk rods"
-	singular_name = "dark plated catwalk rod"
-	desc = "Rods that could be used to make a plated catwalk, with style."
-	icon_state = "catwalk_plated_dark"
-	catwalk_type = /obj/structure/lattice/catwalk/plated/dark
-	merge_type = /obj/item/stack/catwalk/plated/dark
-
-/obj/item/stack/catwalk/swarmer
-	name = "swarmer catwalk rods"
-	singular_name = "swarmer catwalk rod"
-	desc = "Rods that could be used to make a quite peculiar catwalk."
-	icon_state = "catwalk_swarmer"
-	catwalk_type = /obj/structure/lattice/catwalk/swarmer_catwalk
-	merge_type = /obj/item/stack/catwalk/swarmer
-
-/turf/open
-	var/can_be_latticed
-
-/turf/open/attackby(obj/item/C, mob/user, params)
-	if(istype(C, /obj/item/stack/catwalk))
-		if(can_be_latticed)
-			var/obj/item/stack/catwalk/catitem = C
-			if(locate(/obj/structure/lattice/catwalk, src))
-				return
-			if(locate(/obj/structure/lattice/catwalk/plated, src))
-				return
-			if(locate(/obj/structure/lattice/catwalk/plated/dark, src))
-				return
-			var/cost = 2
-			var/obj/structure/lattice/L = locate(/obj/structure/lattice, src)
-			if(L)
-				qdel(L)
-				cost = 1
-			if(catitem.use(cost))
-				new catitem.catwalk_type(src)
-				playsound(src, 'sound/weapons/genhit.ogg', 50, TRUE)
-				to_chat(user, "<span class='notice'>You place down the catwalk.</span>")
-			else
-				to_chat(user, "<span class='warning'>You need two rods to build a catwalk!</span>")
-			return
-		to_chat(user, "<span class='warning'>You can't place down a catwalk in this spot!</span>")
-	return ..()
-
-/turf/open/space
-	can_be_latticed = TRUE
-
-/turf/open/openspace
-	can_be_latticed = TRUE
-
-/turf/open/floor/plating
-	can_be_latticed = TRUE
-
-/turf/open/transparent/openspace
-	can_be_latticed = TRUE
-
-/turf/open/floor/circuit
-	can_be_latticed = TRUE
diff --git a/modular_skyrat/modules/mapping/code/game/objects/structures/lattice.dm b/modular_skyrat/modules/mapping/code/game/objects/structures/lattice.dm
deleted file mode 100644
index b161656b001..00000000000
--- a/modular_skyrat/modules/mapping/code/game/objects/structures/lattice.dm
+++ /dev/null
@@ -1,14 +0,0 @@
-//Moved from code/game/objects/structures/lattice.dm
-/obj/structure/lattice/catwalk/Move()
-	var/turf/T = loc
-	if(isspaceturf(loc))
-		for(var/obj/structure/cable/C in T)
-			C.deconstruct()
-	..()
-
-/obj/structure/lattice/catwalk/deconstruct()
-	var/turf/T = loc
-	if(isspaceturf(loc))
-		for(var/obj/structure/cable/C in T)
-			C.deconstruct()
-	..()
diff --git a/modular_skyrat/modules/mapping/code/game/turfs/plated_catwalk.dm b/modular_skyrat/modules/mapping/code/game/turfs/plated_catwalk.dm
deleted file mode 100644
index cf6b315a1d0..00000000000
--- a/modular_skyrat/modules/mapping/code/game/turfs/plated_catwalk.dm
+++ /dev/null
@@ -1,33 +0,0 @@
-/obj/structure/disposalpipe
-	plane = FLOOR_PLANE
-
-/obj/structure/cable
-	plane = FLOOR_PLANE
-
-/obj/machinery/atmospherics/pipe
-	plane = FLOOR_PLANE
-
-/obj/structure/lattice/catwalk
-	smoothing_groups = list(SMOOTH_GROUP_NORMAL_CATWALK, SMOOTH_GROUP_OPEN_FLOOR)
-	canSmoothWith = list(SMOOTH_GROUP_NORMAL_CATWALK)
-	layer = CATWALK_LAYER
-	plane = FLOOR_PLANE
-
-/obj/structure/lattice/catwalk/Initialize()
-	. = ..()
-	if(isspaceturf(loc))
-		layer = LATTICE_LAYER
-
-/obj/structure/lattice/catwalk/plated
-	name = "plated catwalk"
-	desc = "A durable catwalk for easier maintenance of pipes and wires. Cats hate this thing."
-	icon = 'modular_skyrat/modules/mapping/icons/turf/open/catwalk_plated.dmi'
-	icon_state = "catwalk_plated-0"
-	base_icon_state = "catwalk_plated"
-	smoothing_flags = SMOOTH_BITMASK
-	smoothing_groups = list(SMOOTH_GROUP_PLATED_CATWALK)
-	canSmoothWith = list(SMOOTH_GROUP_PLATED_CATWALK)
-
-/obj/structure/lattice/catwalk/plated/dark
-	name = "plated catwalk"
-	icon = 'modular_skyrat/modules/mapping/icons/turf/open/dark_catwalk_plated.dmi'
diff --git a/modular_skyrat/modules/mapping/icons/obj/items/catwalk_item.dmi b/modular_skyrat/modules/mapping/icons/obj/items/catwalk_item.dmi
deleted file mode 100644
index 35f5c93caa25e738a8dec9d7b66cb297427de1fa..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1144
zcmeAS@N?(olHy`uVBq!ia0vp^2|(<?!3HFsniTN?sYz8K5hX6E#mPmP1tppJc?=8{
zbEcl%&2`v-r}g2@Dz1rdmTtf5U8o^9DV$?bSaz_w=B5?#`<=HrDc(KDFF!|2|L#@(
z7ghZE(<V)m)SXveZD7jUoAI%PMcC4I(YnAXQ!XYIE3ch0pLfQDB@2!+&)9w8$m@S)
zkF_Tk{g~X}nDYDRo)a#W#`;rJl72poe#6$j?)wKuMul+3)82Z~3=GT*JzX3_D(1YM
z?dUD-DA9KRid>gROT)!YtDBa1@#*gDe0lKB_ZKVK|1vMVF8BKAeuaMw{Cg|zX2<fM
zT^J!yBoN4SEH=wrLE~Lego*77J-6gCwR4|xC%tbpcxUi#xAFS>HP(|2lOx3>tl|Rg
z4{SKhCV+-MTdh0z{_o$g_2%Zj!uPLTH{ScNPU?%fnOW7favApM=;+w5tx5+>d@JUu
z|1tF4d_CQ7>AuGn98C^C9$WN%*qf}(z@Rmii{Zc~9f`J!8=Dhrmj-p-THO?7KmR;4
zL(KKoWtp<<7HiHw{~TB?*uul`&gy@1dAPmR%G>8|u3YDPe%sVUTZZVb3`-pEm&VG-
z$-N4{Ubkentn|^VTlt^AF<Dh_ZJK)j&ONUC;Wro#8x)iTZC6+O#PA^}Q-aOr{Nz_L
z_Ajz$wXM$H@4NnH$;XKQS5I)H@Cej#8~F+Y&A*qkE7tq!=lrNIvd0B4O`rLnv6F*=
zA-Brxn|^>->?Fr4(~T77B=4Te-MaG#+d}y-n~yG<V&~4V(ayag>F*JxhF`iZQTs1P
z2P_Y|Y{KHGP!nIrE!6Ty_eEV{^8NJ|xeOeKYZn@bUsd18;nn=_@2hLqOn7f@43uU#
z^inNa$L*`p>I8=i45v3OQr-8wQg-?;{?~_fnL`6!?_MXJYslhwp>XxX#M&LHicJ$3
zH_Z*a`P1Y@H(#3m+hkskEI-lKsQ5C!>8gjHH)TA`KhlxNjE*MW>XUPsbjw<(Rk=aJ
z3?0q5QR=Yp!`4u}`OFNfu4*zgyx98w_l=u3D=+^1qc3li`~0)M_v-W8WbJR{?fz%H
z|5MW6C4yZIZi^S*-(qy(Yy7WAm*N*@Pvwt1t^4};{Nfc)r<HzR-08OX;>MaAeoN~n
z9dUEmS)*5?^rkR!t>2=MRoay&%;#r)+kKW>#(58m-jodW-V0$ZCptGQf4XFoaMu5Q
z`>*#0Zcg>ed8b<C6DYcoEo60YM9e7<cZV75ai>x<w=U<{p|jFfa-vA5>wz<8cyd`Z
zuJ}(nc$U$=-G=Ez@qq;{45fSw7EBiGDjd%ll7i+lALHM4@x)2@13!+=dwYKUii#E&
z$vZLzZ?qFX$y`v^et6^Z#q8{CU57k%lRrB{RxPhHpYkijC5Pq5K7Iy&p{(uMp(n+6
yNV^37N<3G8=EDDahEkRf=1E63FruSB?AvBfR}i}4{TEo2FnGH9xvX<aXaWE#whhYw

diff --git a/modular_skyrat/modules/mapping/icons/turf/open/catwalk_plated.dmi b/modular_skyrat/modules/mapping/icons/turf/open/catwalk_plated.dmi
deleted file mode 100644
index cd09ad6e4aa53a2b401b3d4dbb9b3e01cda37a71..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 7833
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

diff --git a/modular_skyrat/modules/mapping/icons/turf/open/dark_catwalk_plated.dmi b/modular_skyrat/modules/mapping/icons/turf/open/dark_catwalk_plated.dmi
deleted file mode 100644
index 9736bfa72d582b9afd25f212756a4533491bc559..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 7641
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

diff --git a/tgstation.dme b/tgstation.dme
index 577a91cca4f..1b6c8da9bc3 100644
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -172,7 +172,6 @@
 #include "code\__DEFINES\~skyrat_defines\factions.dm"
 #include "code\__DEFINES\~skyrat_defines\game_options.dm"
 #include "code\__DEFINES\~skyrat_defines\gun.dm"
-#include "code\__DEFINES\~skyrat_defines\icon_smoothing.dm"
 #include "code\__DEFINES\~skyrat_defines\integrated_electronics.dm"
 #include "code\__DEFINES\~skyrat_defines\inventory.dm"
 #include "code\__DEFINES\~skyrat_defines\is_helpers.dm"
@@ -186,7 +185,6 @@
 #include "code\__DEFINES\~skyrat_defines\medical_defines.dm"
 #include "code\__DEFINES\~skyrat_defines\mining_traits.dm"
 #include "code\__DEFINES\~skyrat_defines\obj_flags.dm"
-#include "code\__DEFINES\~skyrat_defines\planes_layers.dm"
 #include "code\__DEFINES\~skyrat_defines\preferences.dm"
 #include "code\__DEFINES\~skyrat_defines\projectiles.dm"
 #include "code\__DEFINES\~skyrat_defines\robot_defines.dm"
@@ -1546,6 +1544,7 @@
 #include "code\game\turfs\open\openspace.dm"
 #include "code\game\turfs\open\river.dm"
 #include "code\game\turfs\open\water.dm"
+#include "code\game\turfs\open\floor\catwalk_plating.dm"
 #include "code\game\turfs\open\floor\fancy_floor.dm"
 #include "code\game\turfs\open\floor\hull.dm"
 #include "code\game\turfs\open\floor\iron_floor.dm"
@@ -4251,7 +4250,6 @@
 #include "modular_skyrat\modules\mapping\code\game\objects\fluff.dm"
 #include "modular_skyrat\modules\mapping\code\game\objects\effects\decals\turf_decals.dm"
 #include "modular_skyrat\modules\mapping\code\game\objects\effects\decals\vgdecals.dm"
-#include "modular_skyrat\modules\mapping\code\game\objects\items\catwalk_items.dm"
 #include "modular_skyrat\modules\mapping\code\game\objects\items\spaceship_items.dm"
 #include "modular_skyrat\modules\mapping\code\game\objects\items\clothing\gloves\color.dm"
 #include "modular_skyrat\modules\mapping\code\game\objects\items\clothing\head\jobs.dm"
@@ -4260,10 +4258,8 @@
 #include "modular_skyrat\modules\mapping\code\game\objects\items\tools\tools.dm"
 #include "modular_skyrat\modules\mapping\code\game\objects\structures\furniture.dm"
 #include "modular_skyrat\modules\mapping\code\game\objects\structures\ghost_role_spawners.dm"
-#include "modular_skyrat\modules\mapping\code\game\objects\structures\lattice.dm"
 #include "modular_skyrat\modules\mapping\code\game\objects\structures\plaques\static_plaques.dm"
 #include "modular_skyrat\modules\mapping\code\game\turfs\planet_turfs.dm"
-#include "modular_skyrat\modules\mapping\code\game\turfs\plated_catwalk.dm"
 #include "modular_skyrat\modules\mapping\code\game\turfs\spaceship_turfs.dm"
 #include "modular_skyrat\modules\mapping\code\modules\dungeon.dm"
 #include "modular_skyrat\modules\mapping\code\modules\pool.dm"