Merge branch 'master' into master

maps/yw/cryogaia-04-maintenance.dmm

@@ -11648,7 +11648,10 @@
 /turf/simulated/floor/plating,
 /area/crew_quarters/recreation_area)
 "azg" = (
-/obj/machinery/vending/coffee,
+/obj/machinery/vending/coffee{
+	icon_state = "coffee";
+	dir = 4
+	},
 /turf/simulated/floor/carpet,
 /area/crew_quarters/recreation_area)
 "azh" = (
@@ -12091,7 +12094,10 @@
 /area/hallway/lower/central)
 "aAe" = (
 /obj/effect/floor_decal/spline/plain,
-/obj/machinery/vending/fitness,
+/obj/machinery/vending/fitness{
+	icon_state = "fitness";
+	dir = 4
+	},
 /turf/simulated/floor/carpet,
 /area/crew_quarters/recreation_area)
 "aAf" = (
@@ -13152,7 +13158,10 @@
 /turf/simulated/floor/tiled/techfloor/grid,
 /area/crew_quarters/sleep/cryo)
 "aCD" = (
-/obj/machinery/lapvend,
+/obj/machinery/lapvend{
+	icon_state = "robotics";
+	dir = 4
+	},
 /turf/simulated/floor/tiled/techfloor,
 /area/crew_quarters/sleep/cryo)
 "aCE" = (
@@ -17915,7 +17924,10 @@
 /turf/simulated/floor/tiled/dark,
 /area/hydroponics)
 "aNU" = (
-/obj/machinery/vending/fitness,
+/obj/machinery/vending/fitness{
+	icon_state = "fitness";
+	dir = 1
+	},
 /turf/simulated/floor/tiled,
 /area/crew_quarters/fitness)
 "aNV" = (
@@ -18538,8 +18550,11 @@
 /turf/simulated/floor/tiled/freezer,
 /area/crew_quarters/kitchen/lower)
 "aPu" = (
-/obj/machinery/seed_storage/garden,
 /obj/effect/floor_decal/corner/green/full,
+/obj/machinery/seed_storage/garden{
+	icon_state = "seeds";
+	dir = 1
+	},
 /turf/simulated/floor/tiled/hydro,
 /area/hydroponics)
 "aPv" = (
@@ -18565,10 +18580,13 @@
 	pixel_x = 0;
 	pixel_y = -26
 	},
-/obj/machinery/vending/hydronutrients,
 /obj/effect/floor_decal/corner/green{
 	dir = 10
 	},
+/obj/machinery/vending/hydronutrients{
+	icon_state = "nutri_generic";
+	dir = 1
+	},
 /turf/simulated/floor/tiled/hydro,
 /area/hydroponics)
 "aPx" = (
@@ -27737,13 +27755,17 @@
 /obj/effect/floor_decal/industrial/warning{
 	dir = 1
 	},
-/obj/machinery/atmospherics/pipe/manifold/hidden/supply,
-/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
 /obj/structure/cable{
 	d1 = 4;
 	d2 = 8;
 	icon_state = "4-8"
 	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 4
+	},
 /turf/simulated/floor,
 /area/maintenance/atmos_control)
 "bhv" = (
@@ -35980,13 +36002,6 @@
 /obj/random/maintenance/security,
 /turf/simulated/floor,
 /area/maintenance/aft)
