outpost updates

shiptest-ss13 · Nov 8, 2023 · 38ffa59 · 38ffa59
1 parent 951009d
commit 38ffa59
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 18 deletions.
diff --git a/_maps/outpost/indie_space.dmm b/_maps/outpost/indie_space.dmm
@@ -395,6 +395,7 @@
 /area/outpost/maintenance/fore)
 "cK" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
 /turf/closed/indestructible/reinforced,
 /area/outpost/maintenance/central)
 "cO" = (
@@ -1012,6 +1013,7 @@
 /obj/effect/turf_decal/techfloor{
 	dir = 8
 	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
 /turf/open/floor/plating,
 /area/outpost/maintenance/central)
 "hk" = (
@@ -2229,10 +2231,6 @@
 /obj/effect/decal/cleanable/dirt/dust,
 /turf/open/floor/wood,
 /area/outpost/crew/library)
-"pw" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
-/turf/closed/indestructible/reinforced,
-/area/outpost/maintenance/central)
 "pA" = (
 /obj/structure/disposalpipe/segment{
 	dir = 4
@@ -2734,13 +2732,13 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
 	dir = 4
 	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 6
-	},
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/effect/turf_decal/techfloor{
 	dir = 1
 	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 4
+	},
 /turf/open/floor/plating,
 /area/outpost/maintenance/central)
 "sn" = (
@@ -2939,7 +2937,6 @@
 	},
 /area/outpost/crew/bar)
 "tv" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/effect/turf_decal/techfloor{
 	dir = 4
@@ -3043,6 +3040,9 @@
 /obj/effect/turf_decal/techfloor{
 	dir = 9
 	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 6
+	},
 /turf/open/floor/plating,
 /area/outpost/maintenance/central)
 "tZ" = (
@@ -3334,6 +3334,10 @@
 	},
 /turf/open/floor/plasteel/patterned,
 /area/outpost/cargo)
+"vO" = (
+/obj/structure/lattice,
+/turf/closed/indestructible/rock,
+/area/outpost/external)
 "vR" = (
 /obj/structure/flora/grass/jungle,
 /obj/machinery/light/dim/directional/north,
@@ -5334,8 +5338,10 @@
 /turf/open/floor/wood,
 /area/outpost/crew/bar)
 "IH" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
 /obj/effect/decal/cleanable/dirt/dust,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 10
+	},
 /turf/open/floor/plating,
 /area/outpost/maintenance/central)
 "IJ" = (
@@ -7109,6 +7115,9 @@
 "TU" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
 /obj/effect/decal/cleanable/dirt/dust,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 5
+	},
 /turf/open/floor/plating,
 /area/outpost/maintenance/central)
 "TZ" = (
@@ -7518,7 +7527,7 @@
 /area/outpost/hallway/port)
 "Wz" = (
 /obj/structure/barricade/wooden/crude,
-/obj/effect/spawner/structure/window/reinforced/tinted,
+/obj/effect/spawner/structure/window/reinforced/indestructable,
 /turf/open/floor/plating,
 /area/outpost/maintenance/central)
 "WC" = (
@@ -11948,7 +11957,7 @@ HD
 HD
 HD
 HD
-HD
+vO
 HD
 Cc
 je
@@ -11957,7 +11966,7 @@ je
 je
 Cc
 HD
-HD
+vO
 mC
 mC
 mC
@@ -12329,7 +12338,7 @@ Oh
 ZM
 HD
 HD
-HD
+vO
 rt
 rt
 rt
@@ -16147,7 +16156,7 @@ cq
 cq
 sm
 tv
-pw
+cq
 IH
 kx
 cq
@@ -17839,7 +17848,7 @@ HD
 HD
 HD
 HD
-HD
+vO
 HD
 HD
 HD
@@ -18216,7 +18225,7 @@ mC
 mC
 NH
 rt
-HD
+vO
 HD
 HD
 HD

diff --git a/code/game/turfs/closed/_closed.dm b/code/game/turfs/closed/_closed.dm
@@ -162,8 +162,8 @@
 	icon_state = "wood_wall-0"
 	base_icon_state = "wood_wall"
 	smoothing_flags = SMOOTH_BITMASK
-	smoothing_groups = list(SMOOTH_GROUP_CLOSED_TURFS, SMOOTH_GROUP_WALLS, SMOOTH_GROUP_WOOD_WALLS)
-	canSmoothWith = list(SMOOTH_GROUP_WOOD_WALLS)
+	smoothing_groups = list(SMOOTH_GROUP_CLOSED_TURFS, SMOOTH_GROUP_WALLS, SMOOTH_GROUP_AIRLOCK)
+	canSmoothWith = list(SMOOTH_GROUP_WALLS, SMOOTH_GROUP_WINDOW_FULLTILE, SMOOTH_GROUP_AIRLOCK)
 
 
 /turf/closed/indestructible/alien