From 6810632cd8bb331830d2915cd01f4a10669cc51d Mon Sep 17 00:00:00 2001
From: Alberyk <alberyk.alberyk@gmail.com>
Date: Sun, 22 Aug 2021 12:47:20 -0300
Subject: [PATCH] wall unfucking

---
 code/game/objects/structures/window.dm        |   8 +++----
 code/game/turfs/simulated/shuttle_turfs.dm    |  21 ++++++------------
 code/game/turfs/simulated/walls.dm            |   4 ++++
 .../smooth/{placeholder.dmi => scc_ship.dmi}  | Bin
 4 files changed, 15 insertions(+), 18 deletions(-)
 rename icons/turf/smooth/{placeholder.dmi => scc_ship.dmi} (100%)

diff --git a/code/game/objects/structures/window.dm b/code/game/objects/structures/window.dm
index 4606d8cbdcb..f6f7daa8dee 100644
--- a/code/game/objects/structures/window.dm
+++ b/code/game/objects/structures/window.dm
@@ -492,9 +492,9 @@
 	health = 160
 	maxhealth = 160
 	smooth = 0
-	
-/obj/structure/window/shuttle/placeholder
-	name = "placeholder window"
+
+/obj/structure/window/shuttle/scc_space_ship
+	name = "window"
 	desc = "It looks extremely strong. Might take many good hits to crack it."
 	icon = 'icons/obj/smooth/placeholder_window.dmi'
 	icon_state = "placeholder_window"
@@ -503,7 +503,7 @@
 	smooth = SMOOTH_MORE|SMOOTH_DIAGONAL
 	canSmoothWith = list(
 		/obj/structure/window/shuttle/placeholder,
-		/turf/simulated/wall/shuttle/placeholder
+		/turf/simulated/wall/shuttle/scc_space_ship
 	)
 
 /obj/structure/window/shuttle/placeholder/cardinal
diff --git a/code/game/turfs/simulated/shuttle_turfs.dm b/code/game/turfs/simulated/shuttle_turfs.dm
index 33601f5ac57..1e7d838011d 100644
--- a/code/game/turfs/simulated/shuttle_turfs.dm
+++ b/code/game/turfs/simulated/shuttle_turfs.dm
@@ -117,27 +117,20 @@
 		underlay_appearance.appearance = T
 		underlays = U
 
-/turf/simulated/wall/shuttle/placeholder
-	icon = 'icons/turf/smooth/placeholder.dmi'
+/turf/simulated/wall/shuttle/scc_space_ship
+	name = "spaceship hull"
+	icon = 'icons/turf/smooth/scc_ship.dmi'
 	canSmoothWith = null
 
-/turf/simulated/wall/placeholder_standard
-	name = "placeholder wall"
+/turf/simulated/wall/shuttle/scc_space_ship/cardinal
 	smooth = SMOOTH_MORE
 	canSmoothWith = list(
-		/turf/simulated/wall/placeholder_standard,
-		/turf/simulated/wall/shuttle/placeholder
+		/turf/simulated/wall/shuttle/scc_space_ship
 	)
 
-/turf/simulated/wall/shuttle/placeholder/cardinal
-	smooth = SMOOTH_MORE
-	canSmoothWith = list(
-		/turf/simulated/wall/shuttle/placeholder
-	)
-
-/obj/structure/shuttle_part/placeholder
+/obj/structure/shuttle_part/scc_space_ship
 	name = "spaceship alloy wall"
-	icon = 'icons/turf/smooth/placeholder.dmi'
+	icon = 'icons/turf/smooth/scc_ship.dmi'
 	icon_state = "map-shuttle"
 	outside_part = FALSE
 
diff --git a/code/game/turfs/simulated/walls.dm b/code/game/turfs/simulated/walls.dm
index 121b82f146f..ece19fea70c 100644
--- a/code/game/turfs/simulated/walls.dm
+++ b/code/game/turfs/simulated/walls.dm
@@ -33,6 +33,10 @@
 
 	smooth = SMOOTH_TRUE | SMOOTH_NO_CLEAR_ICON
 
+	canSmoothWith = list(
+		/turf/simulated/wall/shuttle/scc_space_ship
+	)
+
 // Walls always hide the stuff below them.
 /turf/simulated/wall/levelupdate(mapload)
 	if (mapload)
diff --git a/icons/turf/smooth/placeholder.dmi b/icons/turf/smooth/scc_ship.dmi
similarity index 100%
rename from icons/turf/smooth/placeholder.dmi
rename to icons/turf/smooth/scc_ship.dmi