diff --git a/_maps/RandomRuins/IceRuins/icemoon_surface_asteroid.dmm b/_maps/RandomRuins/IceRuins/icemoon_surface_asteroid.dmm index 7b793ef3480..4bcaecbdb02 100644 --- a/_maps/RandomRuins/IceRuins/icemoon_surface_asteroid.dmm +++ b/_maps/RandomRuins/IceRuins/icemoon_surface_asteroid.dmm @@ -34,7 +34,7 @@ /area/icemoon/surface) "B" = ( /turf/open/genturf, -/area/mine/unexplored) +/area/lavaland/surface/outdoors) "C" = ( /obj/structure/fluff/clockwork/blind_eye, /turf/open/floor/bronze, diff --git a/_maps/map_files/tramstation/modular_pieces/maintenance_loweratmosci_1.dmm b/_maps/map_files/tramstation/modular_pieces/maintenance_loweratmosci_1.dmm index cda2466f0a6..ad28ff3bc9a 100644 --- a/_maps/map_files/tramstation/modular_pieces/maintenance_loweratmosci_1.dmm +++ b/_maps/map_files/tramstation/modular_pieces/maintenance_loweratmosci_1.dmm @@ -6,7 +6,7 @@ "bJ" = ( /obj/item/relic, /turf/open/misc/asteroid/airless, -/area/mine/explored) +/area/lavaland/surface) "cm" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/landmark/xeno_spawn, @@ -76,7 +76,7 @@ name = "Stuck-In-Rock" }, /turf/open/misc/asteroid/airless, -/area/mine/explored) +/area/lavaland/surface) "jW" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -93,7 +93,7 @@ /area/station/maintenance/starboard/lesser) "ku" = ( /turf/open/misc/asteroid/airless, -/area/mine/explored) +/area/lavaland/surface) "kw" = ( /turf/template_noop, /area/template_noop) @@ -117,7 +117,7 @@ /area/station/maintenance/starboard/lesser) "ot" = ( /turf/closed/mineral/random/stationside/asteroid/porus, -/area/mine/explored) +/area/lavaland/surface) "qk" = ( /obj/effect/spawner/random/trash/mess, /obj/effect/decal/cleanable/dirt, @@ -126,7 +126,7 @@ "qy" = ( /obj/effect/spawner/random/trash/garbage, /turf/open/misc/asteroid, -/area/mine/explored) +/area/lavaland/surface) "qR" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/cobweb/cobweb2, @@ -209,7 +209,7 @@ /area/station/maintenance/starboard/lesser) "wJ" = ( /turf/open/misc/asteroid, -/area/mine/explored) +/area/lavaland/surface) "wT" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -264,7 +264,7 @@ "AU" = ( /obj/item/stack/ore/glass, /turf/open/misc/asteroid, -/area/mine/explored) +/area/lavaland/surface) "Bx" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/spawner/random/structure/girder, @@ -376,7 +376,7 @@ "MF" = ( /obj/item/shard, /turf/open/misc/asteroid, -/area/mine/explored) +/area/lavaland/surface) "MM" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -522,7 +522,7 @@ /area/station/maintenance/starboard/lesser) "XC" = ( /turf/template_noop, -/area/mine/explored) +/area/lavaland/surface) "YO" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/trimline/neutral/filled/line{ diff --git a/_maps/map_files/tramstation/modular_pieces/maintenance_loweratmosci_2.dmm b/_maps/map_files/tramstation/modular_pieces/maintenance_loweratmosci_2.dmm index 9acd0790b2a..01dd5cb8a9d 100644 --- a/_maps/map_files/tramstation/modular_pieces/maintenance_loweratmosci_2.dmm +++ b/_maps/map_files/tramstation/modular_pieces/maintenance_loweratmosci_2.dmm @@ -23,7 +23,7 @@ /area/station/maintenance/starboard/lesser) "bs" = ( /turf/open/misc/asteroid, -/area/mine/explored) +/area/lavaland/surface) "bN" = ( /obj/effect/decal/cleanable/robot_debris, /obj/effect/turf_decal/sand, @@ -88,7 +88,7 @@ "gk" = ( /obj/item/pickaxe/rusted, /turf/open/misc/asteroid, -/area/mine/explored) +/area/lavaland/surface) "hl" = ( /turf/closed/wall, /area/station/maintenance/starboard/lesser) @@ -106,7 +106,7 @@ "iL" = ( /obj/effect/spawner/random/trash/garbage, /turf/open/misc/asteroid, -/area/mine/explored) +/area/lavaland/surface) "ji" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -168,7 +168,7 @@ "pU" = ( /obj/item/stack/ore/glass, /turf/open/misc/asteroid, -/area/mine/explored) +/area/lavaland/surface) "qK" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -205,14 +205,14 @@ "rV" = ( /obj/item/shard, /turf/open/misc/asteroid, -/area/mine/explored) +/area/lavaland/surface) "sA" = ( /obj/modular_map_connector, /turf/template_noop, /area/template_noop) "ty" = ( /turf/closed/mineral/random/stationside/asteroid/porus, -/area/mine/explored) +/area/lavaland/surface) "uS" = ( /obj/effect/turf_decal/sand/plating, /obj/effect/spawner/random/structure/girder, diff --git a/_maps/map_files/tramstation/modular_pieces/maintenance_loweratmosci_attachment_a_1.dmm b/_maps/map_files/tramstation/modular_pieces/maintenance_loweratmosci_attachment_a_1.dmm index eb9c7fafaac..71cd0ca0d1d 100644 --- a/_maps/map_files/tramstation/modular_pieces/maintenance_loweratmosci_attachment_a_1.dmm +++ b/_maps/map_files/tramstation/modular_pieces/maintenance_loweratmosci_attachment_a_1.dmm @@ -9,13 +9,13 @@ /area/station/maintenance/starboard/lesser) "c" = ( /turf/closed/mineral/random/stationside/asteroid/porus, -/area/mine/explored) +/area/lavaland/surface) "d" = ( /obj/item/stack/ore/glass, /turf/open/misc/asteroid/dug{ initial_gas_mix = "TEMP=2.7" }, -/area/mine/explored) +/area/lavaland/surface) "e" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/door/airlock/maintenance_hatch{ @@ -39,7 +39,7 @@ "i" = ( /obj/structure/ore_box, /turf/open/misc/asteroid/airless, -/area/mine/explored) +/area/lavaland/surface) "n" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/door/airlock/maintenance_hatch{ @@ -68,7 +68,7 @@ "x" = ( /obj/item/shovel, /turf/open/misc/asteroid/airless, -/area/mine/explored) +/area/lavaland/surface) "z" = ( /turf/template_noop, /area/template_noop) @@ -81,7 +81,7 @@ "D" = ( /obj/item/stack/ore/glass, /turf/open/misc/asteroid/airless, -/area/mine/explored) +/area/lavaland/surface) "F" = ( /obj/machinery/door/airlock/maintenance_hatch{ name = "Maintenance Hatch" @@ -107,7 +107,7 @@ /area/station/maintenance/starboard/lesser) "W" = ( /turf/open/misc/asteroid/airless, -/area/mine/explored) +/area/lavaland/surface) "Z" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/light/small/directional/north, diff --git a/_maps/map_files/tramstation/modular_pieces/maintenance_loweratmosci_attachment_a_2.dmm b/_maps/map_files/tramstation/modular_pieces/maintenance_loweratmosci_attachment_a_2.dmm index 343a087d1c4..a816890dcfb 100644 --- a/_maps/map_files/tramstation/modular_pieces/maintenance_loweratmosci_attachment_a_2.dmm +++ b/_maps/map_files/tramstation/modular_pieces/maintenance_loweratmosci_attachment_a_2.dmm @@ -96,11 +96,11 @@ /area/station/maintenance/starboard/lesser) "x" = ( /turf/closed/mineral/random/stationside/asteroid/porus, -/area/mine/explored) +/area/lavaland/surface) "z" = ( /obj/item/pickaxe/rusted, /turf/open/misc/asteroid/airless, -/area/mine/explored) +/area/lavaland/surface) "A" = ( /obj/machinery/door/airlock/external{ name = "Escape Pod Three" @@ -119,7 +119,7 @@ "E" = ( /obj/effect/turf_decal/sand/plating, /turf/open/floor/plating/airless, -/area/mine/explored) +/area/lavaland/surface) "F" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -161,13 +161,13 @@ "T" = ( /obj/structure/ore_box, /turf/open/misc/asteroid/airless, -/area/mine/explored) +/area/lavaland/surface) "U" = ( /turf/template_noop, /area/template_noop) "Z" = ( /turf/open/misc/asteroid/airless, -/area/mine/explored) +/area/lavaland/surface) (1,1,1) = {" L diff --git a/_maps/map_files/tramstation/modular_pieces/maintenance_loweratmosci_attachment_a_3.dmm b/_maps/map_files/tramstation/modular_pieces/maintenance_loweratmosci_attachment_a_3.dmm index 57a2051ca17..d70a9aef0bf 100644 --- a/_maps/map_files/tramstation/modular_pieces/maintenance_loweratmosci_attachment_a_3.dmm +++ b/_maps/map_files/tramstation/modular_pieces/maintenance_loweratmosci_attachment_a_3.dmm @@ -18,7 +18,7 @@ }, /obj/effect/turf_decal/sand/plating, /turf/open/floor/plating, -/area/mine/explored) +/area/lavaland/surface) "d" = ( /turf/closed/wall, /area/station/maintenance/starboard/lesser) @@ -26,11 +26,11 @@ /obj/effect/turf_decal/sand/plating, /obj/structure/chair/stool/directional/north, /turf/open/floor/plating, -/area/mine/explored) +/area/lavaland/surface) "f" = ( /obj/effect/turf_decal/sand/plating, /turf/open/floor/plating, -/area/mine/explored) +/area/lavaland/surface) "g" = ( /turf/open/misc/asteroid, /area/station/maintenance/starboard/lesser) @@ -65,7 +65,7 @@ "m" = ( /obj/item/shard, /turf/open/misc/asteroid, -/area/mine/explored) +/area/lavaland/surface) "n" = ( /obj/machinery/portable_atmospherics/canister{ greyscale_colors = "#2786e5#e8fefe"; @@ -73,7 +73,7 @@ name = "Oxygen canister" }, /turf/open/misc/asteroid, -/area/mine/explored) +/area/lavaland/surface) "p" = ( /obj/effect/turf_decal/sand/plating, /turf/open/floor/plating, @@ -91,7 +91,7 @@ pixel_y = 2 }, /turf/open/floor/plating, -/area/mine/explored) +/area/lavaland/surface) "r" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/portable_atmospherics/canister/water_vapor, @@ -101,15 +101,15 @@ "s" = ( /obj/item/stack/rods, /turf/open/misc/asteroid, -/area/mine/explored) +/area/lavaland/surface) "t" = ( /obj/structure/ore_box, /turf/open/misc/asteroid, -/area/mine/explored) +/area/lavaland/surface) "u" = ( /obj/item/reagent_containers/cup/glass/bottle/beer/light, /turf/open/misc/asteroid, -/area/mine/explored) +/area/lavaland/surface) "w" = ( /turf/closed/wall/rock/porous, /area/station/maintenance/starboard/lesser) @@ -146,25 +146,25 @@ /area/station/maintenance/starboard/lesser) "E" = ( /turf/closed/mineral/random/stationside/asteroid/porus, -/area/mine/explored) +/area/lavaland/surface) "F" = ( /obj/effect/turf_decal/sand/plating, /obj/structure/chair/stool/directional/east, /turf/open/floor/plating, -/area/mine/explored) +/area/lavaland/surface) "O" = ( /turf/open/misc/asteroid, -/area/mine/explored) +/area/lavaland/surface) "P" = ( /obj/effect/turf_decal/sand/plating, /obj/structure/fluff/beach_umbrella, /turf/open/floor/plating, -/area/mine/explored) +/area/lavaland/surface) "Q" = ( /obj/machinery/fishing_portal_generator, /obj/effect/turf_decal/sand/plating, /turf/open/floor/plating, -/area/mine/explored) +/area/lavaland/surface) "R" = ( /obj/structure/rack, /obj/item/shovel, @@ -173,7 +173,7 @@ pixel_y = 4 }, /turf/open/misc/asteroid, -/area/mine/explored) +/area/lavaland/surface) "S" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/door/airlock/maintenance_hatch{ @@ -192,7 +192,7 @@ /area/station/maintenance/starboard/lesser) "V" = ( /turf/closed/wall/rock/porous, -/area/mine/explored) +/area/lavaland/surface) "W" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/components/unary/portables_connector/visible{ @@ -211,7 +211,7 @@ /obj/machinery/power/floodlight, /obj/effect/turf_decal/sand/plating, /turf/open/floor/plating, -/area/mine/explored) +/area/lavaland/surface) "Z" = ( /obj/effect/turf_decal/sand, /turf/open/floor/iron/smooth, diff --git a/_maps/map_files/tramstation/modular_pieces/maintenance_lowercargosci_2.dmm b/_maps/map_files/tramstation/modular_pieces/maintenance_lowercargosci_2.dmm index 099d5468d63..47d9888ba6a 100644 --- a/_maps/map_files/tramstation/modular_pieces/maintenance_lowercargosci_2.dmm +++ b/_maps/map_files/tramstation/modular_pieces/maintenance_lowercargosci_2.dmm @@ -15,7 +15,7 @@ /area/station/maintenance/starboard/central) "eY" = ( /turf/closed/mineral/random/stationside/asteroid/porus, -/area/mine/explored) +/area/lavaland/surface) "ff" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/spawner/random/trash/garbage, @@ -274,7 +274,7 @@ /area/station/maintenance/starboard/central) "VS" = ( /turf/open/misc/asteroid/airless, -/area/mine/explored) +/area/lavaland/surface) "Wc" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, diff --git a/_maps/map_files/tramstation/modular_pieces/maintenance_lowercargosci_attachment_b_1.dmm b/_maps/map_files/tramstation/modular_pieces/maintenance_lowercargosci_attachment_b_1.dmm index 0bad1915c9f..74d931e3d3b 100644 --- a/_maps/map_files/tramstation/modular_pieces/maintenance_lowercargosci_attachment_b_1.dmm +++ b/_maps/map_files/tramstation/modular_pieces/maintenance_lowercargosci_attachment_b_1.dmm @@ -36,7 +36,7 @@ /area/station/maintenance/starboard/central) "E" = ( /turf/closed/mineral/random/stationside/asteroid/porus, -/area/mine/explored) +/area/lavaland/surface) "H" = ( /turf/template_noop, /area/template_noop) diff --git a/_maps/map_files/tramstation/modular_pieces/maintenance_lowerdorm_1.dmm b/_maps/map_files/tramstation/modular_pieces/maintenance_lowerdorm_1.dmm index f10cb5520fc..3fe7fd90a9a 100644 --- a/_maps/map_files/tramstation/modular_pieces/maintenance_lowerdorm_1.dmm +++ b/_maps/map_files/tramstation/modular_pieces/maintenance_lowerdorm_1.dmm @@ -46,7 +46,7 @@ "ag" = ( /obj/item/stack/ore/glass, /turf/open/misc/asteroid/airless, -/area/mine/explored) +/area/lavaland/surface) "ah" = ( /turf/open/floor/catwalk_floor, /area/station/maintenance/central/lesser) @@ -175,7 +175,7 @@ "ay" = ( /obj/item/stack/ore/iron, /turf/open/misc/asteroid/airless, -/area/mine/explored) +/area/lavaland/surface) "az" = ( /obj/modular_map_connector, /turf/template_noop, @@ -249,7 +249,7 @@ /area/station/maintenance/department/crew_quarters/dorms) "aO" = ( /turf/open/misc/asteroid/airless, -/area/mine/explored) +/area/lavaland/surface) "aP" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -262,7 +262,7 @@ /area/station/maintenance/department/crew_quarters/dorms) "aQ" = ( /turf/closed/mineral/random/stationside/asteroid/porus, -/area/mine/explored) +/area/lavaland/surface) "aR" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/rack, diff --git a/_maps/map_files/tramstation/modular_pieces/maintenance_lowerdorm_2.dmm b/_maps/map_files/tramstation/modular_pieces/maintenance_lowerdorm_2.dmm index e725d21cf65..09e7ff72332 100644 --- a/_maps/map_files/tramstation/modular_pieces/maintenance_lowerdorm_2.dmm +++ b/_maps/map_files/tramstation/modular_pieces/maintenance_lowerdorm_2.dmm @@ -61,7 +61,7 @@ name = "walter" }, /turf/open/misc/asteroid, -/area/mine/explored) +/area/lavaland/surface) "fP" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/rack, @@ -211,7 +211,7 @@ /area/template_noop) "uZ" = ( /turf/open/misc/asteroid, -/area/mine/explored) +/area/lavaland/surface) "vZ" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -237,7 +237,7 @@ /area/station/maintenance/central/lesser) "xu" = ( /turf/closed/mineral/random/stationside/asteroid/porus, -/area/mine/explored) +/area/lavaland/surface) "yj" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -255,11 +255,11 @@ "yu" = ( /obj/item/relic, /turf/open/misc/asteroid/dug, -/area/mine/explored) +/area/lavaland/surface) "yw" = ( /obj/item/stack/ore/glass, /turf/open/misc/asteroid, -/area/mine/explored) +/area/lavaland/surface) "yD" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/landmark/blobstart, @@ -443,11 +443,11 @@ "Oi" = ( /obj/item/stack/ore/silver, /turf/open/misc/asteroid, -/area/mine/explored) +/area/lavaland/surface) "OF" = ( /obj/item/pickaxe/emergency, /turf/open/misc/asteroid, -/area/mine/explored) +/area/lavaland/surface) "OI" = ( /turf/template_noop, /area/template_noop) @@ -495,7 +495,7 @@ "XU" = ( /obj/structure/barricade/wooden, /turf/open/misc/asteroid, -/area/mine/explored) +/area/lavaland/surface) "Ya" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/smooth, diff --git a/_maps/map_files/tramstation/modular_pieces/maintenance_lowerdorm_attachment_a_1.dmm b/_maps/map_files/tramstation/modular_pieces/maintenance_lowerdorm_attachment_a_1.dmm index 756e5e88625..84468726c4b 100644 --- a/_maps/map_files/tramstation/modular_pieces/maintenance_lowerdorm_attachment_a_1.dmm +++ b/_maps/map_files/tramstation/modular_pieces/maintenance_lowerdorm_attachment_a_1.dmm @@ -47,7 +47,7 @@ "k" = ( /obj/item/stack/ore/glass, /turf/open/misc/asteroid/airless, -/area/mine/explored) +/area/lavaland/surface) "o" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/light/small/directional/north, @@ -55,10 +55,10 @@ /area/station/maintenance/department/crew_quarters/dorms) "r" = ( /turf/closed/mineral/random/stationside/asteroid/porus, -/area/mine/explored) +/area/lavaland/surface) "t" = ( /turf/open/misc/asteroid/airless, -/area/mine/explored) +/area/lavaland/surface) "C" = ( /turf/template_noop, /area/template_noop) diff --git a/_maps/map_files/tramstation/modular_pieces/maintenance_lowerdorm_attachment_b_1.dmm b/_maps/map_files/tramstation/modular_pieces/maintenance_lowerdorm_attachment_b_1.dmm index 5e2d3964f23..be588cd5210 100644 --- a/_maps/map_files/tramstation/modular_pieces/maintenance_lowerdorm_attachment_b_1.dmm +++ b/_maps/map_files/tramstation/modular_pieces/maintenance_lowerdorm_attachment_b_1.dmm @@ -1,7 +1,7 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE "c" = ( /turf/closed/mineral/random/stationside/asteroid/porus, -/area/mine/explored) +/area/lavaland/surface) "m" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/rack, diff --git a/_maps/map_files/tramstation/modular_pieces/maintenance_lowerdorm_attachment_b_2.dmm b/_maps/map_files/tramstation/modular_pieces/maintenance_lowerdorm_attachment_b_2.dmm index 039d2a60eb9..0bae1f76da5 100644 --- a/_maps/map_files/tramstation/modular_pieces/maintenance_lowerdorm_attachment_b_2.dmm +++ b/_maps/map_files/tramstation/modular_pieces/maintenance_lowerdorm_attachment_b_2.dmm @@ -69,7 +69,7 @@ /area/station/maintenance/central/lesser) "M" = ( /turf/closed/mineral/random/stationside/asteroid/porus, -/area/mine/explored) +/area/lavaland/surface) "Q" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/rack, diff --git a/_maps/map_files/tramstation/tramstation.dmm b/_maps/map_files/tramstation/tramstation.dmm index 7d96136459b..8c32b585584 100644 --- a/_maps/map_files/tramstation/tramstation.dmm +++ b/_maps/map_files/tramstation/tramstation.dmm @@ -241,7 +241,7 @@ /area/station/maintenance/tram/mid) "afH" = ( /turf/open/floor/iron/vaporwave, -/area/mine/explored) +/area/lavaland/surface) "afI" = ( /obj/machinery/light/directional/east, /obj/effect/turf_decal/trimline/white/line{ @@ -1135,7 +1135,7 @@ /obj/structure/easel, /obj/item/canvas/nineteen_nineteen, /turf/open/misc/asteroid/airless, -/area/mine/explored) +/area/lavaland/surface) "azy" = ( /obj/effect/turf_decal/siding/thinplating, /turf/open/floor/glass/reinforced, @@ -1458,7 +1458,7 @@ }, /obj/effect/turf_decal/sand/plating, /turf/open/floor/plating/airless, -/area/mine/explored) +/area/lavaland/surface) "aHt" = ( /obj/effect/turf_decal/trimline/purple/filled/line{ dir = 8 @@ -1898,7 +1898,7 @@ "aRN" = ( /obj/effect/turf_decal/sand/plating, /turf/open/floor/plating/airless, -/area/mine/explored) +/area/lavaland/surface) "aSe" = ( /obj/effect/turf_decal/tile/blue{ dir = 4 @@ -2167,7 +2167,7 @@ /obj/effect/turf_decal/sand/plating, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/plating/airless, -/area/mine/explored) +/area/lavaland/surface) "aWy" = ( /obj/effect/turf_decal/trimline/yellow/warning{ dir = 1 @@ -3047,7 +3047,7 @@ }, /obj/structure/lattice, /turf/open/space/basic, -/area/mine/explored) +/area/lavaland/surface) "bnJ" = ( /turf/open/floor/iron/dark, /area/station/service/hydroponics) @@ -3062,7 +3062,7 @@ /obj/effect/turf_decal/sand/plating, /obj/structure/table, /turf/open/floor/plating/airless, -/area/mine/explored) +/area/lavaland/surface) "bnS" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/effect/turf_decal/trimline/purple/filled/line{ @@ -3299,7 +3299,7 @@ key = "maintenance_upperdormsleft_attachment" }, /turf/open/misc/asteroid, -/area/mine/explored) +/area/lavaland/surface) "bsE" = ( /obj/structure/table/glass, /obj/item/storage/secure/briefcase, @@ -3870,7 +3870,7 @@ key = "maintenance_uppermedsci_attachment_a" }, /turf/open/misc/asteroid, -/area/mine/explored) +/area/lavaland/surface) "bBX" = ( /obj/effect/turf_decal/trimline/neutral/filled/corner{ dir = 4 @@ -6266,7 +6266,7 @@ dir = 1 }, /turf/open/floor/plating/airless, -/area/mine/explored) +/area/lavaland/surface) "cpg" = ( /obj/effect/turf_decal/trimline/neutral/filled/line{ dir = 4 @@ -6619,7 +6619,7 @@ /obj/structure/falsewall, /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/smooth, -/area/mine/explored) +/area/lavaland/surface) "ctU" = ( /obj/effect/turf_decal/trimline/red/filled/line{ dir = 8 @@ -6669,7 +6669,7 @@ "cuX" = ( /obj/item/stack/ore/glass, /turf/open/misc/asteroid/airless, -/area/mine/explored) +/area/lavaland/surface) "cvf" = ( /obj/effect/turf_decal/trimline/neutral/filled/line{ dir = 4 @@ -6753,7 +6753,7 @@ /obj/effect/turf_decal/sand/plating, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/plating/airless, -/area/mine/explored) +/area/lavaland/surface) "cwG" = ( /turf/open/floor/iron, /area/station/cargo/office) @@ -7675,7 +7675,7 @@ dir = 6 }, /turf/open/floor/plating/airless, -/area/mine/explored) +/area/lavaland/surface) "cKE" = ( /obj/effect/decal/cleanable/dirt, /obj/item/weldingtool, @@ -8436,7 +8436,7 @@ /obj/effect/spawner/random/structure/girder, /obj/effect/spawner/random/structure/grille, /turf/open/floor/plating/airless, -/area/mine/explored) +/area/lavaland/surface) "dai" = ( /obj/structure/chair/sofa/corp/corner{ dir = 4 @@ -8774,7 +8774,7 @@ /area/station/engineering/atmos) "dhe" = ( /turf/closed/mineral/random/stationside/asteroid/porus, -/area/mine/explored) +/area/lavaland/surface) "dhl" = ( /obj/structure/chair/office{ dir = 1 @@ -8862,7 +8862,7 @@ }, /obj/machinery/light/small/directional/south, /turf/open/floor/plating/airless, -/area/mine/explored) +/area/lavaland/surface) "djA" = ( /obj/structure/disposalpipe/segment{ dir = 5 @@ -8870,7 +8870,7 @@ /obj/effect/turf_decal/sand/plating, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/plating/airless, -/area/mine/explored) +/area/lavaland/surface) "djE" = ( /obj/structure/window/reinforced/spawner/east, /obj/structure/table/reinforced, @@ -9075,7 +9075,7 @@ key = "maintenance_upperbridgeright_attachment_b" }, /turf/open/misc/asteroid, -/area/mine/explored) +/area/lavaland/surface) "dnp" = ( /obj/effect/turf_decal/sand/plating, /obj/machinery/door/airlock/external{ @@ -9590,10 +9590,10 @@ /area/station/security/prison/garden) "duT" = ( /turf/open/space/basic, -/area/mine/explored) +/area/lavaland/surface) "duU" = ( /turf/closed/wall/r_wall, -/area/mine/explored) +/area/lavaland/surface) "dvn" = ( /obj/structure/easel, /obj/item/canvas/twentythree_twentythree, @@ -9749,7 +9749,7 @@ dir = 4 }, /turf/open/floor/plating/airless, -/area/mine/explored) +/area/lavaland/surface) "dwK" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -10137,7 +10137,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, /turf/open/floor/plating/airless, -/area/mine/explored) +/area/lavaland/surface) "dCD" = ( /obj/structure/bookcase/random/reference, /turf/open/floor/wood/large, @@ -10193,7 +10193,7 @@ /area/station/security/processing) "dDG" = ( /turf/open/misc/asteroid/airless, -/area/mine/explored) +/area/lavaland/surface) "dDH" = ( /obj/effect/turf_decal/trimline/neutral/filled/line{ dir = 8 @@ -10738,7 +10738,7 @@ dir = 4 }, /turf/open/floor/plating/airless, -/area/mine/explored) +/area/lavaland/surface) "dOs" = ( /obj/item/radio/intercom/directional/north, /obj/structure/easel, @@ -11963,7 +11963,7 @@ /obj/effect/turf_decal/sand/plating, /obj/item/storage/toolbox/mechanical, /turf/open/floor/plating/airless, -/area/mine/explored) +/area/lavaland/surface) "ejY" = ( /obj/effect/turf_decal/trimline/purple/line, /obj/effect/turf_decal/stripes/corner{ @@ -12246,7 +12246,7 @@ "epX" = ( /obj/effect/spawner/random/trash/food_packaging, /turf/open/misc/asteroid/airless, -/area/mine/explored) +/area/lavaland/surface) "eqf" = ( /turf/open/floor/iron, /area/station/command/gateway) @@ -12853,7 +12853,7 @@ spawn_loot_chance = 50 }, /turf/open/floor/plating/airless, -/area/mine/explored) +/area/lavaland/surface) "eBr" = ( /obj/machinery/space_heater, /obj/effect/turf_decal/bot, @@ -12937,7 +12937,7 @@ key = "maintenance_lowerdorm_attachment_b" }, /turf/open/misc/asteroid, -/area/mine/explored) +/area/lavaland/surface) "eDo" = ( /obj/effect/landmark/event_spawn, /turf/open/floor/engine, @@ -14826,7 +14826,7 @@ /obj/effect/turf_decal/sand/plating, /obj/structure/railing, /turf/open/floor/plating/airless, -/area/mine/explored) +/area/lavaland/surface) "fmy" = ( /turf/closed/wall, /area/station/hallway/secondary/exit/departure_lounge) @@ -15022,7 +15022,7 @@ }, /obj/structure/lattice, /turf/open/space/basic, -/area/mine/explored) +/area/lavaland/surface) "fqt" = ( /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/trimline/yellow/filled/line{ @@ -15810,7 +15810,7 @@ /obj/effect/spawner/random/structure/furniture_parts, /obj/item/relic, /turf/open/floor/plating/airless, -/area/mine/explored) +/area/lavaland/surface) "fHg" = ( /obj/structure/chair{ dir = 1; @@ -16259,7 +16259,7 @@ }, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/plating/airless, -/area/mine/explored) +/area/lavaland/surface) "fPy" = ( /obj/structure/chair/stool/bar/directional/east, /turf/open/floor/iron, @@ -16996,7 +16996,7 @@ /obj/effect/turf_decal/sand/plating, /obj/machinery/light/small/directional/north, /turf/open/floor/plating/airless, -/area/mine/explored) +/area/lavaland/surface) "geT" = ( /obj/effect/turf_decal/trimline/purple/filled/line{ dir = 5 @@ -20156,7 +20156,7 @@ key = "maintenance_upperdormsright_attachment" }, /turf/open/misc/asteroid, -/area/mine/explored) +/area/lavaland/surface) "hlc" = ( /turf/closed/wall/r_wall, /area/station/science/xenobiology) @@ -20177,7 +20177,7 @@ /obj/item/restraints/handcuffs/cable/red, /obj/effect/decal/cleanable/blood/old, /turf/open/floor/plating/airless, -/area/mine/explored) +/area/lavaland/surface) "hmD" = ( /obj/machinery/shower{ dir = 1 @@ -20504,7 +20504,7 @@ "htM" = ( /obj/item/stack/ore/iron, /turf/open/misc/asteroid/airless, -/area/mine/explored) +/area/lavaland/surface) "htP" = ( /obj/structure/cable, /turf/open/floor/circuit/green, @@ -21065,7 +21065,7 @@ /obj/structure/marker_beacon/burgundy, /obj/effect/turf_decal/stripes/asteroid/box, /turf/open/floor/plating/airless, -/area/mine/explored) +/area/lavaland/surface) "hEU" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -21820,7 +21820,7 @@ key = "maintenance_uppermedsci_attachment_b" }, /turf/open/misc/asteroid, -/area/mine/explored) +/area/lavaland/surface) "hTo" = ( /obj/structure/cable, /obj/machinery/firealarm/directional/east, @@ -22070,7 +22070,7 @@ dir = 4 }, /turf/open/misc/asteroid/airless, -/area/mine/explored) +/area/lavaland/surface) "hXs" = ( /obj/structure/railing/corner, /obj/effect/turf_decal/siding/thinplating/corner, @@ -22749,7 +22749,7 @@ width = 9 }, /turf/open/misc/asteroid/airless, -/area/mine/explored) +/area/lavaland/surface) "iin" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -23063,7 +23063,7 @@ key = "maintenance_upperbarright_attachment_a" }, /turf/open/misc/asteroid, -/area/mine/explored) +/area/lavaland/surface) "ipe" = ( /obj/machinery/atmospherics/pipe/smart/manifold/green/visible{ dir = 8 @@ -23442,7 +23442,7 @@ pixel_y = 32 }, /turf/open/floor/plating/airless, -/area/mine/explored) +/area/lavaland/surface) "iwm" = ( /obj/machinery/door/airlock/security/glass{ name = "Prison Wing" @@ -24199,7 +24199,7 @@ }, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/plating/airless, -/area/mine/explored) +/area/lavaland/surface) "iKr" = ( /obj/effect/turf_decal/bot_white/left, /obj/effect/turf_decal/tile/neutral/fourcorners, @@ -26272,7 +26272,7 @@ /obj/effect/turf_decal/sand/plating, /obj/effect/spawner/random/structure/girder, /turf/open/floor/plating/airless, -/area/mine/explored) +/area/lavaland/surface) "jwx" = ( /obj/machinery/atmospherics/pipe/multiz/scrubbers/visible/layer2{ dir = 4 @@ -26545,7 +26545,7 @@ /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/plating/airless, -/area/mine/explored) +/area/lavaland/surface) "jBy" = ( /obj/structure/sink{ dir = 4; @@ -26560,7 +26560,7 @@ "jBK" = ( /obj/structure/ladder, /turf/open/misc/asteroid/airless, -/area/mine/explored) +/area/lavaland/surface) "jCf" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, /obj/machinery/airalarm/directional/west, @@ -26577,7 +26577,7 @@ }, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/plating/airless, -/area/mine/explored) +/area/lavaland/surface) "jCT" = ( /obj/effect/turf_decal/trimline/red/filled/corner{ dir = 4 @@ -27452,7 +27452,7 @@ /obj/machinery/atmospherics/pipe/heat_exchanging/simple, /obj/structure/lattice, /turf/open/space/basic, -/area/mine/explored) +/area/lavaland/surface) "jTx" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron, @@ -27478,7 +27478,7 @@ key = "maintenance_loweratmosci_attachment_a" }, /turf/open/misc/asteroid, -/area/mine/explored) +/area/lavaland/surface) "jTN" = ( /obj/effect/turf_decal/trimline/red/filled/corner{ dir = 1 @@ -28978,7 +28978,7 @@ }, /obj/effect/turf_decal/sand/plating, /turf/open/floor/plating/airless, -/area/mine/explored) +/area/lavaland/surface) "ktq" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 1 @@ -29107,7 +29107,7 @@ key = "maintenance_upperbridgeright_attachment_a" }, /turf/open/misc/asteroid, -/area/mine/explored) +/area/lavaland/surface) "kwe" = ( /obj/structure/ladder, /turf/open/floor/iron/grimy, @@ -30005,7 +30005,7 @@ /area/station/commons/vacant_room/office) "kMh" = ( /turf/open/openspace/airless/planetary, -/area/mine/explored) +/area/lavaland/surface) "kMm" = ( /obj/structure/table/wood, /obj/item/food/grown/harebell, @@ -30063,7 +30063,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/effect/decal/cleanable/dirt, /turf/open/floor/catwalk_floor, -/area/mine/explored) +/area/lavaland/surface) "kNe" = ( /obj/effect/turf_decal/tile/bar, /obj/effect/turf_decal/tile/bar{ @@ -31258,7 +31258,7 @@ /obj/structure/disposalpipe/junction/yjunction, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/plating/airless, -/area/mine/explored) +/area/lavaland/surface) "lib" = ( /obj/machinery/telecomms/server/presets/security, /turf/open/floor/iron/dark/telecomms, @@ -32004,7 +32004,7 @@ /area/station/security/prison) "lvw" = ( /turf/closed/wall, -/area/mine/explored) +/area/lavaland/surface) "lvE" = ( /obj/effect/turf_decal/trimline/yellow/filled/corner{ dir = 4 @@ -32399,7 +32399,7 @@ dir = 6 }, /turf/open/floor/plating/airless, -/area/mine/explored) +/area/lavaland/surface) "lBt" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 4 @@ -32682,7 +32682,7 @@ "lHN" = ( /obj/vehicle/ridden/wheelchair/motorized, /turf/open/misc/asteroid/airless, -/area/mine/explored) +/area/lavaland/surface) "lIs" = ( /obj/effect/turf_decal/trimline/purple/filled/line, /turf/open/floor/iron/white, @@ -33097,7 +33097,7 @@ /obj/effect/turf_decal/sand/plating, /obj/item/stack/ore/glass, /turf/open/floor/plating/airless, -/area/mine/explored) +/area/lavaland/surface) "lPO" = ( /obj/machinery/door/poddoor/incinerator_atmos_main, /turf/open/floor/engine, @@ -33202,7 +33202,7 @@ key = "maintenance_lowerdorm" }, /turf/open/floor/catwalk_floor, -/area/mine/explored) +/area/lavaland/surface) "lRu" = ( /obj/effect/turf_decal/stripes/line, /obj/effect/landmark/navigate_destination/dockescpod1, @@ -33319,7 +33319,7 @@ "lTX" = ( /obj/item/storage/toolbox/electrical, /turf/open/misc/asteroid/airless, -/area/mine/explored) +/area/lavaland/surface) "lUf" = ( /obj/effect/turf_decal/trimline/neutral/filled/line, /turf/open/floor/iron, @@ -33698,7 +33698,7 @@ /obj/effect/turf_decal/sand/plating, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/plating/airless, -/area/mine/explored) +/area/lavaland/surface) "mbA" = ( /obj/structure/sign/warning/docking, /turf/closed/wall, @@ -33778,7 +33778,7 @@ }, /obj/structure/lattice, /turf/open/space/basic, -/area/mine/explored) +/area/lavaland/surface) "mdy" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/carpet, @@ -35450,7 +35450,7 @@ /obj/structure/cable, /obj/effect/turf_decal/sand/plating, /turf/open/floor/plating/airless, -/area/mine/explored) +/area/lavaland/surface) "mFd" = ( /obj/effect/turf_decal/trimline/neutral/filled/line, /obj/effect/turf_decal/trimline/yellow/warning{ @@ -35745,7 +35745,7 @@ key = "maintenance_upperbarright_attachment_b" }, /turf/open/misc/asteroid, -/area/mine/explored) +/area/lavaland/surface) "mJK" = ( /obj/machinery/door/firedoor, /obj/structure/disposalpipe/segment, @@ -35852,7 +35852,7 @@ key = "maintenance_lowercargosci_attachment_b" }, /turf/open/misc/asteroid, -/area/mine/explored) +/area/lavaland/surface) "mLL" = ( /obj/effect/turf_decal/trimline/neutral/filled/line, /obj/machinery/door/firedoor, @@ -35983,7 +35983,7 @@ }, /obj/effect/turf_decal/sand/plating, /turf/open/floor/plating/airless, -/area/mine/explored) +/area/lavaland/surface) "mNu" = ( /obj/effect/turf_decal/trimline/yellow/warning, /obj/machinery/light/small/directional/north, @@ -36671,7 +36671,7 @@ dir = 9 }, /turf/open/floor/plating/airless, -/area/mine/explored) +/area/lavaland/surface) "naX" = ( /obj/machinery/power/apc/auto_name/directional/north, /obj/structure/cable, @@ -38190,7 +38190,7 @@ "nDT" = ( /obj/item/ammo_casing/spent, /turf/open/floor/plating/airless, -/area/mine/explored) +/area/lavaland/surface) "nDV" = ( /obj/machinery/conveyor{ id = "QMLoad2" @@ -39576,7 +39576,7 @@ /obj/effect/turf_decal/sand/plating, /obj/effect/turf_decal/sand/plating, /turf/open/floor/plating/airless, -/area/mine/explored) +/area/lavaland/surface) "oho" = ( /obj/machinery/computer/secure_data{ dir = 8 @@ -40320,7 +40320,7 @@ /obj/effect/turf_decal/sand/plating, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/visible, /turf/open/floor/plating/airless, -/area/mine/explored) +/area/lavaland/surface) "ovj" = ( /obj/structure/disposalpipe/segment{ dir = 10 @@ -40362,7 +40362,7 @@ key = "maintenance_lowerdorm_attachment_a" }, /turf/open/misc/asteroid, -/area/mine/explored) +/area/lavaland/surface) "oxs" = ( /obj/effect/turf_decal/trimline/neutral/filled/corner, /obj/structure/disposalpipe/segment{ @@ -40467,7 +40467,7 @@ /obj/item/stack/cable_coil, /obj/effect/turf_decal/sand/plating, /turf/open/floor/plating/airless, -/area/mine/explored) +/area/lavaland/surface) "oze" = ( /obj/machinery/dna_scannernew, /obj/machinery/light/directional/north, @@ -40561,7 +40561,7 @@ width = 12 }, /turf/open/misc/asteroid/airless, -/area/mine/explored) +/area/lavaland/surface) "oAA" = ( /obj/effect/turf_decal/trimline/neutral/filled/line{ dir = 4 @@ -40878,7 +40878,7 @@ key = "maintenance_lowertunnel_leftup_attachment_b" }, /turf/open/misc/asteroid, -/area/mine/explored) +/area/lavaland/surface) "oGY" = ( /obj/structure/toilet{ pixel_y = 8 @@ -40984,7 +40984,7 @@ dir = 5 }, /turf/open/floor/plating/airless, -/area/mine/explored) +/area/lavaland/surface) "oIU" = ( /turf/open/floor/iron/white, /area/station/medical/treatment_center) @@ -42226,7 +42226,7 @@ pixel_y = 6 }, /turf/open/floor/plating/airless, -/area/mine/explored) +/area/lavaland/surface) "pgz" = ( /obj/effect/turf_decal/trimline/neutral/filled/line{ dir = 6 @@ -42675,7 +42675,7 @@ /obj/structure/table, /obj/item/radio, /turf/open/floor/plating/airless, -/area/mine/explored) +/area/lavaland/surface) "pot" = ( /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 4 @@ -42778,7 +42778,7 @@ }, /obj/effect/turf_decal/sand/plating, /turf/open/floor/plating/airless, -/area/mine/explored) +/area/lavaland/surface) "ppX" = ( /obj/effect/turf_decal/trimline/yellow/filled/corner{ dir = 8 @@ -42909,7 +42909,7 @@ /obj/effect/spawner/random/structure/girder, /obj/item/stack/sheet/iron, /turf/open/floor/plating/airless, -/area/mine/explored) +/area/lavaland/surface) "psl" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -43218,7 +43218,7 @@ dir = 4 }, /turf/open/floor/plating/airless, -/area/mine/explored) +/area/lavaland/surface) "pwv" = ( /obj/machinery/light/small/directional/south, /turf/open/floor/engine/air, @@ -43502,7 +43502,7 @@ /obj/effect/turf_decal/sand/plating, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/plating/airless, -/area/mine/explored) +/area/lavaland/surface) "pAl" = ( /obj/machinery/light/small/directional/east, /obj/machinery/plumbing/synthesizer{ @@ -43688,7 +43688,7 @@ }, /obj/structure/lattice, /turf/open/space/basic, -/area/mine/explored) +/area/lavaland/surface) "pEe" = ( /obj/effect/turf_decal/trimline/neutral/filled/line{ dir = 1 @@ -44017,7 +44017,7 @@ }, /obj/structure/lattice, /turf/open/space/basic, -/area/mine/explored) +/area/lavaland/surface) "pKs" = ( /obj/structure/ladder, /obj/effect/decal/cleanable/dirt, @@ -45543,7 +45543,7 @@ "qmf" = ( /obj/structure/ore_box, /turf/open/misc/asteroid/airless, -/area/mine/explored) +/area/lavaland/surface) "qmi" = ( /obj/effect/turf_decal/stripes/line, /obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible, @@ -45904,7 +45904,7 @@ key = "maintenance_lowerservicecargo_attachment_a" }, /turf/open/misc/asteroid, -/area/mine/explored) +/area/lavaland/surface) "qrR" = ( /obj/machinery/chem_heater/withbuffer, /obj/effect/turf_decal/tile/yellow/fourcorners, @@ -46541,7 +46541,7 @@ "qDR" = ( /obj/item/pickaxe/rusted, /turf/open/misc/asteroid/airless, -/area/mine/explored) +/area/lavaland/surface) "qEd" = ( /obj/effect/turf_decal/trimline/neutral/filled/line{ dir = 1 @@ -46897,7 +46897,7 @@ /obj/effect/turf_decal/sand/plating, /obj/effect/turf_decal/stripes/asteroid/end, /turf/open/floor/plating/airless, -/area/mine/explored) +/area/lavaland/surface) "qIM" = ( /obj/vehicle/ridden/wheelchair, /obj/effect/turf_decal/bot, @@ -47658,7 +47658,7 @@ key = "maintenance_lowerservicecargo_attachment_b" }, /turf/open/misc/asteroid, -/area/mine/explored) +/area/lavaland/surface) "qXA" = ( /obj/effect/turf_decal/trimline/brown/filled/corner, /obj/machinery/atmospherics/pipe/smart/simple/cyan/visible, @@ -50432,7 +50432,7 @@ dir = 1 }, /turf/open/floor/plating/airless, -/area/mine/explored) +/area/lavaland/surface) "rRK" = ( /obj/machinery/light/small/directional/north, /obj/structure/closet/firecloset, @@ -51239,7 +51239,7 @@ key = "maintenance_lowertunnel_leftup_attachment_a" }, /turf/open/misc/asteroid, -/area/mine/explored) +/area/lavaland/surface) "shR" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/disposalpipe/segment, @@ -51772,7 +51772,7 @@ dir = 4 }, /turf/open/misc/asteroid/airless, -/area/mine/explored) +/area/lavaland/surface) "suM" = ( /obj/structure/table/reinforced, /obj/effect/turf_decal/trimline/yellow/filled/line{ @@ -52465,7 +52465,7 @@ shuttle_id = "pod_lavaland" }, /turf/open/misc/asteroid/airless, -/area/mine/explored) +/area/lavaland/surface) "sIq" = ( /obj/structure/table/glass, /obj/item/wrench/medical, @@ -52648,7 +52648,7 @@ "sLE" = ( /obj/structure/lattice, /turf/open/space/basic, -/area/mine/explored) +/area/lavaland/surface) "sLF" = ( /obj/effect/turf_decal/trimline/yellow/filled/line, /obj/effect/turf_decal/box, @@ -52728,7 +52728,7 @@ key = "maintenance_loweratmosci_attachment_b" }, /turf/open/misc/asteroid, -/area/mine/explored) +/area/lavaland/surface) "sMM" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/trimline/yellow/warning{ @@ -54204,7 +54204,7 @@ dir = 8 }, /turf/open/floor/plating/airless, -/area/mine/explored) +/area/lavaland/surface) "ton" = ( /obj/machinery/door/airlock/public/glass{ name = "Escape Wing" @@ -55767,7 +55767,7 @@ /obj/effect/turf_decal/sand/plating, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/plating/airless, -/area/mine/explored) +/area/lavaland/surface) "tRc" = ( /obj/structure/chair/stool/bar/directional/east, /obj/effect/turf_decal/trimline/red/filled/line{ @@ -56996,7 +56996,7 @@ /obj/effect/turf_decal/sand/plating, /obj/effect/turf_decal/stripes/asteroid/box, /turf/open/floor/plating/airless, -/area/mine/explored) +/area/lavaland/surface) "uno" = ( /turf/closed/wall/r_wall, /area/station/maintenance/radshelter/civil) @@ -57727,7 +57727,7 @@ /obj/structure/transit_tube, /obj/effect/turf_decal/sand/plating, /turf/open/floor/plating/airless, -/area/mine/explored) +/area/lavaland/surface) "uAg" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 8 @@ -58467,7 +58467,7 @@ "uON" = ( /obj/structure/marker_beacon/burgundy, /turf/open/misc/asteroid/airless, -/area/mine/explored) +/area/lavaland/surface) "uOZ" = ( /obj/machinery/atmospherics/components/binary/pump{ dir = 8; @@ -58676,7 +58676,7 @@ "uTp" = ( /obj/item/relic, /turf/open/misc/asteroid/airless, -/area/mine/explored) +/area/lavaland/surface) "uTs" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/effect/turf_decal/trimline/purple/filled/line{ @@ -59379,7 +59379,7 @@ /obj/effect/spawner/structure/electrified_grille, /obj/effect/turf_decal/sand/plating, /turf/open/floor/plating/airless, -/area/mine/explored) +/area/lavaland/surface) "vfY" = ( /obj/structure/cable, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ @@ -59676,7 +59676,7 @@ "vlO" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/misc/asteroid/airless, -/area/mine/explored) +/area/lavaland/surface) "vlX" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/disposalpipe/segment, @@ -60432,7 +60432,7 @@ key = "maintenance_lowersecurity_attachment" }, /turf/open/floor/iron/vaporwave, -/area/mine/explored) +/area/lavaland/surface) "vzO" = ( /obj/effect/turf_decal/sand/plating, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -61643,7 +61643,7 @@ "vWt" = ( /obj/effect/spawner/random/trash/garbage, /turf/open/misc/asteroid/airless, -/area/mine/explored) +/area/lavaland/surface) "vWw" = ( /obj/structure/railing{ dir = 6 @@ -62110,7 +62110,7 @@ /obj/effect/turf_decal/sand/plating, /obj/structure/cable, /turf/open/floor/plating/airless, -/area/mine/explored) +/area/lavaland/surface) "wgV" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, @@ -63191,7 +63191,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/visible/layer2, /obj/effect/turf_decal/sand/plating, /turf/open/floor/plating/airless, -/area/mine/explored) +/area/lavaland/surface) "wAG" = ( /obj/effect/turf_decal/bot, /obj/structure/reagent_dispensers/foamtank, @@ -63448,7 +63448,7 @@ "wGb" = ( /obj/item/shovel, /turf/open/misc/asteroid/airless, -/area/mine/explored) +/area/lavaland/surface) "wGc" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -64082,7 +64082,7 @@ key = "maintenance_lowercargosci_attachment_a" }, /turf/open/misc/asteroid, -/area/mine/explored) +/area/lavaland/surface) "wRw" = ( /obj/structure/cable/multilayer/multiz, /obj/effect/turf_decal/stripes/box, @@ -64238,7 +64238,7 @@ "wUS" = ( /obj/machinery/light/small/directional/north, /turf/open/misc/asteroid/airless, -/area/mine/explored) +/area/lavaland/surface) "wVj" = ( /obj/effect/turf_decal/trimline/purple/filled/line{ dir = 4 @@ -64565,7 +64565,7 @@ /area/station/ai_monitored/turret_protected/ai) "wZm" = ( /turf/closed/wall/rock/porous, -/area/mine/explored) +/area/lavaland/surface) "wZs" = ( /obj/effect/turf_decal/trimline/red/filled/line{ dir = 1 @@ -64734,7 +64734,7 @@ }, /obj/effect/turf_decal/sand/plating, /turf/open/floor/plating/airless, -/area/mine/explored) +/area/lavaland/surface) "xbz" = ( /obj/effect/turf_decal/tile/blue{ dir = 8 @@ -65621,7 +65621,7 @@ dir = 9 }, /turf/open/floor/plating/airless, -/area/mine/explored) +/area/lavaland/surface) "xsL" = ( /obj/effect/turf_decal/trimline/red/filled/corner{ dir = 1 @@ -65670,7 +65670,7 @@ /area/station/service/bar) "xtu" = ( /turf/open/misc/asteroid, -/area/mine/explored) +/area/lavaland/surface) "xtS" = ( /obj/effect/turf_decal/trimline/purple/filled/line, /obj/machinery/camera/directional/south{ @@ -66076,7 +66076,7 @@ dir = 10 }, /turf/open/floor/plating/airless, -/area/mine/explored) +/area/lavaland/surface) "xAJ" = ( /obj/machinery/conveyor{ dir = 4; @@ -66289,7 +66289,7 @@ /obj/effect/turf_decal/sand/plating, /obj/effect/turf_decal/stripes/asteroid/box, /turf/open/floor/plating/airless, -/area/mine/explored) +/area/lavaland/surface) "xFx" = ( /turf/open/floor/iron, /area/station/commons/fitness) @@ -66762,7 +66762,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, /turf/open/floor/catwalk_floor, -/area/mine/explored) +/area/lavaland/surface) "xPU" = ( /obj/effect/turf_decal/trimline/neutral/filled/line{ dir = 8 @@ -66913,7 +66913,7 @@ name = "Bold-And-Brash" }, /turf/open/misc/asteroid/airless, -/area/mine/explored) +/area/lavaland/surface) "xSO" = ( /obj/effect/turf_decal/trimline/yellow/warning{ dir = 1 @@ -66973,7 +66973,7 @@ /obj/effect/turf_decal/sand/plating, /obj/item/stack/sheet/iron, /turf/open/floor/plating/airless, -/area/mine/explored) +/area/lavaland/surface) "xTZ" = ( /obj/item/stack/ore/glass, /obj/item/toy/beach_ball/holoball, @@ -67294,7 +67294,7 @@ }, /obj/effect/turf_decal/sand/plating, /turf/open/floor/plating/airless, -/area/mine/explored) +/area/lavaland/surface) "xXC" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible, /turf/closed/wall/r_wall, diff --git a/_maps/skyrat/automapper/templates/tramstation/tramstation_armory.dmm b/_maps/skyrat/automapper/templates/tramstation/tramstation_armory.dmm index f1b327bb24d..c9b3c4f35ba 100644 --- a/_maps/skyrat/automapper/templates/tramstation/tramstation_armory.dmm +++ b/_maps/skyrat/automapper/templates/tramstation/tramstation_armory.dmm @@ -47,7 +47,7 @@ /area/station/security/office) "bu" = ( /turf/open/misc/asteroid/airless, -/area/mine/explored) +/area/lavaland/surface) "cy" = ( /obj/structure/window/reinforced, /obj/structure/window/reinforced{ @@ -155,7 +155,7 @@ /area/station/ai_monitored/security/armory) "nh" = ( /turf/closed/mineral/random/stationside/asteroid/porus, -/area/mine/explored) +/area/lavaland/surface) "sS" = ( /obj/machinery/suit_storage_unit/security, /obj/effect/turf_decal/tile/neutral/fourcorners, diff --git a/_maps/skyrat/automapper/templates/tramstation/tramstation_arrivals.dmm b/_maps/skyrat/automapper/templates/tramstation/tramstation_arrivals.dmm index cff57531ad7..b3b4c45a138 100644 --- a/_maps/skyrat/automapper/templates/tramstation/tramstation_arrivals.dmm +++ b/_maps/skyrat/automapper/templates/tramstation/tramstation_arrivals.dmm @@ -265,7 +265,7 @@ /obj/effect/turf_decal/sand/plating, /obj/effect/turf_decal/stripes/asteroid/box, /turf/open/floor/plating/airless, -/area/mine/explored) +/area/lavaland/surface) "jc" = ( /obj/effect/turf_decal/tile/yellow{ dir = 8 @@ -495,7 +495,7 @@ /area/space) "qd" = ( /turf/open/misc/asteroid/airless, -/area/mine/explored) +/area/lavaland/surface) "qj" = ( /obj/effect/turf_decal/trimline/neutral/filled/corner{ dir = 4 @@ -1328,10 +1328,6 @@ }, /turf/open/space/openspace, /area/space) -"Zx" = ( -/obj/effect/spawner/structure/window/reinforced, -/turf/open/floor/plating, -/area/space) "ZA" = ( /turf/open/floor/iron/stairs{ dir = 4 @@ -2477,7 +2473,7 @@ Zo BJ BJ BJ -Zx +yC Tb af Bf diff --git a/_maps/skyrat/automapper/templates/tramstation/tramstation_barber_cover.dmm b/_maps/skyrat/automapper/templates/tramstation/tramstation_barber_cover.dmm index 36c17de888e..e94f78861af 100644 --- a/_maps/skyrat/automapper/templates/tramstation/tramstation_barber_cover.dmm +++ b/_maps/skyrat/automapper/templates/tramstation/tramstation_barber_cover.dmm @@ -1,7 +1,7 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE "a" = ( /turf/open/misc/asteroid/airless, -/area/mine/explored) +/area/lavaland/surface) (1,1,1) = {" a diff --git a/_maps/skyrat/automapper/templates/tramstation/tramstation_ntrep_office.dmm b/_maps/skyrat/automapper/templates/tramstation/tramstation_ntrep_office.dmm index 18892685293..aaf7cbf1533 100644 --- a/_maps/skyrat/automapper/templates/tramstation/tramstation_ntrep_office.dmm +++ b/_maps/skyrat/automapper/templates/tramstation/tramstation_ntrep_office.dmm @@ -714,7 +714,7 @@ /area/station/service/hydroponics) "ZG" = ( /turf/closed/mineral/random/stationside/asteroid/porus, -/area/mine/explored) +/area/lavaland/surface) (1,1,1) = {" ZG diff --git a/_maps/skyrat/automapper/templates/tramstation/tramstation_ntrep_office_cover.dmm b/_maps/skyrat/automapper/templates/tramstation/tramstation_ntrep_office_cover.dmm index 501ed17cf59..9829ae741ab 100644 --- a/_maps/skyrat/automapper/templates/tramstation/tramstation_ntrep_office_cover.dmm +++ b/_maps/skyrat/automapper/templates/tramstation/tramstation_ntrep_office_cover.dmm @@ -1,7 +1,7 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE "a" = ( /turf/open/misc/asteroid/airless, -/area/mine/explored) +/area/lavaland/surface) (1,1,1) = {" a diff --git a/code/__DEFINES/flags.dm b/code/__DEFINES/flags.dm index 526aa80c925..bae3c9e7174 100644 --- a/code/__DEFINES/flags.dm +++ b/code/__DEFINES/flags.dm @@ -118,16 +118,14 @@ GLOBAL_LIST_INIT(bitflags, list(1, 2, 4, 8, 16, 32, 64, 128, 256, 512, 1024, 204 #define XENOBIOLOGY_COMPATIBLE (1<<10) /// If Abductors are unable to teleport in with their observation console #define ABDUCTOR_PROOF (1<<11) -/// If an area should be hidden from power consoles, power/atmosphere alerts, etc. -#define NO_ALERTS (1<<12) /// If blood cultists can draw runes or build structures on this AREA. -#define CULT_PERMITTED (1<<13) +#define CULT_PERMITTED (1<<12) ///Whther this area is iluminated by starlight -#define AREA_USES_STARLIGHT (1<<14) +#define AREA_USES_STARLIGHT (1<<13) /// If engravings are persistent in this area -#define PERSISTENT_ENGRAVINGS (1<<15) +#define PERSISTENT_ENGRAVINGS (1<<14) /// Mobs that die in this area don't produce a dead chat message -#define NO_DEATH_MESSAGE (1<<16) +#define NO_DEATH_MESSAGE (1<<15) /* These defines are used specifically with the atom/pass_flags bitmask diff --git a/code/_globalvars/bitfields.dm b/code/_globalvars/bitfields.dm index 92dd49c4b32..d3397668ee8 100644 --- a/code/_globalvars/bitfields.dm +++ b/code/_globalvars/bitfields.dm @@ -61,7 +61,6 @@ DEFINE_BITFIELD(area_flags, list( "MEGAFAUNA_SPAWN_ALLOWED" = MEGAFAUNA_SPAWN_ALLOWED, "MOB_SPAWN_ALLOWED" = MOB_SPAWN_ALLOWED, "NOTELEPORT" = NOTELEPORT, - "NO_ALERTS" = NO_ALERTS, "NO_DEATH_MESSAGE" = NO_DEATH_MESSAGE, "PERSISTENT_ENGRAVINGS" = PERSISTENT_ENGRAVINGS, "UNIQUE_AREA" = UNIQUE_AREA, diff --git a/code/controllers/subsystem/mapping.dm b/code/controllers/subsystem/mapping.dm index da5ff84c157..3cb35136b95 100644 --- a/code/controllers/subsystem/mapping.dm +++ b/code/controllers/subsystem/mapping.dm @@ -404,16 +404,7 @@ Used by the AI doomsday and the self-destruct nuke. GLOBAL_LIST_EMPTY(the_station_areas) /datum/controller/subsystem/mapping/proc/generate_station_area_list() - var/static/list/station_areas_blacklist = typecacheof(list( - /area/space, - /area/mine, - /area/ruin, - /area/centcom/asteroid/nearstation, - /area/icemoon, - )) - for(var/area/A in world) - if (is_type_in_typecache(A, station_areas_blacklist)) - continue + for(var/area/station/A in world) if (!A.contents.len || !(A.area_flags & UNIQUE_AREA)) continue var/turf/picked = A.contents[1] diff --git a/code/datums/alarm.dm b/code/datums/alarm.dm index 7adb2e1cfe4..16a590cff53 100644 --- a/code/datums/alarm.dm +++ b/code/datums/alarm.dm @@ -46,9 +46,6 @@ var/area/our_area = get_area(use_as_source_atom) var/our_z_level = use_as_source_atom.z - if (our_area.area_flags & NO_ALERTS) - return FALSE - var/list/existing_alarms = sent_alarms[alarm_type] if(existing_alarms) if(our_area in existing_alarms) @@ -78,8 +75,6 @@ ///Exists so we can request that the alarms from an area are cleared, even if our source atom is no longer in that area /datum/alarm_handler/proc/clear_alarm_from_area(alarm_type, area/our_area) - if (our_area.area_flags & NO_ALERTS) - return FALSE var/list/existing_alarms = sent_alarms[alarm_type] if(!existing_alarms) diff --git a/code/game/area/areas.dm b/code/game/area/areas.dm index 16eb749c5ac..c5938aa3896 100644 --- a/code/game/area/areas.dm +++ b/code/game/area/areas.dm @@ -272,8 +272,6 @@ GLOBAL_LIST_EMPTY(teleportlocs) * Alarm auto resets after 600 ticks */ /area/proc/burglaralert(obj/trigger) - if (area_flags & NO_ALERTS) - return //Trigger alarm effect set_fire_effect(TRUE) //Lockdown airlocks diff --git a/code/game/area/areas/away_content.dm b/code/game/area/areas/away_content.dm index 2bcafc870f2..6ee3209fecf 100644 --- a/code/game/area/areas/away_content.dm +++ b/code/game/area/areas/away_content.dm @@ -11,7 +11,7 @@ Unused icons for new areas are "awaycontent1" ~ "awaycontent30" has_gravity = STANDARD_GRAVITY ambience_index = AMBIENCE_AWAY sound_environment = SOUND_ENVIRONMENT_ROOM - area_flags = NOTELEPORT|UNIQUE_AREA|NO_ALERTS //SKYRAT EDIT CHANGE + area_flags = NOTELEPORT|UNIQUE_AREA //SKYRAT EDIT CHANGE /area/awaymission/beach name = "Beach" @@ -31,7 +31,7 @@ Unused icons for new areas are "awaycontent1" ~ "awaycontent30" has_gravity = STANDARD_GRAVITY /area/awaymission/secret - area_flags = UNIQUE_AREA|NOTELEPORT|HIDDEN_AREA|NO_ALERTS + area_flags = UNIQUE_AREA|NOTELEPORT|HIDDEN_AREA /area/awaymission/secret/unpowered always_unpowered = TRUE diff --git a/code/game/area/areas/mining.dm b/code/game/area/areas/mining.dm index 237e5440a29..0bf1c341755 100644 --- a/code/game/area/areas/mining.dm +++ b/code/game/area/areas/mining.dm @@ -1,5 +1,4 @@ /**********************Mine areas**************************/ - /area/mine icon = 'icons/area/areas_station.dmi' icon_state = "mining" @@ -7,38 +6,6 @@ area_flags = VALID_TERRITORY | UNIQUE_AREA | FLORA_ALLOWED | CULT_PERMITTED ambient_buzz = 'sound/ambience/magma.ogg' -/area/mine/explored - name = "Mine" - icon_state = "explored" - always_unpowered = TRUE - requires_power = TRUE - power_environ = FALSE - power_equip = FALSE - power_light = FALSE - outdoors = TRUE - flags_1 = NONE - ambience_index = AMBIENCE_MINING - area_flags = VALID_TERRITORY | UNIQUE_AREA | NO_ALERTS | CULT_PERMITTED - sound_environment = SOUND_AREA_STANDARD_STATION - min_ambience_cooldown = 70 SECONDS - max_ambience_cooldown = 220 SECONDS - -/area/mine/unexplored - name = "Mine" - icon_state = "unexplored" - always_unpowered = TRUE - requires_power = TRUE - power_environ = FALSE - power_equip = FALSE - power_light = FALSE - outdoors = TRUE - flags_1 = NONE - ambience_index = AMBIENCE_MINING - area_flags = VALID_TERRITORY | UNIQUE_AREA | NO_ALERTS | CAVES_ALLOWED | FLORA_ALLOWED | MOB_SPAWN_ALLOWED | MEGAFAUNA_SPAWN_ALLOWED - map_generator = /datum/map_generator/cave_generator - min_ambience_cooldown = 70 SECONDS - max_ambience_cooldown = 220 SECONDS - /area/mine/lobby name = "Mining Station" icon_state = "mining_lobby" @@ -174,7 +141,7 @@ power_light = FALSE requires_power = TRUE ambience_index = AMBIENCE_MINING - area_flags = VALID_TERRITORY | UNIQUE_AREA | FLORA_ALLOWED | NO_ALERTS + area_flags = VALID_TERRITORY | UNIQUE_AREA min_ambience_cooldown = 70 SECONDS max_ambience_cooldown = 220 SECONDS @@ -187,7 +154,7 @@ power_equip = FALSE power_light = FALSE ambience_index = AMBIENCE_MINING - area_flags = VALID_TERRITORY | UNIQUE_AREA | FLORA_ALLOWED | NO_ALERTS + area_flags = VALID_TERRITORY | UNIQUE_AREA | FLORA_ALLOWED min_ambience_cooldown = 70 SECONDS max_ambience_cooldown = 220 SECONDS @@ -197,16 +164,16 @@ /area/lavaland/surface/outdoors/unexplored //monsters and ruins spawn here icon_state = "unexplored" - area_flags = VALID_TERRITORY | UNIQUE_AREA | CAVES_ALLOWED | FLORA_ALLOWED | MOB_SPAWN_ALLOWED | NO_ALERTS + area_flags = VALID_TERRITORY | UNIQUE_AREA | CAVES_ALLOWED | FLORA_ALLOWED | MOB_SPAWN_ALLOWED map_generator = /datum/map_generator/cave_generator/lavaland /area/lavaland/surface/outdoors/unexplored/danger //megafauna will also spawn here icon_state = "danger" - area_flags = VALID_TERRITORY | UNIQUE_AREA | CAVES_ALLOWED | FLORA_ALLOWED | MOB_SPAWN_ALLOWED | MEGAFAUNA_SPAWN_ALLOWED | NO_ALERTS + area_flags = VALID_TERRITORY | UNIQUE_AREA | CAVES_ALLOWED | FLORA_ALLOWED | MOB_SPAWN_ALLOWED | MEGAFAUNA_SPAWN_ALLOWED /area/lavaland/surface/outdoors/explored name = "Lavaland Labor Camp" - area_flags = VALID_TERRITORY | UNIQUE_AREA | NO_ALERTS + area_flags = VALID_TERRITORY | UNIQUE_AREA @@ -230,7 +197,7 @@ power_light = FALSE requires_power = TRUE ambience_index = AMBIENCE_MINING - area_flags = UNIQUE_AREA | FLORA_ALLOWED | NO_ALERTS + area_flags = UNIQUE_AREA | FLORA_ALLOWED min_ambience_cooldown = 70 SECONDS max_ambience_cooldown = 220 SECONDS @@ -241,27 +208,27 @@ /area/icemoon/surface/outdoors/nospawn // this is the area you use for stuff to not spawn, but if you still want weather. /area/icemoon/surface/outdoors/noteleport // for places like the cursed spring water - area_flags = UNIQUE_AREA | FLORA_ALLOWED | NO_ALERTS | NOTELEPORT + area_flags = UNIQUE_AREA | FLORA_ALLOWED | NOTELEPORT /area/icemoon/surface/outdoors/noruins // when you want random generation without the chance of getting ruins icon_state = "noruins" - area_flags = UNIQUE_AREA | FLORA_ALLOWED | MOB_SPAWN_ALLOWED | CAVES_ALLOWED | NO_ALERTS + area_flags = UNIQUE_AREA | FLORA_ALLOWED | MOB_SPAWN_ALLOWED | CAVES_ALLOWED map_generator = /datum/map_generator/cave_generator/icemoon/surface/noruins /area/icemoon/surface/outdoors/labor_camp name = "Icemoon Labor Camp" - area_flags = UNIQUE_AREA | NO_ALERTS + area_flags = UNIQUE_AREA /area/icemoon/surface/outdoors/unexplored //monsters and ruins spawn here icon_state = "unexplored" - area_flags = UNIQUE_AREA | FLORA_ALLOWED | MOB_SPAWN_ALLOWED | CAVES_ALLOWED | NO_ALERTS + area_flags = UNIQUE_AREA | FLORA_ALLOWED | MOB_SPAWN_ALLOWED | CAVES_ALLOWED /area/icemoon/surface/outdoors/unexplored/rivers // rivers spawn here icon_state = "danger" map_generator = /datum/map_generator/cave_generator/icemoon/surface /area/icemoon/surface/outdoors/unexplored/rivers/no_monsters - area_flags = UNIQUE_AREA | FLORA_ALLOWED | CAVES_ALLOWED | NO_ALERTS + area_flags = UNIQUE_AREA | FLORA_ALLOWED | CAVES_ALLOWED /area/icemoon/underground name = "Icemoon Caves" @@ -272,14 +239,14 @@ power_equip = FALSE power_light = FALSE ambience_index = AMBIENCE_MINING - area_flags = UNIQUE_AREA | FLORA_ALLOWED | NO_ALERTS + area_flags = UNIQUE_AREA | FLORA_ALLOWED min_ambience_cooldown = 70 SECONDS max_ambience_cooldown = 220 SECONDS /area/icemoon/underground/unexplored // mobs and megafauna and ruins spawn here name = "Icemoon Caves" icon_state = "unexplored" - area_flags = CAVES_ALLOWED | FLORA_ALLOWED | MOB_SPAWN_ALLOWED | MEGAFAUNA_SPAWN_ALLOWED | NO_ALERTS + area_flags = CAVES_ALLOWED | FLORA_ALLOWED | MOB_SPAWN_ALLOWED | MEGAFAUNA_SPAWN_ALLOWED /area/icemoon/underground/unexplored/rivers // rivers spawn here icon_state = "danger" @@ -290,8 +257,8 @@ /area/icemoon/underground/unexplored/rivers/deep/shoreline //use this for when you don't want mobs to spawn in certain areas in the "deep" portions. Think adjacent to rivers or station structures. icon_state = "shore" - area_flags = UNIQUE_AREA | CAVES_ALLOWED | FLORA_ALLOWED | NO_ALERTS + area_flags = UNIQUE_AREA | CAVES_ALLOWED | FLORA_ALLOWED /area/icemoon/underground/explored // ruins can't spawn here name = "Icemoon Underground" - area_flags = UNIQUE_AREA | NO_ALERTS + area_flags = UNIQUE_AREA diff --git a/code/game/area/areas/misc.dm b/code/game/area/areas/misc.dm index fd6d0452d84..13f9abdf048 100644 --- a/code/game/area/areas/misc.dm +++ b/code/game/area/areas/misc.dm @@ -10,7 +10,7 @@ power_light = FALSE power_equip = FALSE power_environ = FALSE - area_flags = UNIQUE_AREA | NO_ALERTS + area_flags = UNIQUE_AREA outdoors = TRUE ambience_index = AMBIENCE_SPACE flags_1 = CAN_BE_DIRTY_1 @@ -19,7 +19,7 @@ /area/space/nearstation icon_state = "space_near" - area_flags = UNIQUE_AREA | NO_ALERTS | AREA_USES_STARLIGHT + area_flags = UNIQUE_AREA | AREA_USES_STARLIGHT /area/misc/start name = "start area" diff --git a/code/game/area/areas/ruins/_ruins.dm b/code/game/area/areas/ruins/_ruins.dm index f876674f163..2cc6775b201 100644 --- a/code/game/area/areas/ruins/_ruins.dm +++ b/code/game/area/areas/ruins/_ruins.dm @@ -5,7 +5,7 @@ icon = 'icons/area/areas_ruins.dmi' icon_state = "ruins" has_gravity = STANDARD_GRAVITY - area_flags = HIDDEN_AREA | BLOBS_ALLOWED | UNIQUE_AREA | NO_ALERTS + area_flags = HIDDEN_AREA | BLOBS_ALLOWED | UNIQUE_AREA static_lighting = TRUE ambience_index = AMBIENCE_RUINS flags_1 = CAN_BE_DIRTY_1 diff --git a/code/game/area/areas/shuttles.dm b/code/game/area/areas/shuttles.dm index 7cec09b8717..5069c407cc4 100644 --- a/code/game/area/areas/shuttles.dm +++ b/code/game/area/areas/shuttles.dm @@ -9,7 +9,7 @@ has_gravity = STANDARD_GRAVITY always_unpowered = FALSE // Loading the same shuttle map at a different time will produce distinct area instances. - area_flags = NO_ALERTS + area_flags = NONE icon = 'icons/area/areas_station.dmi' icon_state = "shuttle" flags_1 = CAN_BE_DIRTY_1 @@ -143,7 +143,6 @@ /area/shuttle/mining name = "Mining Shuttle" - area_flags = NONE //Set this so it doesn't inherit NO_ALERTS /area/shuttle/mining/large name = "Mining Shuttle" @@ -151,7 +150,6 @@ /area/shuttle/labor name = "Labor Camp Shuttle" - area_flags = NONE //Set this so it doesn't inherit NO_ALERTS /area/shuttle/supply name = "NLV Consign" //SKYRAT EDIT CHANGE @@ -162,7 +160,7 @@ area_flags = BLOBS_ALLOWED area_limited_icon_smoothing = /area/shuttle/escape flags_1 = CAN_BE_DIRTY_1 - area_flags = NO_ALERTS | CULT_PERMITTED + area_flags = CULT_PERMITTED /area/shuttle/escape/backup name = "Backup Emergency Shuttle" diff --git a/code/game/area/areas/station.dm b/code/game/area/areas/station.dm index ee6ae6beb72..bfab7aa03aa 100644 --- a/code/game/area/areas/station.dm +++ b/code/game/area/areas/station.dm @@ -1,6 +1,6 @@ // Station areas and shuttles -/area/station/ +/area/station name = "Station Areas" icon = 'icons/area/areas_station.dmi' icon_state = "station" @@ -518,7 +518,7 @@ //Commons - Storage /area/station/commons/storage - sound_environment = SOUND_AREA_STANDARD_STATION + name = "\improper Commons Storage" /area/station/commons/storage/tools name = "\improper Auxiliary Tool Storage" @@ -1240,7 +1240,6 @@ /area/station/cargo/sorting name = "\improper Delivery Office" icon_state = "cargo_delivery" - sound_environment = SOUND_AREA_STANDARD_STATION /area/station/cargo/warehouse name = "\improper Warehouse" diff --git a/code/game/machinery/computer/apc_control.dm b/code/game/machinery/computer/apc_control.dm index 8d546b45430..0ff70c601ad 100644 --- a/code/game/machinery/computer/apc_control.dm +++ b/code/game/machinery/computer/apc_control.dm @@ -69,7 +69,7 @@ active_apc = null /obj/machinery/computer/apc_control/proc/check_apc(obj/machinery/power/apc/APC) - return APC.z == z && !APC.malfhack && !APC.aidisabled && !(APC.obj_flags & EMAGGED) && !APC.machine_stat && !istype(APC.area, /area/station/ai_monitored) && !(APC.area.area_flags & NO_ALERTS) + return APC.z == z && !APC.malfhack && !APC.aidisabled && !(APC.obj_flags & EMAGGED) && !APC.machine_stat && !istype(APC.area, /area/station/ai_monitored) /obj/machinery/computer/apc_control/ui_interact(mob/user, datum/tgui/ui) . = ..() diff --git a/code/modules/awaymissions/cordon.dm b/code/modules/awaymissions/cordon.dm index 3eee15e8839..7dedbc9e77f 100644 --- a/code/modules/awaymissions/cordon.dm +++ b/code/modules/awaymissions/cordon.dm @@ -49,7 +49,7 @@ icon_state = "cordon" static_lighting = FALSE base_lighting_alpha = 255 - area_flags = UNIQUE_AREA|NOTELEPORT|HIDDEN_AREA|NO_ALERTS + area_flags = UNIQUE_AREA|NOTELEPORT|HIDDEN_AREA requires_power = FALSE /area/misc/cordon/Entered(atom/movable/arrived, area/old_area) diff --git a/code/modules/events/anomaly/anomaly_placer.dm b/code/modules/events/anomaly/anomaly_placer.dm index 90c06d36129..2486c981987 100644 --- a/code/modules/events/anomaly/anomaly_placer.dm +++ b/code/modules/events/anomaly/anomaly_placer.dm @@ -64,9 +64,7 @@ /area/station/engineering, /area/station/solars, /area/station/holodeck, - /area/shuttle, /area/station/maintenance, - /area/icemoon, )) //Subtypes from the above that actually should explode. diff --git a/code/modules/mapping/reader.dm b/code/modules/mapping/reader.dm index 85958c75c97..3dee73f8647 100644 --- a/code/modules/mapping/reader.dm +++ b/code/modules/mapping/reader.dm @@ -373,7 +373,7 @@ GLOBAL_LIST_EMPTY(map_model_default) // This is safe because dmm strings will never actually newline // So we can parse things just fine var/list/entries = splittext(model, ",\n") - //will contain all members (paths) in model (in our example : /turf/unsimulated/wall and /area/mine/explored) + //will contain all members (paths) in model (in our example : /turf/unsimulated/wall) var/list/members = new /list(length(entries)) //will contain lists filled with corresponding variables, if any (in our example : list(icon_state = "rock") and list()) //member attributes are rarish, so we could lazyinit this diff --git a/modular_skyrat/modules/liquids/code/ocean_areas.dm b/modular_skyrat/modules/liquids/code/ocean_areas.dm index 7cbc97bfd21..47e5289c71d 100644 --- a/modular_skyrat/modules/liquids/code/ocean_areas.dm +++ b/modular_skyrat/modules/liquids/code/ocean_areas.dm @@ -6,7 +6,6 @@ power_light = FALSE power_equip = FALSE power_environ = FALSE - area_flags = NO_ALERTS outdoors = TRUE ambience_index = AMBIENCE_SPACE flags_1 = CAN_BE_DIRTY_1 @@ -16,7 +15,7 @@ map_generator = /datum/map_generator/ocean_generator /area/ocean/trench - area_flags = CAVES_ALLOWED | FLORA_ALLOWED | MOB_SPAWN_ALLOWED | NO_ALERTS + area_flags = CAVES_ALLOWED | FLORA_ALLOWED | MOB_SPAWN_ALLOWED name = "The Trench" /area/ocean/trench/generated diff --git a/modular_skyrat/modules/mapping/code/areas/ruins.dm b/modular_skyrat/modules/mapping/code/areas/ruins.dm index 61f017e65db..7def11c7a01 100644 --- a/modular_skyrat/modules/mapping/code/areas/ruins.dm +++ b/modular_skyrat/modules/mapping/code/areas/ruins.dm @@ -36,7 +36,7 @@ power_light = FALSE requires_power = TRUE ambience_index = AMBIENCE_CREEPY - area_flags = VALID_TERRITORY | UNIQUE_AREA | FLORA_ALLOWED | NO_ALERTS + area_flags = VALID_TERRITORY | UNIQUE_AREA | FLORA_ALLOWED min_ambience_cooldown = 70 SECONDS max_ambience_cooldown = 220 SECONDS @@ -49,7 +49,7 @@ power_equip = FALSE power_light = FALSE ambience_index = AMBIENCE_CREEPY - area_flags = VALID_TERRITORY | UNIQUE_AREA | FLORA_ALLOWED | NO_ALERTS + area_flags = VALID_TERRITORY | UNIQUE_AREA | FLORA_ALLOWED min_ambience_cooldown = 70 SECONDS max_ambience_cooldown = 220 SECONDS @@ -59,16 +59,16 @@ /area/rockplanet/surface/outdoors/unexplored //monsters and ruins spawn here icon_state = "unexplored" - area_flags = VALID_TERRITORY | UNIQUE_AREA | CAVES_ALLOWED | FLORA_ALLOWED | MOB_SPAWN_ALLOWED | NO_ALERTS + area_flags = VALID_TERRITORY | UNIQUE_AREA | CAVES_ALLOWED | FLORA_ALLOWED | MOB_SPAWN_ALLOWED map_generator = /datum/map_generator/cave_generator/rockplanet /area/rockplanet/surface/outdoors/unexplored/danger //megafauna will also spawn here icon_state = "danger" - area_flags = VALID_TERRITORY | UNIQUE_AREA | CAVES_ALLOWED | FLORA_ALLOWED | MOB_SPAWN_ALLOWED | MEGAFAUNA_SPAWN_ALLOWED | NO_ALERTS + area_flags = VALID_TERRITORY | UNIQUE_AREA | CAVES_ALLOWED | FLORA_ALLOWED | MOB_SPAWN_ALLOWED | MEGAFAUNA_SPAWN_ALLOWED /area/rockplanet/surface/outdoors/explored name = "Rockplanet Labor Camp" - area_flags = VALID_TERRITORY | UNIQUE_AREA | NO_ALERTS + area_flags = VALID_TERRITORY | UNIQUE_AREA /area/security/checkpoint/auxiliary/has_gravity name = "Security Checkpoint - Rockplanet" //Duplicate name bad diff --git a/modular_skyrat/modules/mapping/code/areas/shuttles.dm b/modular_skyrat/modules/mapping/code/areas/shuttles.dm index 1679b3b6924..255cb3453a7 100644 --- a/modular_skyrat/modules/mapping/code/areas/shuttles.dm +++ b/modular_skyrat/modules/mapping/code/areas/shuttles.dm @@ -37,7 +37,7 @@ name = "Trader Ship Cargo Bay" /area/shuttle/escape/no_light - area_flags = UNIQUE_AREA | NO_ALERTS | AREA_USES_STARLIGHT + area_flags = UNIQUE_AREA | AREA_USES_STARLIGHT /area/shuttle/arrival/no_light static_lighting = FALSE