Revert "Merge branch 'master' into Yeehaw"

This reverts commit 972c03f79f, reversing
changes made to 8ebd698763.

_maps/RandomZLevels/Cabin.dmm

@@ -967,6 +967,10 @@
 	},
 /turf/open/floor/plating,
 /area/awaymission/cabin)
+"dw" = (
+/obj/effect/mapping_helpers/planet_z,
+/turf/closed/indestructible/rock/snow,
+/area/space)
 
 (1,1,1) = {"
 aa
@@ -1223,7 +1227,7 @@ aa
 aa
 aa
 aa
-aa
+dw
 "}
 (2,1,1) = {"
 aa

_maps/RandomZLevels/VR/snowdin_VR.dmm

@@ -4,15 +4,9 @@
 /turf/closed/indestructible/rock/snow,
 /area/awaymission/snowdin/cave/mountain)
 "ab" = (
-/obj/effect/turf_decal/tile/neutral{
-	dir = 1
-	},
-/obj/effect/turf_decal/tile/neutral{
-	dir = 8
-	},
-/mob/living/simple_animal/hostile/netherworld/migo,
-/turf/open/floor/plasteel,
-/area/awaymission/snowdin/post/mining_dock)
+/obj/effect/mapping_helpers/planet_z,
+/turf/closed/indestructible/rock/snow,
+/area/awaymission/snowdin/cave/mountain)
 "ac" = (
 /turf/closed/indestructible/rock/snow,
 /area/awaymission/snowdin/cave/mountain)
@@ -10273,6 +10267,16 @@
 /obj/item/shard,
 /turf/open/floor/plating,
 /area/awaymission/snowdin/post/mining_dock)