-"byb" = (
-/obj/structure/table/rack,
-/obj/item/weapon/flame/lighter/random,
-/obj/item/weapon/storage/fancy/cigarettes/dromedaryco,
-/obj/random/maintenance/clean,
-/turf/simulated/floor/plating,
-/area/maintenance/aft)
 "byc" = (
 /obj/structure/cable{
 	icon_state = "4-8"
@@ -40655,6 +40670,13 @@
 "qDc" = (
 /turf/simulated/mineral/floor,
 /area/mine/unexplored/lower_rock)
+"qJo" = (
+/obj/structure/table/rack,
+/obj/item/weapon/flame/lighter/random,
+/obj/item/weapon/storage/fancy/cigarettes/dromedaryco,
+/obj/random/maintenance/clean,
+/turf/simulated/floor/plating,
+/area/mine/explored/lower_rock)
 "qWF" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -88188,7 +88210,7 @@ btE
 btE
 btE
 btE
-bls
+bkO
 bls
 bkO
 bzy
@@ -88438,9 +88460,9 @@ btE
 btE
 bvi
 bvV
+bvj
 bwI
-btE
-bls
+bkO
 bls
 byv
 boQ
@@ -88690,9 +88712,9 @@ btE
 bus
 bvj
 bvW
+bvj
 bwJ
-btE
-bls
+bkO
 bls
 byv
 bzz
@@ -88942,9 +88964,9 @@ btE
 but
 bvj
 aCz
+bvj
 bwK
-btE
-bls
+bkO
 bls
 bkO
 bkO
@@ -89194,9 +89216,9 @@ btE
 buu
 bvj
 bvY
+bvj
 bwL
-btE
-bls
+bkO
 bls
 bls
 bls
@@ -89448,7 +89470,7 @@ bvk
 bvZ
 bwM
 btE
-byb
+bkO
 bls
 bwc
 bls
@@ -89700,7 +89722,7 @@ btE
 btE
 btE
 btE
-aan
+qJo
 bls
 bls
 bls

maps/yw/cryogaia_areas.dm

@@ -31,9 +31,10 @@
 
 /area/borealis2/outdoors/grounds
 	name = "\The outpost grounds"
+	flags = AREA_FLAG_IS_NOT_PERSISTENT
 
 /area/borealis2/outdoors/grounds/upper
-	name = "\The outpost grounds - upper level"
+	name = "\The outpost grounds"
 	base_turf = /turf/simulated/open/cryogaia
 	icon_state = "outside2"
 
@@ -43,7 +44,7 @@
 	icon_state = "submap_hostile_area"
 
 /area/borealis2/outdoors/grounds/walkway
-	name = "Perimeter Wall - Upper"
+	name = "Perimeter Wall Walkway"
 	icon = 'icons/turf/areas.dmi'
 	icon_state = "submap_trespass_area"
 
@@ -57,6 +58,8 @@
 
 /area/borealis2/outdoors/grounds/tower
 	name = "Perimeter Tower"
+	sound_env = SMALL_ENCLOSED
+	forbid_events = TRUE
 
 /area/borealis2/outdoors/grounds/tower/north
 	name = "Perimeter Tower - N"
@@ -99,11 +102,11 @@
 	icon_state = "northwest"
 
 /area/borealis2/outdoors/exterior
-	name = "The wilderness"
+	name = "\The wilderness"
 	icon_state = "outside1unex"
 
 /area/borealis2/outdoors/exterior/upper
-	name = "The wilderness - upper level"
+	name = "\The wilderness"
 	icon_state = "outside2unex"
 
 /area/borealis2/outdoors/exterior/lake
@@ -203,6 +206,9 @@
 /area/chapel/monastery/upper
 	name = "Monastery Upper Floor"
 
+/area/chapel/monastery/music
+	name = "Monastery Music Room"
+
 //holodorms
 /area/holodeck/holodorm/source_basic
 	name = "\improper Holodeck Source"

maps/yw/cryogaia_defines.dm

@@ -152,7 +152,18 @@
 		/area/tcommsat/powercontrol,
 		/area/constructionsite/medical,
 		/area/borealis2/outdoors/grounds/entrance,
-		/area/security/vacantoffice)
+		/area/security/vacantoffice,
+		/area/borealis2/outdoors/grounds/tower/southwest,
+		/area/borealis2/outdoors/grounds/tower/south,
+		/area/borealis2/outdoors/grounds/tower/southeast,
+		/area/borealis2/outdoors/grounds/tower/east,
+		/area/borealis2/outdoors/grounds/tower/west,
+		/area/borealis2/outdoors/grounds/tower/northwest,
+		/area/borealis2/outdoors/grounds/tower/northeast,
+		/area/borealis2/outdoors/grounds/checkpoint,
+		/area/borealis2/outdoors/grounds/wall,
+		/area/cryogaia/station/ert_arrival
+		)
 	unit_test_exempt_from_atmos = list(
 //		/area/engineering/atmos/intake
 		)

maps/yw/cryogaia_turfs.dm

@@ -40,6 +40,12 @@ CRYOGAIA_TURF_CREATE(/turf/simulated/floor/tiled/old_tile/gray)
 /turf/simulated/floor/outdoors/snow/gravsnow/cryogaia/covered
 	outdoors = 0
 
+/turf/simulated/floor/reinforced/cryogaia
+	name = "hangar hatch"
+	desc = "A heavily reinforced hangar access point. It doesn't look like it'll open easily."
+	outdoors = 1
+	CRYOGAIA_SET_ATMOS
+
 /turf/simulated/floor/tiled/old_tile/gray/cryogaia
 	CRYOGAIA_SET_ATMOS