Merge pull request #1375 from quackjack/revert-1344-xmasmap

Xmas map revert PR Followup
Yawn-Wider · Jan 7, 2024 · 098af2d · 098af2d
2 parents 92102d3 + 60e1a43
commit 098af2d
Show file tree

Hide file tree

Showing 4 changed files with 768 additions and 343 deletions.
diff --git a/code/game/turfs/flooring/flooring_premade.dm b/code/game/turfs/flooring/flooring_premade.dm
@@ -430,6 +430,12 @@
 	icon_state = "darkmarble"
 	initial_flooring = /decl/flooring/bmarble
 
+/turf/simulated/floor/fakesprings // YW Addition: I don't care enough to fix catwalk decals, have this hack
+	name = "Hotsprings"
+	desc = "A natural hotspring connecting to an aquifer. It seems the facility was built ontop of it."
+	icon = 'icons/turf/outdoors.dmi'
+	icon_state = "seashallow"
+
 //ATMOS PREMADES
 /turf/simulated/floor/reinforced/airless
 	name = "vacuum floor"

diff --git a/code/game/turfs/simulated/water.dm b/code/game/turfs/simulated/water.dm
@@ -112,6 +112,13 @@
 	under_state = "pool"
 	outdoors = OUTDOORS_NO
 
+/turf/simulated/floor/water/pool/black // YW Addition
+	name = "pool"
+	desc = "Don't worry, it's not closed."
+	icon = 'icons/turf/outdoors_yw.dmi'
+	under_state = "poolblack"
+	outdoors = OUTDOORS_NO
+
 /turf/simulated/floor/water/deep/pool
 	name = "deep pool"
 	desc = "Don't worry, it's not closed."

diff --git a/icons/turf/outdoors_yw.dmi b/icons/turf/outdoors_yw.dmi