+"xA" = (
+/mob/living/simple_animal/hostile/netherworld/migo,
+/obj/effect/turf_decal/tile/neutral{
+	dir = 1
+	},
+/obj/effect/turf_decal/tile/neutral{
+	dir = 8
+	},
+/turf/open/floor/plasteel,
+/area/awaymission/snowdin/post/mining_dock)
 "xB" = (
 /obj/effect/turf_decal/stripes/line{
 	dir = 4
@@ -16009,7 +16013,7 @@ ac
 ac
 "}
 (2,1,1) = {"
-ac
+ab
 ac
 ac
 ac
@@ -66514,7 +66518,7 @@ wD
 wT
 xe
 xs
-ab
+xA
 xI
 xN
 wL

_maps/RandomZLevels/caves.dmm

@@ -2251,6 +2251,10 @@
 	initial_gas_mix = "n2=23;o2=14"
 	},
 /area/awaymission/caves/BMP_asteroid)
+"gW" = (
+/obj/effect/mapping_helpers/planet_z,
+/turf/closed/indestructible/rock,
+/area/space/nearstation)
 "gX" = (
 /obj/effect/baseturf_helper/lava,
 /turf/closed/mineral/volcanic,
@@ -2532,7 +2536,7 @@ aa
 aa
 aa
 aa
-aa
+gW
 "}
 (2,1,1) = {"
 aa

_maps/RandomZLevels/moonoutpost19.dmm

@@ -7215,6 +7215,10 @@
 	heat_capacity = 1e+006
 	},
 /area/awaymission/moonoutpost19/research)
+"oV" = (
+/obj/effect/mapping_helpers/planet_z,
+/turf/open/space,
+/area/space)
 "vV" = (
 /obj/machinery/door/airlock/external,
 /obj/effect/mapping_helpers/airlock/cyclelink_helper{
@@ -7508,7 +7512,7 @@ aa
 aa
 aa
 aa
-aa
+oV
 "}
 (2,1,1) = {"
 aa

_maps/RandomZLevels/snowdin.dmm

@@ -4,15 +4,9 @@
 /turf/closed/indestructible/rock/snow,
 /area/awaymission/snowdin/cave/mountain)
 "ab" = (
-/obj/effect/turf_decal/tile/neutral{
-	dir = 1
-	},
-/obj/effect/turf_decal/tile/neutral{
-	dir = 8
-	},
-/mob/living/simple_animal/hostile/netherworld/migo,
-/turf/open/floor/plasteel,
-/area/awaymission/snowdin/post/mining_dock)
+/obj/effect/mapping_helpers/planet_z,
+/turf/closed/indestructible/rock/snow,
+/area/awaymission/snowdin/cave/mountain)
 "ac" = (
 /turf/closed/indestructible/rock/snow,
 /area/awaymission/snowdin/cave/mountain)
@@ -10337,6 +10331,16 @@
 /obj/item/shard,
 /turf/open/floor/plating,
 /area/awaymission/snowdin/post/mining_dock)
+"xA" = (
+/mob/living/simple_animal/hostile/netherworld/migo,
+/obj/effect/turf_decal/tile/neutral{
+	dir = 1
+	},
+/obj/effect/turf_decal/tile/neutral{
+	dir = 8
+	},
+/turf/open/floor/plasteel,
+/area/awaymission/snowdin/post/mining_dock)
 "xB" = (
 /obj/effect/turf_decal/stripes/line{
 	dir = 4
@@ -16104,7 +16108,7 @@ ac
 ac
 "}
 (2,1,1) = {"
-ac
+ab
 ac
 ac
 ac
@@ -66609,7 +66613,7 @@ wD
 wT
 xe
 xs
-ab
+xA
 xI
 xN
 wL

_maps/RandomZLevels/spacebattle.dmm

@@ -5,16 +5,6 @@
 "ab" = (
 /turf/open/space,
 /area/space)
-"ac" = (
-/obj/effect/turf_decal/tile/blue{
-	dir = 1
-	},
-/obj/effect/turf_decal/tile/blue{
-	dir = 8
-	},
-/mob/living/simple_animal/hostile/syndicate/melee/sword,
-/turf/open/floor/plasteel,
-/area/awaymission/spacebattle/cruiser)
 "ad" = (
 /obj/structure/shuttle/engine/propulsion/right{
 	dir = 1
@@ -2607,6 +2597,16 @@
 /obj/effect/spawner/lootdrop/armory_contraband,
 /turf/open/floor/plating,
 /area/awaymission/spacebattle/cruiser)
+"jK" = (
+/mob/living/simple_animal/hostile/syndicate/melee/sword,
+/obj/effect/turf_decal/tile/blue{
+	dir = 1
+	},
+/obj/effect/turf_decal/tile/blue{
+	dir = 8
+	},
+/turf/open/floor/plasteel,
+/area/awaymission/spacebattle/cruiser)
 "jL" = (
 /obj/machinery/door/poddoor{
 	id = "spacebattlearmory";
@@ -2894,6 +2894,10 @@
 /obj/item/mecha_parts/mecha_equipment/weapon/energy/ion,
 /turf/open/floor/plating,
 /area/awaymission/spacebattle/cruiser)
+"kM" = (
+/obj/effect/mapping_helpers/planet_z,
+/turf/closed/mineral/random,
+/area/space/nearstation)
 "vw" = (
 /turf/closed/wall/mineral/plastitanium/nodiagonal,
 /area/awaymission/spacebattle/syndicate5)
@@ -3171,7 +3175,7 @@ aa
 aa
 aa
 aa
-aa
+kM
 "}
 (2,1,1) = {"
 aa
@@ -35682,10 +35686,10 @@ eC
 cn
 fL
 cp
-ac
+jK
 fs
 fO
-ac
+jK
 eM
 eM
 eM

_maps/RandomZLevels/undergroundoutpost45.dmm

@@ -25,9 +25,6 @@
 "ag" = (
 /turf/closed/wall/mineral/titanium,
 /area/awaymission/undergroundoutpost45/central)
-"ah" = (
-/turf/open/space,
-/area/space/nearstation)
 "aj" = (
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/plasteel{
@@ -13948,6 +13945,10 @@
 	temperature = 363.9
 	},
 /area/awaymission/undergroundoutpost45/caves)
+"zi" = (
+/obj/effect/mapping_helpers/planet_z,
+/turf/open/space,
+/area/space/nearstation)
 "KE" = (
 /obj/machinery/atmospherics/components/unary/vent_pump/on{
 	dir = 4
@@ -14210,7 +14211,7 @@ aa
 aa
 aa
 aa
-ah
+zi
 "}
 (2,1,1) = {"
 aa

_maps/map_files/MetaStation/MetaStation.dmm

@@ -3528,6 +3528,7 @@
 	pixel_x = -22
 	},
 /obj/structure/rack,
+/obj/item/storage/fancy/donut_box,
 /obj/item/gun/energy/e_gun/dragnet,
 /obj/item/gun/energy/e_gun/dragnet,
 /obj/effect/turf_decal/tile/neutral{
@@ -4003,7 +4004,8 @@
 	dir = 8
 	},
 /obj/structure/rack,
-/obj/item/storage/fancy/donut_box,
+/obj/item/gun/energy/pumpaction/blaster,
+/obj/item/gun/energy/pumpaction/blaster,
 /turf/open/floor/plasteel/dark,
 /area/ai_monitored/security/armory)
 "ahJ" = (
@@ -27115,10 +27117,6 @@
 /obj/effect/turf_decal/tile/neutral{
 	dir = 2
 	},
-/obj/structure/sign/departments/custodian{
-	pixel_x = 32;
-	pixel_y = -32
-	},
 /turf/open/floor/plasteel,
 /area/hallway/primary/central)
 "baI" = (
@@ -83446,10 +83444,6 @@
 	},
 /turf/open/floor/plasteel/white,
 /area/science/lab)
-"iCn" = (
-/obj/machinery/vr_sleeper,
-/turf/open/floor/plasteel,
-/area/security/prison)
 "iLj" = (
 /obj/structure/table,
 /turf/open/floor/plating,
@@ -83468,16 +83462,6 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
 /turf/open/floor/plasteel/dark,
 /area/crew_quarters/fitness/recreation)
-"jhu" = (
-/obj/structure/cable/yellow{
-	icon_state = "1-2"
-	},
-/obj/machinery/door/airlock/public/glass{
-	id_tag = "permahydro";
-	name = "Recreation Module"
-	},
-/turf/open/floor/plasteel,
-/area/security/prison)
 "jwW" = (
 /turf/closed/wall/mineral/plastitanium,
 /area/crew_quarters/fitness/recreation)
@@ -83535,6 +83519,16 @@
 "krD" = (
 /turf/closed/wall,
 /area/science/circuit)
+"kwg" = (
+/obj/structure/cable/yellow{
+	icon_state = "1-2"
+	},
+/obj/machinery/door/airlock/public/glass{
+	id_tag = "permahydro";
+	name = "Recreation Module"
+	},
+/turf/open/floor/plasteel,
+/area/security/prison)
 "kwI" = (
 /obj/item/wrench,
 /obj/item/clothing/suit/apron,
@@ -83595,6 +83589,10 @@
 	},
 /turf/open/floor/plasteel/white,
 /area/science/circuit)
+"kRT" = (
+/obj/machinery/vr_sleeper,
+/turf/open/floor/plasteel,
+/area/security/prison)
 "kVo" = (
 /obj/structure/cable/yellow{
 	icon_state = "1-2"
@@ -83614,6 +83612,13 @@
 /obj/item/integrated_circuit_printer,
 /turf/open/floor/plasteel/white,
 /area/science/circuit)
+"lmg" = (
+/obj/machinery/computer/arcade{
+	icon_state = "arcade";
+	dir = 1
+	},
+/turf/open/floor/plasteel,
+/area/security/prison)
 "lsv" = (
 /obj/machinery/power/apc{
 	areastring = "/area/science/circuit";
@@ -83662,10 +83667,6 @@
 	},
 /turf/open/floor/plating,
 /area/maintenance/starboard/fore)
-"lWL" = (
-/obj/machinery/smartfridge/organ/preloaded,
-/turf/closed/wall,
-/area/medical/surgery)
 "lWY" = (
 /obj/machinery/door/airlock/hatch{
 	name = "Telecomms Server Room"
@@ -83787,6 +83788,13 @@
 /obj/item/storage/fancy/candle_box,
 /turf/open/floor/engine/cult,
 /area/library)
+"oba" = (
+/obj/structure/chair/stool,
+/obj/machinery/light/small{
+	dir = 4
+	},
+/turf/open/floor/plasteel,
+/area/security/prison)
 "obb" = (
 /obj/structure/target_stake,
 /obj/effect/turf_decal/stripes/line{
@@ -84055,20 +84063,6 @@
 	},
 /turf/open/floor/plasteel/dark,
 /area/crew_quarters/cryopod)
-"ram" = (
-/obj/machinery/computer/arcade{
-	icon_state = "arcade";
-	dir = 1
-	},
-/turf/open/floor/plasteel,
-/area/security/prison)
-"roa" = (
-/obj/structure/chair/stool,
-/obj/machinery/light/small{
-	dir = 4
-	},
-/turf/open/floor/plasteel,
-/area/security/prison)
 "rzX" = (
 /obj/structure/chair/office/light{
 	dir = 1;
@@ -84082,17 +84076,6 @@
 	},
 /turf/open/floor/plasteel/white,
 /area/science/lab)
-"rLV" = (
-/obj/structure/table,
-/obj/item/folder,
-/obj/item/paper/guides/jobs/hydroponics,
-/obj/structure/cable/yellow{
-	icon_state = "1-2"
-	},
-/obj/item/pen,
-/obj/item/storage/crayons,
-/turf/open/floor/plasteel,
-/area/security/prison)
 "rMS" = (
 /obj/machinery/status_display/supply,
 /turf/closed/wall,
@@ -84288,6 +84271,15 @@
 	},
 /turf/open/floor/plating,
 /area/maintenance/starboard)
+"uHA" = (
+/obj/structure/cable/yellow{
+	icon_state = "1-2"
+	},
+/obj/structure/cable/yellow{
+	icon_state = "2-8"
+	},
+/turf/open/floor/plasteel,
+/area/security/prison)
 "uJU" = (
 /obj/structure/cable/yellow{
 	icon_state = "1-2"
@@ -84372,6 +84364,10 @@
 /obj/structure/lattice,
 /turf/open/space/basic,
 /area/space)
+"vPN" = (
+/obj/machinery/smartfridge/organ/preloaded,
+/turf/closed/wall,
+/area/medical/surgery)
 "wdu" = (
 /obj/structure/grille,
 /obj/structure/lattice,
@@ -84444,6 +84440,17 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
 /turf/open/floor/plasteel,
 /area/science/misc_lab)
+"xcb" = (
+/obj/structure/table,
+/obj/item/folder,
+/obj/item/paper/guides/jobs/hydroponics,
+/obj/structure/cable/yellow{
+	icon_state = "1-2"
+	},
+/obj/item/pen,
+/obj/item/storage/crayons,
+/turf/open/floor/plasteel,
+/area/security/prison)
 "xeC" = (
 /obj/machinery/light,
 /turf/open/floor/plasteel/dark,
@@ -84500,15 +84507,6 @@
 	},
 /turf/open/floor/plating,
 /area/maintenance/port/aft)
-"xIi" = (
-/obj/structure/cable/yellow{
-	icon_state = "1-2"
-	},
-/obj/structure/cable/yellow{
-	icon_state = "2-8"
-	},
-/turf/open/floor/plasteel,
-/area/security/prison)
 "xVl" = (
 /turf/closed/wall,
 /area/hallway/secondary/service)
@@ -104239,7 +104237,7 @@ cia
 cia
 cpX
 cia
-lWL
+vPN
 cia
 ceu
 dyg
@@ -106712,11 +106710,11 @@ aaa
 aaf
 aaf
 aay
-rLV
-xIi
+xcb
+uHA
 abC
-jhu
-xIi
+kwg
+uHA
 abC
 abC
 acr
@@ -106970,10 +106968,10 @@ aaf
 aaa
 aax
 abl
-roa
-ram
+oba
+lmg
 aax
-iCn
+kRT
 aaR
 aaR
 aaI

_maps/map_files/Mining/Lavaland.dmm

@@ -3571,6 +3571,14 @@
 	},
 /turf/open/floor/plating/asteroid/basalt/lava_land_surface,
 /area/lavaland/surface/outdoors)
+"Wt" = (
+/obj/effect/baseturf_helper/lava_land/surface,
+/turf/closed/wall,
+/area/mine/laborcamp/security)
+"Wz" = (
+/obj/effect/mapping_helpers/planet_z,
+/turf/open/lava/smooth/lava_land_surface,
+/area/lavaland/surface/outdoors)
 "WA" = (
 /obj/effect/mapping_helpers/airlock/cyclelink_helper{
 	dir = 8
@@ -3622,6 +3630,26 @@
 	},
 /turf/open/floor/plasteel,
 /area/mine/production)
+"WF" = (
+/obj/effect/baseturf_helper/lava_land/surface,
+/turf/closed/wall,
+/area/mine/laborcamp)
+"WH" = (
+/obj/effect/baseturf_helper/lava_land/surface,
+/turf/closed/wall,
+/area/mine/eva)
+"WI" = (
+/obj/effect/baseturf_helper/lava_land/surface,
+/turf/closed/wall,
+/area/mine/production)
+"WJ" = (
+/obj/effect/baseturf_helper/lava_land/surface,
+/turf/closed/wall/r_wall,
+/area/mine/maintenance)
+"WK" = (
+/obj/effect/baseturf_helper/lava_land/surface,
+/turf/closed/wall,
+/area/mine/living_quarters)
 
 (1,1,1) = {"
 aa
@@ -3878,7 +3906,7 @@ aj
 aj
 aj
 aj
-aj
+Wz
 "}
 (2,1,1) = {"
 aa
@@ -8723,7 +8751,7 @@ aq
 WB
 aq
 bi
-aq
+WF
 WC
 aq
 bZ
@@ -8984,7 +9012,7 @@ az
 az
 aq
 ca
-ca
+Wt
 ca
 aj
 aj
@@ -12074,7 +12102,7 @@ ai
 cQ
 dk
 dA
-cQ
+WJ
 ed
 er
 eM
@@ -13106,7 +13134,7 @@ dR
 ef
 es
 dZ
-cM
+WK
 fg
 cM
 cM
@@ -20292,9 +20320,9 @@ bt
 bH
 bV
 cq
-bf
-bq
+WH
 bq
+WI
 db
 bP
 bP