From 5ce509bc66266dc7b2069a417f5d9d8bb12be13e Mon Sep 17 00:00:00 2001
From: wesoda25 <37246588+wesoda25@users.noreply.github.com>
Date: Wed, 11 Nov 2020 11:37:38 -0500
Subject: [PATCH] Fixes bathhouse ruin walls (#54896)

---
 .../icemoon_underground_bathhouse.dmm         | 20 +++++++------------
 code/datums/ruins/icemoon.dm                  |  2 +-
 code/game/area/areas/ruins/icemoon.dm         | 10 +++++++++-
 3 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/_maps/RandomRuins/IceRuins/icemoon_underground_bathhouse.dmm b/_maps/RandomRuins/IceRuins/icemoon_underground_bathhouse.dmm
index 9d9881d5dda..902cad0ca8c 100644
--- a/_maps/RandomRuins/IceRuins/icemoon_underground_bathhouse.dmm
+++ b/_maps/RandomRuins/IceRuins/icemoon_underground_bathhouse.dmm
@@ -3,10 +3,7 @@
 /turf/template_noop,
 /area/template_noop)
 "b" = (
-/turf/closed/wall{
-	icon = 'icons/turf/shuttleold.dmi';
-	icon_state = "block"
-	},
+/turf/closed/wall/bathhouse,
 /area/ruin/powered/bathhouse)
 "c" = (
 /obj/structure/table/greyscale,
@@ -19,9 +16,6 @@
 /obj/item/clothing/under/misc/pj/blue,
 /turf/open/floor/plasteel/white,
 /area/ruin/powered/bathhouse)
-"d" = (
-/turf/closed/mineral/random/snow/no_caves,
-/area/icemoon/underground/unexplored)
 "e" = (
 /obj/structure/mirror{
 	pixel_y = 28
@@ -102,7 +96,7 @@ b
 b
 b
 b
-d
+a
 a
 a
 "}
@@ -164,7 +158,7 @@ q
 b
 n
 n
-d
+a
 "}
 (8,1,1) = {"
 b
@@ -174,7 +168,7 @@ g
 b
 n
 n
-d
+a
 "}
 (9,1,1) = {"
 b
@@ -184,7 +178,7 @@ g
 i
 n
 n
-d
+a
 "}
 (10,1,1) = {"
 b
@@ -193,7 +187,7 @@ g
 g
 b
 n
-d
+a
 a
 "}
 (11,1,1) = {"
@@ -202,7 +196,7 @@ b
 b
 b
 b
-d
+a
 a
 a
 "}
diff --git a/code/datums/ruins/icemoon.dm b/code/datums/ruins/icemoon.dm
index 6c3af295288..bff57639053 100644
--- a/code/datums/ruins/icemoon.dm
+++ b/code/datums/ruins/icemoon.dm
@@ -99,7 +99,7 @@
 /datum/map_template/ruin/icemoon/underground/bathhouse
 	name = "Bath House"
 	id = "bathhouse"
-	description = "A taste of paradise, locked in the hell of the Ice Moon."
+	description = "A warm, safe place."
 	suffix = "icemoon_underground_bathhouse.dmm"
 
 /datum/map_template/ruin/icemoon/underground/wendigo_cave
diff --git a/code/game/area/areas/ruins/icemoon.dm b/code/game/area/areas/ruins/icemoon.dm
index fa6d9b26fc9..4895e78e62a 100644
--- a/code/game/area/areas/ruins/icemoon.dm
+++ b/code/game/area/areas/ruins/icemoon.dm
@@ -8,4 +8,12 @@
 	name = "Bath House"
 	icon_state = "dk_yellow"
 	mood_bonus = 10
-	mood_message = "<span class='nicegreen'>This place reminds me of home.</span>\n"
+	mood_message = "<span class='nicegreen'>I wish I could stay here forever.</span>\n"
+
+/turf/closed/wall/bathhouse
+	desc = "It's cool to the touch, pleasantly so."
+	icon = 'icons/turf/shuttleold.dmi'
+	icon_state = "block"
+	base_icon_state = "block"
+	smoothing_flags = NONE
+	canSmoothWith = null