From 6818986fcb121cc7043ca2e58e46ba4fe90092b2 Mon Sep 17 00:00:00 2001
From: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com>
Date: Mon, 21 Oct 2024 21:29:47 -0400
Subject: [PATCH] Fixes smoothing of small shuttles to prevent floating lights
 or black space (#27075)

* better shuttle smoothing

* also missed these

* ghhh

* pwease
---
 _maps/map_files/shuttles/emergency_bar.dmm   | 21 +++++++++++---------
 _maps/map_files/shuttles/emergency_clown.dmm | 21 +++++++++++---------
 _maps/map_files/shuttles/emergency_old.dmm   | 19 ++++++++++--------
 3 files changed, 35 insertions(+), 26 deletions(-)

diff --git a/_maps/map_files/shuttles/emergency_bar.dmm b/_maps/map_files/shuttles/emergency_bar.dmm
index b2feadfc8cd..44494f912be 100644
--- a/_maps/map_files/shuttles/emergency_bar.dmm
+++ b/_maps/map_files/shuttles/emergency_bar.dmm
@@ -463,6 +463,9 @@
 /obj/structure/shuttle/engine/propulsion,
 /turf/simulated/floor/plating/airless,
 /area/shuttle/escape)
+"qr" = (
+/turf/simulated/wall/indestructible/titanium/nodiagonal,
+/area/shuttle/escape)
 "Jz" = (
 /obj/structure/chair/stool/bar{
 	dir = 4
@@ -521,7 +524,7 @@ ab
 bo
 bt
 bz
-ab
+qr
 ab
 "}
 (3,1,1) = {"
@@ -555,7 +558,7 @@ aa
 aa
 ab
 ac
-ab
+qr
 aq
 ab
 aK
@@ -579,7 +582,7 @@ bL
 (5,1,1) = {"
 aa
 ab
-ab
+qr
 ak
 ai
 ar
@@ -604,7 +607,7 @@ bL
 "}
 (6,1,1) = {"
 ab
-ab
+qr
 ah
 ai
 al
@@ -625,7 +628,7 @@ ab
 bo
 bw
 bA
-ab
+qr
 ab
 "}
 (7,1,1) = {"
@@ -656,7 +659,7 @@ aa
 "}
 (8,1,1) = {"
 ab
-ab
+qr
 aj
 ai
 al
@@ -683,7 +686,7 @@ ab
 (9,1,1) = {"
 aa
 ab
-ab
+qr
 am
 ao
 al
@@ -711,7 +714,7 @@ aa
 aa
 ab
 ac
-ab
+qr
 ar
 ab
 aB
@@ -781,7 +784,7 @@ ac
 bs
 by
 bD
-ab
+qr
 ab
 "}
 (13,1,1) = {"
diff --git a/_maps/map_files/shuttles/emergency_clown.dmm b/_maps/map_files/shuttles/emergency_clown.dmm
index 807f8e4933e..2249a3098dd 100644
--- a/_maps/map_files/shuttles/emergency_clown.dmm
+++ b/_maps/map_files/shuttles/emergency_clown.dmm
@@ -374,6 +374,9 @@
 "Dr" = (
 /turf/simulated/wall/indestructible/syndicate,
 /area/shuttle/escape)
+"MA" = (
+/turf/simulated/wall/indestructible/titanium/nodiagonal,
+/area/shuttle/escape)
 "Uo" = (
 /obj/structure/chair/comfy/shuttle{
 	dir = 8
@@ -430,7 +433,7 @@ ab
 aw
 bf
 bj
-ab
+MA
 ab
 "}
 (3,1,1) = {"
@@ -464,7 +467,7 @@ aa
 aa
 ab
 ac
-ab
+MA
 as
 Dr
 aB
@@ -488,11 +491,11 @@ bt
 (5,1,1) = {"
 aa
 ab
-ab
+MA
 ak
 ao
 at
-Dr
+tH
 tH
 aI
 tH
@@ -513,7 +516,7 @@ bt
 "}
 (6,1,1) = {"
 ab
-ab
+MA
 ah
 ai
 am
@@ -565,7 +568,7 @@ aa
 "}
 (8,1,1) = {"
 ab
-ab
+MA
 aj
 ai
 ap
@@ -592,7 +595,7 @@ ab
 (9,1,1) = {"
 aa
 ab
-ab
+MA
 an
 aq
 av
@@ -620,7 +623,7 @@ aa
 aa
 ab
 ac
-ab
+MA
 Uo
 ab
 aD
@@ -690,7 +693,7 @@ ac
 be
 bi
 aw
-ab
+MA
 ab
 "}
 (13,1,1) = {"
diff --git a/_maps/map_files/shuttles/emergency_old.dmm b/_maps/map_files/shuttles/emergency_old.dmm
index 87b13a61c37..20b71b4435f 100644
--- a/_maps/map_files/shuttles/emergency_old.dmm
+++ b/_maps/map_files/shuttles/emergency_old.dmm
@@ -326,6 +326,9 @@
 /obj/structure/chair/comfy/shuttle,
 /turf/simulated/floor/mineral/plastitanium/red/brig,
 /area/shuttle/escape)
+"nt" = (
+/turf/simulated/wall/indestructible/titanium/nodiagonal,
+/area/shuttle/escape)
 "rj" = (
 /obj/machinery/economy/vending/wallmed/directional/east,
 /obj/structure/bed/roller,
@@ -395,7 +398,7 @@ ab
 DZ
 bb
 bf
-ab
+nt
 ab
 "}
 (3,1,1) = {"
@@ -429,7 +432,7 @@ aa
 aa
 ab
 ac
-ab
+nt
 as
 ab
 aZ
@@ -453,7 +456,7 @@ bo
 (5,1,1) = {"
 aa
 ab
-ab
+nt
 al
 ap
 at
@@ -478,7 +481,7 @@ bo
 "}
 (6,1,1) = {"
 ab
-ab
+nt
 ah
 ai
 an
@@ -530,7 +533,7 @@ aa
 "}
 (8,1,1) = {"
 ab
-ab
+nt
 aj
 ai
 an
@@ -557,7 +560,7 @@ ab
 (9,1,1) = {"
 aa
 ab
-ab
+nt
 ao
 aq
 an
@@ -585,7 +588,7 @@ aa
 aa
 ab
 ac
-ab
+nt
 at
 ab
 aA
@@ -655,7 +658,7 @@ ac
 rj
 be
 aI
-ab
+nt
 ab
 "}
 (13,1,1) = {"