Fixes open air turf placements.

Citadel-Station-13 · Oct 1, 2023 · f642402 · f642402
1 parent b038431
commit f642402
Show file tree

Hide file tree

Showing 4 changed files with 46 additions and 46 deletions.
diff --git a/code/game/turfs/simulated/floors/outdoors.dm b/code/game/turfs/simulated/floors/outdoors.dm
@@ -13,6 +13,9 @@
 	name = "mud"
 	icon_state = "mud_dark"
 
+/turf/simulated/floor/outdoors/mud/indoors
+	outdoors = FALSE
+
 /turf/simulated/floor/outdoors/rocks
 	name = "rocks"
 	desc = "Hard as a rock."

diff --git a/code/game/turfs/simulated/floors/water.dm b/code/game/turfs/simulated/floors/water.dm
@@ -106,7 +106,7 @@
 
 /turf/simulated/floor/water/deep/indoors
 	outdoors = FALSE
-	
+
 /turf/simulated/floor/water/pool
 	name = "pool"
 	desc = "Don't worry, it's not closed."
@@ -415,10 +415,16 @@ var/list/shoreline_icon_cache = list()
 			to_chat(L, "<span class='warning'>You climb out of \the [src].</span>")
 	..()
 
+/turf/simulated/floor/water/blood/indoors
+	outdoors = FALSE
+
 /turf/simulated/floor/water/blood/deep
 	name = "deep coagulating pool"
 	desc = "A body of crimson fluid. It smells like pennies and gasoline.  It seems quite deep."
 	icon_state = "acidb_deep"
 	under_state = "abyss"
 	slowdown = 8
 	depth = 7
+
+/turf/simulated/floor/water/blood/deep/indoors
+	outdoors = FALSE
diff --git a/maps/rift/levels/rift-05-surface2.dmm b/maps/rift/levels/rift-05-surface2.dmm
@@ -4540,7 +4540,7 @@
 /turf/simulated/floor/tiled/steel,
 /area/crew_quarters/heads/hor)
 "dcW" = (
-/turf/simulated/floor/outdoors/mud,
+/turf/simulated/floor/outdoors/mud/indoors,
 /area/crew_quarters/coffee_shop)
 "ddZ" = (
 /turf/simulated/floor/outdoors/gravsnow/lythios43c/indoors,
@@ -8668,7 +8668,7 @@
 /area/maintenance/medbay)
 "fLD" = (
 /obj/structure/catwalk,
-/turf/simulated/floor/water/blood/deep,
+/turf/simulated/floor/water/blood/deep/indoors,
 /area/crew_quarters/coffee_shop)
 "fLK" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
@@ -11032,9 +11032,7 @@
 /area/crew_quarters/showers)
 "hid" = (
 /obj/effect/floor_decal/spline/plain,
-/obj/structure/table/marble,
-/obj/item/reagent_containers/food/drinks/cup,
-/turf/simulated/floor/outdoors/mud,
+/turf/simulated/floor/outdoors/mud/indoors,
 /area/crew_quarters/coffee_shop)
 "hij" = (
 /obj/effect/floor_decal/borderfloorwhite{
@@ -12511,7 +12509,7 @@
 /obj/structure/catwalk,
 /obj/structure/table/fancyblack,
 /obj/item/deck/tarot,
-/turf/simulated/floor/water/blood/deep,
+/turf/simulated/floor/water/blood/deep/indoors,
 /area/crew_quarters/coffee_shop)
 "ibv" = (
 /obj/effect/floor_decal/borderfloor/corner{
@@ -13695,7 +13693,7 @@
 	},
 /obj/structure/flora/ausbushes/sparsegrass,
 /obj/effect/debris/cleanable/cobweb,
-/turf/simulated/floor/outdoors/mud,
+/turf/simulated/floor/outdoors/mud/indoors,
 /area/crew_quarters/coffee_shop)
 "iRD" = (
 /obj/structure/window/reinforced{
@@ -16772,7 +16770,7 @@
 	dir = 4
 	},
 /obj/structure/flora/ausbushes/sparsegrass,
-/turf/simulated/floor/outdoors/mud,
+/turf/simulated/floor/outdoors/mud/indoors,
 /area/crew_quarters/coffee_shop)
 "kIF" = (
 /obj/effect/floor_decal/borderfloor/corner{
@@ -22125,7 +22123,7 @@
 /obj/effect/floor_decal/spline/plain{
 	dir = 6
 	},
-/turf/simulated/floor/outdoors/mud,
+/turf/simulated/floor/outdoors/mud/indoors,
 /area/crew_quarters/coffee_shop)
 "obw" = (
 /obj/machinery/door/blast/regular{
@@ -26834,7 +26832,7 @@
 /obj/effect/floor_decal/spline/plain{
 	dir = 10
 	},
-/turf/simulated/floor/outdoors/mud,
+/turf/simulated/floor/outdoors/mud/indoors,
 /area/crew_quarters/coffee_shop)
 "rdl" = (
 /obj/machinery/atmospherics/pipe/zpipe/down/supply,
@@ -28611,7 +28609,7 @@
 /obj/effect/floor_decal/spline/plain{
 	dir = 8
 	},
-/turf/simulated/floor/outdoors/mud,
+/turf/simulated/floor/outdoors/mud/indoors,
 /area/crew_quarters/coffee_shop)
 "sjS" = (
 /obj/structure/undies_wardrobe,
@@ -29932,10 +29930,8 @@
 /turf/simulated/floor/plating,
 /area/maintenance/lower/medsec_maintenance)
 "tfk" = (
-/obj/structure/curtain/open/bed{
-	name = "brown curtain"
-	},
 /obj/spawner/window/low_wall/reinforced/full/firelocks,
+/obj/structure/curtain/black,
 /turf/simulated/floor/plating,
 /area/hallway/primary/surfacetwo)
 "tfp" = (
@@ -30347,7 +30343,7 @@
 	dir = 8
 	},
 /obj/structure/catwalk,
-/turf/simulated/floor/water/blood/deep,
+/turf/simulated/floor/water/blood/deep/indoors,
 /area/crew_quarters/coffee_shop)
 "tsj" = (
 /obj/machinery/door/blast/regular{
@@ -30590,7 +30586,7 @@
 	dir = 8
 	},
 /obj/structure/catwalk,
-/turf/simulated/floor/water/blood/deep,
+/turf/simulated/floor/water/blood/deep/indoors,
 /area/crew_quarters/coffee_shop)
 "tBX" = (
 /obj/machinery/light{
@@ -31858,7 +31854,7 @@
 /area/security/range)
 "usC" = (
 /obj/structure/flora/pumpkin/pumpkin_patch/presents,
-/turf/simulated/floor/outdoors/mud,
+/turf/simulated/floor/outdoors/mud/indoors,
 /area/crew_quarters/coffee_shop)
 "usM" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
@@ -33280,7 +33276,7 @@
 /obj/structure/extinguisher_cabinet{
 	pixel_y = 30
 	},
-/turf/simulated/floor/outdoors/mud,
+/turf/simulated/floor/outdoors/mud/indoors,
 /area/crew_quarters/coffee_shop)
 "vnk" = (
 /obj/structure/marker_beacon/red,
@@ -34952,11 +34948,6 @@
 	},
 /turf/simulated/floor/tiled/monowhite,
 /area/medical/resleeving)
-"wtK" = (
-/obj/effect/floor_decal/spline/plain,
-/obj/structure/table/marble,
-/turf/simulated/floor/outdoors/mud,
-/area/crew_quarters/coffee_shop)
 "wuF" = (
 /obj/machinery/atmospherics/pipe/manifold/hidden/supply{
 	dir = 4
@@ -35784,7 +35775,7 @@
 "wZw" = (
 /obj/structure/bed/chair/wood,
 /obj/structure/catwalk,
-/turf/simulated/floor/water/blood/deep,
+/turf/simulated/floor/water/blood/deep/indoors,
 /area/crew_quarters/coffee_shop)
 "xax" = (
 /obj/structure/railing{
@@ -36137,7 +36128,7 @@
 /obj/structure/catwalk,
 /obj/structure/table/fancyblack,
 /obj/structure/spirit_board/prop,
-/turf/simulated/floor/water/blood/deep,
+/turf/simulated/floor/water/blood/deep/indoors,
 /area/crew_quarters/coffee_shop)
 "xln" = (
 /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
@@ -49280,7 +49271,7 @@ oRV
 cqf
 dcW
 dcW
-wtK
+hid
 ydU
 fmy
 fmy

diff --git a/maps/rift/levels/rift-06-surface3.dmm b/maps/rift/levels/rift-06-surface3.dmm
@@ -4145,7 +4145,7 @@
 /obj/effect/floor_decal/spline/plain{
 	dir = 1
 	},
-/turf/simulated/floor/outdoors/mud,
+/turf/simulated/floor/outdoors/mud/indoors,
 /area/hydroponics)
 "amZ" = (
 /obj/machinery/computer/station_alert/all,
@@ -16608,7 +16608,7 @@
 /obj/effect/floor_decal/spline/plain{
 	dir = 4
 	},
-/turf/simulated/floor/outdoors/mud,
+/turf/simulated/floor/outdoors/mud/indoors,
 /area/hydroponics)
 "aZt" = (
 /obj/effect/floor_decal/borderfloor{
@@ -17428,7 +17428,7 @@
 "cGx" = (
 /obj/effect/floor_decal/spline/plain,
 /obj/structure/flora/ausbushes/sparsegrass,
-/turf/simulated/floor/outdoors/mud,
+/turf/simulated/floor/outdoors/mud/indoors,
 /area/hydroponics)
 "cHl" = (
 /obj/machinery/door/blast/shutters{
@@ -19065,7 +19065,7 @@
 /area/rift/surfaceeva/airlock/arrivals)
 "gou" = (
 /obj/effect/floor_decal/spline/plain,
-/turf/simulated/floor/outdoors/mud,
+/turf/simulated/floor/outdoors/mud/indoors,
 /area/hydroponics)
 "gpa" = (
 /turf/simulated/wall/r_wall/prepainted,
@@ -19572,7 +19572,7 @@
 /obj/effect/floor_decal/spline/plain{
 	dir = 1
 	},
-/turf/simulated/floor/outdoors/mud,
+/turf/simulated/floor/outdoors/mud/indoors,
 /area/hydroponics)
 "hEX" = (
 /obj/effect/floor_decal/industrial/warning/corner{
@@ -20003,7 +20003,7 @@
 /turf/simulated/floor/cult,
 /area/crew_quarters/barrestroom)
 "iCm" = (
-/turf/simulated/floor/outdoors/mud,
+/turf/simulated/floor/outdoors/mud/indoors,
 /area/hydroponics)
 "iCv" = (
 /obj/structure/disposalpipe/segment{
@@ -20967,7 +20967,7 @@
 /obj/effect/floor_decal/spline/plain{
 	dir = 8
 	},
-/turf/simulated/floor/outdoors/mud,
+/turf/simulated/floor/outdoors/mud/indoors,
 /area/hydroponics)
 "kLl" = (
 /obj/structure/closet/gmcloset{
@@ -21011,7 +21011,7 @@
 /mob/living/simple_mob/animal/passive/cow{
 	name = "Betsy"
 	},
-/turf/simulated/floor/outdoors/mud,
+/turf/simulated/floor/outdoors/mud/indoors,
 /area/hydroponics)
 "kPD" = (
 /obj/effect/floor_decal/spline/plain,
@@ -21162,7 +21162,7 @@
 /obj/effect/floor_decal/spline/plain{
 	dir = 10
 	},
-/turf/simulated/floor/outdoors/mud,
+/turf/simulated/floor/outdoors/mud/indoors,
 /area/hydroponics)
 "lhu" = (
 /obj/machinery/light{
@@ -22362,7 +22362,7 @@
 /area/crew_quarters/bar)
 "nzW" = (
 /obj/landmark/spawnpoint/job/botanist,
-/turf/simulated/floor/outdoors/mud,
+/turf/simulated/floor/outdoors/mud/indoors,
 /area/hydroponics)
 "nCn" = (
 /obj/structure/ladder{
@@ -23208,7 +23208,7 @@
 	dir = 6
 	},
 /obj/machinery/portable_atmospherics/hydroponics,
-/turf/simulated/floor/outdoors/mud,
+/turf/simulated/floor/outdoors/mud/indoors,
 /area/hydroponics)
 "pBE" = (
 /obj/effect/floor_decal/borderfloor{
@@ -23627,7 +23627,7 @@
 /obj/effect/floor_decal/spline/plain{
 	dir = 1
 	},
-/turf/simulated/floor/outdoors/mud,
+/turf/simulated/floor/outdoors/mud/indoors,
 /area/hydroponics)
 "quy" = (
 /obj/structure/grille,
@@ -23725,7 +23725,7 @@
 /area/rift/surfacebase/outside/outside3)
 "qEq" = (
 /obj/machinery/portable_atmospherics/hydroponics,
-/turf/simulated/floor/outdoors/mud,
+/turf/simulated/floor/outdoors/mud/indoors,
 /area/hydroponics)
 "qGN" = (
 /obj/structure/catwalk,
@@ -23783,7 +23783,7 @@
 /area/crew_quarters/barrestroom)
 "qNK" = (
 /obj/structure/flora/ausbushes/sparsegrass,
-/turf/simulated/floor/outdoors/mud,
+/turf/simulated/floor/outdoors/mud/indoors,
 /area/hydroponics)
 "qOi" = (
 /turf/simulated/wall/cult,
@@ -23883,7 +23883,7 @@
 /obj/effect/floor_decal/spline/plain{
 	dir = 9
 	},
-/turf/simulated/floor/outdoors/mud,
+/turf/simulated/floor/outdoors/mud/indoors,
 /area/hydroponics)
 "raY" = (
 /obj/machinery/holoposter{
@@ -23980,7 +23980,7 @@
 /obj/effect/floor_decal/spline/plain{
 	dir = 1
 	},
-/turf/simulated/floor/outdoors/mud,
+/turf/simulated/floor/outdoors/mud/indoors,
 /area/hydroponics)
 "rtY" = (
 /obj/effect/floor_decal/borderfloor,
@@ -24255,7 +24255,7 @@
 /obj/effect/floor_decal/spline/plain{
 	dir = 5
 	},
-/turf/simulated/floor/outdoors/mud,
+/turf/simulated/floor/outdoors/mud/indoors,
 /area/hydroponics)
 "slu" = (
 /obj/structure/railing{
@@ -24650,7 +24650,7 @@
 /obj/effect/floor_decal/spline/plain{
 	dir = 1
 	},
-/turf/simulated/floor/outdoors/mud,
+/turf/simulated/floor/outdoors/mud/indoors,
 /area/hydroponics)
 "tEl" = (
 /obj/effect/floor_decal/borderfloor{
@@ -24831,7 +24831,7 @@
 "tQY" = (
 /obj/effect/floor_decal/spline/plain,
 /obj/machinery/portable_atmospherics/hydroponics,
-/turf/simulated/floor/outdoors/mud,
+/turf/simulated/floor/outdoors/mud/indoors,
 /area/hydroponics)
 "tSU" = (
 /obj/machinery/door/blast/shutters{