diff --git a/GainStation13/code/modules/cargo/packs.dm b/GainStation13/code/modules/cargo/packs.dm
index 3836cb713a..ac3de1b2d0 100644
--- a/GainStation13/code/modules/cargo/packs.dm
+++ b/GainStation13/code/modules/cargo/packs.dm
@@ -1,3 +1,7 @@
+//Reminders-
+// If you add something to this list, please group it by type and sort it alphabetically instead of just jamming it in like an animal
+// cost = 700- Minimum cost, or infinite points are possible.
+
 /datum/supply_pack/vending/mealdor
 	name = "Meal Vendor Supply Crate"
 	desc = "Suprising one to order. If you need a refill for the meal vendor, someone's immobile somewhere. And since you managed to make it to cargo... Well it's not our job to say no!"
@@ -11,3 +15,18 @@
 	cost = 5000
 	contains = list(/obj/item/circuitboard/machine/energy_harvester)
 	crate_name = "Energy Harvester Board supply crate"
+
+/datum/supply_pack/organic/strangeseeds
+	name = "Strange Seeds Crate"
+	desc = "After our chemical waste mysteriously disappeared we've discovered many strange and interesting species of plants, and they're yours for the taking! Contains 8 packs of strange seeds."
+	cost = 4500
+	contains = list(/obj/item/seeds/random,
+					/obj/item/seeds/random,
+					/obj/item/seeds/random,
+					/obj/item/seeds/random,
+					/obj/item/seeds/random,
+					/obj/item/seeds/random,
+					/obj/item/seeds/random,
+					/obj/item/seeds/random)
+	crate_name = "strange seeds crate"
+	crate_type = /obj/structure/closet/crate/hydroponics
\ No newline at end of file
diff --git a/GainStation13/code/modules/mob/dead/new_player/sprite_accessories/horns.dm b/GainStation13/code/modules/mob/dead/new_player/sprite_accessories/horns.dm
index f0575e50f0..b655be9ff5 100644
--- a/GainStation13/code/modules/mob/dead/new_player/sprite_accessories/horns.dm
+++ b/GainStation13/code/modules/mob/dead/new_player/sprite_accessories/horns.dm
@@ -1 +1,7 @@
 //GS13 - markings, ported or our own (preferably mark where you took them from)
+
+/datum/sprite_accessory/horns/unicorn
+	name = "Unicorn"
+	icon_state = "unicorn"
+	icon = 'GainStation13/icons/mob/horns.dmi'
+	color_src = MATRIXED
diff --git a/GainStation13/code/modules/mob/living/species.dm b/GainStation13/code/modules/mob/living/species.dm
index 5ab43d3b93..12fff6fc92 100644
--- a/GainStation13/code/modules/mob/living/species.dm
+++ b/GainStation13/code/modules/mob/living/species.dm
@@ -328,7 +328,7 @@
 			FATNESS_LEVEL_BARELYMOBILE,
 			FATNESS_LEVEL_IMMOBILE,
 			"<span class='notice'>You feel less restrained by your fat!</span>",
-			"<span class='danger'>You feel belly smush against the floor!</span>")
+			"<span class='danger'>You feel your belly smush against the floor!</span>")
 		return
 	if(HAS_TRAIT(H, TRAIT_EXTREMELYOBESE))
 		handle_fatness_trait(
diff --git a/GainStation13/icons/mob/horns.dmi b/GainStation13/icons/mob/horns.dmi
new file mode 100644
index 0000000000..fee6d22512
Binary files /dev/null and b/GainStation13/icons/mob/horns.dmi differ
diff --git a/GainStation13/icons/obj/vending.dmi b/GainStation13/icons/obj/vending.dmi
index e4b7fb3408..577d0c2fa3 100644
Binary files a/GainStation13/icons/obj/vending.dmi and b/GainStation13/icons/obj/vending.dmi differ
diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_snack_store.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_snack_store.dmm
index e8471e72b7..195e1d1744 100644
--- a/_maps/RandomRuins/LavaRuins/lavaland_surface_snack_store.dmm
+++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_snack_store.dmm
@@ -899,9 +899,6 @@
 	dir = 8
 	},
 /obj/effect/decal/cleanable/dirt,
-/obj/effect/mob_spawn/human/skeleton/alive{
-	name = "Bob"
-	},
 /turf/open/floor/plasteel/freezer,
 /area/ruin/powered/snackstore)
 "VL" = (
diff --git a/_maps/RandomRuins/SpaceRuins/feeders_den.dmm b/_maps/RandomRuins/SpaceRuins/feeders_den.dmm
index 6ef2cc89c2..3ea042629d 100644
--- a/_maps/RandomRuins/SpaceRuins/feeders_den.dmm
+++ b/_maps/RandomRuins/SpaceRuins/feeders_den.dmm
@@ -23,13 +23,13 @@
 "de" = (/obj/structure/sign/poster/contraband/donut_corp{pixel_y = 32},/turf/open/floor/carpet/black,/area/ruin/space/has_grav/feedersden)
 "dj" = (/obj/structure/sink{dir = 4; pixel_x = 12},/obj/structure/mirror{pixel_x = 24},/obj/effect/turf_decal/loading_area{dir = 1; icon_state = "borderfloor"},/obj/effect/turf_decal/loading_area{dir = 2; icon_state = "steel_decals9"},/turf/open/floor/plasteel,/area/ruin/space/has_grav/feedersden)
 "dl" = (/obj/structure/rack/shelf,/obj/item/stack/sheet/glass/fifty,/obj/item/stack/sheet/metal/fifty,/obj/item/stack/sheet/mineral/titanium/fifty{pixel_x = -4; pixel_y = 4},/turf/open/floor/plating,/area/ruin/space/has_grav/feedersden)
-"dr" = (/obj/machinery/door/airlock/external,/obj/effect/turf_decal{dir = 8},/obj/effect/turf_decal{dir = 4},/turf/open/floor/plating,/area/ruin/space/has_grav/feedersden)
+"dr" = (/obj/effect/turf_decal{dir = 8},/obj/effect/turf_decal{dir = 4},/obj/machinery/door/airlock/external{dir = 8},/turf/open/floor/plating,/area/ruin/space/has_grav/feedersden)
 "dv" = (/obj/machinery/chem_dispenser/mutagensaltpeter,/turf/open/floor/plating,/area/ruin/space/has_grav/feedersden)
 "dz" = (/obj/structure/rack,/obj/item/mop/advanced,/obj/item/storage/bag/trash,/obj/effect/turf_decal/tile/brown{dir = 4},/obj/effect/turf_decal/tile/brown,/obj/item/storage/box/lights/mixed,/obj/structure/window/reinforced/tinted{dir = 4},/obj/effect/turf_decal/tile/brown{dir = 4},/turf/open/floor/plasteel,/area/ruin/space/has_grav/feedersden)
 "dA" = (/obj/structure/toilet{dir = 8},/obj/machinery/light/small{dir = 4; light_color = "#d8b1b1"},/turf/open/floor/plasteel/freezer,/area/ruin/space/has_grav/feedersden)
 "dC" = (/obj/machinery/deepfryer,/turf/open/floor/plasteel,/area/ruin/space/has_grav/feedersden)
 "dG" = (/obj/structure/flora/ausbushes/grassybush,/turf/open/floor/plating/asteroid,/area/ruin/space/has_grav/feedersden)
-"dH" = (/obj/machinery/door/airlock/public/glass{name = "Cell 2"; id_tag = "feederden_cell2"},/turf/open/floor/plasteel/dark,/area/ruin/space/has_grav/feedersden)
+"dH" = (/obj/machinery/door/airlock/public/glass{name = "Cell 2"; id_tag = "feederden_cell2"},/obj/effect/turf_decal/stripes/line{dir = 2},/obj/effect/turf_decal/stripes/line{dir = 1},/turf/open/floor/plasteel/dark,/area/ruin/space/has_grav/feedersden)
 "dL" = (/obj/structure/lattice,/turf/closed/mineral/random,/area/ruin/space/has_grav/feedersden)
 "eb" = (/obj/structure/lattice,/turf/template_noop,/area/ruin/unpowered/no_grav)
 "ef" = (/obj/structure/table/wood,/obj/item/storage/pill_bottle/breast_enlargement{pixel_y = 5; pixel_x = -5},/turf/open/floor/wood,/area/ruin/space/has_grav/feedersden)
@@ -56,12 +56,13 @@
 "gq" = (/obj/vehicle/ridden/wheelchair,/turf/open/floor/plating,/area/ruin/space/has_grav/feedersden)
 "gu" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4; piping_layer = 3; pixel_x = 5; pixel_y = 5},/obj/effect/turf_decal/loading_area{icon_state = "steel_decals_central6"},/obj/effect/turf_decal/stripes/white/line{dir = 4; icon_state = "steel_decals3"},/obj/effect/turf_decal/stripes/white/line{dir = 2; icon_state = "steel_decals3"},/obj/effect/turf_decal/stripes/white/line{dir = 5; icon_state = "steel_decals3"},/obj/effect/turf_decal/stripes/white/line{dir = 6; icon_state = "steel_decals3"},/turf/open/floor/plasteel,/area/ruin/space/has_grav/feedersden)
 "gD" = (/obj/structure/lattice/catwalk,/obj/item/stack/marker_beacon{anchored = 1; icon_state = "markerburgundy-on"; light_color = "#FA644B"; light_power = 3; light_range = 2; name = "landing marker"; picked_color = "Burgundy"; pixel_x = -12; pixel_y = -10},/turf/template_noop,/area/ruin/space/has_grav/feedersden)
-"gF" = (/obj/structure/closet/firecloset/full,/obj/effect/turf_decal/stripes/white/line{dir = 1},/obj/effect/turf_decal/stripes/white/line{dir = 2; icon_state = "steel_decals_central4"},/obj/effect/turf_decal/tile/neutral,/obj/effect/turf_decal/tile/neutral{dir = 8},/obj/effect/turf_decal/tile/neutral{dir = 1},/obj/effect/turf_decal/tile/neutral{dir = 4},/turf/open/floor/plasteel,/area/ruin/space/has_grav/feedersden)
+"gF" = (/obj/structure/closet/firecloset/full,/obj/effect/turf_decal/stripes/white/line{dir = 2; icon_state = "steel_decals_central4"},/obj/effect/turf_decal/tile/neutral,/obj/effect/turf_decal/tile/neutral{dir = 8},/obj/effect/turf_decal/tile/neutral{dir = 1},/obj/effect/turf_decal/tile/neutral{dir = 4},/obj/effect/turf_decal/stripes/line{dir = 1},/turf/open/floor/plasteel,/area/ruin/space/has_grav/feedersden)
 "gL" = (/obj/structure/sign/poster/contraband/space_cola{pixel_x = 32},/obj/structure/reagent_dispensers/cooking_oil,/turf/open/floor/mineral/basaltstone_floor,/area/ruin/space/has_grav/feedersden)
 "gU" = (/obj/effect/spawner/structure/window/plastitanium,/turf/open/floor/plating,/area/ruin/space/has_grav/feedersden)
 "gZ" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 8},/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{dir = 2; piping_layer = 3; pixel_x = 5; pixel_y = 5},/obj/effect/turf_decal/stripes{icon_state = "steel_decals5"; dir = 1},/obj/effect/turf_decal/stripes/white/line{dir = 9; icon_state = "steel_decals7"},/obj/effect/turf_decal/stripes/white/line{dir = 6; icon_state = "steel_decals7"},/turf/open/floor/plasteel,/area/ruin/space/has_grav/feedersden)
 "hg" = (/obj/machinery/power/adipoelectric_generator,/obj/structure/cable{icon_state = "0-2"; pixel_y = 1},/turf/open/floor/plating,/area/ruin/space/has_grav/feedersden)
 "hl" = (/obj/item/storage/toolbox/syndicate,/turf/open/floor/plating,/area/ruin/space/has_grav/feedersden)
+"hF" = (/obj/machinery/pool/drain,/turf/open/pool,/area/ruin/space/has_grav/feedersden)
 "hT" = (/obj/machinery/atmospherics/components/unary/vent_pump/on,/turf/open/floor/plating,/area/ruin/space/has_grav/feedersden)
 "ie" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4; piping_layer = 3; pixel_x = 5; pixel_y = 5},/obj/machinery/seed_extractor,/turf/open/floor/plating,/area/ruin/space/has_grav/feedersden)
 "ik" = (/obj/effect/turf_decal/tile/brown{dir = 1},/obj/effect/turf_decal/tile/brown{dir = 8},/obj/machinery/quantumpad/supply_only{map_pad_id = "denbase"; map_pad_link_id = "lavalandbase"},/turf/open/floor/plasteel,/area/ruin/space/has_grav/feedersden)
@@ -88,8 +89,8 @@
 "lR" = (/obj/machinery/iv_drip/feeding_tube,/obj/machinery/light/small{dir = 1},/turf/open/floor/carpet/black,/area/ruin/space/has_grav/feedersden)
 "ma" = (/obj/structure/cable{icon_state = "4-8"},/turf/open/floor/plating,/area/ruin/space/has_grav/feedersden)
 "mf" = (/obj/effect/turf_decal/tile/brown{dir = 8},/obj/effect/turf_decal/tile/brown{dir = 1},/obj/machinery/computer/shuttle/syndicate{name = "shuttle terminal"; dir = 4; shuttleId = "feeder_ship"; possible_destinations = "feeder_home;whiteship_home;feeder_custom"},/turf/open/floor/plasteel,/area/ruin/space/has_grav/feedersden)
-"mm" = (/obj/machinery/vending/mealdor{free = 1},/obj/machinery/light{dir = 4},/turf/open/floor/plasteel/dark,/area/ruin/space/has_grav/feedersden)
-"mD" = (/obj/structure/closet/emcloset/anchored,/obj/effect/turf_decal/stripes/white/line{dir = 2},/obj/effect/turf_decal/stripes/white/line{dir = 1; icon_state = "steel_decals_central4"},/obj/effect/turf_decal/tile/neutral{dir = 1},/obj/effect/turf_decal/tile/neutral{dir = 4},/obj/effect/turf_decal/tile/neutral{dir = 8},/obj/effect/turf_decal/tile/neutral,/turf/open/floor/plasteel,/area/ruin/space/has_grav/feedersden)
+"mm" = (/obj/machinery/vending/mealdor{free = 1; fair_market_price = 0; extra_price = 0; default_price = 0},/obj/machinery/light{dir = 4},/turf/open/floor/plasteel/dark,/area/ruin/space/has_grav/feedersden)
+"mD" = (/obj/structure/closet/emcloset/anchored,/obj/effect/turf_decal/stripes/white/line{dir = 1; icon_state = "steel_decals_central4"},/obj/effect/turf_decal/tile/neutral{dir = 1},/obj/effect/turf_decal/tile/neutral{dir = 4},/obj/effect/turf_decal/tile/neutral{dir = 8},/obj/effect/turf_decal/tile/neutral,/obj/effect/turf_decal/stripes/line{dir = 2},/turf/open/floor/plasteel,/area/ruin/space/has_grav/feedersden)
 "mJ" = (/obj/structure/chair/sofa/corner{dir = 4},/turf/open/floor/carpet/orange,/area/ruin/space/has_grav/feedersden)
 "mU" = (/obj/structure/sink/kitchen{dir = 8; pixel_x = 11},/obj/effect/turf_decal/tile/bar,/obj/effect/turf_decal/tile/bar{dir = 1},/turf/open/floor/plasteel/dark,/area/ruin/space/has_grav/feedersden)
 "nd" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 8},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4; piping_layer = 3; pixel_x = 5; pixel_y = 5},/obj/effect/turf_decal/stripes{icon_state = "steel_decals5"; dir = 1},/obj/effect/turf_decal/loading_area{dir = 1; icon_state = "steel_decals9"},/obj/effect/turf_decal/stripes/white/line{dir = 6; icon_state = "steel_decals7"},/obj/effect/turf_decal/stripes/white/line{dir = 9; icon_state = "steel_decals7"},/obj/structure/cable{icon_state = "4-8"},/turf/open/floor/plasteel,/area/ruin/space/has_grav/feedersden)
@@ -98,17 +99,17 @@
 "nw" = (/obj/machinery/light/small{dir = 1},/obj/effect/turf_decal/stripes{icon_state = "trim"; dir = 1},/turf/open/floor/mineral/plastitanium/red,/area/ruin/space/has_grav/feedersden)
 "nA" = (/obj/machinery/atmospherics/pipe/manifold/supply,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4; piping_layer = 3; pixel_x = 5; pixel_y = 5},/obj/effect/turf_decal/stripes{icon_state = "steel_decals5"; dir = 1},/obj/effect/turf_decal/loading_area{dir = 1; icon_state = "steel_decals9"},/obj/effect/turf_decal/stripes/white/line{dir = 6; icon_state = "steel_decals7"},/obj/effect/turf_decal/stripes/white/line{dir = 9; icon_state = "steel_decals7"},/turf/open/floor/plasteel,/area/ruin/space/has_grav/feedersden)
 "nE" = (/obj/structure/flora/junglebush,/turf/open/floor/plating/asteroid,/area/ruin/space/has_grav/feedersden)
-"nQ" = (/obj/structure/rack,/obj/item/clothing/suit/space/syndicate{pixel_x = -10},/obj/item/clothing/head/helmet/space/syndicate{pixel_x = -10},/obj/item/clothing/mask/gas{pixel_x = -10; pixel_y = 3},/obj/item/clothing/suit/space/syndicate/orange{pixel_x = 8; name = "extra stretchy space suit"},/obj/item/clothing/head/helmet/space/syndicate/orange{pixel_x = 10},/obj/item/clothing/mask/gas{pixel_x = 10; pixel_y = 3},/obj/item/tank/jetpack/carbondioxide/eva,/obj/effect/turf_decal/stripes/white/line{dir = 9},/obj/effect/turf_decal/stripes/white/line{dir = 1; icon_state = "steel_decals_central4"},/obj/effect/turf_decal/tile/neutral{dir = 1},/obj/effect/turf_decal/tile/neutral{dir = 4},/obj/effect/turf_decal/tile/neutral{dir = 8},/obj/effect/turf_decal/tile/neutral,/turf/open/floor/plasteel,/area/ruin/space/has_grav/feedersden)
+"nQ" = (/obj/structure/rack,/obj/item/clothing/suit/space/syndicate{pixel_x = -10},/obj/item/clothing/head/helmet/space/syndicate{pixel_x = -10},/obj/item/clothing/mask/gas{pixel_x = -10; pixel_y = 3},/obj/item/clothing/suit/space/syndicate/orange{pixel_x = 8; name = "extra stretchy space suit"},/obj/item/clothing/head/helmet/space/syndicate/orange{pixel_x = 10},/obj/item/clothing/mask/gas{pixel_x = 10; pixel_y = 3},/obj/item/tank/jetpack/carbondioxide/eva,/obj/effect/turf_decal/stripes/white/line{dir = 1; icon_state = "steel_decals_central4"},/obj/effect/turf_decal/tile/neutral{dir = 1},/obj/effect/turf_decal/tile/neutral{dir = 4},/obj/effect/turf_decal/tile/neutral{dir = 8},/obj/effect/turf_decal/tile/neutral,/obj/effect/turf_decal/stripes/line{dir = 6},/turf/open/floor/plasteel,/area/ruin/space/has_grav/feedersden)
 "nW" = (/obj/machinery/door/airlock/hatch{name = "airlock"; req_access_txt = "150"},/obj/structure/cable{icon_state = "1-2"},/obj/effect/turf_decal{dir = 1},/turf/open/floor/plating,/area/ruin/space/has_grav/feedersden)
 "oF" = (/obj/structure/chair/office/dark{dir = 8},/turf/open/floor/plasteel/dark,/area/ruin/space/has_grav/feedersden)
 "oH" = (/obj/structure/lattice/catwalk,/turf/template_noop,/area/ruin/space/has_grav/feedersden)
 "oK" = (/turf/open/floor/wood,/area/ruin/space/has_grav/feedersden)
 "oS" = (/obj/structure/chair/sofa/left{dir = 8},/turf/open/floor/carpet/orange,/area/ruin/space/has_grav/feedersden)
 "oY" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 9},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 9; piping_layer = 3; pixel_x = 5; pixel_y = 5},/obj/effect/turf_decal/tile/bar,/obj/effect/turf_decal/tile/bar{dir = 1},/turf/open/floor/plasteel/dark,/area/ruin/space/has_grav/feedersden)
-"pc" = (/obj/structure/table/wood,/turf/open/floor/wood,/area/ruin/space/has_grav/feedersden)
-"pe" = (/obj/effect/turf_decal/loading_area{dir = 1; icon_state = "steel_decals3"},/obj/effect/turf_decal/loading_area{dir = 10; icon_state = "steel_decals3"},/obj/effect/turf_decal/stripes/white/line{dir = 6; icon_state = "steel_decals1"},/turf/open/floor/plasteel,/area/ruin/space/has_grav/feedersden)
+"pc" = (/obj/structure/table/wood,/obj/item/clothing/neck/petcollar/locked/bluespace_collar_receiver{pixel_x = 8},/obj/item/clothing/neck/petcollar/locked/bluespace_collar_transmitter{pixel_x = -8},/turf/open/floor/wood,/area/ruin/space/has_grav/feedersden)
+"pe" = (/obj/effect/turf_decal/loading_area{dir = 1; icon_state = "steel_decals3"},/obj/effect/turf_decal/loading_area{dir = 10; icon_state = "steel_decals3"},/obj/effect/turf_decal/stripes/white/line{dir = 6; icon_state = "steel_decals1"},/obj/effect/turf_decal/stripes/line{dir = 4},/turf/open/floor/plasteel,/area/ruin/space/has_grav/feedersden)
 "pf" = (/obj/structure/sign/warning/securearea,/turf/closed/wall/r_wall/syndicate/nodiagonal,/area/ruin/space/has_grav/feedersden)
-"ph" = (/obj/machinery/vending/gato{free = 1},/turf/open/floor/wood,/area/ruin/space/has_grav/feedersden)
+"ph" = (/obj/machinery/vending/gato{free = 1; fair_market_price = 0; extra_price = 0; default_price = 0},/turf/open/floor/wood,/area/ruin/space/has_grav/feedersden)
 "pl" = (/obj/machinery/porta_turret/fattening,/obj/structure/lattice/catwalk,/obj/item/stack/marker_beacon{anchored = 1; icon_state = "markerburgundy-on"; light_color = "#FA644B"; light_power = 3; light_range = 2; name = "landing marker"; picked_color = "Burgundy"},/turf/open/floor/plating,/area/ruin/space/has_grav/feedersden)
 "pO" = (/obj/structure/table/wood,/obj/item/reagent_containers/food/snacks/meat/bacon,/turf/open/floor/wood,/area/ruin/space/has_grav/feedersden)
 "qh" = (/obj/effect/turf_decal/tile/brown{dir = 1},/obj/effect/turf_decal/tile/brown{dir = 8},/obj/structure/ore_box,/obj/item/stack/sheet/mineral/calorite,/obj/item/stack/sheet/mineral/calorite,/obj/item/stack/sheet/mineral/calorite,/obj/item/stack/sheet/mineral/calorite,/obj/item/stack/sheet/mineral/calorite,/obj/item/stack/sheet/mineral/calorite,/obj/item/stack/sheet/mineral/calorite,/obj/item/stack/sheet/mineral/calorite,/obj/item/stack/sheet/mineral/calorite,/turf/open/floor/plasteel,/area/ruin/space/has_grav/feedersden)
@@ -126,7 +127,7 @@
 "rs" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 8},/obj/structure/cable{icon_state = "4-8"},/turf/open/floor/plating,/area/ruin/space/has_grav/feedersden)
 "rt" = (/obj/structure/chair/sofa,/obj/item/reagent_containers/food/snacks/pizzaslice/margherita,/turf/open/floor/carpet/orange,/area/ruin/space/has_grav/feedersden)
 "rB" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 8},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4; piping_layer = 3; pixel_x = 5; pixel_y = 5},/obj/effect/turf_decal/stripes{icon_state = "steel_decals5"; dir = 1},/obj/effect/turf_decal/stripes/white/line{dir = 6; icon_state = "steel_decals7"},/obj/effect/turf_decal/stripes/white/line{dir = 9; icon_state = "steel_decals7"},/turf/open/floor/plasteel,/area/ruin/space/has_grav/feedersden)
-"rE" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4; piping_layer = 3; pixel_x = 5; pixel_y = 5},/obj/machinery/vending/hydroseeds{slogan_delay = 700; free = 1},/obj/structure/disposalpipe/segment{dir = 4},/turf/open/floor/plating,/area/ruin/space/has_grav/feedersden)
+"rE" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4; piping_layer = 3; pixel_x = 5; pixel_y = 5},/obj/machinery/vending/hydroseeds{slogan_delay = 700; free = 1; fair_market_price = 0; extra_price = 0; default_price = 0},/obj/structure/disposalpipe/segment{dir = 4},/turf/open/floor/plating,/area/ruin/space/has_grav/feedersden)
 "rH" = (/obj/effect/turf_decal{dir = 1},/obj/item/stack/marker_beacon{anchored = 1; icon_state = "markerburgundy-on"; light_color = "#FA644B"; light_power = 3; light_range = 2; name = "landing marker"; picked_color = "Burgundy"},/turf/open/floor/mineral/plastitanium/red,/area/ruin/space/has_grav/feedersden)
 "rJ" = (/obj/machinery/atmospherics/pipe/manifold/supply{dir = 1},/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{dir = 1; piping_layer = 3; pixel_x = 5; pixel_y = 5},/obj/structure/disposalpipe/segment{dir = 10},/obj/structure/cable{icon_state = "2-4"},/turf/open/floor/plasteel/dark,/area/ruin/space/has_grav/feedersden)
 "rO" = (/obj/machinery/light/small{brightness = 2; dir = 8},/obj/structure/rack/shelf,/obj/item/reagent_containers/rag/towel/syndicate,/obj/item/reagent_containers/rag/towel/syndicate,/obj/item/soap/syndie,/obj/item/reagent_containers/rag/towel/syndicate,/obj/effect/turf_decal/loading_area{dir = 1; icon_state = "borderfloor"},/turf/open/floor/plasteel/yellowsiding,/area/ruin/space/has_grav/feedersden)
@@ -136,22 +137,22 @@
 "sn" = (/obj/structure/lattice/catwalk,/obj/machinery/porta_turret/fattening,/turf/open/floor/plating,/area/ruin/space/has_grav/feedersden)
 "sq" = (/turf/open/floor/mineral/basaltstone_floor,/area/ruin/space/has_grav/feedersden)
 "su" = (/obj/item/storage/box/ingredients/wildcard,/obj/item/storage/box/ingredients/wildcard,/obj/item/storage/box/ingredients/wildcard,/obj/item/storage/box/ingredients/wildcard,/obj/item/storage/box/ingredients/wildcard,/obj/item/storage/box/ingredients/wildcard,/obj/item/storage/box/ingredients/wildcard,/obj/item/storage/box/ingredients/wildcard,/obj/item/storage/box/ingredients/wildcard,/obj/structure/rack/shelf,/obj/item/storage/box/ingredients/wildcard,/obj/item/storage/box/ingredients/wildcard,/turf/open/floor/plasteel/freezer,/area/ruin/space/has_grav/feedersden)
-"sC" = (/obj/machinery/vending/hydronutrients{free = 1},/turf/open/floor/plating,/area/ruin/space/has_grav/feedersden)
+"sC" = (/obj/machinery/vending/hydronutrients{free = 1; fair_market_price = 0; extra_price = 0; default_price = 0},/turf/open/floor/plating,/area/ruin/space/has_grav/feedersden)
 "sI" = (/obj/effect/turf_decal/stripes/white/line{dir = 1; icon_state = "steel_decals_central7"},/obj/effect/turf_decal/stripes/white/line{dir = 2; icon_state = "steel_decals3"},/obj/effect/turf_decal/stripes/white/line{dir = 5; icon_state = "steel_decals3"},/obj/effect/turf_decal/stripes/white/line{dir = 6; icon_state = "steel_decals3"},/obj/effect/turf_decal/stripes/white/line{dir = 4; icon_state = "steel_decals3"},/turf/open/floor/plasteel,/area/ruin/space/has_grav/feedersden)
 "sN" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 8},/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{dir = 2; piping_layer = 3; pixel_x = 5; pixel_y = 5},/obj/effect/turf_decal/stripes{icon_state = "steel_decals5"; dir = 1},/obj/effect/turf_decal/stripes/white/line{dir = 6; icon_state = "steel_decals7"},/obj/effect/turf_decal/stripes/white/line{dir = 9; icon_state = "steel_decals7"},/obj/structure/cable{icon_state = "1-8"},/turf/open/floor/plasteel,/area/ruin/space/has_grav/feedersden)
-"sR" = (/obj/machinery/vending/dinnerware{free = 1},/turf/open/floor/plasteel,/area/ruin/space/has_grav/feedersden)
+"sR" = (/obj/machinery/vending/dinnerware{free = 1; fair_market_price = 0; extra_price = 0; default_price = 0},/turf/open/floor/plasteel,/area/ruin/space/has_grav/feedersden)
 "sT" = (/obj/structure/cable{icon_state = "2-4"},/obj/structure/cable{icon_state = "2-8"},/turf/open/floor/plating,/area/ruin/space/has_grav/feedersden)
 "tb" = (/obj/structure/table/wood,/obj/machinery/chem_dispenser/drinks/fullupgrade{dir = 1},/turf/open/floor/carpet/orange,/area/ruin/space/has_grav/feedersden)
 "tf" = (/obj/item/trash/plate{pixel_x = -5; pixel_y = 4},/turf/open/floor/wood{icon_state = "wood-broken7"},/area/ruin/space/has_grav/feedersden)
 "tj" = (/obj/item/book/manual/blubbery_bartender{pixel_y = -4; pixel_x = -4},/obj/item/book/manual/fatty_chems{pixel_y = -8; pixel_x = -8},/turf/open/floor/plasteel/freezer,/area/ruin/space/has_grav/feedersden)
 "ty" = (/obj/effect/turf_decal/stripes/white/line{dir = 8; icon_state = "steel_decals_central4"},/turf/open/floor/plasteel/yellowsiding{dir = 8},/area/ruin/space/has_grav/feedersden)
-"tB" = (/obj/effect/turf_decal/loading_area{icon_state = "steel_decals_central7"},/obj/effect/turf_decal/loading_area{dir = 9; icon_state = "steel_decals4"},/turf/open/floor/plasteel,/area/ruin/space/has_grav/feedersden)
+"tB" = (/obj/effect/turf_decal/loading_area{icon_state = "steel_decals_central7"},/obj/effect/turf_decal/loading_area{dir = 9; icon_state = "steel_decals4"},/obj/effect/turf_decal/stripes/line{dir = 4},/turf/open/floor/plasteel,/area/ruin/space/has_grav/feedersden)
 "tE" = (/obj/structure/table/wood,/obj/item/reagent_containers/food/drinks/soda_cans/cola,/obj/item/reagent_containers/food/drinks/soda_cans/dr_gibb{pixel_y = -7; pixel_x = -5},/turf/open/floor/wood,/area/ruin/space/has_grav/feedersden)
 "tH" = (/obj/machinery/atmospherics/components/unary/vent_scrubber/on{dir = 4; piping_layer = 3; pixel_x = 5; pixel_y = 5},/obj/effect/turf_decal/stripes/white/line{dir = 2; icon_state = "steel_decals_central4"},/turf/open/floor/plasteel,/area/ruin/space/has_grav/feedersden)
 "tI" = (/obj/structure/disposalpipe/segment{dir = 5},/turf/closed/wall/r_wall/syndicate/nodiagonal,/area/ruin/space/has_grav/feedersden)
 "tP" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/effect/turf_decal/stripes{icon_state = "steel_decals5"},/obj/effect/turf_decal/stripes{icon_state = "steel_grid"; dir = 5},/turf/open/floor/plasteel,/area/ruin/space/has_grav/feedersden)
 "tV" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 8},/obj/effect/turf_decal{dir = 8},/obj/machinery/door/airlock/hatch{name = "airlock"; req_access_txt = "150"},/turf/open/floor/plating,/area/ruin/space/has_grav/feedersden)
-"tZ" = (/obj/machinery/vending/mealdor{free = 1},/obj/machinery/light{dir = 8},/turf/open/floor/plasteel/dark,/area/ruin/space/has_grav/feedersden)
+"tZ" = (/obj/machinery/vending/mealdor{free = 1; fair_market_price = 0; extra_price = 0; default_price = 0},/obj/machinery/light{dir = 8},/turf/open/floor/plasteel/dark,/area/ruin/space/has_grav/feedersden)
 "uc" = (/obj/structure/rack/shelf,/obj/item/storage/box/donkpockets,/obj/item/storage/box/donkpockets/donkpocketberry{pixel_y = 4},/turf/open/floor/plasteel,/area/ruin/space/has_grav/feedersden)
 "uk" = (/obj/effect/turf_decal/stripes/white/line{dir = 6; icon_state = "steel_decals1"},/turf/open/floor/plasteel,/area/ruin/space/has_grav/feedersden)
 "uq" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4; piping_layer = 3; pixel_x = 5; pixel_y = 5},/obj/effect/turf_decal/stripes/white/line{dir = 5; icon_state = "steel_decals6"},/obj/effect/turf_decal/stripes/white/line{dir = 6; icon_state = "steel_decals6"},/obj/structure/disposalpipe/segment{dir = 5},/turf/open/floor/plasteel,/area/ruin/space/has_grav/feedersden)
@@ -186,6 +187,7 @@
 "yg" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 8},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4; piping_layer = 3; pixel_x = 5; pixel_y = 5},/turf/open/floor/plasteel,/area/ruin/space/has_grav/feedersden)
 "yk" = (/obj/effect/turf_decal/stripes/white/line{dir = 1; icon_state = "steel_decals_central7"},/obj/effect/turf_decal/stripes/white/line{dir = 2; icon_state = "steel_decals3"},/obj/effect/turf_decal/stripes/white/line{dir = 5; icon_state = "steel_decals3"},/obj/effect/turf_decal/stripes/white/line{dir = 6; icon_state = "steel_decals3"},/obj/effect/turf_decal/stripes/white/line{dir = 4; icon_state = "steel_decals3"},/obj/machinery/light{light_color = "#cee5d2"},/obj/item/storage/bag/plants,/turf/open/floor/plasteel,/area/ruin/space/has_grav/feedersden)
 "yq" = (/obj/item/stack/marker_beacon{anchored = 1; icon_state = "markerburgundy-on"; light_color = "#FA644B"; light_power = 3; light_range = 2; name = "landing marker"; picked_color = "Burgundy"},/obj/effect/turf_decal/stripes/line{dir = 5},/turf/open/floor/mineral/plastitanium/red,/area/ruin/space/has_grav/feedersden)
+"yv" = (/obj/structure/pool/ladder{dir = 8},/obj/machinery/pool/filter{pixel_y = 24},/turf/open/pool,/area/ruin/space/has_grav/feedersden)
 "zc" = (/obj/effect/turf_decal/loading_area{icon_state = "steel_decals6"},/turf/open/floor/plasteel,/area/ruin/space/has_grav/feedersden)
 "zg" = (/obj/machinery/airalarm/syndicate{pixel_y = 32},/obj/effect/turf_decal/tile/red{dir = 4},/obj/effect/turf_decal/tile/red{dir = 1},/obj/effect/turf_decal/loading_area{dir = 1; icon_state = "drain"; name = "drain"},/turf/open/floor/plasteel/dark,/area/ruin/space/has_grav/feedersden)
 "zl" = (/obj/machinery/autolathe/hacked,/turf/open/floor/plating,/area/ruin/space/has_grav/feedersden)
@@ -201,8 +203,8 @@
 "zS" = (/obj/structure/chair/sofa/right{dir = 4},/turf/open/floor/carpet/orange,/area/ruin/space/has_grav/feedersden)
 "zY" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/effect/spawner/structure/window/plastitanium,/turf/open/floor/plating,/area/ruin/space/has_grav/feedersden)
 "Aa" = (/obj/structure/fans/tiny,/obj/effect/turf_decal{dir = 4},/obj/effect/turf_decal{dir = 8},/obj/machinery/door/airlock/hatch{name = "airlock"; req_access_txt = "150"},/turf/open/floor/plating,/area/ruin/space/has_grav/feedersden)
-"Ae" = (/obj/machinery/shower{dir = 4},/turf/open/pool,/area/ruin/space/has_grav/feedersden)
-"Ag" = (/obj/machinery/vending/boozeomat/all_access,/turf/open/floor/carpet/orange,/area/ruin/space/has_grav/feedersden)
+"Ae" = (/turf/open/pool,/area/ruin/space/has_grav/feedersden)
+"Ag" = (/obj/machinery/vending/boozeomat/all_access{extra_price = 0; fair_market_price = 0; default_price = 0},/turf/open/floor/carpet/orange,/area/ruin/space/has_grav/feedersden)
 "Aj" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 8},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4; piping_layer = 3; pixel_x = 5; pixel_y = 5},/obj/effect/turf_decal/stripes{icon_state = "steel_decals5"; dir = 1},/obj/effect/turf_decal/stripes/white/line{dir = 9; icon_state = "steel_decals7"},/obj/effect/turf_decal/stripes/white/line{dir = 6; icon_state = "steel_decals7"},/turf/open/floor/plasteel,/area/ruin/space/has_grav/feedersden)
 "AD" = (/obj/structure/table/wood,/obj/item/storage/box/drinkingglasses{pixel_y = 10; pixel_x = 4},/obj/item/reagent_containers/glass/beaker/bluespace{pixel_y = 10; pixel_x = -10},/turf/open/floor/carpet/orange,/area/ruin/space/has_grav/feedersden)
 "AN" = (/obj/structure/table,/obj/item/reagent_containers/food/snacks/pizza/arnold,/obj/item/reagent_containers/food/snacks/meat/bacon,/obj/item/reagent_containers/food/condiment/pack/hotsauce,/obj/item/reagent_containers/food/condiment/pack/hotsauce,/turf/open/floor/plasteel,/area/ruin/space/has_grav/feedersden)
@@ -244,14 +246,14 @@
 "FE" = (/turf/template_noop,/area/template_noop)
 "FH" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 5},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{piping_layer = 3; pixel_x = 5; pixel_y = 5},/obj/structure/disposalpipe/segment,/turf/open/floor/plating,/area/ruin/space/has_grav/feedersden)
 "GF" = (/obj/structure/chair/sofa,/obj/item/gun/energy/laser/alter_ray/noloss{pixel_x = -8; pixel_y = -5},/turf/open/floor/carpet/orange,/area/ruin/space/has_grav/feedersden)
-"Hi" = (/obj/machinery/door/airlock/hatch{name = "airlock"; req_access_txt = "150"},/obj/structure/disposalpipe/segment{dir = 4},/turf/open/floor/plasteel,/area/ruin/space/has_grav/feedersden)
+"Hi" = (/obj/machinery/door/airlock/hatch{name = "airlock"; req_access_txt = "150"},/obj/structure/disposalpipe/segment{dir = 4},/obj/effect/turf_decal/stripes/line{dir = 8},/obj/effect/turf_decal/stripes/line{dir = 4},/turf/open/floor/plasteel,/area/ruin/space/has_grav/feedersden)
 "Hp" = (/obj/structure/reagent_dispensers/keg/lipoifier,/turf/open/floor/plating,/area/ruin/space/has_grav/feedersden)
 "HQ" = (/obj/structure/sign/poster/contraband/chonk,/turf/closed/wall/r_wall/syndicate,/area/ruin/space/has_grav/feedersden)
-"Io" = (/obj/structure/reagent_dispensers/fueltank,/obj/effect/turf_decal/box/red,/obj/structure/medkit_cabinet{pixel_y = 27},/obj/effect/turf_decal/stripes/white/line{dir = 9},/obj/effect/turf_decal/tile/neutral,/obj/effect/turf_decal/tile/neutral{dir = 8},/obj/effect/turf_decal/tile/neutral{dir = 1},/obj/effect/turf_decal/tile/neutral{dir = 4},/turf/open/floor/plasteel,/area/ruin/space/has_grav/feedersden)
+"Io" = (/obj/structure/reagent_dispensers/fueltank,/obj/structure/medkit_cabinet{pixel_y = 27},/obj/effect/turf_decal/tile/neutral,/obj/effect/turf_decal/tile/neutral{dir = 8},/obj/effect/turf_decal/tile/neutral{dir = 1},/obj/effect/turf_decal/tile/neutral{dir = 4},/obj/effect/turf_decal/stripes/line{dir = 6},/turf/open/floor/plasteel,/area/ruin/space/has_grav/feedersden)
 "Iq" = (/obj/structure/sign/warning/securearea,/turf/closed/wall/r_wall/syndicate,/area/ruin/space/has_grav/feedersden)
 "It" = (/obj/machinery/cryopod/feederden{dir = 8},/turf/open/floor/plasteel/dark,/area/ruin/space/has_grav/feedersden)
 "IC" = (/obj/structure/filingcabinet,/obj/item/folder/syndicate/mining,/turf/open/floor/circuit/red,/area/ruin/space/has_grav/feedersden)
-"IG" = (/obj/machinery/vending/clothing{free = 1},/turf/open/floor/plating,/area/ruin/space/has_grav/feedersden)
+"IG" = (/obj/machinery/vending/clothing{free = 1; fair_market_price = 0; extra_price = 0; default_price = 0},/turf/open/floor/plating,/area/ruin/space/has_grav/feedersden)
 "IS" = (/obj/structure/flora/junglebush/large,/turf/open/floor/plating/asteroid/airless,/area/ruin/unpowered/no_grav)
 "Jh" = (/turf/open/floor/plating,/area/ruin/space/has_grav/feedersden)
 "Jx" = (/obj/item/trash/can,/turf/open/floor/wood,/area/ruin/space/has_grav/feedersden)
@@ -261,7 +263,7 @@
 "Ko" = (/obj/machinery/light{dir = 1},/obj/effect/turf_decal/stripes{icon_state = "steel_decals5"},/obj/effect/turf_decal/stripes/white/line{dir = 5; icon_state = "steel_decals7"},/obj/effect/turf_decal/stripes/white/line{dir = 10; icon_state = "steel_decals7"},/turf/open/floor/plasteel,/area/ruin/space/has_grav/feedersden)
 "Ku" = (/obj/structure/lattice,/turf/closed/mineral/random,/area/template_noop)
 "KH" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{piping_layer = 3; pixel_x = 5; pixel_y = 5},/obj/machinery/door/airlock/public/glass{name = "Cell 2"; id_tag = "feederden_cell2"},/turf/open/floor/mineral/basaltstone_floor,/area/ruin/space/has_grav/feedersden)
-"KK" = (/obj/machinery/vending/mealdor{free = 1},/obj/structure/sign/poster/contraband/eat{pixel_y = 32},/turf/open/floor/wood,/area/ruin/space/has_grav/feedersden)
+"KK" = (/obj/machinery/vending/mealdor{free = 1; fair_market_price = 0; extra_price = 0; default_price = 0},/obj/structure/sign/poster/contraband/eat{pixel_y = 32},/turf/open/floor/wood,/area/ruin/space/has_grav/feedersden)
 "KR" = (/turf/open/floor/carpet/orange,/area/ruin/space/has_grav/feedersden)
 "KT" = (/obj/structure/sign/poster/contraband/eat{pixel_y = 32},/obj/machinery/iv_drip/feeding_tube,/turf/open/floor/wood,/area/ruin/space/has_grav/feedersden)
 "KW" = (/obj/machinery/atmospherics/pipe/manifold/supply,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4; piping_layer = 3; pixel_x = 5; pixel_y = 5},/obj/effect/turf_decal/stripes{icon_state = "steel_decals5"; dir = 1},/obj/effect/turf_decal/stripes/white/line{dir = 9; icon_state = "steel_decals7"},/obj/effect/turf_decal/stripes/white/line{dir = 6; icon_state = "steel_decals7"},/turf/open/floor/plasteel,/area/ruin/space/has_grav/feedersden)
@@ -270,7 +272,7 @@
 "Lu" = (/obj/effect/turf_decal/stripes{icon_state = "steel_decals5"},/obj/effect/turf_decal/loading_area{dir = 8; icon_state = "steel_decals9"},/obj/effect/turf_decal/stripes/white/line{dir = 5; icon_state = "steel_decals7"},/obj/effect/turf_decal/stripes/white/line{dir = 10; icon_state = "steel_decals7"},/turf/open/floor/plasteel,/area/ruin/space/has_grav/feedersden)
 "Lv" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 5},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4; piping_layer = 3; pixel_x = 5; pixel_y = 5},/obj/effect/turf_decal/stripes{icon_state = "steel_decals5"; dir = 1},/obj/effect/turf_decal/stripes{icon_state = "steel_grid"; dir = 10},/turf/open/floor/plasteel,/area/ruin/space/has_grav/feedersden)
 "Lz" = (/obj/effect/mob_spawn/human/feeders_den/victim{dir = 4},/turf/open/floor/mineral/basaltstone_floor,/area/ruin/space/has_grav/feedersden)
-"LM" = (/obj/machinery/vending/mealdor{free = 1},/turf/open/floor/mineral/basaltstone_floor,/area/ruin/space/has_grav/feedersden)
+"LM" = (/obj/machinery/vending/mealdor{free = 1; fair_market_price = 0; extra_price = 0; default_price = 0},/turf/open/floor/mineral/basaltstone_floor,/area/ruin/space/has_grav/feedersden)
 "LN" = (/obj/structure/table,/obj/item/reagent_containers/food/condiment/enzyme{layer = 5; pixel_x = -5; pixel_y = 6},/obj/item/reagent_containers/food/condiment/enzyme{layer = 5; pixel_x = 1; pixel_y = 6},/obj/item/reagent_containers/food/condiment/peppermill{pixel_x = 3},/obj/item/reagent_containers/food/condiment/saltshaker{pixel_x = 9},/turf/open/floor/plasteel,/area/ruin/space/has_grav/feedersden)
 "LT" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/effect/turf_decal/stripes{icon_state = "steel_decals5"},/obj/effect/turf_decal/stripes{icon_state = "steel_grid"; dir = 5},/obj/effect/turf_decal/loading_area{dir = 8; icon_state = "steel_decals9"},/turf/open/floor/plasteel,/area/ruin/space/has_grav/feedersden)
 "LV" = (/obj/machinery/adipoelectric_transformer,/obj/structure/cable{icon_state = "0-2"; pixel_y = 1},/turf/open/floor/plating,/area/ruin/space/has_grav/feedersden)
@@ -304,7 +306,7 @@
 "QF" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{piping_layer = 3; pixel_x = 5; pixel_y = 5},/obj/structure/disposalpipe/segment,/obj/effect/turf_decal/loading_area{dir = 1; icon_state = "steel_decals9"},/obj/effect/turf_decal/loading_area{dir = 2; icon_state = "steel_decals9"},/obj/effect/turf_decal/loading_area{dir = 4; icon_state = "steel_decals9"},/obj/effect/turf_decal/loading_area{dir = 8; icon_state = "steel_decals9"},/obj/effect/turf_decal{dir = 1},/obj/effect/turf_decal,/obj/machinery/door/airlock/hatch{name = "airlock"; req_access_txt = "150"},/obj/structure/cable{icon_state = "1-2"},/turf/open/floor/plasteel,/area/ruin/space/has_grav/feedersden)
 "QK" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/effect/turf_decal/stripes{icon_state = "steel_decals5"},/obj/effect/turf_decal/loading_area{dir = 8; icon_state = "steel_decals9"},/obj/effect/turf_decal/stripes/white/line{dir = 5; icon_state = "steel_decals7"},/obj/effect/turf_decal/stripes/white/line{dir = 10; icon_state = "steel_decals7"},/turf/open/floor/plasteel,/area/ruin/space/has_grav/feedersden)
 "QW" = (/obj/structure/table/wood,/obj/effect/turf_decal/tile/red{dir = 1},/obj/effect/turf_decal/tile/red{dir = 8},/turf/open/floor/plasteel/dark,/area/ruin/space/has_grav/feedersden)
-"Ra" = (/obj/machinery/door/airlock/hatch{name = "airlock"; req_access_txt = "150"},/turf/open/floor/plasteel,/area/ruin/space/has_grav/feedersden)
+"Ra" = (/obj/machinery/door/airlock/hatch{name = "airlock"; req_access_txt = "150"},/obj/effect/turf_decal/stripes/line{dir = 1},/obj/effect/turf_decal/stripes/line,/turf/open/floor/plasteel,/area/ruin/space/has_grav/feedersden)
 "Rc" = (/obj/docking_port/stationary{dir = 8; height = 7; name = "Outpost"; width = 7; roundstart_template = /datum/map_template/shuttle/feeder; shuttle_id = "feeder_home"; area_type = /area/ruin/space/has_grav/feedersden; dwidth = 3},/turf/open/floor/plating,/area/ruin/space/has_grav/feedersden)
 "Rh" = (/obj/structure/table,/obj/machinery/microwave,/turf/open/floor/plasteel,/area/ruin/space/has_grav/feedersden)
 "Rp" = (/obj/effect/turf_decal/tile/red{dir = 1},/obj/effect/turf_decal/tile/red{dir = 4},/obj/effect/turf_decal/loading_area{dir = 1; icon_state = "drain"; name = "drain"},/obj/effect/turf_decal/loading_area{dir = 1; icon_state = "drain"; name = "drain"},/obj/effect/turf_decal/loading_area{dir = 1; icon_state = "drain"; name = "drain"},/turf/open/floor/plasteel/dark,/area/ruin/space/has_grav/feedersden)
@@ -348,8 +350,8 @@
 "WZ" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 5; piping_layer = 3; pixel_x = 5; pixel_y = 5},/obj/structure/cable{icon_state = "1-2"},/turf/open/floor/plating,/area/ruin/space/has_grav/feedersden)
 "Xa" = (/obj/structure/table/wood,/obj/item/card/id/syndicate{pixel_y = 14},/obj/item/storage/fancy/cigarettes/cigpack_syndicate{pixel_x = -3},/obj/item/lighter{pixel_x = 4},/obj/effect/turf_decal/tile/red{dir = 1},/obj/effect/turf_decal/tile/red{dir = 8},/turf/open/floor/plasteel/dark,/area/ruin/space/has_grav/feedersden)
 "Xh" = (/obj/machinery/atmospherics/components/unary/vent_pump/on,/obj/effect/turf_decal/tile/red{dir = 1},/obj/effect/turf_decal/tile/red{dir = 4},/obj/effect/turf_decal/loading_area{dir = 1; icon_state = "drain"; name = "drain"},/turf/open/floor/plasteel/dark,/area/ruin/space/has_grav/feedersden)
-"Xo" = (/obj/structure/sign/poster/contraband/corn_oil{pixel_y = 32},/obj/machinery/vending/kink{free = 1},/turf/open/floor/wood,/area/ruin/space/has_grav/feedersden)
-"Xs" = (/obj/structure/rack,/obj/item/storage/bag/ore,/obj/item/t_scanner/adv_mining_scanner/lesser,/obj/item/pickaxe/mini,/obj/item/shovel,/obj/effect/turf_decal/stripes/white/line{dir = 10},/obj/effect/turf_decal/stripes/white/line{dir = 2; icon_state = "steel_decals_central4"},/obj/effect/turf_decal/tile/neutral,/obj/effect/turf_decal/tile/neutral{dir = 8},/obj/effect/turf_decal/tile/neutral{dir = 1},/obj/effect/turf_decal/tile/neutral{dir = 4},/turf/open/floor/plasteel,/area/ruin/space/has_grav/feedersden)
+"Xo" = (/obj/structure/sign/poster/contraband/corn_oil{pixel_y = 32},/obj/machinery/vending/kink{free = 1; fair_market_price = 0; extra_price = 0; default_price = 0},/turf/open/floor/wood,/area/ruin/space/has_grav/feedersden)
+"Xs" = (/obj/structure/rack,/obj/item/storage/bag/ore,/obj/item/t_scanner/adv_mining_scanner/lesser,/obj/item/pickaxe/mini,/obj/item/shovel,/obj/effect/turf_decal/stripes/white/line{dir = 2; icon_state = "steel_decals_central4"},/obj/effect/turf_decal/tile/neutral,/obj/effect/turf_decal/tile/neutral{dir = 8},/obj/effect/turf_decal/tile/neutral{dir = 1},/obj/effect/turf_decal/tile/neutral{dir = 4},/obj/effect/turf_decal/stripes/line{dir = 5},/turf/open/floor/plasteel,/area/ruin/space/has_grav/feedersden)
 "XF" = (/obj/effect/turf_decal/tile/red{dir = 8},/obj/effect/turf_decal/tile/red,/turf/open/floor/plasteel/dark,/area/ruin/space/has_grav/feedersden)
 "XL" = (/turf/closed/mineral/random,/area/ruin/space/has_grav/feedersden)
 "XP" = (/obj/structure/rack,/obj/item/circuitboard/machine/hydroponics,/obj/item/circuitboard/machine/hydroponics,/obj/item/circuitboard/machine/hydroponics,/obj/item/storage/box/disks_plantgene,/obj/item/storage/box/disks_plantgene,/turf/open/floor/plating,/area/ruin/space/has_grav/feedersden)
@@ -365,9 +367,9 @@
 "YU" = (/obj/structure/table,/obj/item/reagent_containers/food/snacks/burger/cheese,/turf/open/floor/plasteel,/area/ruin/space/has_grav/feedersden)
 "YX" = (/turf/open/floor/circuit/red,/area/ruin/space/has_grav/feedersden)
 "Zc" = (/obj/item/trash/tray{pixel_y = -5; pixel_x = -10},/obj/item/reagent_containers/food/snacks/burger/chicken{pixel_y = -5; pixel_x = -10},/turf/open/floor/wood,/area/ruin/space/has_grav/feedersden)
-"Ze" = (/obj/effect/turf_decal/box/red,/obj/structure/extinguisher_cabinet{pixel_x = -5; pixel_y = 30},/obj/structure/reagent_dispensers/watertank/high,/obj/effect/turf_decal/stripes/white/line{dir = 2},/obj/effect/turf_decal/tile/neutral,/obj/effect/turf_decal/tile/neutral{dir = 8},/obj/effect/turf_decal/tile/neutral{dir = 1},/obj/effect/turf_decal/tile/neutral{dir = 4},/turf/open/floor/plasteel,/area/ruin/space/has_grav/feedersden)
+"Ze" = (/obj/structure/extinguisher_cabinet{pixel_x = -5; pixel_y = 30},/obj/structure/reagent_dispensers/watertank/high,/obj/effect/turf_decal/tile/neutral,/obj/effect/turf_decal/tile/neutral{dir = 8},/obj/effect/turf_decal/tile/neutral{dir = 1},/obj/effect/turf_decal/tile/neutral{dir = 4},/obj/effect/turf_decal/stripes/line{dir = 2},/turf/open/floor/plasteel,/area/ruin/space/has_grav/feedersden)
 "Zh" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 8},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4; piping_layer = 3; pixel_x = 5; pixel_y = 5},/obj/vehicle/ridden/wheelchair,/turf/open/floor/plasteel/dark,/area/ruin/space/has_grav/feedersden)
-"Zn" = (/obj/machinery/vending/kink{free = 1},/turf/open/floor/plasteel/dark,/area/ruin/space/has_grav/feedersden)
+"Zn" = (/obj/machinery/vending/kink{free = 1; fair_market_price = 0; extra_price = 0; default_price = 0},/turf/open/floor/plasteel/dark,/area/ruin/space/has_grav/feedersden)
 "Zp" = (/obj/effect/turf_decal/tile/bar,/obj/effect/turf_decal/tile/neutral{dir = 1},/obj/effect/turf_decal/tile/neutral{dir = 4},/turf/open/floor/plasteel/dark,/area/ruin/space/has_grav/feedersden)
 "Zw" = (/obj/machinery/atmospherics/components/unary/vent_pump/on,/turf/open/floor/mineral/basaltstone_floor,/area/ruin/space/has_grav/feedersden)
 "ZC" = (/obj/structure/flora/ausbushes/grassybush,/turf/open/floor/plating/asteroid/airless,/area/ruin/unpowered/no_grav)
@@ -395,7 +397,7 @@ FEFEFEFEFEBrBrBrnrtZlltPwyLoJWMqLoKofbcdcdzgcdRpRpqiRpRpRpXhRpRpRpjOkKkKRzKoLusa
 FEFEFEFEfmBrBrBrnrZnNBLvAjNRgZKWNRAjNXTGTGTGTGBDTGXWZhZhZhqquOuOuOuOuOrJZOWrndWrsNnArBxJLfZnnrqFebebebFEFEFEFE
 FEFEFEfmfmBrBrDcDcDcNJNJDcnrnrnrnrnrnrnrnrnrDcWJiONxgUgUgUuXZpTKDcnrnrQFnrnrnrnrnrnrDciuiuDcDcBrFEFEFEFEFEFEFE
 FEFEBrZCfmISBrDcrOCTMadjnrNggqvpnrWNYEfncnbanrDxvYFDLNdCsRiNvYSsnrZeIoxCkoPgnrridlkCnrfNginrBrBrBrFEFEFEFEFEFE
-FEFEBrBrfmfmBrDcAeEBtyEqnrIGJhJhWslslsuklslsvtDxvYSyBeaaaaUBvYmUnrcWmaUerscxtVbXJhkMnrfNdAnrBrBrBrFEFEFEFEFEFE
+FEFEBrBrfmfmBrDchFyvtyEqnrIGJhJhWslslsuklslsvtDxvYSyBeaaaaUBvYmUnrcWmaUerscxtVbXJhkMnrfNdAnrBrBrBrFEFEFEFEFEFE
 FEFEFEBrfmfmeEDcAeEBtyRVDcxGHpEHNklstHguboygaQoYvYvYvYvYvYvwvYkdnrgFXsFHYpDBnrzlJhXPDcnrnrDcBrBrBrFEFEFEFEFEFE
 FEFEFEBrfmsnVvpfDcDcDcDcDcDcnrnrDcDOlsucaEBPnrvYaDMYMdRhDKjhANYUnrnrnrTPJhfKDcnrRanrDcBrEWYNxZBrBrBrFEFEFEFEFE
 FEFEFEFEfmfmCdYBYIgkgkqMJhJhJhwknrqhlslszcVFDczAnrnrnrkgnrnrnrnrDcmDnQddRCuFnrNtVWdvnrISVefmfmfxBrBrFEFEFEFEFE
diff --git a/_maps/map_files/Mining/Lavaland_Demone.dmm b/_maps/map_files/Mining/Lavaland_Demone.dmm
index 62a6b6d68d..c34d018065 100644
--- a/_maps/map_files/Mining/Lavaland_Demone.dmm
+++ b/_maps/map_files/Mining/Lavaland_Demone.dmm
@@ -22,7 +22,7 @@
 "aO" = (/obj/structure/flora/ash/cap_shroom,/turf/open/floor/plating/asteroid/basalt/lava_land_surface,/area/lavaland/surface/outdoors)
 "aQ" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/effect/turf_decal/loading_area{dir = 10; icon_state = "steel_decals6"},/obj/effect/turf_decal/loading_area{dir = 9; icon_state = "steel_decals6"},/turf/open/floor/plasteel,/area/lavaland/demone/factorygen)
 "aR" = (/obj/structure/table/wood,/obj/item/paper_bin,/turf/open/floor/carpet/red,/area/lavaland/demone/reception)
-"aV" = (/obj/structure/table/wood,/turf/open/floor/carpet/gato,/area/lavaland/demone/living)
+"aV" = (/obj/structure/table/wood,/obj/item/trash/tray,/turf/open/floor/carpet/gato,/area/lavaland/demone/living)
 "aY" = (/obj/structure/flora/redgrass/redg,/obj/item/reagent_containers/food/snacks/chocolatebar,/turf/open/candyfloor,/area/ruin/powered/candyland)
 "aZ" = (/obj/machinery/portable_atmospherics/canister/oxygen,/turf/open/floor/plasteel/dark/side{dir = 6},/area/lavaland/demone/minestorage)
 "bb" = (/obj/machinery/power/terminal{dir = 1},/obj/structure/cable{icon_state = "0-8"},/obj/machinery/light,/turf/open/floor/plating,/area/lavaland/demone/villagesilo)
@@ -30,7 +30,7 @@
 "bh" = (/obj/effect/turf_decal/stripes/line{dir = 4},/turf/open/floor/plasteel/dark/side{dir = 4},/area/lavaland/demone/living)
 "bi" = (/obj/structure/stone_tile/surrounding_tile/cracked,/turf/open/indestructible/necropolis,/area/lavaland/surface/outdoors)
 "bj" = (/obj/structure/flora/ausbushes/ppflowers,/turf/open/floor/grass,/area/lavaland/demone/living)
-"bk" = (/obj/structure/table/reinforced,/obj/item/kitchen/knife,/turf/open/floor/plasteel/cafeteria,/area/lavaland/demone/kitchen)
+"bk" = (/obj/structure/table/reinforced,/obj/item/kitchen/knife/butcher,/turf/open/floor/plasteel/cafeteria,/area/lavaland/demone/kitchen)
 "bl" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/open/floor/mineral/sandstone_floor,/area/lavaland/demone/lobby)
 "bm" = (/obj/structure/cable{icon_state = "4-8"},/turf/open/floor/wood,/area/lavaland/demone/demonevillage)
 "bn" = (/obj/machinery/light{dir = 8},/turf/open/floor/plating/asteroid/basalt/lava_land_surface,/area/lavaland/demone/demonevillage)
@@ -61,7 +61,7 @@
 "cA" = (/obj/effect/turf_decal/tile/purple{dir = 1},/obj/effect/turf_decal/tile/purple{dir = 8},/turf/open/floor/plasteel/dark,/area/lavaland/demone/minestorage)
 "cB" = (/obj/structure/railing{dir = 4},/obj/effect/turf_decal/loading_area{dir = 4; icon_state = "drain"; name = "drain"},/turf/open/floor/mineral/sandstone_floor,/area/lavaland/demone/lobby)
 "cC" = (/obj/structure/stone_tile/slab/cracked,/obj/structure/stone_tile/slab/burnt,/turf/open/lava/smooth/lava_land_surface,/area/lavaland/surface/outdoors)
-"cG" = (/obj/structure/cable{icon_state = "4-8"},/turf/open/floor/plasteel/dark/side{dir = 5},/area/lavaland/demone/tele)
+"cG" = (/obj/structure/cable{icon_state = "4-8"},/obj/effect/turf_decal/tile/purple{dir = 8},/turf/open/floor/plasteel/dark/side{dir = 5},/area/lavaland/demone/tele)
 "cH" = (/obj/item/reagent_containers/food/snacks/donut/plain{name = "Heaven donut"; desc = "A plain donut..."; pixel_y = -1; pixel_x = 9},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{dir = 4},/turf/open/floor/plasteel,/area/lavaland/demone/factorygen)
 "cJ" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/open/floor/plasteel,/area/lavaland/demone/living)
 "cM" = (/obj/structure/closet/secure_closet/freezer/fridge,/obj/effect/decal/cleanable/cobweb,/obj/effect/turf_decal/loading_area{dir = 10; icon_state = "steel_decals6"},/obj/effect/turf_decal/loading_area{dir = 9; icon_state = "steel_decals6"},/turf/open/floor/plasteel,/area/lavaland/demone/demonevillage)
@@ -78,10 +78,12 @@
 "dd" = (/obj/machinery/light,/obj/effect/turf_decal/loading_area{icon_state = "drain"; name = "drain"},/turf/open/floor/plasteel/freezer,/area/lavaland/demone/factory)
 "dg" = (/obj/structure/table/wood,/obj/item/mining_scanner{pixel_x = -9},/obj/item/trash/plate{pixel_x = 6; pixel_y = 3},/turf/open/floor/wood,/area/lavaland/demone/demonevillage)
 "dh" = (/turf/open/floor/mineral/basaltstone_floor,/area/lavaland/demone/reception)
+"dk" = (/obj/effect/turf_decal/tile/purple{dir = 1},/obj/effect/turf_decal/tile/purple{dir = 8},/turf/open/floor/plasteel/dark/side{dir = 4},/area/lavaland/demone/tele)
+"dl" = (/obj/structure/closet/crate/bin,/turf/open/floor/carpet/gato,/area/lavaland/demone/living)
 "dr" = (/obj/structure/sign/nanotrasen,/turf/closed/wall/mineral/iron,/area/lavaland/demone/lobby)
 "dt" = (/obj/item/flashlight/lantern{icon_state = "lantern-on"; on = 1},/turf/open/indestructible/chocolate{icon_state = "choclit_4"},/area/ruin/powered/candyland)
 "du" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{dir = 4},/turf/open/floor/wood,/area/lavaland/demone/demonevillage)
-"dw" = (/obj/vehicle/ridden/atv,/obj/effect/turf_decal/tile/purple,/obj/effect/turf_decal/tile/purple{dir = 8},/turf/open/floor/plasteel/dark,/area/lavaland/demone/minestorage)
+"dw" = (/obj/vehicle/ridden/atv,/obj/effect/turf_decal/stripes/line,/obj/effect/turf_decal/arrows{dir = 1},/turf/open/floor/plasteel/dark,/area/lavaland/demone/minestorage)
 "dx" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{dir = 4},/obj/structure/cable{icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/open/floor/carpet/red,/area/lavaland/demone/reception)
 "dB" = (/obj/item/reagent_containers/food/snacks/donut/plain,/turf/open/floor/plating/asteroid/basalt/lava_land_surface,/area/lavaland/surface/outdoors)
 "dC" = (/obj/machinery/light,/obj/structure/extinguisher_cabinet{pixel_y = -28},/turf/open/floor/plasteel/freezer,/area/lavaland/demone/factory)
@@ -90,7 +92,7 @@
 "dJ" = (/obj/structure/stone_tile/slab,/obj/structure/stone_tile/slab,/turf/open/floor/plating/asteroid/basalt/lava_land_surface,/area/lavaland/surface/outdoors)
 "dN" = (/obj/effect/decal/cleanable/oil,/obj/structure/cable{icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{dir = 10},/turf/open/floor/plasteel,/area/lavaland/demone/factorygen)
 "dP" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{dir = 4},/obj/structure/barricade/sandbags,/turf/open/floor/plasteel/freezer,/area/lavaland/demone/factory)
-"dV" = (/turf/open/floor/wood{icon_state = "wood-broken7"},/area/lavaland/surface/outdoors)
+"dV" = (/obj/machinery/hydroponics/constructable,/turf/open/floor/wood{icon_state = "wood-broken7"},/area/lavaland/surface/outdoors)
 "dX" = (/obj/structure/stone_tile/block,/obj/structure/stone_tile/block{dir = 8},/turf/open/indestructible/necropolis,/area/lavaland/surface/outdoors)
 "dY" = (/obj/structure/cable/blue{icon_state = "1-2"},/obj/effect/turf_decal/loading_area{dir = 9; icon_state = "steel_panel"; name = "steel pannel"},/turf/open/floor/plasteel/dark,/area/lavaland/demone/villagepsu)
 "dZ" = (/turf/open/indestructible/bubblegum,/area/ruin/powered/candyland)
@@ -119,6 +121,7 @@
 "eQ" = (/obj/effect/decal/cleanable/cobweb,/obj/effect/turf_decal/loading_area{icon_state = "drain"; name = "drain"; dir = 1},/turf/open/floor/mineral/basaltstone_floor,/area/lavaland/demone/reception)
 "eT" = (/obj/structure/sink{dir = 8; pixel_x = -16},/obj/structure/mirror{dir = 4; pixel_x = -27},/obj/effect/turf_decal/loading_area{dir = 9; icon_state = "steel_panel"; name = "steel pannel"},/obj/effect/turf_decal/loading_area{dir = 10; icon_state = "steel_decals6"},/turf/open/floor/plasteel,/area/lavaland/demone/reception)
 "eU" = (/obj/structure/sign/logo/donutsign2,/turf/open/floor/plating/asteroid/basalt/lava_land_surface,/area/lavaland/surface/outdoors)
+"eV" = (/obj/effect/turf_decal/tile/purple{dir = 8},/obj/effect/turf_decal/tile/purple,/turf/open/floor/plasteel/dark/side{dir = 1},/area/lavaland/demone/tele)
 "fa" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 5},/obj/effect/turf_decal/loading_area{dir = 1; icon_state = "drain"; name = "drain"},/turf/open/floor/carpet/gato,/area/lavaland/demone/living)
 "fc" = (/obj/machinery/photocopier,/turf/open/floor/plaswood,/area/lavaland/demone/factoryoffice)
 "fd" = (/obj/machinery/atmospherics/components/unary/vent_pump/on,/turf/open/floor/plasteel,/area/lavaland/demone/minestorage)
@@ -145,7 +148,7 @@
 "gg" = (/turf/closed/indestructible/chocolate{icon_state = "choco_wall2"},/area/ruin/powered/candyland)
 "gh" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{dir = 1},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/effect/turf_decal/loading_area{dir = 4; icon_state = "steel_decals5"},/turf/open/floor/plasteel,/area/lavaland/demone/factorystorage)
 "gl" = (/obj/structure/stone_tile/block{dir = 1},/obj/structure/stone_tile/slab/cracked{dir = 10; pixel_y = -6},/turf/open/indestructible/necropolis,/area/lavaland/surface/outdoors)
-"gn" = (/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer1,/turf/open/floor/plasteel/dark/side{dir = 8},/area/lavaland/demone/tele)
+"gn" = (/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer1,/obj/effect/turf_decal/tile/purple,/obj/effect/turf_decal/tile/purple{dir = 4},/turf/open/floor/plasteel/dark/side{dir = 8},/area/lavaland/demone/tele)
 "gs" = (/obj/machinery/conveyor{id = "donut"},/obj/machinery/door/poddoor{id = "Donut2"},/turf/open/floor/plasteel,/area/lavaland/demone/factorystorage)
 "gt" = (/obj/structure/railing{dir = 8},/obj/effect/turf_decal/stripes/line{dir = 9},/obj/effect/turf_decal/loading_area{dir = 2; icon_state = "steel_decals5"},/turf/open/floor/plasteel,/area/lavaland/demone/factorystorage)
 "gu" = (/obj/item/reagent_containers/food/snacks/chocolateegg{pixel_y = 9; pixel_x = 7},/obj/item/reagent_containers/food/snacks/chocolateegg{pixel_y = 12; pixel_x = -3},/turf/open/indestructible/chocolate{icon_state = "choclit_3"},/area/ruin/powered/candyland)
@@ -179,7 +182,7 @@
 "hO" = (/obj/effect/turf_decal/bot,/obj/machinery/portable_atmospherics/canister/oxygen,/turf/open/floor/mineral/basaltstone_floor,/area/lavaland/demone/factorystorage)
 "hP" = (/obj/structure/cable{icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 5},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{dir = 9},/turf/open/floor/plasteel/freezer,/area/lavaland/demone/factory)
 "hQ" = (/obj/effect/turf_decal/loading_area{dir = 1; icon_state = "drain"; name = "drain"},/obj/structure/cable{icon_state = "4-8"},/turf/open/floor/wood,/area/lavaland/demone/demonevillage)
-"hR" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 9},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{dir = 4},/turf/open/floor/plasteel/dark/side{dir = 8},/area/lavaland/demone/tele)
+"hR" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 9},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{dir = 4},/obj/effect/turf_decal/tile/purple,/obj/effect/turf_decal/tile/purple{dir = 4},/turf/open/floor/plasteel/dark/side{dir = 8},/area/lavaland/demone/tele)
 "hW" = (/turf/open/floor/carpet/black,/area/lavaland/demone/factoryoffice)
 "hZ" = (/obj/structure/chair/sofa,/obj/structure/chair/sofa,/obj/machinery/light{dir = 1},/turf/open/floor/carpet,/area/lavaland/demone/reception)
 "ic" = (/turf/open/floor/carpet,/area/lavaland/demone/reception)
@@ -187,9 +190,9 @@
 "ih" = (/obj/machinery/light{dir = 4},/obj/item/storage/fancy/egg_box,/obj/item/storage/fancy/egg_box,/obj/item/storage/fancy/egg_box,/obj/item/reagent_containers/food/condiment/soymilk,/obj/item/reagent_containers/food/condiment/soymilk,/obj/item/reagent_containers/food/condiment/soymilk,/obj/item/reagent_containers/food/condiment/soymilk,/obj/item/reagent_containers/food/condiment/soymilk,/obj/item/reagent_containers/food/condiment/soymilk,/obj/structure/closet/secure_closet/freezer/fridge,/turf/open/floor/plasteel,/area/lavaland/demone/factory)
 "ii" = (/obj/vehicle/ridden/grocery_cart/motorized{name = "Obesium Scooter"; desc = "NO FUCKING WAY OBESIUM IS REAL!!"},/turf/open/floor/plating/asteroid/basalt/lava_land_surface,/area/lavaland/surface/outdoors)
 "ik" = (/obj/machinery/poweredfans,/obj/machinery/door/airlock/survival_pod/glass{dir = 4; req_one_access_txt = "48"},/turf/open/floor/plating,/area/lavaland/demone/villagesilo)
-"il" = (/obj/structure/table/reinforced,/obj/item/storage/box/donkpockets{pixel_y = 6},/obj/machinery/light/small{dir = 1},/turf/open/floor/plasteel/cafeteria,/area/lavaland/demone/kitchen)
+"il" = (/obj/item/storage/box/donkpockets,/obj/machinery/light/small{dir = 1},/obj/structure/rack/shelf,/obj/item/storage/box/donkpockets/donkpocketpizza{pixel_y = 6},/turf/open/floor/plasteel/cafeteria,/area/lavaland/demone/kitchen)
 "im" = (/obj/effect/turf_decal/tile/purple{dir = 1},/obj/effect/turf_decal/tile/purple{dir = 8},/obj/effect/turf_decal/tile/purple,/turf/open/floor/plasteel/dark,/area/lavaland/demone/minestorage)
-"io" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 5},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{dir = 4},/turf/open/floor/plasteel/dark/side{dir = 6},/area/lavaland/demone/tele)
+"io" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 5},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{dir = 4},/obj/effect/turf_decal/tile/purple{dir = 1},/turf/open/floor/plasteel/dark/side{dir = 6},/area/lavaland/demone/tele)
 "ip" = (/obj/structure/table/reinforced/brass,/obj/item/reagent_containers/food/drinks/drinkingglass,/obj/item/reagent_containers/food/drinks/drinkingglass{pixel_x = 10},/obj/item/reagent_containers/food/drinks/drinkingglass{pixel_x = -10},/turf/open/indestructible/bubblegum,/area/ruin/powered/candyland)
 "iq" = (/obj/structure/flora/redgrass/redg,/turf/open/floor/plating/asteroid/basalt/lava_land_surface,/area/lavaland/surface/outdoors)
 "iv" = (/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer1,/turf/open/floor/wood,/area/lavaland/demone/demonevillage)
@@ -228,7 +231,7 @@
 "ko" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/effect/turf_decal/loading_area{dir = 8; icon_state = "drain"; name = "drain"},/turf/open/floor/plasteel/cafeteria,/area/lavaland/demone/factory)
 "kp" = (/turf/open/floor/plasteel/dark/side{dir = 10},/area/lavaland/demone/living)
 "kr" = (/turf/open/lava/smooth/lava_land_surface,/area/lavaland/surface/outdoors)
-"ks" = (/obj/structure/closet/crate/radiation,/obj/item/stack/sheet/mineral/uranium{amount = 50},/obj/item/stack/sheet/mineral/uranium{amount = 50},/obj/item/stack/sheet/mineral/uranium{amount = 50},/obj/item/stack/sheet/mineral/uranium{amount = 50},/obj/item/stack/sheet/mineral/uranium{amount = 50},/obj/item/stack/sheet/mineral/uranium{amount = 50},/obj/item/stack/sheet/mineral/uranium{amount = 50},/obj/item/stack/sheet/mineral/uranium{amount = 50},/obj/item/stack/sheet/mineral/uranium{amount = 50},/obj/item/stack/sheet/mineral/uranium{amount = 50},/obj/item/stack/sheet/mineral/uranium{amount = 50},/obj/item/stack/sheet/mineral/uranium{amount = 50},/obj/item/stack/sheet/mineral/uranium{amount = 50},/obj/item/stack/sheet/mineral/uranium{amount = 50},/obj/item/stack/sheet/mineral/uranium{amount = 50},/obj/item/stack/sheet/mineral/uranium{amount = 50},/obj/item/stack/sheet/mineral/uranium{amount = 50},/obj/item/stack/sheet/mineral/uranium{amount = 50},/obj/item/stack/sheet/mineral/uranium{amount = 50},/obj/item/stack/sheet/mineral/uranium{amount = 50},/obj/item/stack/sheet/mineral/uranium{amount = 50},/obj/item/stack/sheet/mineral/uranium{amount = 50},/obj/item/stack/sheet/mineral/uranium{amount = 50},/obj/item/stack/sheet/mineral/uranium{amount = 50},/obj/item/stack/sheet/mineral/uranium{amount = 50},/obj/item/stack/sheet/mineral/uranium{amount = 50},/obj/item/stack/sheet/mineral/uranium{amount = 50},/obj/item/stack/sheet/mineral/uranium{amount = 50},/obj/item/stack/sheet/mineral/uranium{amount = 50},/obj/item/stack/sheet/mineral/uranium{amount = 50},/obj/item/stack/sheet/mineral/uranium{amount = 50},/obj/item/stack/sheet/mineral/uranium{amount = 50},/obj/item/stack/sheet/mineral/uranium{amount = 50},/obj/item/stack/sheet/mineral/uranium{amount = 50},/obj/item/stack/sheet/mineral/uranium{amount = 50},/obj/item/stack/sheet/mineral/uranium{amount = 50},/obj/item/stack/sheet/mineral/uranium{amount = 50},/obj/item/stack/sheet/mineral/uranium{amount = 50},/obj/item/stack/sheet/mineral/uranium{amount = 50},/obj/item/stack/sheet/mineral/uranium{amount = 50},/obj/item/stack/sheet/mineral/uranium{amount = 50},/obj/item/stack/sheet/mineral/uranium{amount = 50},/obj/item/stack/sheet/mineral/uranium{amount = 50},/obj/item/stack/sheet/mineral/uranium{amount = 50},/obj/item/stack/sheet/mineral/uranium{amount = 50},/obj/item/stack/sheet/mineral/uranium{amount = 50},/obj/item/stack/sheet/mineral/uranium{amount = 50},/obj/item/stack/sheet/mineral/uranium{amount = 50},/obj/item/stack/sheet/mineral/uranium{amount = 50},/obj/item/stack/sheet/mineral/uranium{amount = 50},/obj/item/stack/sheet/mineral/uranium{amount = 50},/obj/item/stack/sheet/mineral/uranium{amount = 50},/obj/item/stack/sheet/mineral/uranium{amount = 50},/obj/item/stack/sheet/mineral/uranium{amount = 50},/obj/item/stack/sheet/mineral/uranium{amount = 50},/obj/item/stack/sheet/mineral/uranium{amount = 50},/obj/item/stack/sheet/mineral/uranium{amount = 50},/obj/item/stack/sheet/mineral/uranium{amount = 50},/obj/item/stack/sheet/mineral/uranium{amount = 50},/obj/item/stack/sheet/mineral/uranium{amount = 50},/obj/item/stack/sheet/mineral/uranium{amount = 50},/obj/item/stack/sheet/mineral/uranium{amount = 50},/obj/item/stack/sheet/mineral/uranium{amount = 50},/obj/item/stack/sheet/mineral/uranium{amount = 50},/obj/machinery/airalarm/unlocked{pixel_y = -24; dir = 1},/obj/effect/turf_decal/loading_area{dir = 10; icon_state = "steel_panel"; name = "steel pannel"},/turf/open/floor/plasteel/dark,/area/lavaland/demone/villagepsu)
+"ks" = (/obj/structure/closet/crate/radiation,/obj/item/stack/sheet/mineral/uranium{amount = 50},/obj/item/stack/sheet/mineral/uranium{amount = 50},/obj/item/stack/sheet/mineral/uranium{amount = 50},/obj/item/stack/sheet/mineral/uranium{amount = 50},/obj/machinery/airalarm/unlocked{pixel_y = -24; dir = 1},/obj/effect/turf_decal/loading_area{dir = 10; icon_state = "steel_panel"; name = "steel pannel"},/turf/open/floor/plasteel/dark,/area/lavaland/demone/villagepsu)
 "kt" = (/obj/structure/closet/crate/bin,/obj/effect/turf_decal/loading_area{icon_state = "drain"; name = "drain"},/obj/effect/turf_decal/loading_area{dir = 10; icon_state = "steel_panel"; name = "steel pannel"},/turf/open/floor/plasteel,/area/lavaland/demone/reception)
 "ku" = (/obj/structure/chair/wood{dir = 1},/turf/open/floor/carpet/black,/area/lavaland/demone/factoryoffice)
 "kw" = (/obj/structure/chair/sofachair{dir = 1},/turf/open/floor/carpet,/area/lavaland/demone/reception)
@@ -275,7 +278,7 @@
 "mj" = (/obj/effect/turf_decal/loading_area{dir = 10; icon_state = "steel_panel"; name = "steel pannel"},/turf/open/floor/plasteel/dark,/area/lavaland/demone/villagepsu)
 "ml" = (/obj/machinery/hydroponics/constructable,/obj/structure/sign/poster/random{pixel_x = 32},/turf/open/floor/plasteel/dark,/area/lavaland/demone/demonevillage)
 "mn" = (/turf/open/floor/plasteel/dark/side{dir = 9},/area/lavaland/demone/tele)
-"mp" = (/obj/machinery/power/smes{charge = 20},/obj/machinery/light/small{dir = 1},/obj/structure/cable{icon_state = "0-2"},/turf/open/floor/plating,/area/lavaland/demone/living)
+"mp" = (/obj/machinery/light/small{dir = 1},/obj/structure/cable{icon_state = "0-2"},/obj/machinery/power/smes/engineering,/turf/open/floor/plating,/area/lavaland/demone/living)
 "mq" = (/obj/effect/turf_decal/loading_area{dir = 1; icon_state = "steel_decals5"},/obj/effect/turf_decal/loading_area{dir = 1; icon_state = "drain"; name = "drain"},/turf/open/floor/plating/lavaland_baseturf,/area/lavaland/surface/outdoors)
 "mw" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{dir = 1},/obj/machinery/atmospherics/pipe/manifold/supply/hidden,/turf/open/floor/plasteel/freezer,/area/lavaland/demone/factory)
 "mx" = (/turf/open/floor/wood,/area/lavaland/surface/outdoors)
@@ -352,7 +355,7 @@
 "ps" = (/obj/machinery/light{dir = 1},/obj/machinery/firealarm{pixel_y = 28},/turf/open/floor/plasteel/freezer,/area/lavaland/demone/factory)
 "pt" = (/obj/structure/grille,/obj/structure/window/fulltile,/turf/open/floor/plating,/area/lavaland/demone/tele)
 "pu" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{dir = 4},/turf/open/floor/plasteel/dark/side{dir = 8},/area/lavaland/demone/tele)
-"pw" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{dir = 4},/turf/open/floor/plasteel/dark/side{dir = 4},/area/lavaland/demone/tele)
+"pw" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{dir = 4},/obj/effect/turf_decal/tile/purple{dir = 8},/obj/effect/turf_decal/tile/purple{dir = 8},/obj/effect/turf_decal/tile/purple{dir = 1},/turf/open/floor/plasteel/dark/side{dir = 4},/area/lavaland/demone/tele)
 "py" = (/obj/structure/closet/emcloset/anchored,/turf/open/floor/plasteel/dark,/area/lavaland/demone/living)
 "pA" = (/mob/living/simple_animal/hostile/skeleton{name = "Ignatio Varga"},/turf/open/floor/plating/asteroid/basalt/lava_land_surface,/area/lavaland/surface/outdoors)
 "pE" = (/obj/machinery/conveyor{id = "donut"},/obj/item/reagent_containers/food/snacks/donut/berry{desc = "Straight from lavaland!"; name = "Hella Donut"},/turf/open/floor/mineral/basaltstone_floor,/area/lavaland/demone/factorystorage)
@@ -427,7 +430,7 @@
 "sJ" = (/obj/machinery/portable_atmospherics/canister/oxygen,/obj/effect/turf_decal/stripes/line,/turf/open/floor/plasteel/dark,/area/lavaland/demone/villagesilo)
 "sL" = (/obj/effect/turf_decal/loading_area{icon_state = "drain"; name = "drain"},/turf/open/floor/plasteel/freezer,/area/lavaland/demone/demonevillage)
 "sO" = (/obj/structure/cable/cyan{icon_state = "2-4"},/obj/structure/closet/crate,/obj/item/stack/sheet/mineral/uranium{amount = 50},/obj/item/stack/sheet/mineral/uranium{amount = 50},/obj/item/stack/sheet/mineral/uranium{amount = 50},/obj/item/stack/sheet/mineral/uranium{amount = 50},/obj/effect/turf_decal/loading_area{dir = 10; icon_state = "steel_decals6"},/obj/effect/turf_decal/loading_area{dir = 9; icon_state = "steel_decals6"},/turf/open/floor/plasteel,/area/lavaland/demone/factorygen)
-"sP" = (/obj/machinery/power/apc/auto_name/west{cell = 999999; name = "Demone Teleporter Area"; cell_type = /obj/item/stock_parts/cell/bluespace; req_one_access_txt = "48"},/obj/structure/cable{icon_state = "0-4"},/turf/open/floor/plasteel/dark/side,/area/lavaland/demone/tele)
+"sP" = (/obj/machinery/power/apc/auto_name/west{cell = 999999; name = "Demone Teleporter Area"; cell_type = /obj/item/stock_parts/cell/bluespace; req_one_access_txt = "48"},/obj/structure/cable{icon_state = "0-4"},/obj/effect/turf_decal/tile/purple{dir = 1},/obj/effect/turf_decal/tile/purple{dir = 4},/turf/open/floor/plasteel/dark/side,/area/lavaland/demone/tele)
 "sR" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/open/floor/carpet/red,/area/lavaland/demone/reception)
 "sS" = (/obj/effect/turf_decal/loading_area{dir = 8; icon_state = "steel_panel"; name = "steel pannel"},/obj/effect/turf_decal/stripes/corner{dir = 1},/turf/open/floor/plasteel/freezer,/area/lavaland/demone/factory)
 "sU" = (/obj/machinery/light,/obj/effect/turf_decal/loading_area{icon_state = "drain"; name = "drain"},/turf/open/floor/plasteel/freezer,/area/lavaland/demone/demonevillage)
@@ -544,7 +547,7 @@
 "xJ" = (/obj/effect/turf_decal/loading_area{icon_state = "drain"; name = "drain"; dir = 1},/turf/open/floor/plating/lavaland_baseturf,/area/lavaland/surface/outdoors)
 "xK" = (/obj/effect/turf_decal/loading_area{dir = 4; icon_state = "drain"; name = "drain"},/turf/open/floor/plasteel/freezer,/area/lavaland/demone/factory)
 "xL" = (/obj/machinery/light,/turf/open/floor/plating,/area/lavaland/demone/villagesilo)
-"xM" = (/obj/structure/table,/obj/item/key{pixel_x = -7; pixel_y = 3},/obj/item/key{pixel_x = 4},/obj/item/key{pixel_y = 6; pixel_x = 8},/obj/machinery/light/small{dir = 1},/obj/effect/turf_decal/tile/purple{dir = 1},/obj/effect/turf_decal/tile/purple{dir = 8},/turf/open/floor/plasteel/dark,/area/lavaland/demone/minestorage)
+"xM" = (/obj/structure/table,/obj/item/key{pixel_x = -7; pixel_y = 3},/obj/item/key{pixel_x = 4},/obj/item/key{pixel_y = 6; pixel_x = 8},/obj/machinery/light/small{dir = 1},/obj/effect/turf_decal/tile/purple{dir = 1},/obj/effect/turf_decal/tile/purple{dir = 8},/obj/effect/turf_decal/tile/purple{dir = 4},/turf/open/floor/plasteel/dark,/area/lavaland/demone/minestorage)
 "xQ" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{dir = 1},/obj/structure/cable{icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/open/floor/mineral/basaltstone_floor,/area/lavaland/demone/factorystorage)
 "xW" = (/obj/machinery/light{dir = 1},/turf/open/floor/mineral/sandstone_floor,/area/lavaland/demone/lobby)
 "xZ" = (/obj/machinery/power/apc/auto_name/north{cell = 2800; name = "Abandoned House 2 APC"},/obj/structure/table/wood,/obj/structure/cable{icon_state = "0-2"},/obj/item/implant/radio/mining,/turf/open/floor/wood,/area/lavaland/demone/demonevillage)
@@ -553,7 +556,7 @@
 "yh" = (/obj/item/reagent_containers/food/snacks/candyheart,/turf/open/candyfloor,/area/ruin/powered/candyland)
 "yl" = (/obj/structure/sign/nanotrasen,/turf/closed/wall/mineral/iron,/area/lavaland/demone/factoryoffice)
 "ym" = (/obj/structure/grille,/obj/structure/window/fulltile,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{dir = 4},/turf/open/floor/plating,/area/lavaland/demone/tele)
-"yp" = (/obj/structure/closet/secure_closet/freezer/kitchen,/turf/open/floor/plasteel/cafeteria,/area/lavaland/demone/kitchen)
+"yp" = (/obj/structure/closet/secure_closet/freezer/kitchen,/obj/item/reagent_containers/food/snacks/rationpack,/obj/item/reagent_containers/food/snacks/rationpack,/obj/item/reagent_containers/food/snacks/rationpack,/obj/item/reagent_containers/food/snacks/rationpack,/turf/open/floor/plasteel/cafeteria,/area/lavaland/demone/kitchen)
 "yr" = (/obj/structure/closet/secure_closet/freezer/fridge,/obj/machinery/light{dir = 1},/turf/open/floor/wood,/area/lavaland/demone/demonevillage)
 "yt" = (/obj/machinery/conveyor{id = "donut"},/obj/machinery/door/poddoor{id = "Donut2"},/turf/open/floor/mineral/basaltstone_floor,/area/lavaland/demone/factorystorage)
 "yv" = (/obj/effect/turf_decal/loading_area{dir = 10; icon_state = "steel_panel"; name = "steel pannel"},/obj/effect/turf_decal/loading_area{dir = 1; icon_state = "steel_panel"; name = "steel pannel"},/obj/effect/turf_decal/stripes/line{dir = 10},/turf/open/floor/plasteel/freezer,/area/lavaland/demone/factory)
@@ -588,7 +591,7 @@
 "zL" = (/obj/effect/turf_decal/loading_area{dir = 5; icon_state = "steel_panel"; name = "steel pannel"},/obj/effect/turf_decal/loading_area{dir = 2; icon_state = "steel_panel"; name = "steel pannel"},/obj/effect/turf_decal/stripes/line{dir = 5},/turf/open/floor/plasteel/freezer,/area/lavaland/demone/factory)
 "zN" = (/obj/machinery/light{dir = 4},/obj/structure/cable{icon_state = "1-2"},/turf/open/floor/plaswood,/area/lavaland/demone/factoryoffice)
 "zO" = (/obj/machinery/airalarm/unlocked{pixel_y = 24},/obj/effect/turf_decal/loading_area{icon_state = "drain"; name = "drain"; dir = 1},/turf/open/floor/mineral/basaltstone_floor,/area/lavaland/demone/factorystorage)
-"zR" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{dir = 4},/turf/open/floor/plasteel/dark/side,/area/lavaland/demone/tele)
+"zR" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{dir = 4},/obj/effect/turf_decal/tile/purple{dir = 1},/obj/effect/turf_decal/tile/purple{dir = 4},/turf/open/floor/plasteel/dark/side,/area/lavaland/demone/tele)
 "zS" = (/obj/structure/lattice/catwalk,/obj/structure/lattice/catwalk,/turf/closed/wall/mineral/iron,/area/lavaland/surface/outdoors)
 "zV" = (/obj/structure/flora/rock,/turf/open/floor/plating/asteroid/basalt/lava_land_surface,/area/lavaland/surface/outdoors)
 "zX" = (/obj/structure/cable{icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 10},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{dir = 4},/turf/open/floor/plasteel,/area/lavaland/demone/living)
@@ -610,6 +613,7 @@
 "AN" = (/obj/structure/flora/ash/tall_shroom,/turf/open/floor/plating/asteroid/basalt/lava_land_surface,/area/lavaland/surface/outdoors)
 "AO" = (/obj/structure/cable{icon_state = "1-2"},/obj/structure/cable{icon_state = "1-8"},/turf/open/floor/plating,/area/lavaland/demone/living)
 "AP" = (/obj/machinery/light,/turf/open/floor/wood,/area/lavaland/demone/demonevillage)
+"AQ" = (/obj/effect/turf_decal/tile/purple{dir = 8},/obj/effect/turf_decal/tile/purple{dir = 1},/turf/open/floor/plasteel/dark/side{dir = 4},/area/lavaland/demone/tele)
 "AR" = (/obj/structure/curtain{color = #FFC0CB},/turf/open/indestructible/bubblegum,/area/ruin/powered/candyland)
 "AS" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/item/beacon,/obj/effect/turf_decal/stripes/line{dir = 1},/turf/open/floor/plasteel,/area/lavaland/demone/living)
 "AT" = (/obj/machinery/hydroponics/constructable,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{dir = 4},/turf/open/floor/plasteel/dark,/area/lavaland/demone/demonevillage)
@@ -708,6 +712,7 @@
 "Fe" = (/turf/open/lava/smooth/lava_land_surface,/area/lavaland/demone/factory)
 "Ff" = (/obj/item/reagent_containers/food/drinks/soda_cans/pwr_game{pixel_y = 8},/turf/open/floor/carpet/gato,/area/ruin/powered/candyland)
 "Fk" = (/obj/effect/turf_decal/loading_area{dir = 4; icon_state = "drain"; name = "drain"},/obj/machinery/airalarm/unlocked{dir = 8; pixel_x = 24},/turf/open/floor/wood,/area/lavaland/demone/demonevillage)
+"Fl" = (/obj/effect/turf_decal/tile/purple,/turf/open/floor/plasteel/dark/side{dir = 9},/area/lavaland/demone/tele)
 "Fr" = (/obj/effect/decal/cleanable/cobweb,/obj/machinery/power/apc/auto_name/north{name = "Lobby Donut Factory APC"},/obj/structure/cable{icon_state = "0-4"},/turf/open/floor/mineral/sandstone_floor,/area/lavaland/demone/lobby)
 "Ft" = (/obj/effect/turf_decal/loading_area{dir = 1; icon_state = "drain"; name = "drain"},/turf/open/floor/plasteel/freezer,/area/lavaland/demone/demonevillage)
 "Fu" = (/obj/item/kirbyplants/random,/turf/open/floor/wood,/area/lavaland/demone/demonevillage)
@@ -716,7 +721,7 @@
 "Fy" = (/obj/structure/mineral_door/iron,/turf/open/floor/plasteel/freezer,/area/lavaland/demone/demonevillage)
 "FB" = (/turf/open/floor/plasteel/dark/side,/area/lavaland/demone/minestorage)
 "FE" = (/obj/effect/turf_decal/stripes/line{dir = 2},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{dir = 4},/obj/effect/turf_decal/loading_area{dir = 1; icon_state = "steel_decals5"},/turf/open/floor/plasteel,/area/lavaland/demone/factorystorage)
-"FH" = (/obj/structure/cable{icon_state = "2-8"},/obj/structure/cable{icon_state = "1-2"},/turf/open/floor/plasteel/dark/side,/area/lavaland/demone/tele)
+"FH" = (/obj/structure/cable{icon_state = "2-8"},/obj/structure/cable{icon_state = "1-2"},/obj/effect/turf_decal/tile/purple{dir = 4},/obj/effect/turf_decal/tile/purple{dir = 1},/turf/open/floor/plasteel/dark/side,/area/lavaland/demone/tele)
 "FJ" = (/obj/machinery/light{dir = 8},/obj/effect/turf_decal/loading_area{dir = 5; icon_state = "steel_panel"; name = "steel pannel"},/obj/effect/turf_decal/stripes/line{dir = 1},/obj/effect/turf_decal/loading_area{dir = 8; icon_state = "drain"; name = "drain"},/turf/open/floor/plasteel/freezer,/area/lavaland/demone/factory)
 "FP" = (/turf/open/floor/wood{icon_state = "wood-broken3"},/area/lavaland/surface/outdoors)
 "FQ" = (/obj/effect/turf_decal/loading_area{dir = 1; icon_state = "drain"; name = "drain"},/obj/machinery/light{dir = 8},/turf/open/floor/carpet/gato,/area/lavaland/demone/living)
@@ -746,7 +751,7 @@
 "GH" = (/turf/closed/wall/r_wall,/area/lavaland/demone/tele)
 "GI" = (/obj/structure/cable{icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 10},/obj/effect/turf_decal/tile/purple{dir = 1},/obj/effect/turf_decal/tile/purple{dir = 4},/obj/machinery/light/small{dir = 1},/turf/open/floor/plasteel,/area/lavaland/demone/living)
 "GJ" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1,/turf/open/floor/mineral/sandstone_floor,/area/lavaland/demone/lobby)
-"GP" = (/obj/structure/closet/crate/radiation,/obj/item/stack/sheet/mineral/uranium{amount = 50},/obj/item/stack/sheet/mineral/uranium{amount = 50},/obj/item/stack/sheet/mineral/uranium{amount = 50},/obj/item/stack/sheet/mineral/uranium{amount = 50},/obj/item/stack/sheet/mineral/uranium{amount = 50},/obj/item/stack/sheet/mineral/uranium{amount = 50},/obj/item/stack/sheet/mineral/uranium{amount = 50},/obj/item/stack/sheet/mineral/uranium{amount = 50},/obj/item/stack/sheet/mineral/uranium{amount = 50},/obj/item/stack/sheet/mineral/uranium{amount = 50},/obj/item/stack/sheet/mineral/uranium{amount = 50},/obj/item/stack/sheet/mineral/uranium{amount = 50},/obj/item/stack/sheet/mineral/uranium{amount = 50},/obj/item/stack/sheet/mineral/uranium{amount = 50},/obj/item/stack/sheet/mineral/uranium{amount = 50},/obj/item/stack/sheet/mineral/uranium{amount = 50},/obj/item/stack/sheet/mineral/uranium{amount = 50},/obj/item/stack/sheet/mineral/uranium{amount = 50},/obj/item/stack/sheet/mineral/uranium{amount = 50},/obj/item/stack/sheet/mineral/uranium{amount = 50},/obj/item/stack/sheet/mineral/uranium{amount = 50},/obj/item/stack/sheet/mineral/uranium{amount = 50},/obj/item/stack/sheet/mineral/uranium{amount = 50},/obj/item/stack/sheet/mineral/uranium{amount = 50},/obj/item/stack/sheet/mineral/uranium{amount = 50},/obj/item/stack/sheet/mineral/uranium{amount = 50},/obj/item/stack/sheet/mineral/uranium{amount = 50},/obj/item/stack/sheet/mineral/uranium{amount = 50},/obj/item/stack/sheet/mineral/uranium{amount = 50},/obj/item/stack/sheet/mineral/uranium{amount = 50},/obj/item/stack/sheet/mineral/uranium{amount = 50},/obj/item/stack/sheet/mineral/uranium{amount = 50},/obj/item/stack/sheet/mineral/uranium{amount = 50},/obj/item/stack/sheet/mineral/uranium{amount = 50},/obj/item/stack/sheet/mineral/uranium{amount = 50},/obj/item/stack/sheet/mineral/uranium{amount = 50},/obj/item/stack/sheet/mineral/uranium{amount = 50},/obj/item/stack/sheet/mineral/uranium{amount = 50},/obj/item/stack/sheet/mineral/uranium{amount = 50},/obj/item/stack/sheet/mineral/uranium{amount = 50},/obj/item/stack/sheet/mineral/uranium{amount = 50},/obj/item/stack/sheet/mineral/uranium{amount = 50},/obj/item/stack/sheet/mineral/uranium{amount = 50},/obj/item/stack/sheet/mineral/uranium{amount = 50},/obj/item/stack/sheet/mineral/uranium{amount = 50},/obj/item/stack/sheet/mineral/uranium{amount = 50},/obj/item/stack/sheet/mineral/uranium{amount = 50},/obj/item/stack/sheet/mineral/uranium{amount = 50},/obj/item/stack/sheet/mineral/uranium{amount = 50},/obj/item/stack/sheet/mineral/uranium{amount = 50},/obj/item/stack/sheet/mineral/uranium{amount = 50},/obj/item/stack/sheet/mineral/uranium{amount = 50},/obj/item/stack/sheet/mineral/uranium{amount = 50},/obj/item/stack/sheet/mineral/uranium{amount = 50},/obj/item/stack/sheet/mineral/uranium{amount = 50},/obj/item/stack/sheet/mineral/uranium{amount = 50},/obj/item/stack/sheet/mineral/uranium{amount = 50},/obj/item/stack/sheet/mineral/uranium{amount = 50},/obj/item/stack/sheet/mineral/uranium{amount = 50},/obj/item/stack/sheet/mineral/uranium{amount = 50},/obj/item/stack/sheet/mineral/uranium{amount = 50},/obj/effect/turf_decal/loading_area{dir = 10; icon_state = "steel_panel"; name = "steel pannel"},/obj/effect/turf_decal/loading_area{dir = 4; icon_state = "steel_panel"; name = "steel pannel"},/turf/open/floor/plasteel/dark,/area/lavaland/demone/villagepsu)
+"GP" = (/obj/structure/closet/crate/radiation,/obj/item/stack/sheet/mineral/uranium{amount = 50},/obj/item/stack/sheet/mineral/uranium{amount = 50},/obj/item/stack/sheet/mineral/uranium{amount = 50},/obj/effect/turf_decal/loading_area{dir = 10; icon_state = "steel_panel"; name = "steel pannel"},/obj/effect/turf_decal/loading_area{dir = 4; icon_state = "steel_panel"; name = "steel pannel"},/turf/open/floor/plasteel/dark,/area/lavaland/demone/villagepsu)
 "GZ" = (/obj/structure/window/fulltile,/obj/structure/flora/ausbushes/ppflowers,/obj/structure/flora/ausbushes/ywflowers,/obj/structure/flora/ausbushes/grassybush,/obj/structure/flora/ausbushes/brflowers,/turf/open/floor/grass,/area/lavaland/demone/reception)
 "Hg" = (/obj/effect/turf_decal/candy/bluewhite1,/turf/open/candyfloor,/area/ruin/powered/candyland)
 "Hh" = (/obj/effect/turf_decal/stripes/line,/obj/structure/closet/crate/large,/turf/open/floor/plasteel/dark,/area/lavaland/demone/villagesilo)
@@ -769,6 +774,7 @@
 "Ik" = (/obj/machinery/light{dir = 8},/obj/item/stack/marker_beacon{anchored = 1; icon_state = "markerburgundy-on"; light_color = "#FA644B"; light_power = 3; light_range = 2; name = "landing marker"; picked_color = "Burgundy"},/turf/open/floor/plating/asteroid/basalt/lava_land_surface,/area/lavaland/demone/villagepsu)
 "Im" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/open/floor/mineral/basaltstone_floor,/area/lavaland/demone/reception)
 "In" = (/obj/structure/flora/ash/cap_shroom,/turf/closed/mineral/random/volcanic,/area/lavaland/surface/outdoors)
+"Ip" = (/obj/effect/turf_decal/stripes/line{dir = 1},/turf/open/floor/plasteel/dark,/area/lavaland/demone/minestorage)
 "Iv" = (/obj/machinery/light{dir = 1},/turf/open/floor/carpet/black,/area/lavaland/demone/demonevillage)
 "Iz" = (/obj/structure/closet/cabinet,/obj/effect/decal/cleanable/cobweb,/turf/open/floor/wood,/area/lavaland/demone/demonevillage)
 "IA" = (/obj/effect/turf_decal/loading_area{icon_state = "drain"; name = "drain"; dir = 1},/turf/open/floor/carpet/red,/area/lavaland/demone/demonevillage)
@@ -819,7 +825,7 @@
 "Kr" = (/obj/structure/window/fulltile,/turf/open/floor/grass,/area/lavaland/demone/living)
 "Kt" = (/obj/machinery/light{dir = 4},/obj/structure/table/wood,/turf/open/floor/mineral/sandstone_floor,/area/lavaland/demone/lobby)
 "Kw" = (/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer1{dir = 4},/turf/open/floor/plaswood,/area/lavaland/demone/factoryoffice)
-"Kx" = (/obj/structure/table/reinforced,/turf/open/floor/plasteel/cafeteria,/area/lavaland/demone/kitchen)
+"Kx" = (/obj/structure/table/reinforced,/obj/machinery/reagentgrinder,/turf/open/floor/plasteel/cafeteria,/area/lavaland/demone/kitchen)
 "KA" = (/obj/effect/turf_decal/bot,/turf/open/floor/mineral/basaltstone_floor,/area/lavaland/demone/factorystorage)
 "KE" = (/obj/structure/chair/brass{dir = 4},/turf/open/indestructible/bubblegum,/area/ruin/powered/candyland)
 "KG" = (/obj/machinery/light{dir = 1},/turf/open/floor/plating/asteroid/basalt/lava_land_surface,/area/lavaland/demone/lobby)
@@ -864,6 +870,7 @@
 "Mn" = (/obj/effect/turf_decal/loading_area{dir = 1; icon_state = "steel_decals5"},/obj/effect/turf_decal/loading_area{dir = 1; icon_state = "drain"; name = "drain"},/obj/effect/turf_decal/loading_area{icon_state = "steel_panel"; name = "steel pannel"},/turf/open/floor/plating/lavaland_baseturf,/area/lavaland/surface/outdoors)
 "Mo" = (/obj/machinery/light{dir = 1},/turf/open/floor/plating/asteroid/basalt/lava_land_surface,/area/lavaland/demone/villagepsu)
 "Mp" = (/obj/structure/stone_tile/slab,/turf/open/floor/plating/asteroid/basalt/lava_land_surface,/area/lavaland/surface/outdoors)
+"Mq" = (/mob/living/simple_animal/hostile/skeleton/plasmaminer,/turf/open/floor/plasteel/dark,/area/lavaland/demone/villagepsu)
 "Mr" = (/obj/machinery/light{dir = 1},/obj/machinery/gibber,/obj/effect/turf_decal/loading_area{dir = 10; icon_state = "steel_decals6"},/obj/effect/turf_decal/loading_area{dir = 9; icon_state = "steel_decals6"},/turf/open/floor/plasteel,/area/lavaland/demone/demonevillage)
 "Ms" = (/obj/effect/turf_decal/stripes/line{dir = 8},/turf/open/floor/plasteel/dark,/area/lavaland/demone/villagesilo)
 "Mt" = (/obj/structure/cable{icon_state = "1-2"},/obj/structure/cable{icon_state = "2-8"},/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer1{dir = 4},/turf/open/floor/plating,/area/lavaland/surface/outdoors)
@@ -874,7 +881,7 @@
 "MH" = (/obj/machinery/light{dir = 1},/turf/open/indestructible/bubblegum,/area/ruin/powered/candyland)
 "MJ" = (/obj/item/reagent_containers/food/snacks/tinychocolate,/turf/open/indestructible/chocolate,/area/ruin/powered/candyland)
 "MK" = (/obj/structure/fence{dir = 4},/turf/open/floor/plating/asteroid/basalt/lava_land_surface,/area/lavaland/surface/outdoors)
-"ML" = (/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer1,/turf/open/floor/plasteel/dark/side{dir = 10},/area/lavaland/demone/tele)
+"ML" = (/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer1,/obj/effect/turf_decal/tile/purple{dir = 4},/turf/open/floor/plasteel/dark/side{dir = 10},/area/lavaland/demone/tele)
 "MM" = (/obj/structure/lollipop,/turf/open/floor/plating/asteroid/basalt/lava_land_surface,/area/lavaland/surface/outdoors)
 "MQ" = (/turf/open/floor/plasteel,/area/lavaland/demone/minestorage)
 "MR" = (/obj/item/karl_pickaxe,/turf/open/indestructible/necropolis,/area/lavaland/surface/outdoors)
@@ -912,7 +919,7 @@
 "Om" = (/obj/structure/filingcabinet/chestdrawer,/obj/machinery/light{dir = 1},/obj/effect/turf_decal/loading_area{icon_state = "drain"; name = "drain"; dir = 1},/turf/open/floor/mineral/basaltstone_floor,/area/lavaland/demone/reception)
 "On" = (/obj/item/ammo_casing{pixel_y = 2; pixel_x = -1},/obj/item/ammo_casing{pixel_x = -12; pixel_y = 20},/obj/effect/turf_decal/loading_area{dir = 6; icon_state = "steel_panel"; name = "steel pannel"},/obj/effect/turf_decal/stripes/line{dir = 4},/turf/open/floor/plasteel/freezer,/area/lavaland/demone/factory)
 "Oo" = (/obj/machinery/light,/obj/structure/cable{icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1,/turf/open/floor/plating,/area/lavaland/demone/demonevillage)
-"Oq" = (/obj/machinery/hydroponics/constructable,/turf/open/floor/wood,/area/lavaland/surface/outdoors)
+"Oq" = (/obj/structure/closet/emcloset/anchored,/turf/open/floor/wood,/area/lavaland/surface/outdoors)
 "Os" = (/obj/structure/sign/warning/fire,/turf/closed/wall/r_wall,/area/lavaland/demone/factory)
 "Ou" = (/obj/structure/table/reinforced,/obj/item/reagent_containers/food/snacks/donut/berry{desc = "Straight from lavaland!"; name = "Hella Donut"},/turf/open/floor/plasteel,/area/lavaland/demone/factory)
 "Ow" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 5},/obj/effect/turf_decal/loading_area{icon_state = "drain"; name = "drain"; dir = 1},/turf/open/floor/plasteel/freezer,/area/lavaland/demone/factory)
@@ -941,6 +948,8 @@
 "Px" = (/obj/structure/cable/blue{icon_state = "1-2"},/obj/machinery/light{dir = 8},/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer1{dir = 4},/obj/effect/turf_decal/loading_area{dir = 9; icon_state = "steel_panel"; name = "steel pannel"},/turf/open/floor/plasteel/dark,/area/lavaland/demone/villagepsu)
 "Py" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{dir = 4},/obj/effect/turf_decal/loading_area{dir = 9; icon_state = "steel_panel"; name = "steel pannel"},/obj/effect/turf_decal/stripes/line{dir = 8},/turf/open/floor/plasteel/freezer,/area/lavaland/demone/factory)
 "Pz" = (/obj/structure/fence/door,/turf/open/floor/plating/asteroid/basalt/lava_land_surface,/area/lavaland/surface/outdoors)
+"PB" = (/obj/item/storage/toolbox/emergency{pixel_y = -8; pixel_x = -20},/turf/open/floor/wood,/area/lavaland/surface/outdoors)
+"PC" = (/obj/effect/turf_decal/tile/purple{dir = 4},/obj/effect/turf_decal/tile/purple{dir = 1},/turf/open/floor/plasteel/dark/side,/area/lavaland/demone/tele)
 "PD" = (/obj/structure/chair/wood{dir = 1},/obj/structure/cable{icon_state = "1-2"},/turf/open/floor/wood,/area/lavaland/demone/demonevillage)
 "PF" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{dir = 1},/obj/machinery/door/airlock/public/glass{name = "Storage Room"},/obj/structure/cable{icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/machinery/door/firedoor,/turf/open/floor/vault,/area/lavaland/demone/reception)
 "PK" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{dir = 1},/obj/structure/cable{icon_state = "1-8"},/turf/open/floor/carpet/red,/area/lavaland/demone/lobby)
@@ -951,7 +960,7 @@
 "PR" = (/obj/machinery/light,/turf/open/floor/grass,/area/lavaland/demone/living)
 "PX" = (/obj/effect/turf_decal/loading_area{icon_state = "drain"; name = "drain"; dir = 1},/obj/effect/turf_decal/loading_area{icon_state = "drain"; name = "drain"; dir = 4},/turf/open/floor/plating/lavaland_baseturf,/area/lavaland/surface/outdoors)
 "PY" = (/obj/structure/cable{icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{dir = 10},/turf/open/floor/wood,/area/lavaland/demone/demonevillage)
-"Qb" = (/turf/open/floor/wood{icon_state = "wood-broken"},/area/lavaland/surface/outdoors)
+"Qb" = (/obj/item/pickaxe/silver,/turf/open/floor/wood{icon_state = "wood-broken"},/area/lavaland/surface/outdoors)
 "Qg" = (/turf/open/floor/plasteel/dark/side{dir = 8},/area/lavaland/demone/living)
 "Qh" = (/obj/structure/cable{icon_state = "4-8"},/obj/structure/cable{icon_state = "4-8"},/turf/open/floor/plating/asteroid/basalt/lava_land_surface,/area/lavaland/surface/outdoors)
 "Qo" = (/obj/item/reagent_containers/food/snacks/donut/choco,/turf/open/indestructible/chocolate,/area/ruin/powered/candyland)
@@ -979,7 +988,7 @@
 "Ri" = (/obj/machinery/light{dir = 4},/turf/open/floor/plasteel,/area/lavaland/demone/reception)
 "Rj" = (/obj/structure/closet/crate,/turf/open/floor/mineral/basaltstone_floor,/area/lavaland/demone/factorystorage)
 "Rk" = (/obj/structure/cable{icon_state = "4-8"},/obj/effect/turf_decal/loading_area{dir = 8; icon_state = "steel_panel"; name = "steel pannel"},/obj/effect/turf_decal/stripes/corner{dir = 1},/turf/open/floor/plasteel/freezer,/area/lavaland/demone/factory)
-"Rl" = (/obj/structure/cable{icon_state = "1-4"},/turf/open/floor/plasteel/dark/side{dir = 1},/area/lavaland/demone/tele)
+"Rl" = (/obj/structure/cable{icon_state = "1-4"},/obj/effect/turf_decal/tile/purple,/obj/effect/turf_decal/tile/purple{dir = 8},/turf/open/floor/plasteel/dark/side{dir = 1},/area/lavaland/demone/tele)
 "Rm" = (/turf/open/floor/plasteel/dark/side{dir = 8},/area/lavaland/demone/tele)
 "Rp" = (/obj/effect/turf_decal/bot,/obj/machinery/light/small{dir = 8; light_color = "#d8b1b1"},/obj/structure/chair/comfy/shuttle{dir = 1},/turf/open/floor/mineral/titanium/yellow,/area/lavaland/surface/outdoors)
 "Rq" = (/obj/structure/table/reinforced/brass,/obj/item/reagent_containers/food/drinks/soda_cans/lemon_lime{pixel_x = -9},/turf/open/indestructible/chocolate{icon_state = "choclit_3"},/area/ruin/powered/candyland)
@@ -987,10 +996,11 @@
 "Rs" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{dir = 1},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 6},/turf/open/floor/plasteel/freezer,/area/lavaland/demone/factory)
 "Rt" = (/turf/open/floor/plasteel/dark/side,/area/lavaland/demone/living)
 "Rx" = (/obj/machinery/light{dir = 1},/obj/structure/table/reinforced,/obj/effect/turf_decal/loading_area{dir = 10; icon_state = "steel_decals6"},/obj/effect/turf_decal/loading_area{dir = 9; icon_state = "steel_decals6"},/turf/open/floor/plasteel,/area/lavaland/demone/demonevillage)
-"Ry" = (/obj/structure/cable{icon_state = "2-8"},/turf/open/floor/plasteel/dark/side{dir = 8},/area/lavaland/demone/tele)
+"Ry" = (/obj/structure/cable{icon_state = "2-8"},/obj/effect/turf_decal/tile/purple{dir = 4},/obj/effect/turf_decal/tile/purple,/turf/open/floor/plasteel/dark/side{dir = 8},/area/lavaland/demone/tele)
 "Rz" = (/obj/structure/chair/wood/normal{dir = 4},/turf/open/floor/plasteel/grimy,/area/lavaland/demone/reception)
 "RA" = (/turf/open/floor/plasteel/cafeteria,/area/lavaland/demone/factory)
 "RB" = (/obj/machinery/power/terminal{dir = 4},/obj/structure/cable/cyan{icon_state = "0-8"},/obj/item/storage/toolbox/mechanical{pixel_x = 4; pixel_y = 9},/obj/item/stack/sheet/mineral/uranium{amount = 50; pixel_y = -7; pixel_x = -6},/turf/open/floor/plating,/area/lavaland/demone/living)
+"RD" = (/obj/effect/turf_decal/tile/purple,/obj/effect/turf_decal/tile/purple{dir = 8},/turf/open/floor/plasteel/dark/side{dir = 1},/area/lavaland/demone/tele)
 "RE" = (/obj/machinery/portable_atmospherics/canister/oxygen,/turf/open/floor/wood,/area/lavaland/demone/demonevillage)
 "RF" = (/obj/machinery/airalarm/directional/north,/turf/open/floor/plasteel/dark/side{dir = 1},/area/lavaland/demone/minestorage)
 "RJ" = (/obj/effect/turf_decal/stripes/line{dir = 8},/obj/machinery/light{dir = 4},/turf/open/floor/plating,/area/lavaland/surface/outdoors)
@@ -1032,7 +1042,7 @@
 "Ta" = (/obj/structure/stone_tile/slab/cracked{dir = 8},/obj/structure/stone_tile/slab/cracked{dir = 10},/turf/open/floor/plating/asteroid/basalt/lava_land_surface,/area/lavaland/surface/outdoors)
 "Tb" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 6},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{dir = 6},/obj/structure/cable{icon_state = "4-8"},/turf/open/floor/plasteel,/area/lavaland/demone/living)
 "Td" = (/obj/structure/cable{icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1,/turf/closed/wall/mineral/plastitanium,/area/lavaland/demone/demonevillage)
-"Te" = (/obj/structure/cable{icon_state = "4-8"},/obj/machinery/atmospherics/components/unary/vent_pump/on,/turf/open/floor/plasteel/dark/side{dir = 4},/area/lavaland/demone/tele)
+"Te" = (/obj/structure/cable{icon_state = "4-8"},/obj/machinery/atmospherics/components/unary/vent_pump/on,/obj/effect/turf_decal/tile/purple{dir = 8},/obj/effect/turf_decal/tile/purple{dir = 1},/turf/open/floor/plasteel/dark/side{dir = 4},/area/lavaland/demone/tele)
 "Th" = (/obj/structure/stone_tile/block/cracked,/obj/structure/stone_tile/block/cracked{dir = 8},/turf/open/chasm/lavaland,/area/lavaland/surface/outdoors)
 "Tj" = (/obj/effect/turf_decal/stripes/line{dir = 4},/turf/open/floor/plasteel/dark/side{dir = 5},/area/lavaland/demone/living)
 "Tk" = (/obj/item/reagent_containers/food/snacks/chocolatebunny{pixel_y = 12; pixel_x = -12},/turf/open/candyfloor,/area/ruin/powered/candyland)
@@ -1067,7 +1077,7 @@
 "UA" = (/obj/structure/stone_tile/surrounding_tile{dir = 4},/turf/open/indestructible/necropolis,/area/lavaland/surface/outdoors)
 "UC" = (/obj/machinery/atmospherics/pipe/manifold/supply/hidden,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{dir = 4},/obj/effect/turf_decal/loading_area{dir = 1; icon_state = "drain"; name = "drain"},/obj/structure/table/wood,/obj/item/candle{pixel_y = 5},/obj/item/ashtray{pixel_y = -4; pixel_x = 5},/turf/open/floor/carpet/gato,/area/lavaland/demone/living)
 "UD" = (/obj/structure/flora/rock{icon_state = "lavarocks2"},/turf/open/floor/plating/asteroid/basalt/lava_land_surface,/area/lavaland/surface/outdoors)
-"UF" = (/obj/machinery/button/door{id = "DemoGarage"; name = "Garage Doors Button"; pixel_y = 29},/obj/machinery/light/small{dir = 1},/obj/item/storage/toolbox/mechanical{pixel_x = 4; pixel_y = 9},/obj/effect/turf_decal/tile/purple,/obj/effect/turf_decal/tile/purple{dir = 4},/turf/open/floor/plasteel/dark,/area/lavaland/demone/minestorage)
+"UF" = (/obj/machinery/button/door{id = "DemoGarage"; name = "Garage Doors Button"; pixel_y = 29},/obj/machinery/light/small{dir = 1},/obj/item/storage/toolbox/mechanical{pixel_x = 4; pixel_y = 9},/obj/effect/turf_decal/tile/purple,/obj/effect/turf_decal/tile/purple{dir = 4},/obj/effect/turf_decal/tile/purple{dir = 1},/turf/open/floor/plasteel/dark,/area/lavaland/demone/minestorage)
 "UG" = (/obj/structure/table/reinforced/brass,/obj/item/reagent_containers/food/drinks/soda_cans/cola{pixel_x = -9},/turf/open/indestructible/chocolate{icon_state = "choclit_3"},/area/ruin/powered/candyland)
 "UK" = (/obj/structure/flora/ausbushes/grassybush,/mob/living/simple_animal/butterfly,/turf/open/floor/grass,/area/lavaland/demone/living)
 "UM" = (/obj/structure/table/reinforced/brass,/obj/item/trash/plate,/obj/item/trash/plate{pixel_y = 2},/obj/item/trash/plate{pixel_y = 2},/obj/item/trash/plate{pixel_y = 4},/obj/item/trash/plate{pixel_y = 6},/turf/open/indestructible/bubblegum,/area/ruin/powered/candyland)
@@ -1116,7 +1126,7 @@
 "WB" = (/obj/structure/stone_tile/surrounding_tile{dir = 1},/obj/item/pickaxe,/turf/open/indestructible/necropolis,/area/lavaland/surface/outdoors)
 "WD" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/effect/turf_decal/loading_area{dir = 10; icon_state = "steel_decals6"},/obj/effect/turf_decal/loading_area{dir = 9; icon_state = "steel_decals6"},/turf/open/floor/plasteel,/area/lavaland/demone/factorygen)
 "WG" = (/obj/item/flashlight/lantern{icon_state = "lantern-on"; on = 1; pixel_x = 8},/turf/open/indestructible/chocolate,/area/ruin/powered/candyland)
-"WH" = (/obj/vehicle/ridden/atv,/obj/machinery/light/small,/obj/effect/turf_decal/tile/purple,/obj/effect/turf_decal/tile/purple{dir = 8},/turf/open/floor/plasteel/dark,/area/lavaland/demone/minestorage)
+"WH" = (/obj/vehicle/ridden/atv,/obj/machinery/light/small,/obj/effect/turf_decal/stripes/line,/obj/effect/turf_decal/arrows{dir = 1},/turf/open/floor/plasteel/dark,/area/lavaland/demone/minestorage)
 "WI" = (/mob/living/simple_animal/hostile/skeleton/plasmaminer{name = "Walter"},/turf/open/floor/plating/asteroid/basalt/lava_land_surface,/area/lavaland/surface/outdoors)
 "WJ" = (/turf/open/floor/plasteel/dark/side{dir = 1},/area/lavaland/demone/minestorage)
 "WM" = (/obj/effect/turf_decal/loading_area{icon_state = "drain"; name = "drain"; dir = 1},/turf/open/floor/mineral/basaltstone_floor,/area/lavaland/demone/factorystorage)
@@ -1145,7 +1155,7 @@
 "XU" = (/obj/structure/mirror{dir = 8; pixel_x = -8; pixel_y = -1},/turf/closed/wall/mineral/iron,/area/lavaland/demone/demonevillage)
 "XW" = (/obj/structure/cable{icon_state = "4-8"},/turf/open/floor/plasteel/dark,/area/lavaland/demone/villagepsu)
 "XX" = (/obj/structure/cable{icon_state = "4-8"},/obj/machinery/atmospherics/components/unary/vent_pump/on,/turf/open/floor/plasteel,/area/lavaland/demone/living)
-"XY" = (/obj/structure/cable{icon_state = "4-8"},/obj/structure/cable{icon_state = "1-4"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 6},/turf/open/floor/plasteel/dark/side{dir = 8},/area/lavaland/demone/tele)
+"XY" = (/obj/structure/cable{icon_state = "4-8"},/obj/structure/cable{icon_state = "1-4"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 6},/obj/effect/turf_decal/tile/purple,/obj/effect/turf_decal/tile/purple{dir = 4},/turf/open/floor/plasteel/dark/side{dir = 8},/area/lavaland/demone/tele)
 "Yc" = (/obj/structure/railing{dir = 4},/obj/effect/turf_decal/stripes/line{dir = 5},/obj/effect/turf_decal/loading_area{dir = 2; icon_state = "steel_decals5"},/turf/open/floor/plasteel,/area/lavaland/demone/factorystorage)
 "Ye" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{dir = 4},/turf/open/floor/plasteel/cafeteria,/area/lavaland/demone/factory)
 "Yf" = (/turf/open/floor/grass,/area/lavaland/demone/living)
@@ -1232,10 +1242,10 @@ krkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrenenenenenenenenenenenenenenenenenenkrkrkrkrkrkr
 krkrkrkrkrkrenenenenenenenenenkrkrkrkrkrkrkrenenenenenenencXenenkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrenenenenenenenenklenenaxRhRhPQZIPYRhRhaxenenenenenaxMSkEkEyrtTRhFuIvBSBSJxaxenenenenDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCenenenenenenenenenenenenenDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCenenenenkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkr
 krkrkrkrenenenenenenenenenenenenenenkrkrkrkrkrkrenenenenenenenenkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrenenenenenenenenenenenklenenVUaxIDaxVUdHaxaxVUenenenenenaxIaRhRhRhTNRhRhLlLlYUlNaxenenenenDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCenenenenenenenenenenenenenenenDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCenenenenenenkrkrkrkrkrkrkrkrkrkrkrkr
 krkrkrenenenenenenenenenenenenenenenenenenenkrkrenenenenenenenkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrenenenenenenenenenenenenklenenpfSCenSCpfwMenenpfenenenenenaxRhRhtHAPzAduduZIOJRhREaxenenenenDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCenenenenenenenenenenenenenenenenDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCenenenenenkrkrkrkrkrkrkrkrkrkrkr
-krkrenenenenenenenenenenenenenenenenenenenenkrkrkrenenenenenkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrenenenenenenenenenenenenenenklenenenenenenenwMenenenenenenenenVUaxIDaxVUdHaxaxVUaxaxaxVUenenenenDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCenrrenenenenenenenenenenenenenenenDCDCDCDCDCDCDCDCenenenenDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCenenkrkrkrkrkrkrkrkrkrkr
+krkrenenenenenenenenenenenenenenenenenenenenkrkrkrenenenenenkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrenenenenenenenenenenenenenenklenCzenenenenenwMenenenenenenenenVUaxIDaxVUdHaxaxVUaxaxaxVUenenenenDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCenrrenenenenenenenenenenenenenenenDCDCDCDCDCDCDCDCenenenenDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCenenkrkrkrkrkrkrkrkrkrkr
 krkrkrenenenenenenenenenenenenenenenenenenenenkrkrenenenenenkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrenenenenenenenenenenenenenenenenklenenenenenenenwMenenenenenenenenpfSCenSCpfwMenenpfenenenpfenenenenDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCenenenenenenDCDCDCDCenenenenenenenenDCDCDCDCDCDCDCenenenenenDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCenkrkrkrkrkrkrkrkrkrkr
 krkrkrkrenenenenenenenenenenenenenenenenenenenkrkrkrkrenenenkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrenenenenenenenenenenenenenenenenenklenenenenenenenwMenenenenenenenenenenenenenwMenenenenenenenenenenenDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCenenenenenDCDCDCDCDCDCDCenenenenenenDCDCDCDCDCenenenenenenenenDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCenDCDCDCDCDCDCDCDCDCDCenkrkrkrkrkrkrkrkrkrkr
-krkrkrkrkrkrkrkrkrkrkrkrkrkrkrenenenenenenenenenkrkrkrenenenkrkrkrkrkrkrkrkrkrkrkrkrkrkrenenenenenenUXenenenUXenenenUXenenenklenenenenenenenwMenenenenenenenenenenenenenwMenenenenenenenenenenenenDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCenenenenDCDCDCDCDCDCDCDCenenenenenenDCDCDCDCDCenenenenenenenDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCenDCDCDCenDCenDCDCDCDCDCDCDCDCDCDCenkrkrkrkrkrkrkrkrkrkr
+krkrkrkrkrkrkrkrkrkrkrkrkrkrkrenenenenenenenenenkrkrkrenenenkrkrkrkrkrkrkrkrkrkrkrkrkrkrenenenenenenUXenenenUXenenenUXenenenklenenenenenenenwMenenenenenenenenenenenenenwMenenCzenenenenenenenenenDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCenenenenDCDCDCDCDCDCDCDCenenenenenenDCDCDCDCDCenenenenenenenDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCenDCDCDCenDCenDCDCDCDCDCDCDCDCDCDCenkrkrkrkrkrkrkrkrkrkr
 krkrkrkrkrkrkrkrkrkrkrkrkrenenenenenenenenenenenenkrkrenenenkrkrkrkrkrkrkrkrkrkrkrkrkrenenenenenenenVUaxaxaxVUaxaxaxVUenenenklenenenenenenenwMenenenenenenenenenenenenenwMenenenenenenenenenenenenenDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCenenenenDCDCDCDCDCDCDCDCDCenenenenenDCenDCDCDCenenenenenenDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCenenenenenenenDCDCDCDCDCDCDCDCDCDCenkrkrkrkrkrkrkrkrkrkr
 krkrkrkrkrenenenenenenenenenenenenenenenenenenenenenkrenenkrkrkrkrkrkrkrkrkrkrkrkrkrenenenencXenenenaxIzlOdgOIRhRhpVaxenenenklenenenenenenenwMenenenenenenenenenenenenenwMenenenenenenenenenenenenenDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCenenenenenDCDCDCDCDCDCDCDCDCenenenenenenenDCDCDCenenenenenDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCenenenenenenenenenenDCDCDCDCDCDCDCDCDCenkrkrkrkrkrkrkrkrkrkr
 krkrenenenenenenenenenenenenenenencXenenenenenenenenkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrenenenenenenenenenaxRhRhRhRhRhRhRhaxenenenklenenenenenenenwMenenenenenenenenenenenenenwMenenenenenenenenenenenenenenDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCenenenenenenDCDCDCDCDCDCDCDCDCenenenenenenDCDCenenenenenaODCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCenenenenenenenenhcenenDCDCDCDCDCDCDCDCDCenkrkrkrkrkrkrkrkrkrkr
@@ -1244,9 +1254,9 @@ krkrkrkrkrenenenenenenenenenenenenenenenenenenenenkrkrkrkrkrkrkrkrkrkrkrkrkrenen
 krkrkrkrkrkrkrkrkrkrenenenenenenenenenenenenenenkrkrkrkrkrkrkrkrkrkrkrkrkrkrenenenenenenenenenenenenaxRENbfEaDCybNCyDaCyCyCyrmCyCyCyCyCyCyCyuaCyCyCyCyCyCyCyCyCyCyuZCyCyMtenenovenenenenenenenenenDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCenenenenenenenenenenenDCDCDCaOenenenenenenenDCDCenenenenenenenenenenenenenenenenenenDCDCDCDCDCenenDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCenenenenenenenenenenenenDCDCDCDCDCDCDCenenkrkrkrkrkrkrkrkrkrkr
 krkrkrkrkrkrkrkrkrkrkrenenenenenenenencXenenenkrkrkrkrkrkrkrkrkrkrkrkrkrkrenenenenenenenenrzrrenenenluIAIAIAluenwMenenenenenenenenenenenenenenenenenenenenenenenenuSGBGBtcGBGBuSenenenenenenenenDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCenenenenenrrenenenenenenenenenenenenenenenenDCenenenenenenenenenenpROkOkOkOkOkOkOkenenDCDCDCenenenDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCzVenhcenenenpAenenenenenenzVDCDCDCDCDCenenkrkrkrkrkrkrkrkrkrkr
 krkrkrkrkrkrkrkrkrkrkrkrkrenenenenenenenenenkrkrkrkrkrkrkrkrkrkrkrkrkrenenenenenenenenenenenenenenenaxrBNHDLaxenwMenenenenenenenenenenenenenenenenenenenenenenenenGBJdwwuIuBjcGBenenenenenenenenDCDCDCDCDCDCDCenrzDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCenenenenenenenenenenenenrrenenenenenenenenenenenenenenenenenenenenBBOkTOKemxFPdVOkenenenDCenenenenenDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCenenenenWIenenenenenenenenDCDCDCDCDCenenkrkrkrkrkrkrkrkrkrkr
-krkrkrkrkrkrkrkrkrkrkrkrkrkrkrenenenkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkreneneneneneneneneneneneneneniqVUaxIDaxVUenwMenenenenenenenenenenenenenenenenenenenenenenenenGBdYiQVuBYrLuSIkenenenenenenenDCDCDCDCDCDCrKenenDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCenenenenenDCenenenenenenenenenenenenenenenenrrenenenenenenenenenenenOkQbrGFPmxOqOkenenenDCenenenenenDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCenenenenenenenenenenenDCDCDCDCDCenenkrkrkrkrkrkrkrkrkrkr
-krkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrenenenenenenrrenenenenenenenenenenaoSCenSCpfenwMenenenUXenenenUXenenenenenenenenenenenenenenenOKuSPxLeuFBYBYBUenenenenenenenenDCDCDCDCDCDCenenenenenDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCenenenenenDCDCenenenenenenenenenenenenenenenenenenenenenenenenenenenOkmxFPmxmxmxOkenenenDCenenenenenenDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCenDCDCDCenenenenenenrzDCenDCDCDCenenkrkrkrkrkrkrkrkrkrkr
-krkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrrzkrenenenenenenenenenenenenenenenenenenenenenenenwMenenenVUaxaxaxVUenenenenenenenenenenenenenenenenGBdYvdCbXWYZuSIkenenenenenenenDCDCDCDCDCenenenenzVrzrKDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCANenenenenDCDCenDCenenenenenenenenenenenenenenenenenenenenenenenenenOkmxmxmxKomxOkenenenaOenenenenenenDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCenDCDCDCDCenenenenenenzVenDCDCenenenkrkrkrkrkrkrkrkrkrkr
+krkrkrkrkrkrkrkrkrkrkrkrkrkrkrenenenkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkreneneneneneneneneneneneneneniqVUaxIDaxVUenwMenenenenenenenenenenenCzenenenenenenenenenenenenGBdYiQVuBYrLuSIkenenenenenenenDCDCDCDCDCDCrKenenDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCenenenenenDCenenenenenenenenenenenenenenenenrrenenenenenenenenenenenOkQbrGFPmxmxOkenenenDCenenenenenDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCenenenenenenenenenenenDCDCDCDCDCenenkrkrkrkrkrkrkrkrkrkr
+krkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrenenenenenenrrenenenenenenenenenenaoSCenSCpfenwMenenenUXenenenUXenenenenenenenenenenenenenenenOKuSPxLeuFMqBYBUenenenenenenenenDCDCDCDCDCDCenenenenenDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCenenenenenDCDCenenenenenenenenenenenenenenenenenenenenenenenenenenenOkmxFPmxPBmxOkenenenDCenenenenenenDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCenDCDCDCenenenenenenrzDCenDCDCDCenenkrkrkrkrkrkrkrkrkrkr
+krkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrrzkrenenenenenenenenenenenenenenenenenenenenenenenwMenenenVUaxaxaxVUenenenenenenenenenenenenenenenenGBdYvdCbXWYZuSIkenenenenenenenDCDCDCDCDCenenenenzVrzrKDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCANenenenenDCDCenDCenenenenenenenenenenenenenenenenenenenenenenenenenOkmxmxmxKoOqOkenenenaOenenenenenenDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCenDCDCDCDCenenenenenenzVenDCDCenenenkrkrkrkrkrkrkrkrkrkr
 krkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrenkreneneneneneniqenenenenenenenenenenenenenenCzwMenenenaxJwHuHuaxenenenenenenenenenenenenenenenenGBJYGxmjksGPGBenenenenenenenenDCDCDCDCANenenenenenenenDCDCDCurDCDCDCDCDCDCDCDCDCDCDCDCDCDCenenenenDCDCDCDCenenenenenenenenenenenenenenenenenenenenenenenenenOkOkOkqHOkOkOkenenenenenenenenenenDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCenenenenenenenenenDCDCenenenkrkrkrkrkrkrkrkrkrkr
 krkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkreneneneniqeneniqiqiqrzenenenenenenenenenenenenenwMenenenaxjSQXTTaxenenenenenenenenenenenenenenenenuSGBGBGBGBGBuSenenenenenenenenrKDCDCenenenenenenenenenenOkyyyyyyOkenenenDCDCDCDCDCDCDCDCDCDCenenDCDCDCDCDCaOeneneneneneneneneneneneneneneneneneneneneneneneniqiqBteneniqiqenenenenenenenenenenDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCenenenenenenenenenenenenenkrkrkrkrkrkrkrkrkrkrkr
 krkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrenenrrrziqenmceniqiqrrenenenenenenenenenenenenOoenenenaxybRhFkaxenenenUXenenenenenenenenenenenenMoencXenUVenMoenenenenenenenenenenrzenenenenenenenenenenmVenenenmVenenenenDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCenenenenenenenenenenenenenenenenenenenenenenenzVrriqeneneniqrrenenenenenenenenenenDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCenenenenenenenenenenkrkrkrkrkrkrkrkrkrkrkrkrkrkr
@@ -1434,17 +1444,17 @@ krkrkrenenenenenenkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrenenenenenkrkr
 krkrenenenenenenenkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrenenenkrkrkrkrkrkryPRRCCMpBfkrkrkrkrkrkrkrkrkrenenenDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCANenzVenenrrenenenenenenrrenenenenenenenenenenenenenenenenenenenenenenenenenDCDCDCenenenenBVenenenenenenenenenenenenenenDCDCDCDCDCiqrrencXenenenenenenenenenenenenenenkrkrenenenkrkrkrkrenenkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrenenenkrkrkrenenenenenenenenenkrkrenenenenenenenenenenenenenenenenenenenenenkrkrkrkrkrenenenenenenenkrkrkrkrkrkrkrkr
 krkrenenenenenenkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkryPMpMpCCuXkrkrkrkrkrkrkrkrkrkreneniqDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCenenDCDCDCDCDCDCenenenenenenenenenrrenenenenenenenenenenenenenenenenenenenDCiqenenenenenenenenenenenenenenenenenenDCkrDCDCDCDCDCDCDCDCDCDCiqenenenenenenenenenenenkrkrkrenkrkrkrkriqkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrenenenenenkrkrkrkrenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenkrkrenenenenenkrkrkrkrkrkrkrkrkr
 krenenenenenenenenkrkrkrkrkrkrkrkrkrkrkrenkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrVgMpRRMpVgkrkrkrkrkrkrkrkrkrkrkrenenDCDCDCDCDCDCDCDCDCDCUNUNUNUNUNDCDCDCDCDCDCDCDCDCDCrKenenwZwZQtenDCDCDCDCDCDCzVencXenenenenenenenenenenenenenenenenenenDCDCDCDCenenenenenenenenenenenDCDCkrkrDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCenenkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrenenenenenenenenkrkrenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenkrkrkrkrkrkrkrkrkrkrkrkrkrkrkr
-krenenenenenenenenkrkrkrkrkrkrkrkrkrkrkrenkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkryPMpMpMpBfkrkrkrkrkrkrkrkrkrkrkrkrenenDCDCDCDCDCDCDCDCDCUNVnVnVnUNDCDCDCDCDCDCDCDCDCDCenenTaenenenenDCDCDCDCDCDCDCDCDCDCenenenenenenenenenenenenenenenDCDCDCDCenenenenenenenenenenenenenDCkrkrkrkrkrkrDCDCDCDCDCDCkrkrkrkrkrkrkrkrkrkrenkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenkrkrkrkrkrkrkrkrkrkrkr
-krkrkrenenenkrkrkrkrkrkrkrkrkrkrkrkrkrkrenenenkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkryPMpMpqMBfkrkrkrkrkrkrkrkrkrkrkrkrenenDCDCDCDCDCDCDCDCDCUNVnnkVnUNDCDCDCDCDCDCDCDCDCDCenenSCwZGienSCrKDCDCDCDCiqcXenenenenenenenenenenenenenenenenenenenDCDCDCDCDCenenenenenenenenenenkrkrkrkrkrkrkrkrkrDCDCDCkrkrkrkrkrkrkrkrkrenkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenkrkrkrkrkrkrkrkrkrkrkrkrkr
+krenenenenenenenenkrkrkrkrkrkrkrkrkrkrkrenkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkryPMpMpMpBfkrkrkrkrkrkrkrkrkrkrkrkrenenDCDCDCDCDCDCDCDCDCUNVnVnVnUNDCDCDCDCDCDCDCDCDCDCDNenTaenenenenDCDCDCDCDCDCDCDCDCDCenenenenenenenenenenenenenenenDCDCDCDCenenenenenenenenenenenenenDCkrkrkrkrkrkrDCDCDCDCDCDCkrkrkrkrkrkrkrkrkrkrenkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenkrkrkrkrkrkrkrkrkrkrkr
+krkrkrenenenkrkrkrkrkrkrkrkrkrkrkrkrkrkrenenenkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkryPMpMpqMBfkrkrkrkrkrkrkrkrkrkrkrkrenenDCDCDCDCDCDCDCDCDCUNVnnkVnUNDCDCDCDCDCDCDCDCDCDCDNenSCwZGienSCrKDCDCDCDCiqcXenenenenenenenenenenenenenenenenenenenDCDCDCDCDCenenenenenenenenenenkrkrkrkrkrkrkrkrkrDCDCDCkrkrkrkrkrkrkrkrkrenkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenkrkrkrkrkrkrkrkrkrkrkrkrkr
 krkrkrenkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrenenenkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkryPMpdJqMBfkrkrkreneneneneneneneneneneniqDCDCDCDCDCDCDCDCUNVnVnVnUNDCDCUNUNUNUNUNUNUNDCzVenenQtSbmiwZenenenenenenenDCDCDCDCDCiqenenenenenenenenenenenenenenDCDCDCDCDCDCenenenenenenenkrkrkrkrkrkrkrkrkrkrkrkrkrenkrkrkrkrenkrkrkrkrkrenkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrenkrkrenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenkrkrenenkrkrkrkrkrkrkr
 krkrkrenkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrenenenkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrenenenVgkLopkLVgenenenenenUNUNUNUNUNUNUNenenenWrWrWrWrWrWrWrWrUNUNrYUNUNUNUNUNObtswDTjcNUNDCDCenNvenSbenSCenenDCDCDCDCDCDCDCDCDCDCDCDCencXenenenenenenenenenenenenDCDCDCDCDCDCDCenenenenkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrenkrkrkrkrkrkrenenkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrenenkrkrenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenkrenenenenkrkrkrkrkr
 enkrkrenenkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrenenenenenkrkrkrkrkrkrkrkrkrkrkrkrenGHptptrJshrJptptGHenenenUNHmDiSxDipyUNenenenWrUuilypbkKxnPwxUNKWHkqgRBmpIZUNQgnySabhEbUNDCDCenSbQuenQtenenenenDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCenenenenenenDCDCDCDCDCDCDCDCDCDCkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrenkrkrenkrkrkrenkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenkrkrkrenenkrkrkrkrkr
 enkrkrkrkrenkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrenenenenenkrkrkrkrkrkrkrkrkrkrenenptmnLXvRXlvRLXEBptenUNenUNgzcwcPohgzUNenUNenWrnfnfnOnffsBZrHUNDkjeyRFwAODkvFkpRtRthdOhUNDCDCgcSCQtenSbSCgcenenenDCDCDCDCDCDCDCDCDCkrkrkrenenenenencXenenenenDCDCDCkrDCDCDCDCDCkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenkrenenenkrkrkrkrkr
-enkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrenenenkrenenkrkrkrkrkrkrkrkrkrenenenptRmGHsPFHeKGHRMptenvIenUNawGFASGFWgUNenvIenWrWrxAKNSibfJRWrUNUNUNUNUNtXUNUNbKbKSLbKbKbKbKbKbKnAnAnAnAnAbKbKenkrkrkrDCDCDCDCDCDCkrkrkrkrkrkrkrkrenenenenenenenDCkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenkrenenenkrkrkrkrkr
-enenenkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrenenkrkrenkrkrkrkrkrkrkrkrkrenenenenptRmRMmnRlcGRyRMGHafafafUNgewCwPcJAFUNafafafUNonGjpoSaCJtoGIwcZrclZrZrqFQIUNSIRFWJRcRcRcZsbKxMcZcZcZcZcZUFbKenkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrDCkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenkrkrenenkrkrkrkrkr
-enenenenkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrenenkrkrenkrkrkrkrkrkrkrkrkrenenenenptRmRMgnpHTeXYEUkSheheheheheEpgPheheheheheheVphezXlPQMTDQMfzQMQMXXQMQMNPTbniEqDEMQMQfdMQfDQwcAcZcZcZcZcZthbKenenkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenkrenenenkrkrkrkrkr
+enkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrenenenkrenenkrkrkrkrkrkrkrkrkrenenenptRmGHsPFHPCGHRMptenvIenUNawGFASGFWgUNenvIenWrWrxAKNSibfJRWrUNUNUNUNUNtXUNUNbKbKSLbKbKbKbKbKbKnAnAnAnAnAbKbKenkrkrkrDCDCDCDCDCDCkrkrkrkrkrkrkrkrenenenenenenenDCkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenkrenenenkrkrkrkrkr
+enenenkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrenenkrkrenkrkrkrkrkrkrkrkrkrenenenenptRmdkFlRlcGRyRMGHafafafUNgewCwPcJAFUNafafafUNonGjpoSaCJtoGIwcZrclZrZrqFQIUNSIRFWJRcRcRcZsbKxMIpIpIpIpIpUFbKenkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrDCkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenkrkrenenkrkrkrkrkr
+enenenenkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrenenkrkrenkrkrkrkrkrkrkrkrkrenenenenptRmAQgnpHTeXYEUkSheheheheheEpgPheheheheheheVphezXlPQMTDQMfzQMQMXXQMQMNPTbniEqDEMQMQfdMQfDQwcAcZcZcZcZcZthbKenenkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenkrenenenkrkrkrkrkr
 enenenenenenenkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrenkrkrkrenenkrkrkrkrkrkrkrkrenDqwQympupwMLzRiohRIBGHafafafafafafafafafafafafafUNFQfaqSZfMahhUCZDtgWcbubuZfIRUNLpcOZmZmIEFBaZbKimdwnGWHnGdwsibKenenenkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenkrkrenenkrkrkrkrkrkr
-enenenenenenenenenkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrenenenptRmGHvRvRvRGHRMptenvIenvIenenvIenenvIenvIenUNppSAToMzppSAaVPaMzppSAPaMzppUNbKbKbKbKbKbKbKbKbKbKbKbKbKbKbKbKenkrkrkrkrenkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrenenenenkrenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenkrkrenenkrkrkrkrkrkr
+enenenenenenenenenkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrenenenptRmGHeVeVRDGHRMptenvIenvIenenvIenenvIenvIenUNdlSAToMzppSAaVPaMzppSAPaMzdlUNbKbKbKbKbKbKbKbKbKbKbKbKbKbKbKbKenkrkrkrkrenkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrenenenenkrenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenkrkrenenkrkrkrkrkrkr
 enenenenenenenenenkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrenenptOWLheKeKeKTBraptenUNenUNenkrUNkrenUNenUNenUNKrKrKrKrKrKrKrKrKrKrKrKrKrKrUNenenenenenenenenenkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrenenkrkrkrkrkrkrkrkrkrkrkrkrkrenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenkrenenenkrkrkrkrkrkr
 enenenenenenenenenkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrenGHptptptptptptptGHenenkrkrkrkrkrkrkrenkrenenUNICsjzIBLYfYfbjtEsjbjPRUKYfaEUNenkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrenkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrenenenenenenenenenenenenenenenenenenenenenkrkrenenkrkrkrkrkrkrkr
 krenenenkrkrenenenenkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrenenenenenenenenenenenkrkrkrkrkrkrkrkrkrkrkrenUNUNUNUNUNUNUNUNUNUNUNUNUNUNUNUNenkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkr
diff --git a/_maps/map_files/Mining/Lavaland_Lower.dmm b/_maps/map_files/Mining/Lavaland_Lower.dmm
index cc06a8d1b6..dec87839b6 100644
--- a/_maps/map_files/Mining/Lavaland_Lower.dmm
+++ b/_maps/map_files/Mining/Lavaland_Lower.dmm
@@ -7088,6 +7088,13 @@
 /obj/machinery/washing_machine,
 /turf/open/floor/carpet/red,
 /area/xenoarch/caloriteresearch_powered)
+"qo" = (
+/obj/effect/turf_decal/stripes{
+	icon_state = "trim";
+	dir = 1
+	},
+/turf/open/floor/engine,
+/area/xenoarch/caloriteresearch_powered)
 "qp" = (
 /obj/machinery/computer{
 	desc = "This screen is broken beyond repairs... What little you can make out of it reads as follows... '-The skin of employee 228, mimicking them after consuming them.'";
@@ -7102,6 +7109,13 @@
 	icon_state = "engine"
 	},
 /area/xenoarch/nothinghere)
+"qq" = (
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/catwalk_floor,
+/area/xenoarch/caloriteresearch_powered)
 "qr" = (
 /obj/effect/turf_decal/box,
 /obj/structure/trash_pile,
@@ -7158,6 +7172,9 @@
 /area/xenoarch/caloriteresearch_powered)
 "qz" = (
 /obj/structure/barricade/security,
+/obj/effect/turf_decal/stripes/line{
+	dir = 8
+	},
 /turf/open/floor/engine,
 /area/xenoarch/caloriteresearch_powered)
 "qB" = (
@@ -7274,6 +7291,13 @@
 	},
 /turf/open/floor/plasteel,
 /area/xenoarch/gen)
+"qX" = (
+/obj/structure/barricade/security,
+/obj/effect/turf_decal/stripes/line{
+	dir = 4
+	},
+/turf/open/floor/engine,
+/area/xenoarch/caloriteresearch_powered)
 "qY" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/porta_turret/fattening,
@@ -7302,6 +7326,17 @@
 "rc" = (
 /turf/open/floor/plasteel/dark/side,
 /area/xenoarch/gen)
+"rd" = (
+/obj/machinery/door/airlock/public{
+	dir = 4
+	},
+/obj/effect/turf_decal/loading_area{
+	dir = 6;
+	icon_state = "steel_panel";
+	name = "steel pannel"
+	},
+/turf/open/floor/plasteel/freezer,
+/area/xenoarch/caloriteresearch_powered)
 "re" = (
 /obj/effect/turf_decal/stripes/line{
 	dir = 4
@@ -7366,7 +7401,10 @@
 /turf/open/floor/plasteel,
 /area/xenoarch/caloriteresearch_powered)
 "ro" = (
-/obj/machinery/jukebox,
+/obj/machinery/jukebox{
+	fair_market_price = 0;
+	queuecost = 0
+	},
 /obj/machinery/light{
 	dir = 1
 	},
@@ -7451,15 +7489,33 @@
 /turf/open/indestructible/bubblegum,
 /area/ruin/powered/candyland)
 "rF" = (
-/obj/structure/sink{
-	dir = 4;
-	pixel_x = 11
+/obj/structure/urinal{
+	pixel_y = 29
 	},
-/obj/structure/mirror{
-	pixel_x = 28
+/obj/effect/turf_decal/stripes/white/line{
+	dir = 1;
+	icon_state = "steel_decals9"
+	},
+/obj/effect/turf_decal/stripes/white/line{
+	dir = 4;
+	icon_state = "steel_decals9"
+	},
+/obj/effect/turf_decal/stripes/white/line{
+	dir = 2;
+	icon_state = "steel_decals9"
 	},
 /turf/open/floor/plasteel/freezer,
 /area/xenoarch/caloriteresearch_powered)
+"rG" = (
+/obj/effect/turf_decal/stripes/white/line{
+	dir = 1;
+	icon_state = "steel_decals_central4"
+	},
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/turf/open/floor/plasteel,
+/area/xenoarch/caloriteresearch_powered)
 "rK" = (
 /obj/effect/turf_decal/stripes/white/line{
 	dir = 6;
@@ -7498,6 +7554,20 @@
 /obj/structure/chair/bench,
 /turf/open/floor/plasteel/dark,
 /area/xenoarch/caloriteresearch_powered)
+"rS" = (
+/obj/effect/turf_decal/stripes/white/line{
+	dir = 2;
+	icon_state = "steel_decals3"
+	},
+/obj/effect/turf_decal/stripes/white/line{
+	dir = 6;
+	icon_state = "steel_decals3"
+	},
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/turf/open/floor/plasteel,
+/area/xenoarch/caloriteresearch_powered)
 "rT" = (
 /obj/structure/bed/double,
 /turf/open/floor/plasteel/dark,
@@ -7578,7 +7648,8 @@
 /obj/machinery/light/small{
 	dir = 1
 	},
-/turf/open/floor/plating,
+/obj/effect/turf_decal/stripes,
+/turf/open/floor/catwalk_floor,
 /area/xenoarch/caloriteresearch_powered)
 "sl" = (
 /obj/structure/chair/sofa,
@@ -7641,7 +7712,7 @@
 /obj/structure/filingcabinet,
 /obj/item/paper/fluff/ruins/calorite_facility/note1,
 /obj/item/paper/fluff/ruins/calorite_facility/note18,
-/turf/open/floor/plasteel/dark,
+/turf/open/floor/plasteel,
 /area/xenoarch/caloriteresearch_powered)
 "sy" = (
 /obj/structure/cable{
@@ -7711,7 +7782,7 @@
 "sJ" = (
 /obj/structure/table,
 /obj/item/pen,
-/turf/open/floor/plasteel/dark,
+/turf/open/floor/plasteel,
 /area/xenoarch/caloriteresearch_powered)
 "sK" = (
 /obj/structure/table,
@@ -7859,9 +7930,12 @@
 /area/xenoarch/caloriteresearch_powered)
 "tm" = (
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plating{
-	icon_state = "platingdmg1"
-	},
+/obj/effect/turf_decal/stripes/line,
+/turf/open/floor/engine,
+/area/xenoarch/caloriteresearch_powered)
+"tn" = (
+/obj/machinery/portable_atmospherics/canister/air,
+/turf/open/floor/plating,
 /area/xenoarch/caloriteresearch_powered)
 "tp" = (
 /obj/effect/turf_decal/tile/brown{
@@ -7882,6 +7956,10 @@
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/plating/airless,
 /area/xenoarch/caloriteresearch_unpowered)
+"tu" = (
+/mob/living/simple_animal/hostile/fatten/magehand,
+/turf/open/floor/plasteel/freezer,
+/area/xenoarch/caloriteresearch_powered)
 "tv" = (
 /obj/item/kirbyplants/random,
 /obj/effect/turf_decal/tile/bar{
@@ -7934,6 +8012,7 @@
 /obj/machinery/door/airlock/public/glass{
 	dir = 4
 	},
+/obj/structure/trap/fattening,
 /turf/open/floor/plasteel/freezer,
 /area/xenoarch/caloriteresearch_powered)
 "tE" = (
@@ -7954,6 +8033,23 @@
 	},
 /turf/open/floor/mineral/calorite,
 /area/xenoarch/caloriteresearch_powered)
+"tI" = (
+/obj/effect/turf_decal/stripes/white/line{
+	dir = 4;
+	icon_state = "steel_decals4"
+	},
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/turf/open/floor/plasteel,
+/area/xenoarch/caloriteresearch_powered)
+"tJ" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/turf/open/floor/plating,
+/area/xenoarch/caloriteresearch_powered)
 "tL" = (
 /obj/effect/turf_decal/loading_area{
 	icon_state = "drain";
@@ -7991,7 +8087,11 @@
 /turf/open/floor/plasteel,
 /area/xenoarch/arch)
 "tT" = (
-/obj/machinery/vending/engivend,
+/obj/machinery/vending/engivend{
+	extra_price = 0;
+	default_price = 0;
+	fair_market_price = 0
+	},
 /turf/open/floor/plating,
 /area/xenoarch/caloriteresearch_powered)
 "tU" = (
@@ -8013,12 +8113,16 @@
 	icon_state = "drain";
 	name = "drain"
 	},
-/turf/open/floor/plasteel/freezer,
+/turf/open/floor/plasteel/white,
 /area/xenoarch/caloriteresearch_powered)
 "tZ" = (
 /obj/structure/girder,
 /turf/open/floor/plating/airless,
 /area/xenoarch/caloriteresearch_unpowered)
+"ub" = (
+/obj/machinery/porta_turret/fattening,
+/turf/open/floor/plasteel/dark,
+/area/xenoarch/caloriteresearch_powered)
 "uc" = (
 /obj/structure/toilet,
 /obj/effect/turf_decal/loading_area{
@@ -8039,7 +8143,11 @@
 /obj/effect/turf_decal/tile/bar{
 	dir = 1
 	},
-/obj/machinery/vending/dinnerware,
+/obj/machinery/vending/dinnerware{
+	default_price = 0;
+	extra_price = 0;
+	fair_market_price = 0
+	},
 /turf/open/floor/mineral/basaltstone_floor,
 /area/xenoarch/caloriteresearch_powered)
 "ui" = (
@@ -8158,7 +8266,11 @@
 	dir = 1
 	},
 /obj/structure/rack/shelf,
-/turf/open/floor/plasteel/dark,
+/obj/effect/turf_decal/stripes{
+	icon_state = "trim";
+	dir = 9
+	},
+/turf/open/floor/engine,
 /area/xenoarch/caloriteresearch_powered)
 "uF" = (
 /obj/effect/turf_decal/tile/red,
@@ -8193,6 +8305,16 @@
 /obj/machinery/field/generator,
 /turf/open/floor/engine,
 /area/xenoarch/caloriteresearch_powered)
+"uP" = (
+/obj/structure/trap/belch,
+/obj/effect/turf_decal/stripes/line{
+	dir = 1
+	},
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/turf/open/floor/plasteel,
+/area/xenoarch/caloriteresearch_powered)
 "uQ" = (
 /obj/effect/turf_decal/stripes/white/line{
 	dir = 2;
@@ -8203,6 +8325,9 @@
 	icon_state = "steel_decals3"
 	},
 /obj/effect/decal/cleanable/dirt,
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
 /turf/open/floor/plasteel,
 /area/xenoarch/caloriteresearch_powered)
 "uR" = (
@@ -8241,6 +8366,13 @@
 /obj/structure/closet/l3closet/janitor,
 /turf/open/floor/plasteel/dark,
 /area/xenoarch/caloriteresearch_powered)
+"uY" = (
+/obj/machinery/field/generator,
+/obj/effect/turf_decal/stripes/line{
+	dir = 8
+	},
+/turf/open/floor/engine,
+/area/xenoarch/caloriteresearch_powered)
 "va" = (
 /obj/structure/toilet{
 	dir = 4
@@ -8249,6 +8381,12 @@
 	dir = 8
 	},
 /obj/effect/decal/cleanable/dirt,
+/mob/living/simple_animal/hostile/fatten/magehand,
+/obj/effect/turf_decal/loading_area{
+	dir = 8;
+	icon_state = "drain";
+	name = "drain"
+	},
 /turf/open/floor/plasteel/freezer,
 /area/xenoarch/caloriteresearch_powered)
 "vb" = (
@@ -8397,7 +8535,8 @@
 	dir = 1
 	},
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plating,
+/obj/effect/turf_decal/stripes,
+/turf/open/floor/catwalk_floor,
 /area/xenoarch/caloriteresearch_powered)
 "vH" = (
 /obj/machinery/computer/security/telescreen/entertainment{
@@ -8507,8 +8646,16 @@
 /turf/open/floor/plasteel/dark,
 /area/xenoarch/gen)
 "vX" = (
-/obj/machinery/light{
-	dir = 1
+/obj/structure/urinal{
+	pixel_y = 29
+	},
+/obj/effect/turf_decal/stripes/white/line{
+	dir = 1;
+	icon_state = "steel_decals9"
+	},
+/obj/effect/turf_decal/stripes/white/line{
+	dir = 4;
+	icon_state = "steel_decals9"
 	},
 /turf/open/floor/plasteel/freezer,
 /area/xenoarch/caloriteresearch_powered)
@@ -8523,8 +8670,10 @@
 /turf/open/floor/plating,
 /area/xenoarch/caloriteresearch_powered)
 "vZ" = (
-/obj/structure/trap/belch,
-/turf/open/floor/plasteel/dark,
+/obj/effect/turf_decal/stripes/line{
+	dir = 1
+	},
+/turf/open/floor/engine,
 /area/xenoarch/caloriteresearch_powered)
 "wd" = (
 /obj/structure/table,
@@ -8547,7 +8696,7 @@
 "wg" = (
 /obj/structure/frame/computer,
 /obj/item/trash/odd_disk,
-/turf/open/floor/plasteel/dark,
+/turf/open/floor/plasteel,
 /area/xenoarch/caloriteresearch_powered)
 "wh" = (
 /obj/effect/turf_decal/tile/purple{
@@ -8649,6 +8798,9 @@
 /obj/effect/turf_decal/stripes{
 	dir = 8
 	},
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
 /turf/open/floor/plasteel,
 /area/xenoarch/caloriteresearch_powered)
 "wB" = (
@@ -8702,7 +8854,11 @@
 	},
 /obj/item/autosurgeon/nutripump_turbo,
 /obj/structure/rack/shelf,
-/turf/open/floor/plasteel/dark,
+/obj/effect/turf_decal/stripes{
+	icon_state = "trim";
+	dir = 5
+	},
+/turf/open/floor/engine,
 /area/xenoarch/caloriteresearch_powered)
 "wR" = (
 /obj/structure/rack/shelf,
@@ -8733,6 +8889,11 @@
 /obj/item/reagent_containers/food/snacks/candy,
 /turf/open/candyfloor,
 /area/ruin/powered/candyland)
+"wX" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/trap/belch,
+/turf/open/floor/plasteel,
+/area/xenoarch/caloriteresearch_powered)
 "wY" = (
 /obj/effect/turf_decal/tile/neutral{
 	dir = 8
@@ -8854,6 +9015,11 @@
 	dir = 1
 	},
 /area/xenoarch/gen)
+"xo" = (
+/obj/effect/decal/cleanable/dirt,
+/mob/living/simple_animal/hostile/fatten/magehand,
+/turf/open/floor/plasteel/freezer,
+/area/xenoarch/caloriteresearch_powered)
 "xp" = (
 /obj/structure/chair/bronze,
 /obj/item/pen/red,
@@ -8924,6 +9090,20 @@
 /obj/machinery/portable_atmospherics/scrubber,
 /turf/open/floor/plating,
 /area/xenoarch/arch)
+"xx" = (
+/obj/machinery/porta_turret/fattening,
+/obj/item/stack/marker_beacon{
+	anchored = 1;
+	icon_state = "markerburgundy-on";
+	light_color = "#FA644B";
+	light_power = 3;
+	light_range = 2;
+	name = "landing marker";
+	picked_color = "Burgundy"
+	},
+/obj/effect/turf_decal/box,
+/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
+/area/lavaland/surface/outdoors)
 "xy" = (
 /obj/effect/turf_decal/stripes/corner{
 	dir = 8
@@ -8959,7 +9139,11 @@
 	},
 /area/xenoarch/nothinghere)
 "xH" = (
-/obj/machinery/vending/kink,
+/obj/machinery/vending/kink{
+	fair_market_price = 0;
+	extra_price = 0;
+	default_price = 0
+	},
 /turf/open/floor/plating,
 /area/xenoarch/caloriteresearch_powered)
 "xJ" = (
@@ -9035,7 +9219,7 @@
 /obj/structure/chair/wood/normal{
 	dir = 8
 	},
-/turf/open/floor/carpet/royalblue,
+/turf/open/floor/wood,
 /area/xenoarch/caloriteresearch_powered)
 "xV" = (
 /obj/effect/turf_decal/loading_area{
@@ -9059,7 +9243,7 @@
 	icon_state = "drain";
 	name = "drain"
 	},
-/turf/open/floor/plasteel/freezer,
+/turf/open/floor/plasteel/white,
 /area/xenoarch/caloriteresearch_powered)
 "xX" = (
 /obj/effect/turf_decal/candy/redwhite3,
@@ -9101,9 +9285,8 @@
 /turf/open/floor/plasteel,
 /area/xenoarch/caloriteresearch_powered)
 "yg" = (
-/turf/open/floor/plating{
-	icon_state = "panelscorched"
-	},
+/obj/effect/turf_decal/stripes,
+/turf/open/floor/catwalk_floor,
 /area/xenoarch/caloriteresearch_powered)
 "yh" = (
 /obj/effect/turf_decal/tile/neutral{
@@ -9171,13 +9354,22 @@
 	dir = 8
 	},
 /obj/effect/decal/cleanable/dirt,
+/obj/effect/turf_decal/stripes/white/line{
+	dir = 8;
+	icon_state = "steel_decals9"
+	},
+/obj/effect/turf_decal/loading_area{
+	dir = 1;
+	icon_state = "drain";
+	name = "drain"
+	},
 /turf/open/floor/plasteel/freezer,
 /area/xenoarch/caloriteresearch_powered)
 "yp" = (
 /obj/machinery/light/broken,
 /obj/item/kirbyplants,
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel/dark,
+/turf/open/floor/plasteel,
 /area/xenoarch/caloriteresearch_powered)
 "yq" = (
 /obj/machinery/iv_drip/feeding_tube,
@@ -9234,18 +9426,29 @@
 "yD" = (
 /obj/structure/cable,
 /obj/effect/turf_decal/box/white,
-/turf/open/floor/plating{
-	icon_state = "platingdmg1"
-	},
+/turf/open/floor/catwalk_floor,
 /area/xenoarch/caloriteresearch_powered)
 "yE" = (
 /turf/open/floor/plating,
 /area/xenoarch/caloriteresearch_unpowered)
+"yF" = (
+/mob/living/simple_animal/hostile/fatten/magehand,
+/turf/open/floor/carpet/royalblue,
+/area/xenoarch/caloriteresearch_powered)
 "yG" = (
 /obj/structure/fans/tiny/invisible,
 /obj/machinery/door/airlock/hatch,
 /turf/open/floor/plating,
 /area/xenoarch/caloriteresearch_unpowered)
+"yH" = (
+/obj/machinery/door/airlock/public/glass{
+	dir = 4
+	},
+/obj/effect/turf_decal/stripes/line{
+	dir = 4
+	},
+/turf/open/floor/plasteel/freezer,
+/area/xenoarch/caloriteresearch_powered)
 "yJ" = (
 /obj/effect/decal/cleanable/glass,
 /obj/structure/cable{
@@ -9334,6 +9537,24 @@
 /obj/effect/spawner/lootdrop/mre,
 /turf/open/floor/plasteel/dark,
 /area/xenoarch/caloriteresearch_powered)
+"yW" = (
+/obj/structure/sink{
+	dir = 4;
+	pixel_x = 11
+	},
+/obj/structure/mirror{
+	pixel_x = 28
+	},
+/obj/effect/turf_decal/stripes/white/line{
+	dir = 4;
+	icon_state = "steel_decals9"
+	},
+/obj/effect/turf_decal/stripes/white/line{
+	dir = 2;
+	icon_state = "steel_decals9"
+	},
+/turf/open/floor/plasteel/freezer,
+/area/xenoarch/caloriteresearch_powered)
 "yX" = (
 /obj/machinery/conveyor{
 	dir = 4;
@@ -9387,7 +9608,8 @@
 /area/lavaland/surface/outdoors)
 "zg" = (
 /obj/item/crowbar,
-/turf/open/floor/plating,
+/obj/effect/turf_decal/stripes,
+/turf/open/floor/catwalk_floor,
 /area/xenoarch/caloriteresearch_powered)
 "zh" = (
 /obj/effect/turf_decal/loading_area{
@@ -9436,7 +9658,11 @@
 /turf/open/floor/plasteel,
 /area/xenoarch/caloriteresearch_powered)
 "zq" = (
-/obj/machinery/vending/dinnerware,
+/obj/machinery/vending/dinnerware{
+	default_price = 0;
+	extra_price = 0;
+	fair_market_price = 0
+	},
 /turf/open/floor/plasteel,
 /area/xenoarch/caloriteresearch_powered)
 "zr" = (
@@ -9490,6 +9716,10 @@
 	},
 /turf/open/floor/mineral/calorite/strong,
 /area/lavaland/surface/outdoors)
+"zy" = (
+/obj/structure/table_frame,
+/turf/open/floor/catwalk_floor,
+/area/xenoarch/caloriteresearch_powered)
 "zz" = (
 /obj/structure/table,
 /turf/open/floor/plasteel/dark,
@@ -9533,6 +9763,14 @@
 	},
 /obj/item/newspaper,
 /obj/effect/decal/cleanable/dirt,
+/obj/machinery/light/small{
+	dir = 4
+	},
+/obj/effect/turf_decal/loading_area{
+	icon_state = "drain";
+	name = "drain";
+	dir = 4
+	},
 /turf/open/floor/plasteel/freezer,
 /area/xenoarch/caloriteresearch_powered)
 "zM" = (
@@ -9542,7 +9780,7 @@
 /obj/structure/cable{
 	icon_state = "0-2"
 	},
-/turf/open/floor/plating,
+/turf/open/floor/catwalk_floor,
 /area/xenoarch/caloriteresearch_powered)
 "zQ" = (
 /obj/structure/reagent_dispensers/water_cooler,
@@ -9702,6 +9940,9 @@
 /obj/structure/fluff/paper/stack{
 	dir = 1
 	},
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
 /turf/open/floor/plasteel,
 /area/xenoarch/caloriteresearch_powered)
 "As" = (
@@ -9850,6 +10091,7 @@
 /obj/structure/cable{
 	icon_state = "0-8"
 	},
+/obj/item/wallframe/apc,
 /turf/open/floor/plating,
 /area/xenoarch/caloriteresearch_powered)
 "AL" = (
@@ -9867,6 +10109,9 @@
 "AM" = (
 /obj/structure/table,
 /obj/item/clothing/gloves/color/red/insulated,
+/obj/effect/turf_decal/stripes/line{
+	dir = 8
+	},
 /turf/open/floor/engine,
 /area/xenoarch/caloriteresearch_powered)
 "AN" = (
@@ -9876,7 +10121,11 @@
 /obj/effect/turf_decal/tile/purple{
 	dir = 8
 	},
-/obj/machinery/vending/wardrobe/jani_wardrobe,
+/obj/machinery/vending/wardrobe/jani_wardrobe{
+	extra_price = 0;
+	default_price = 0;
+	fair_market_price = 0
+	},
 /turf/open/floor/plasteel/dark,
 /area/xenoarch/caloriteresearch_powered)
 "AO" = (
@@ -9957,7 +10206,11 @@
 /obj/machinery/light{
 	dir = 1
 	},
-/obj/machinery/vending/cola/random,
+/obj/machinery/vending/cola/random{
+	fair_market_price = 0;
+	extra_price = 0;
+	default_price = 0
+	},
 /turf/open/floor/plasteel,
 /area/xenoarch/caloriteresearch_powered)
 "Bd" = (
@@ -9995,10 +10248,18 @@
 	},
 /turf/open/floor/plating/asteroid/basalt/lava_land_surface,
 /area/lavaland/surface/outdoors)
+"Bk" = (
+/obj/structure/table,
+/obj/machinery/microwave{
+	pixel_x = 1;
+	pixel_y = 6
+	},
+/turf/open/floor/plasteel/freezer,
+/area/xenoarch/caloriteresearch_powered)
 "Bl" = (
 /obj/structure/filingcabinet,
 /obj/item/paper/fluff/ruins/calorite_facility/note4,
-/turf/open/floor/plasteel/dark,
+/turf/open/floor/plasteel,
 /area/xenoarch/caloriteresearch_powered)
 "Bm" = (
 /turf/closed/mineral/random/volcanic/strangerock,
@@ -10013,7 +10274,7 @@
 /area/xenoarch/caloriteresearch_powered)
 "Br" = (
 /obj/structure/dresser,
-/turf/open/floor/carpet/royalblue,
+/turf/open/floor/wood,
 /area/xenoarch/caloriteresearch_powered)
 "Bt" = (
 /obj/structure/table,
@@ -10025,6 +10286,15 @@
 /obj/structure/toilet{
 	dir = 8
 	},
+/mob/living/simple_animal/hostile/fatten/magehand,
+/obj/machinery/light/small{
+	dir = 4
+	},
+/obj/effect/turf_decal/loading_area{
+	icon_state = "drain";
+	name = "drain";
+	dir = 4
+	},
 /turf/open/floor/plasteel/freezer,
 /area/xenoarch/caloriteresearch_powered)
 "Bw" = (
@@ -10110,12 +10380,15 @@
 	},
 /obj/effect/decal/cleanable/molten_object/large,
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plating,
+/obj/effect/turf_decal/stripes/corner{
+	dir = 1
+	},
+/turf/open/floor/catwalk_floor,
 /area/xenoarch/caloriteresearch_powered)
 "BL" = (
 /obj/structure/rack/shelf,
 /obj/item/storage/backpack/duffelbag/med/surgery{
-	pixel_y = 12
+	pixel_y = 8
 	},
 /turf/open/floor/plasteel/white,
 /area/xenoarch/caloriteresearch_powered)
@@ -10169,7 +10442,11 @@
 /obj/effect/turf_decal/tile/bar{
 	dir = 1
 	},
-/obj/machinery/vending/boozeomat/all_access,
+/obj/machinery/vending/boozeomat/all_access{
+	fair_market_price = 0;
+	extra_price = 0;
+	default_price = 0
+	},
 /turf/open/floor/mineral/basaltstone_floor,
 /area/xenoarch/caloriteresearch_powered)
 "Cl" = (
@@ -10193,6 +10470,11 @@
 /obj/item/stack/cable_coil/cut/red,
 /turf/open/floor/plating,
 /area/xenoarch/caloriteresearch_powered)
+"Cq" = (
+/obj/structure/table,
+/obj/machinery/reagentgrinder,
+/turf/open/floor/plasteel/freezer,
+/area/xenoarch/caloriteresearch_powered)
 "Cr" = (
 /obj/structure/cable{
 	icon_state = "1-4"
@@ -10201,7 +10483,7 @@
 	icon_state = "4-8"
 	},
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plating,
+/turf/open/floor/catwalk_floor,
 /area/xenoarch/caloriteresearch_powered)
 "Cs" = (
 /obj/effect/turf_decal/stripes/white/line{
@@ -10591,6 +10873,14 @@
 	},
 /turf/open/floor/plasteel/dark,
 /area/xenoarch/arch)
+"DR" = (
+/obj/effect/decal/cleanable/glass,
+/obj/structure/cable,
+/turf/open/floor/plating,
+/area/xenoarch/caloriteresearch_powered)
+"DT" = (
+/turf/open/floor/catwalk_floor,
+/area/xenoarch/caloriteresearch_powered)
 "DU" = (
 /obj/effect/turf_decal/tile/brown{
 	dir = 8
@@ -10611,8 +10901,13 @@
 /turf/open/floor/plating,
 /area/lavaland/surface/outdoors)
 "DW" = (
-/obj/structure/fluff/paper/stack,
-/turf/open/floor/plasteel/dark,
+/obj/structure/trap/belch,
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/turf/open/floor/plating{
+	icon_state = "platingdmg1"
+	},
 /area/xenoarch/caloriteresearch_powered)
 "DX" = (
 /obj/effect/turf_decal/box,
@@ -10742,7 +11037,7 @@
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
-/turf/open/floor/plating,
+/turf/open/floor/catwalk_floor,
 /area/xenoarch/caloriteresearch_powered)
 "Es" = (
 /obj/effect/decal/cleanable/dirt,
@@ -10804,6 +11099,10 @@
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/plasteel/rockvault,
 /area/xenoarch/nothinghere)
+"EE" = (
+/obj/structure/sign/warning,
+/turf/closed/wall/rust,
+/area/xenoarch/caloriteresearch_powered)
 "EH" = (
 /obj/machinery/conveyor{
 	dir = 6;
@@ -10872,6 +11171,10 @@
 	pixel_x = -4;
 	pixel_y = 4
 	},
+/turf/open/floor/catwalk_floor,
+/area/xenoarch/caloriteresearch_powered)
+"ET" = (
+/obj/structure/flora/rock,
 /turf/open/floor/plating,
 /area/xenoarch/caloriteresearch_powered)
 "EV" = (
@@ -10881,7 +11184,7 @@
 /obj/machinery/computer{
 	name = "bluescreened computer"
 	},
-/turf/open/floor/plasteel/dark,
+/turf/open/floor/plasteel,
 /area/xenoarch/caloriteresearch_powered)
 "EW" = (
 /obj/structure/chair/sofa{
@@ -11034,7 +11337,7 @@
 	dir = 1
 	},
 /obj/structure/frame/computer,
-/turf/open/floor/plasteel/dark,
+/turf/open/floor/plasteel,
 /area/xenoarch/caloriteresearch_powered)
 "FC" = (
 /obj/structure/plasticflaps,
@@ -11044,6 +11347,11 @@
 	},
 /turf/open/floor/plating,
 /area/xenoarch/caloriteresearch_unpowered)
+"FD" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/flora/rock/pile,
+/turf/open/floor/plasteel/freezer,
+/area/xenoarch/caloriteresearch_powered)
 "FE" = (
 /turf/open/floor/plasteel/grimy,
 /area/xenoarch/nothinghere)
@@ -11117,12 +11425,35 @@
 	},
 /turf/open/floor/plasteel,
 /area/xenoarch/arch)
+"FS" = (
+/obj/machinery/power/floodlight,
+/obj/machinery/light/floor,
+/obj/structure/cable{
+	icon_state = "0-4"
+	},
+/turf/open/floor/plating,
+/area/xenoarch/caloriteresearch_powered)
 "FT" = (
 /obj/machinery/light/broken{
 	dir = 4
 	},
 /turf/open/floor/plasteel/rockvault,
 /area/xenoarch/nothinghere)
+"FU" = (
+/obj/effect/turf_decal/tile/neutral{
+	dir = 8
+	},
+/obj/effect/turf_decal/tile/neutral{
+	dir = 4
+	},
+/obj/effect/turf_decal/tile/neutral{
+	dir = 1
+	},
+/obj/effect/turf_decal/tile/neutral,
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/porta_turret/fattening/heavy,
+/turf/open/floor/plasteel/dark,
+/area/xenoarch/caloriteresearch_powered)
 "FV" = (
 /obj/structure/lattice,
 /turf/open/lava/smooth/lava_land_surface,
@@ -11187,6 +11518,14 @@
 /area/xenoarch/caloriteresearch_powered)
 "Gj" = (
 /obj/item/soap/deluxe,
+/obj/effect/turf_decal/stripes/white/line{
+	dir = 1;
+	icon_state = "steel_decals9"
+	},
+/obj/effect/turf_decal/stripes/white/line{
+	dir = 8;
+	icon_state = "steel_decals9"
+	},
 /turf/open/floor/plasteel/freezer,
 /area/xenoarch/caloriteresearch_powered)
 "Gk" = (
@@ -11194,6 +11533,15 @@
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/plasteel/dark,
 /area/xenoarch/caloriteresearch_powered)
+"Gl" = (
+/obj/effect/turf_decal/stripes/line{
+	dir = 1
+	},
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/turf/open/floor/plasteel,
+/area/xenoarch/caloriteresearch_powered)
 "Gn" = (
 /obj/structure/girder,
 /turf/open/floor/plating/airless,
@@ -11243,7 +11591,7 @@
 /obj/structure/cable{
 	icon_state = "1-4"
 	},
-/turf/open/floor/plating,
+/turf/open/floor/pod,
 /area/xenoarch/caloriteresearch_powered)
 "Gx" = (
 /obj/structure/closet/crate/trashcart,
@@ -11258,7 +11606,11 @@
 /turf/open/floor/plasteel,
 /area/xenoarch/arch)
 "GA" = (
-/obj/machinery/vending/cigarette,
+/obj/machinery/vending/cigarette{
+	extra_price = 0;
+	fair_market_price = 0;
+	default_price = 0
+	},
 /turf/open/floor/plasteel,
 /area/xenoarch/caloriteresearch_powered)
 "GD" = (
@@ -11273,7 +11625,11 @@
 /obj/effect/turf_decal/tile/bar{
 	dir = 1
 	},
-/obj/machinery/vending/mealdor,
+/obj/machinery/vending/mealdor{
+	default_price = 0;
+	extra_price = 0;
+	fair_market_price = 0
+	},
 /turf/open/floor/mineral/basaltstone_floor,
 /area/xenoarch/caloriteresearch_powered)
 "GH" = (
@@ -11405,7 +11761,11 @@
 /obj/effect/turf_decal/tile/bar{
 	dir = 1
 	},
-/obj/machinery/vending/coffee,
+/obj/machinery/vending/coffee{
+	extra_price = 0;
+	default_price = 0;
+	fair_market_price = 0
+	},
 /turf/open/floor/mineral/basaltstone_floor,
 /area/xenoarch/caloriteresearch_powered)
 "Hm" = (
@@ -11470,7 +11830,7 @@
 /obj/structure/fluff/paper/stack{
 	dir = 9
 	},
-/turf/open/floor/plasteel/dark,
+/turf/open/floor/plasteel,
 /area/xenoarch/caloriteresearch_powered)
 "HH" = (
 /obj/structure/table,
@@ -11527,7 +11887,7 @@
 /obj/machinery/light/small/broken{
 	dir = 1
 	},
-/turf/open/floor/carpet/royalblue,
+/turf/open/floor/wood,
 /area/xenoarch/caloriteresearch_powered)
 "HR" = (
 /obj/effect/turf_decal/tile/bar,
@@ -11626,6 +11986,12 @@
 	},
 /turf/open/floor/plasteel,
 /area/xenoarch/caloriteresearch_powered)
+"In" = (
+/obj/effect/turf_decal/stripes/line{
+	dir = 8
+	},
+/turf/open/floor/engine,
+/area/xenoarch/caloriteresearch_powered)
 "Ip" = (
 /obj/structure/table,
 /obj/item/weldingtool,
@@ -11676,6 +12042,11 @@
 /obj/structure/table/wood,
 /turf/open/floor/mineral/basaltstone_floor,
 /area/xenoarch/caloriteresearch_powered)
+"ID" = (
+/obj/item/electronics/apc,
+/obj/effect/turf_decal/stripes,
+/turf/open/floor/catwalk_floor,
+/area/xenoarch/caloriteresearch_powered)
 "IE" = (
 /obj/structure/table,
 /obj/machinery/reagentgrinder,
@@ -11693,11 +12064,24 @@
 /obj/item/reagent_containers/rag/towel{
 	pixel_y = 3
 	},
+/obj/machinery/light{
+	dir = 1
+	},
+/obj/effect/turf_decal/loading_area{
+	dir = 8;
+	icon_state = "steel_panel";
+	name = "steel pannel"
+	},
 /turf/open/floor/plasteel/freezer,
 /area/xenoarch/caloriteresearch_powered)
 "IG" = (
 /obj/machinery/ore_silo,
-/turf/open/floor/plating,
+/obj/effect/turf_decal/stripes/line,
+/obj/effect/turf_decal/stripes{
+	icon_state = "trim";
+	dir = 8
+	},
+/turf/open/floor/engine,
 /area/xenoarch/caloriteresearch_powered)
 "IH" = (
 /obj/structure/tree/candylight,
@@ -11761,12 +12145,30 @@
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/plasteel,
 /area/xenoarch/caloriteresearch_powered)
+"IT" = (
+/obj/machinery/biogenerator,
+/turf/open/floor/plasteel/freezer,
+/area/xenoarch/caloriteresearch_powered)
 "IV" = (
 /obj/structure/chair/sofa/right/old{
 	dir = 1
 	},
 /turf/open/floor/carpet/green,
 /area/xenoarch/gen)
+"IW" = (
+/obj/machinery/porta_turret/fattening/heavy,
+/obj/item/stack/marker_beacon{
+	anchored = 1;
+	icon_state = "markerburgundy-on";
+	light_color = "#FA644B";
+	light_power = 3;
+	light_range = 2;
+	name = "landing marker";
+	picked_color = "Burgundy"
+	},
+/obj/effect/turf_decal/box,
+/turf/open/floor/plating,
+/area/lavaland/surface/outdoors)
 "IX" = (
 /obj/machinery/door/airlock/maintenance_hatch,
 /turf/open/floor/plating,
@@ -11802,7 +12204,7 @@
 "Jf" = (
 /obj/structure/table,
 /obj/item/folder/yellow,
-/turf/open/floor/plasteel/dark,
+/turf/open/floor/plasteel,
 /area/xenoarch/caloriteresearch_powered)
 "Jg" = (
 /obj/machinery/door/airlock/public{
@@ -11816,7 +12218,8 @@
 	pixel_y = 1
 	},
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plating,
+/obj/effect/turf_decal/stripes,
+/turf/open/floor/catwalk_floor,
 /area/xenoarch/caloriteresearch_powered)
 "Ji" = (
 /obj/effect/decal/cleanable/oil,
@@ -11894,7 +12297,13 @@
 	icon_state = "4-8"
 	},
 /obj/item/paper/fluff/ruins/calorite_facility/engineer_note,
-/turf/open/floor/plating,
+/turf/open/floor/catwalk_floor,
+/area/xenoarch/caloriteresearch_powered)
+"Jw" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/turf_decal/stripes/box,
+/obj/machinery/porta_turret/fattening/heavy,
+/turf/open/floor/plasteel/dark,
 /area/xenoarch/caloriteresearch_powered)
 "Jx" = (
 /obj/effect/turf_decal/tile/bar,
@@ -11910,6 +12319,9 @@
 /obj/structure/cable{
 	icon_state = "2-4"
 	},
+/obj/effect/turf_decal/stripes/corner{
+	dir = 8
+	},
 /turf/open/floor/plating,
 /area/xenoarch/caloriteresearch_powered)
 "Jz" = (
@@ -11989,6 +12401,13 @@
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/plasteel,
 /area/xenoarch/caloriteresearch_powered)
+"JK" = (
+/obj/machinery/door/airlock/maintenance_hatch,
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/turf/open/floor/plating,
+/area/xenoarch/caloriteresearch_powered)
 "JN" = (
 /obj/machinery/light{
 	dir = 1
@@ -12038,6 +12457,11 @@
 	},
 /turf/open/floor/plasteel,
 /area/xenoarch/caloriteresearch_powered)
+"JS" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/turf_decal/stripes,
+/turf/open/floor/catwalk_floor,
+/area/xenoarch/caloriteresearch_powered)
 "JT" = (
 /obj/structure/cable{
 	icon_state = "0-8"
@@ -12058,6 +12482,9 @@
 	dir = 9;
 	icon_state = "steel_decals6"
 	},
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
 /turf/open/floor/plasteel,
 /area/xenoarch/caloriteresearch_powered)
 "JW" = (
@@ -12069,8 +12496,14 @@
 /turf/open/floor/plasteel,
 /area/xenoarch/arch)
 "JZ" = (
-/obj/structure/rack/shelf,
-/turf/open/floor/plasteel/dark,
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/obj/structure/disposalpipe/segment,
+/obj/effect/turf_decal/stripes/corner{
+	dir = 4
+	},
+/turf/open/floor/plating,
 /area/xenoarch/caloriteresearch_powered)
 "Ka" = (
 /obj/effect/turf_decal/tile/bar,
@@ -12086,7 +12519,7 @@
 	},
 /obj/item/stack/sheet/mineral/diamond,
 /obj/effect/turf_decal/box/white,
-/turf/open/floor/plating,
+/turf/open/floor/catwalk_floor,
 /area/xenoarch/caloriteresearch_powered)
 "Kc" = (
 /obj/item/reagent_containers/food/snacks/bluecherrycupcake,
@@ -12122,7 +12555,7 @@
 /area/xenoarch/arch)
 "Kh" = (
 /obj/effect/turf_decal/box/white,
-/turf/open/floor/plating,
+/turf/open/floor/catwalk_floor,
 /area/xenoarch/caloriteresearch_powered)
 "Ki" = (
 /obj/structure/table,
@@ -12274,7 +12707,7 @@
 /obj/structure/cable{
 	icon_state = "1-4"
 	},
-/turf/open/floor/plating,
+/turf/open/floor/catwalk_floor,
 /area/xenoarch/caloriteresearch_powered)
 "KG" = (
 /obj/structure/trash_pile,
@@ -12284,6 +12717,19 @@
 /mob/living/simple_animal/hostile/feed/chocolate_slime/creambeast,
 /turf/open/indestructible/chocolate,
 /area/ruin/powered/candyland)
+"KK" = (
+/obj/effect/turf_decal/stripes/white/line{
+	dir = 2;
+	icon_state = "steel_decals4"
+	},
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/structure/cable{
+	icon_state = "2-4"
+	},
+/turf/open/floor/plating,
+/area/xenoarch/caloriteresearch_powered)
 "KL" = (
 /turf/open/floor/plating{
 	icon_state = "platingdmg1"
@@ -12298,7 +12744,7 @@
 "KN" = (
 /obj/structure/rack/shelf,
 /obj/item/taperecorder,
-/turf/open/floor/plasteel/dark,
+/turf/open/floor/plasteel,
 /area/xenoarch/caloriteresearch_powered)
 "KO" = (
 /obj/structure/chair/sofa/right/old{
@@ -12439,6 +12885,11 @@
 "Lk" = (
 /obj/structure/scale,
 /obj/effect/decal/cleanable/dirt,
+/obj/effect/turf_decal/loading_area{
+	dir = 1;
+	icon_state = "steel_panel";
+	name = "steel pannel"
+	},
 /turf/open/floor/plasteel/freezer,
 /area/xenoarch/caloriteresearch_powered)
 "Lm" = (
@@ -12461,6 +12912,21 @@
 /obj/item/stack/ore/calorite,
 /turf/open/floor/plating,
 /area/lavaland/surface/outdoors)
+"Lp" = (
+/obj/structure/bed/double,
+/obj/item/restraints/handcuffs,
+/turf/open/floor/plasteel/dark,
+/area/xenoarch/caloriteresearch_powered)
+"Lq" = (
+/obj/effect/turf_decal/stripes/white/line{
+	dir = 2;
+	icon_state = "steel_decals_central4"
+	},
+/obj/structure/cable{
+	icon_state = "1-8"
+	},
+/turf/open/floor/plasteel,
+/area/xenoarch/caloriteresearch_powered)
 "Ls" = (
 /turf/open/floor/plasteel,
 /area/xenoarch/caloriteresearch_powered)
@@ -12482,6 +12948,16 @@
 /obj/effect/decal/cleanable/oil,
 /turf/open/floor/plating,
 /area/lavaland/surface/outdoors)
+"LB" = (
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/turf_decal/stripes/corner{
+	dir = 4
+	},
+/turf/open/floor/plating,
+/area/xenoarch/caloriteresearch_powered)
 "LC" = (
 /obj/effect/turf_decal/tile/neutral{
 	dir = 8
@@ -12497,6 +12973,17 @@
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/plasteel/dark,
 /area/xenoarch/caloriteresearch_powered)
+"LD" = (
+/obj/machinery/shower{
+	pixel_y = 19
+	},
+/obj/effect/turf_decal/loading_area{
+	dir = 1;
+	icon_state = "drain";
+	name = "drain"
+	},
+/turf/open/floor/plasteel/freezer,
+/area/xenoarch/caloriteresearch_powered)
 "LE" = (
 /obj/effect/turf_decal{
 	dir = 1
@@ -12581,7 +13068,7 @@
 /obj/machinery/computer{
 	name = "broken computer"
 	},
-/turf/open/floor/plasteel/dark,
+/turf/open/floor/plasteel,
 /area/xenoarch/caloriteresearch_powered)
 "LZ" = (
 /obj/effect/turf_decal/loading_area{
@@ -12622,7 +13109,7 @@
 	icon_state = "0-2"
 	},
 /obj/effect/turf_decal/box/white,
-/turf/open/floor/plating,
+/turf/open/floor/catwalk_floor,
 /area/xenoarch/caloriteresearch_powered)
 "Me" = (
 /obj/structure/barricade/wooden,
@@ -12671,6 +13158,15 @@
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/mineral/basaltstone_floor,
 /area/xenoarch/caloriteresearch_powered)
+"Mr" = (
+/obj/machinery/door/airlock/public/glass{
+	dir = 4
+	},
+/obj/effect/turf_decal/stripes/line{
+	dir = 8
+	},
+/turf/open/floor/plasteel/white,
+/area/xenoarch/caloriteresearch_powered)
 "Ms" = (
 /obj/structure/closet/toolcloset,
 /turf/open/floor/plating,
@@ -12679,6 +13175,23 @@
 /obj/item/stack/sheet/mineral/wood,
 /turf/open/floor/plating,
 /area/xenoarch/gen)
+"Mu" = (
+/obj/machinery/conveyor{
+	dir = 2;
+	id = "fatchamber"
+	},
+/obj/item/stack/tile/mineral/calorite/hide,
+/obj/item/stack/tile/mineral/calorite/hide,
+/obj/item/stack/tile/mineral/calorite/hide,
+/obj/item/stack/tile/mineral/calorite/hide,
+/obj/item/stack/tile/mineral/calorite/hide,
+/obj/item/stack/tile/mineral/calorite/hide,
+/obj/item/stack/tile/mineral/calorite/hide,
+/obj/item/stack/tile/mineral/calorite/hide,
+/obj/item/stack/tile/mineral/calorite/hide,
+/obj/item/stack/tile/mineral/calorite/hide,
+/turf/open/floor/mineral/calorite/hide,
+/area/xenoarch/caloriteresearch_powered)
 "Mv" = (
 /obj/item/restraints/legcuffs/beartrap,
 /obj/item/restraints/legcuffs/beartrap,
@@ -12848,7 +13361,7 @@
 /obj/structure/cable{
 	icon_state = "0-8"
 	},
-/turf/open/floor/plating,
+/turf/open/floor/catwalk_floor,
 /area/xenoarch/caloriteresearch_powered)
 "Nc" = (
 /obj/structure/chair/bench/left,
@@ -12871,6 +13384,12 @@
 	icon_state = "engine"
 	},
 /area/xenoarch/nothinghere)
+"Nf" = (
+/obj/structure/frame/machine,
+/turf/open/floor/plating{
+	icon_state = "platingdmg1"
+	},
+/area/xenoarch/caloriteresearch_powered)
 "Ng" = (
 /obj/item/paper/fluff/ruins/calorite_facility/charred,
 /turf/open/floor/plasteel/dark,
@@ -12906,14 +13425,30 @@
 	},
 /turf/open/floor/plasteel/dark,
 /area/xenoarch/caloriteresearch_powered)
+"Nl" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/turf_decal/loading_area{
+	dir = 6;
+	icon_state = "steel_panel";
+	name = "steel pannel"
+	},
+/turf/open/floor/plasteel/freezer,
+/area/xenoarch/caloriteresearch_powered)
 "Nn" = (
 /obj/structure/barricade/wooden,
 /turf/open/floor/plating/asteroid/basalt/lava_land_surface,
 /area/lavaland/surface/outdoors)
+"No" = (
+/obj/structure/trap/belch,
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/turf/open/floor/plasteel,
+/area/xenoarch/caloriteresearch_powered)
 "Np" = (
 /obj/structure/fluff/paper/stack,
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel/dark,
+/turf/open/floor/plasteel,
 /area/xenoarch/caloriteresearch_powered)
 "Nq" = (
 /obj/structure/chair/bench/left,
@@ -12957,6 +13492,39 @@
 	},
 /turf/open/floor/plating,
 /area/xenoarch/caloriteresearch_unpowered)
+"NC" = (
+/obj/machinery/field/generator,
+/obj/effect/turf_decal/stripes/line{
+	dir = 4
+	},
+/turf/open/floor/engine,
+/area/xenoarch/caloriteresearch_powered)
+"ND" = (
+/obj/effect/turf_decal/stripes/white/line{
+	dir = 1;
+	icon_state = "steel_decals9"
+	},
+/obj/effect/turf_decal/stripes/white/line{
+	dir = 4;
+	icon_state = "steel_decals9"
+	},
+/obj/effect/turf_decal/stripes/white/line{
+	dir = 2;
+	icon_state = "steel_decals9"
+	},
+/obj/effect/turf_decal/stripes/white/line{
+	dir = 8;
+	icon_state = "steel_decals9"
+	},
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/structure/cable{
+	icon_state = "2-4"
+	},
+/turf/open/floor/plasteel,
+/area/xenoarch/caloriteresearch_powered)
 "NE" = (
 /obj/effect/turf_decal/stripes/line{
 	dir = 1
@@ -12978,6 +13546,10 @@
 /obj/structure/table,
 /obj/machinery/cell_charger,
 /obj/effect/decal/cleanable/dirt,
+/obj/item/electronics/apc{
+	pixel_y = 12
+	},
+/obj/item/stock_parts/cell/high,
 /turf/open/floor/plating,
 /area/xenoarch/caloriteresearch_powered)
 "NK" = (
@@ -13023,7 +13595,11 @@
 /obj/effect/turf_decal/tile/bar{
 	dir = 1
 	},
-/obj/machinery/vending/snack/orange,
+/obj/machinery/vending/snack/orange{
+	default_price = 0;
+	extra_price = 0;
+	fair_market_price = 0
+	},
 /turf/open/floor/mineral/basaltstone_floor,
 /area/xenoarch/caloriteresearch_powered)
 "NT" = (
@@ -13053,6 +13629,21 @@
 "Oa" = (
 /turf/open/floor/plasteel/white,
 /area/xenoarch/caloriteresearch_powered)
+"Ob" = (
+/obj/effect/turf_decal/stripes/line{
+	dir = 1
+	},
+/obj/effect/turf_decal/tile/yellow{
+	dir = 1
+	},
+/obj/effect/turf_decal/tile/yellow{
+	dir = 4
+	},
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/turf/open/floor/plating,
+/area/xenoarch/caloriteresearch_powered)
 "Oc" = (
 /obj/structure/cable{
 	icon_state = "4-8"
@@ -13071,7 +13662,7 @@
 "Oe" = (
 /obj/structure/curtain,
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel/freezer,
+/turf/open/floor/plasteel/white,
 /area/xenoarch/caloriteresearch_powered)
 "Of" = (
 /obj/structure/lattice,
@@ -13109,6 +13700,11 @@
 	dir = 4
 	},
 /obj/effect/decal/cleanable/dirt,
+/obj/effect/turf_decal/loading_area{
+	dir = 6;
+	icon_state = "steel_panel";
+	name = "steel pannel"
+	},
 /turf/open/floor/plasteel/freezer,
 /area/xenoarch/caloriteresearch_powered)
 "Oq" = (
@@ -13141,6 +13737,12 @@
 "Ou" = (
 /turf/open/floor/plating/airless,
 /area/xenoarch/caloriteresearch_unpowered)
+"Ov" = (
+/obj/structure/cable{
+	icon_state = "0-4"
+	},
+/turf/open/floor/plating,
+/area/xenoarch/caloriteresearch_powered)
 "Ow" = (
 /obj/effect/turf_decal/stripes{
 	dir = 10
@@ -13233,10 +13835,23 @@
 	},
 /turf/open/floor/mineral/basaltstone_floor,
 /area/xenoarch/caloriteresearch_powered)
+"OL" = (
+/obj/effect/turf_decal/loading_area{
+	dir = 9;
+	icon_state = "steel_panel";
+	name = "steel pannel"
+	},
+/turf/open/floor/plasteel/freezer,
+/area/xenoarch/caloriteresearch_powered)
 "OM" = (
 /obj/machinery/shower{
 	dir = 1
 	},
+/mob/living/simple_animal/hostile/fatten/magehand,
+/obj/effect/turf_decal/loading_area{
+	icon_state = "drain";
+	name = "drain"
+	},
 /turf/open/floor/plasteel/freezer,
 /area/xenoarch/caloriteresearch_powered)
 "ON" = (
@@ -13272,6 +13887,15 @@
 	},
 /turf/open/floor/plasteel,
 /area/xenoarch/caloriteresearch_powered)
+"OW" = (
+/obj/machinery/light{
+	dir = 1
+	},
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/turf/open/floor/plasteel,
+/area/xenoarch/caloriteresearch_powered)
 "OY" = (
 /obj/effect/turf_decal/tile/neutral{
 	dir = 8
@@ -13293,7 +13917,16 @@
 	amount = 20
 	},
 /obj/effect/turf_decal/box/white,
-/turf/open/floor/plating,
+/obj/item/stack/sheet/mineral/plasma{
+	amount = 20
+	},
+/obj/item/stack/sheet/mineral/plasma{
+	amount = 20
+	},
+/obj/item/stack/sheet/mineral/plasma{
+	amount = 20
+	},
+/turf/open/floor/catwalk_floor,
 /area/xenoarch/caloriteresearch_powered)
 "Pa" = (
 /obj/machinery/mineral/ore_redemption,
@@ -13390,13 +14023,19 @@
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/plasteel/freezer,
 /area/xenoarch/caloriteresearch_powered)
+"Pt" = (
+/obj/structure/cable{
+	icon_state = "2-4"
+	},
+/turf/open/floor/catwalk_floor,
+/area/xenoarch/caloriteresearch_powered)
 "Pu" = (
 /obj/structure/table/wood,
 /obj/machinery/light/small{
 	dir = 1
 	},
 /obj/item/clothing/accessory/armband/science,
-/turf/open/floor/carpet/royalblue,
+/turf/open/floor/wood,
 /area/xenoarch/caloriteresearch_powered)
 "Pv" = (
 /turf/open/floor/plating/asteroid/basalt/lava_land_surface,
@@ -13485,6 +14124,19 @@
 	},
 /turf/open/floor/plasteel/dark,
 /area/xenoarch/caloriteresearch_powered)
+"PL" = (
+/obj/effect/turf_decal/stripes/line{
+	dir = 4
+	},
+/obj/effect/turf_decal/tile/yellow,
+/obj/effect/turf_decal/tile/yellow{
+	dir = 4
+	},
+/obj/structure/cable{
+	icon_state = "2-4"
+	},
+/turf/open/floor/plating,
+/area/xenoarch/caloriteresearch_powered)
 "PM" = (
 /obj/effect/turf_decal/stripes{
 	dir = 4
@@ -13505,7 +14157,7 @@
 	icon_state = "0-2"
 	},
 /obj/effect/turf_decal/box/white,
-/turf/open/floor/plating,
+/turf/open/floor/catwalk_floor,
 /area/xenoarch/caloriteresearch_powered)
 "PW" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1,
@@ -13542,6 +14194,12 @@
 	},
 /turf/open/floor/plating,
 /area/xenoarch/caloriteresearch_unpowered)
+"Qd" = (
+/obj/effect/turf_decal/stripes/line{
+	dir = 4
+	},
+/turf/open/floor/engine,
+/area/xenoarch/caloriteresearch_powered)
 "Qe" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/trash_pile,
@@ -13603,6 +14261,12 @@
 /obj/item/trash/tray,
 /turf/open/floor/plasteel/dark,
 /area/xenoarch/caloriteresearch_powered)
+"Qp" = (
+/obj/item/wallframe/apc,
+/turf/open/floor/plating{
+	icon_state = "platingdmg1"
+	},
+/area/xenoarch/caloriteresearch_powered)
 "Qr" = (
 /turf/open/floor/plating/lavaland_baseturf,
 /area/xenoarch/caloriteresearch_unpowered)
@@ -13614,6 +14278,16 @@
 /obj/machinery/shower{
 	pixel_y = 19
 	},
+/obj/effect/turf_decal/loading_area{
+	dir = 2;
+	icon_state = "steel_panel";
+	name = "steel pannel"
+	},
+/obj/effect/turf_decal/loading_area{
+	dir = 1;
+	icon_state = "drain";
+	name = "drain"
+	},
 /turf/open/floor/plasteel/freezer,
 /area/xenoarch/caloriteresearch_powered)
 "Qz" = (
@@ -13649,12 +14323,15 @@
 	dir = 9;
 	icon_state = "steel_decals6"
 	},
+/obj/structure/cable{
+	icon_state = "2-4"
+	},
 /turf/open/floor/plasteel,
 /area/xenoarch/caloriteresearch_powered)
 "QH" = (
 /obj/structure/table,
 /obj/item/paper,
-/turf/open/floor/plasteel/dark,
+/turf/open/floor/plasteel,
 /area/xenoarch/caloriteresearch_powered)
 "QL" = (
 /obj/structure/flora/junglebush/c,
@@ -13706,6 +14383,12 @@
 /obj/structure/closet/crate/large,
 /turf/open/floor/plasteel,
 /area/xenoarch/caloriteresearch_powered)
+"QU" = (
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/turf/open/floor/plasteel,
+/area/xenoarch/caloriteresearch_powered)
 "QV" = (
 /obj/effect/decal/cleanable/molten_object/large,
 /turf/open/floor/plasteel/freezer,
@@ -13729,7 +14412,7 @@
 	pixel_x = 1;
 	pixel_y = 5
 	},
-/turf/open/floor/plating,
+/turf/open/floor/catwalk_floor,
 /area/xenoarch/caloriteresearch_powered)
 "QZ" = (
 /obj/effect/turf_decal/stripes/line{
@@ -13767,6 +14450,11 @@
 /obj/structure/chair/sofa/corner,
 /turf/open/floor/mineral/basaltstone_floor,
 /area/xenoarch/caloriteresearch_powered)
+"Rg" = (
+/obj/effect/decal/cleanable/glass,
+/obj/structure/trap/fattening,
+/turf/open/floor/plating,
+/area/xenoarch/caloriteresearch_powered)
 "Rh" = (
 /obj/structure/lattice/catwalk,
 /turf/open/floor/plating/asteroid/basalt,
@@ -14019,9 +14707,7 @@
 /area/xenoarch/caloriteresearch_powered)
 "Sh" = (
 /obj/machinery/suit_storage_unit/atmos,
-/turf/open/floor/plating{
-	icon_state = "platingdmg1"
-	},
+/turf/open/floor/catwalk_floor,
 /area/xenoarch/caloriteresearch_powered)
 "Si" = (
 /obj/effect/turf_decal/tile/neutral{
@@ -14042,6 +14728,18 @@
 	dir = 1
 	},
 /area/xenoarch/caloriteresearch_powered)
+"Sl" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/cleanable/glass,
+/turf/open/floor/plasteel/freezer,
+/area/xenoarch/caloriteresearch_powered)
+"Sm" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/turf/open/floor/plasteel,
+/area/xenoarch/caloriteresearch_powered)
 "Sn" = (
 /obj/item/shard,
 /turf/open/floor/plating{
@@ -14182,6 +14880,13 @@
 /obj/item/xenoarch/clean/brush,
 /turf/open/floor/plasteel,
 /area/xenoarch/caloriteresearch_powered)
+"SI" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/turf/open/floor/plasteel,
+/area/xenoarch/caloriteresearch_powered)
 "SJ" = (
 /obj/structure/mineral_door/calorite,
 /obj/structure/barricade/wooden/crude,
@@ -14207,7 +14912,7 @@
 "SP" = (
 /obj/structure/table,
 /obj/item/paper/fluff/ruins/calorite_facility/note37,
-/turf/open/floor/plasteel/dark,
+/turf/open/floor/plasteel,
 /area/xenoarch/caloriteresearch_powered)
 "SR" = (
 /obj/machinery/door/airlock/public/glass{
@@ -14237,7 +14942,18 @@
 /obj/structure/rack/shelf,
 /obj/item/stack/sheet/metal/fifty,
 /obj/item/stack/sheet/glass/fifty,
-/turf/open/floor/plating,
+/turf/open/floor/catwalk_floor,
+/area/xenoarch/caloriteresearch_powered)
+"SV" = (
+/obj/machinery/door/airlock/public{
+	dir = 4
+	},
+/obj/effect/turf_decal/loading_area{
+	dir = 9;
+	icon_state = "steel_panel";
+	name = "steel pannel"
+	},
+/turf/open/floor/plasteel/freezer,
 /area/xenoarch/caloriteresearch_powered)
 "SW" = (
 /obj/structure/table,
@@ -14326,11 +15042,12 @@
 /obj/structure/closet/cabinet,
 /obj/item/clothing/under/plasmaman/science,
 /obj/item/clothing/head/helmet/space/plasmaman/science,
-/turf/open/floor/carpet/royalblue,
+/turf/open/floor/wood,
 /area/xenoarch/caloriteresearch_powered)
 "To" = (
 /obj/machinery/power/floodlight,
 /obj/machinery/light/floor,
+/obj/structure/cable,
 /turf/open/floor/plating,
 /area/xenoarch/caloriteresearch_powered)
 "Tp" = (
@@ -14343,7 +15060,7 @@
 	name = "drain"
 	},
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel/freezer,
+/turf/open/floor/plasteel/white,
 /area/xenoarch/caloriteresearch_powered)
 "Tq" = (
 /obj/effect/turf_decal/stripes/line{
@@ -14406,7 +15123,7 @@
 	charge = 20
 	},
 /obj/structure/cable,
-/turf/open/floor/plating,
+/turf/open/floor/catwalk_floor,
 /area/xenoarch/caloriteresearch_powered)
 "Tx" = (
 /obj/effect/decal/cleanable/dirt,
@@ -14666,6 +15383,20 @@
 	icon_state = "engine"
 	},
 /area/xenoarch/nothinghere)
+"Ut" = (
+/obj/effect/turf_decal/stripes/white/line{
+	dir = 5;
+	icon_state = "steel_decals3"
+	},
+/obj/effect/turf_decal/stripes/white/line{
+	dir = 4;
+	icon_state = "steel_decals3"
+	},
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/turf/open/floor/plasteel,
+/area/xenoarch/caloriteresearch_powered)
 "Uu" = (
 /obj/item/reagent_containers/food/snacks/cakeslice/chocolate,
 /turf/open/indestructible/chocolate,
@@ -14704,6 +15435,11 @@
 /obj/machinery/light/small{
 	dir = 8
 	},
+/obj/effect/turf_decal/loading_area{
+	dir = 8;
+	icon_state = "drain";
+	name = "drain"
+	},
 /turf/open/floor/plasteel/freezer,
 /area/xenoarch/caloriteresearch_powered)
 "UC" = (
@@ -14722,7 +15458,7 @@
 /obj/machinery/light/small{
 	dir = 8
 	},
-/turf/open/floor/plasteel/freezer,
+/turf/open/floor/plasteel/white,
 /area/xenoarch/caloriteresearch_powered)
 "UF" = (
 /obj/structure/table/wood,
@@ -14730,6 +15466,8 @@
 /mob/living/simple_animal/hostile/fatten/magehand,
 /mob/living/simple_animal/hostile/fatten/magehand,
 /mob/living/simple_animal/hostile/fatten/magehand,
+/mob/living/simple_animal/hostile/fatten/magehand,
+/mob/living/simple_animal/hostile/fatten/magehand,
 /turf/open/floor/mineral/calorite,
 /area/lavaland/surface/outdoors)
 "UG" = (
@@ -14744,7 +15482,11 @@
 	dir = 8;
 	name = "LIZARD CONTAINMENT SEAL"
 	},
-/turf/open/floor/plasteel/dark,
+/turf/open/floor/carpet/orange,
+/area/xenoarch/caloriteresearch_powered)
+"UI" = (
+/obj/machinery/vending/mealdor,
+/turf/open/floor/plasteel/freezer,
 /area/xenoarch/caloriteresearch_powered)
 "UK" = (
 /obj/machinery/shower{
@@ -14755,7 +15497,7 @@
 	icon_state = "drain";
 	name = "drain"
 	},
-/turf/open/floor/plasteel/freezer,
+/turf/open/floor/plasteel/white,
 /area/xenoarch/caloriteresearch_powered)
 "UL" = (
 /obj/structure/closet/cabinet,
@@ -14778,6 +15520,9 @@
 	icon_state = "steel_decals1"
 	},
 /obj/effect/decal/cleanable/glass,
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
 /turf/open/floor/plasteel,
 /area/xenoarch/caloriteresearch_powered)
 "UQ" = (
@@ -14833,7 +15578,12 @@
 /obj/item/clothing/neck/petcollar/calorite,
 /obj/item/trash/fatoray_scrap1,
 /obj/structure/rack/shelf,
-/turf/open/floor/plasteel/dark,
+/obj/effect/turf_decal/stripes/line,
+/obj/effect/turf_decal/stripes{
+	icon_state = "trim";
+	dir = 4
+	},
+/turf/open/floor/engine,
 /area/xenoarch/caloriteresearch_powered)
 "Va" = (
 /obj/structure/sign/poster/contraband/punch_shit{
@@ -14879,6 +15629,9 @@
 /obj/machinery/conveyor_switch/oneway{
 	id = "fatloop"
 	},
+/obj/effect/turf_decal/stripes/line{
+	dir = 4
+	},
 /turf/open/floor/engine,
 /area/xenoarch/caloriteresearch_powered)
 "Vl" = (
@@ -15086,7 +15839,14 @@
 	icon_state = "drain";
 	name = "drain"
 	},
-/turf/open/floor/plasteel/freezer,
+/turf/open/floor/plasteel/white,
+/area/xenoarch/caloriteresearch_powered)
+"Wc" = (
+/obj/effect/decal/cleanable/glass,
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/turf/open/floor/plasteel,
 /area/xenoarch/caloriteresearch_powered)
 "Wd" = (
 /obj/machinery/light/small,
@@ -15109,6 +15869,14 @@
 	icon_state = "platingdmg1"
 	},
 /area/xenoarch/caloriteresearch_unpowered)
+"Wm" = (
+/obj/machinery/light/small{
+	dir = 4
+	},
+/obj/item/wallframe/apc,
+/obj/item/stock_parts/cell/high,
+/turf/open/floor/plating,
+/area/xenoarch/caloriteresearch_powered)
 "Wo" = (
 /obj/effect/turf_decal/loading_area{
 	dir = 1;
@@ -15127,7 +15895,7 @@
 /obj/structure/fluff/paper/stack{
 	dir = 8
 	},
-/turf/open/floor/plasteel/dark,
+/turf/open/floor/plasteel,
 /area/xenoarch/caloriteresearch_powered)
 "Ws" = (
 /obj/structure/flora/rock/pile,
@@ -15160,7 +15928,11 @@
 /obj/effect/turf_decal/tile/bar{
 	dir = 1
 	},
-/obj/machinery/vending/cola/random,
+/obj/machinery/vending/cola/random{
+	default_price = 0;
+	extra_price = 0;
+	fair_market_price = 0
+	},
 /turf/open/floor/mineral/basaltstone_floor,
 /area/xenoarch/caloriteresearch_powered)
 "WA" = (
@@ -15188,6 +15960,21 @@
 	},
 /turf/open/floor/plating,
 /area/lavaland/surface/outdoors)
+"WC" = (
+/obj/effect/turf_decal/stripes/white/line{
+	dir = 8;
+	icon_state = "steel_decals3"
+	},
+/obj/effect/turf_decal/stripes/white/line{
+	dir = 9;
+	icon_state = "steel_decals3"
+	},
+/obj/effect/turf_decal/stripes/white/line{
+	dir = 2;
+	icon_state = "steel_decals4"
+	},
+/turf/open/floor/plasteel,
+/area/xenoarch/caloriteresearch_powered)
 "WD" = (
 /obj/structure/lattice,
 /turf/open/floor/plating/asteroid/basalt/lava_land_surface,
@@ -15243,7 +16030,11 @@
 /turf/open/floor/plating,
 /area/xenoarch/caloriteresearch_powered)
 "WQ" = (
-/obj/machinery/vending/tool,
+/obj/machinery/vending/tool{
+	extra_price = 0;
+	default_price = 0;
+	fair_market_price = 0
+	},
 /turf/open/floor/plating,
 /area/xenoarch/caloriteresearch_powered)
 "WS" = (
@@ -15305,6 +16096,10 @@
 /obj/structure/table,
 /turf/open/floor/plasteel,
 /area/xenoarch/caloriteresearch_powered)
+"Xe" = (
+/obj/structure/flora/rock/pile,
+/turf/open/floor/plating,
+/area/xenoarch/caloriteresearch_powered)
 "Xf" = (
 /obj/machinery/light{
 	dir = 4
@@ -15315,7 +16110,11 @@
 "Xg" = (
 /obj/machinery/light/broken,
 /obj/structure/reagent_dispensers/water_cooler,
-/turf/open/floor/plasteel/dark,
+/turf/open/floor/plasteel,
+/area/xenoarch/caloriteresearch_powered)
+"Xh" = (
+/mob/living/simple_animal/hostile/fatten/magehand,
+/turf/open/floor/wood,
 /area/xenoarch/caloriteresearch_powered)
 "Xi" = (
 /obj/effect/turf_decal/loading_area{
@@ -15336,6 +16135,15 @@
 	dir = 1
 	},
 /obj/effect/decal/cleanable/dirt,
+/obj/effect/turf_decal/loading_area{
+	dir = 4;
+	icon_state = "steel_panel";
+	name = "steel pannel"
+	},
+/obj/effect/turf_decal/loading_area{
+	icon_state = "drain";
+	name = "drain"
+	},
 /turf/open/floor/plasteel/freezer,
 /area/xenoarch/caloriteresearch_powered)
 "Xk" = (
@@ -15453,10 +16261,10 @@
 /turf/open/floor/plasteel/dark,
 /area/xenoarch/caloriteresearch_powered)
 "XH" = (
-/obj/structure/cable{
-	icon_state = "1-8"
-	},
 /obj/machinery/light,
+/obj/structure/cable{
+	icon_state = "1-4"
+	},
 /turf/open/floor/plating{
 	icon_state = "platingdmg1"
 	},
@@ -15479,6 +16287,14 @@
 	dir = 8
 	},
 /obj/effect/decal/cleanable/dirt,
+/obj/effect/turf_decal/stripes/white/line{
+	dir = 1;
+	icon_state = "steel_decals9"
+	},
+/obj/effect/turf_decal/loading_area{
+	icon_state = "drain";
+	name = "drain"
+	},
 /turf/open/floor/plasteel/freezer,
 /area/xenoarch/caloriteresearch_powered)
 "XK" = (
@@ -15532,7 +16348,11 @@
 /turf/open/floor/plating,
 /area/lavaland/surface/outdoors)
 "XV" = (
-/obj/machinery/vending/clothing,
+/obj/machinery/vending/clothing{
+	extra_price = 0;
+	default_price = 0;
+	fair_market_price = 0
+	},
 /turf/open/floor/plasteel,
 /area/xenoarch/caloriteresearch_powered)
 "XX" = (
@@ -15558,15 +16378,13 @@
 /obj/structure/cable{
 	icon_state = "0-8"
 	},
-/turf/open/floor/plating,
+/turf/open/floor/catwalk_floor,
 /area/xenoarch/caloriteresearch_powered)
 "XZ" = (
 /obj/structure/cable{
-	icon_state = "4-8"
-	},
-/turf/open/floor/plating{
-	icon_state = "platingdmg1"
+	icon_state = "1-8"
 	},
+/turf/open/floor/plating,
 /area/xenoarch/caloriteresearch_powered)
 "Yb" = (
 /obj/structure/table,
@@ -15608,6 +16426,12 @@
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/plasteel,
 /area/xenoarch/caloriteresearch_powered)
+"Yk" = (
+/obj/effect/turf_decal/stripes/corner{
+	dir = 1
+	},
+/turf/open/floor/plating,
+/area/xenoarch/caloriteresearch_powered)
 "Ym" = (
 /obj/effect/turf_decal/tile/purple{
 	dir = 1
@@ -15623,6 +16447,9 @@
 /area/xenoarch/caloriteresearch_powered)
 "Yp" = (
 /obj/machinery/space_heater,
+/obj/effect/turf_decal/stripes/line{
+	dir = 8
+	},
 /turf/open/floor/engine,
 /area/xenoarch/caloriteresearch_powered)
 "Yr" = (
@@ -15644,10 +16471,16 @@
 /obj/structure/lattice/catwalk,
 /turf/open/floor/plating,
 /area/lavaland/surface/outdoors)
+"Yv" = (
+/obj/effect/turf_decal/stripes{
+	dir = 8
+	},
+/turf/open/floor/catwalk_floor,
+/area/xenoarch/caloriteresearch_powered)
 "Yz" = (
 /obj/structure/closet/cabinet,
 /obj/item/clothing/accessory/armband/science,
-/turf/open/floor/carpet/royalblue,
+/turf/open/floor/wood,
 /area/xenoarch/caloriteresearch_powered)
 "YB" = (
 /obj/effect/turf_decal/stripes/line{
@@ -15674,11 +16507,16 @@
 /area/xenoarch/caloriteresearch_powered)
 "YJ" = (
 /obj/machinery/door/airlock/public,
+/obj/effect/turf_decal/loading_area{
+	dir = 5;
+	icon_state = "steel_panel";
+	name = "steel pannel"
+	},
 /turf/open/floor/plasteel/freezer,
 /area/xenoarch/caloriteresearch_powered)
 "YK" = (
 /obj/item/wrench,
-/turf/open/floor/plating,
+/turf/open/floor/catwalk_floor,
 /area/xenoarch/caloriteresearch_powered)
 "YN" = (
 /obj/effect/turf_decal/tile/bar{
@@ -15745,6 +16583,10 @@
 "Za" = (
 /turf/closed/indestructible/chocolate,
 /area/ruin/powered/candyland)
+"Zc" = (
+/obj/item/grenade/chem_grenade/lipoifier_weak,
+/turf/open/floor/plating,
+/area/xenoarch/caloriteresearch_powered)
 "Zd" = (
 /obj/structure/cable{
 	icon_state = "4-8"
@@ -15882,17 +16724,8 @@
 /obj/machinery/light{
 	dir = 8
 	},
-/obj/effect/turf_decal/stripes/white/line{
-	dir = 8;
-	icon_state = "steel_decals3"
-	},
-/obj/effect/turf_decal/stripes/white/line{
-	dir = 9;
-	icon_state = "steel_decals3"
-	},
-/obj/effect/turf_decal/stripes/white/line{
-	dir = 2;
-	icon_state = "steel_decals4"
+/obj/structure/cable{
+	icon_state = "1-2"
 	},
 /turf/open/floor/plasteel,
 /area/xenoarch/caloriteresearch_powered)
@@ -15985,6 +16818,23 @@
 /obj/effect/turf_decal/stripes/line,
 /turf/open/floor/plating,
 /area/xenoarch/arch)
+"ZS" = (
+/obj/effect/turf_decal/stripes/corner,
+/turf/open/floor/plating,
+/area/xenoarch/caloriteresearch_powered)
+"ZU" = (
+/obj/effect/turf_decal/stripes/line{
+	dir = 4
+	},
+/obj/effect/turf_decal/tile/yellow,
+/obj/effect/turf_decal/tile/yellow{
+	dir = 4
+	},
+/obj/structure/cable{
+	icon_state = "1-8"
+	},
+/turf/open/floor/plating,
+/area/xenoarch/caloriteresearch_powered)
 "ZV" = (
 /obj/effect/turf_decal/stripes/white/line{
 	dir = 2;
@@ -16003,6 +16853,14 @@
 	pixel_x = 28
 	},
 /obj/effect/decal/cleanable/dirt,
+/obj/effect/turf_decal/stripes/white/line{
+	dir = 4;
+	icon_state = "steel_decals9"
+	},
+/obj/effect/turf_decal/stripes/white/line{
+	dir = 2;
+	icon_state = "steel_decals9"
+	},
 /turf/open/floor/plasteel/freezer,
 /area/xenoarch/caloriteresearch_powered)
 
@@ -44302,7 +45160,7 @@ lQ
 lQ
 lQ
 lQ
-lQ
+SZ
 lQ
 ab
 ab
@@ -44559,7 +45417,7 @@ lQ
 lQ
 lQ
 lQ
-lQ
+Nn
 lQ
 lQ
 ab
@@ -44816,7 +45674,7 @@ lQ
 lQ
 lQ
 lQ
-lQ
+SZ
 lQ
 lQ
 lQ
@@ -45073,7 +45931,7 @@ lQ
 lQ
 lQ
 lQ
-lQ
+SZ
 lQ
 lQ
 lQ
@@ -45330,7 +46188,7 @@ ab
 ab
 ab
 lQ
-lQ
+Nn
 lQ
 lQ
 lQ
@@ -45594,16 +46452,16 @@ ab
 ab
 lQ
 lQ
-lQ
-lQ
-ab
-ab
+Td
+Td
 ab
 ab
 ab
 ab
 ab
 ab
+Td
+Td
 ab
 ab
 ab
@@ -45852,15 +46710,15 @@ ab
 ab
 ab
 ab
+Td
+Td
+Td
+ab
+ab
+ab
 lQ
-lQ
-lQ
-ab
-ab
-ab
-ab
-ab
-ab
+Td
+Td
 ab
 ab
 ab
@@ -46116,7 +46974,7 @@ lQ
 lQ
 lQ
 lQ
-ab
+lQ
 ab
 ab
 ab
@@ -46371,7 +47229,7 @@ ab
 ab
 ab
 ab
-ab
+lQ
 lQ
 lQ
 lQ
@@ -46627,9 +47485,9 @@ ab
 ab
 ab
 ab
-ab
-ab
-ab
+Td
+Td
+lQ
 ab
 ab
 lQ
@@ -46884,8 +47742,8 @@ ab
 ab
 ab
 ab
-ab
-ab
+Td
+Td
 ab
 ab
 ab
@@ -47670,7 +48528,7 @@ lQ
 lQ
 lQ
 lQ
-lQ
+SZ
 lQ
 lQ
 lQ
@@ -47927,7 +48785,7 @@ ab
 lQ
 lQ
 lQ
-lQ
+SZ
 lQ
 lQ
 lQ
@@ -48184,7 +49042,7 @@ ab
 ab
 lQ
 lQ
-lQ
+Nn
 lQ
 lQ
 lQ
@@ -48441,7 +49299,7 @@ ab
 ab
 ab
 lQ
-lQ
+SZ
 lQ
 lQ
 lQ
@@ -50287,12 +51145,12 @@ vx
 ab
 BP
 zm
-lQ
+Td
 lQ
 Td
 lQ
 lQ
-lQ
+Td
 lQ
 lQ
 lQ
@@ -50551,7 +51409,7 @@ ab
 BP
 lQ
 lQ
-lQ
+Td
 lQ
 lQ
 ab
@@ -53120,7 +53978,7 @@ lQ
 lQ
 lQ
 lQ
-lQ
+IW
 lQ
 lQ
 lQ
@@ -54394,7 +55252,7 @@ Nd
 Nd
 CK
 GD
-lQ
+xx
 lQ
 BP
 lQ
@@ -55936,7 +56794,7 @@ Ug
 Ug
 Iz
 GD
-lQ
+xx
 lQ
 lQ
 lQ
@@ -56193,7 +57051,7 @@ lQ
 lQ
 lQ
 lQ
-jY
+lQ
 lQ
 lQ
 lQ
@@ -56448,7 +57306,7 @@ ab
 ab
 xR
 lQ
-lQ
+jY
 lQ
 lQ
 lQ
@@ -58765,7 +59623,7 @@ vx
 lQ
 BP
 lQ
-lQ
+Td
 lQ
 lQ
 lQ
@@ -59026,7 +59884,7 @@ lQ
 jY
 jY
 lQ
-lQ
+Td
 lQ
 lQ
 lQ
@@ -59283,7 +60141,7 @@ lQ
 lQ
 lQ
 lQ
-lQ
+Td
 lQ
 lQ
 lQ
@@ -59537,7 +60395,7 @@ jY
 lQ
 lQ
 lQ
-lQ
+Td
 BP
 lQ
 lQ
@@ -60573,7 +61431,7 @@ ab
 ab
 jV
 lQ
-lQ
+Td
 ab
 ab
 ab
@@ -61857,7 +62715,7 @@ ab
 ab
 ab
 lQ
-lQ
+Td
 lQ
 ab
 ab
@@ -64182,15 +65040,15 @@ ab
 lQ
 ab
 ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
+HJ
+HJ
+HJ
+HJ
+Bm
+HJ
+Bm
+Bm
+HJ
 ab
 ab
 ab
@@ -64439,15 +65297,15 @@ ab
 lQ
 ab
 ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
+Bm
+Bm
+Xe
+KL
+Bm
+Bm
+Bm
+Zc
+HJ
 ab
 ab
 ab
@@ -64696,15 +65554,15 @@ ab
 jV
 ab
 ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
+Bm
+Iu
+Sl
+Sl
+KL
+ET
+Bm
+Bm
+HJ
 ab
 ab
 ab
@@ -64953,15 +65811,15 @@ ab
 ab
 ab
 ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
+HJ
+Bk
+LM
+FD
+NU
+xT
+ET
+KL
+HJ
 ab
 ab
 ab
@@ -65210,15 +66068,15 @@ ab
 ab
 ab
 ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
+HJ
+Cq
+Jr
+xT
+xT
+xT
+xT
+Sl
+Bm
 ab
 ab
 ab
@@ -65467,15 +66325,15 @@ ab
 ab
 ab
 ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
+HJ
+Bm
+Bm
+Sl
+Bm
+IT
+UI
+Bm
+Bm
 ab
 ab
 ab
@@ -65727,7 +66585,7 @@ HJ
 XB
 HJ
 HJ
-HJ
+yH
 XB
 XB
 HJ
@@ -65983,8 +66841,8 @@ OA
 UE
 Ny
 zq
-Ls
 su
+Ls
 CD
 wT
 Gu
@@ -66237,7 +67095,7 @@ HJ
 Pr
 Jr
 Oe
-Jr
+Oa
 Ny
 vf
 UA
@@ -67535,7 +68393,7 @@ wj
 Lu
 OA
 AM
-Zt
+In
 Yp
 HJ
 XB
@@ -67799,7 +68657,7 @@ Zt
 Zt
 KL
 SG
-KE
+SG
 XB
 ab
 ab
@@ -68047,16 +68905,16 @@ rK
 Ny
 qT
 uO
-Zt
-Zt
+Qd
+Qd
 Vk
-qz
-Zt
-Zt
-Zt
-uO
+qX
+Qd
+Qd
+Qd
+NC
 CB
-XZ
+KL
 XB
 ab
 ab
@@ -68300,7 +69158,7 @@ Vh
 wI
 HJ
 QG
-Iu
+DR
 Hj
 Ja
 Zt
@@ -68554,23 +69412,23 @@ Ur
 XB
 Li
 wI
-rT
+Lp
 HJ
 JU
 TC
 OA
 ty
 uO
-Zt
-Zt
-Zt
+In
+In
+In
 qz
-Zt
-Zt
-Zt
-uO
+In
+In
+In
+uY
 rW
-Zt
+zs
 HJ
 ab
 ab
@@ -68811,7 +69669,7 @@ XB
 XB
 HJ
 yb
-Iu
+Rg
 HJ
 JU
 TC
@@ -68822,12 +69680,12 @@ Ny
 Tj
 Tj
 Tj
-Ny
+EE
 yb
 OA
 KL
 yb
-OA
+Ov
 HJ
 XB
 XB
@@ -69070,21 +69928,21 @@ KL
 SG
 SG
 Ls
-SX
-HU
-HF
+KK
+rS
+tI
 ZC
-IM
-Dh
+GU
+GU
 wz
 wz
 wz
 UO
-Hf
-Ls
-Ls
-Ls
-Ls
+Wc
+GU
+No
+Kq
+XZ
 Ls
 OA
 xg
@@ -69324,15 +70182,15 @@ UC
 Sb
 CQ
 SG
-KL
-UC
-UC
-GY
+WZ
+Sm
+tJ
+Lq
 BB
 xc
-UC
-qM
-Ls
+WC
+IM
+Dh
 Ls
 Ls
 Ls
@@ -69342,7 +70200,7 @@ Ak
 zI
 AX
 EL
-Ls
+SG
 OA
 Yn
 Tg
@@ -69581,15 +70439,15 @@ EX
 QZ
 rt
 Fr
-UC
+SI
 Ls
 Ye
 Mg
 qM
 OH
 UC
-UC
-UC
+Ls
+Ls
 ux
 Ls
 Ls
@@ -69838,7 +70696,7 @@ FP
 qt
 Xd
 Pd
-UC
+SI
 Xx
 Eb
 ti
@@ -70095,7 +70953,7 @@ UC
 Fd
 Lf
 Ls
-Ls
+QU
 Ls
 YF
 Ht
@@ -70364,7 +71222,7 @@ Vt
 CF
 Ls
 UC
-Ls
+RK
 Vf
 yX
 Zz
@@ -70609,9 +71467,9 @@ UW
 qt
 BC
 GY
-vM
-xc
-YF
+ND
+rG
+Ob
 To
 Vt
 Vt
@@ -70620,7 +71478,7 @@ uG
 SG
 TJ
 vw
-UC
+wX
 Dr
 Ma
 Qg
@@ -70866,7 +71724,7 @@ Ls
 Fd
 JR
 OB
-qM
+Ut
 OH
 YF
 BY
@@ -70874,7 +71732,7 @@ Vt
 Tl
 Vt
 SG
-To
+FS
 Gr
 Ls
 UC
@@ -71111,7 +71969,7 @@ VZ
 VZ
 VZ
 VZ
-BM
+Mu
 VZ
 VZ
 VZ
@@ -71131,7 +71989,7 @@ LH
 Wx
 uG
 NX
-SG
+Cn
 TF
 Ls
 UC
@@ -71380,7 +72238,7 @@ HJ
 HJ
 HJ
 HJ
-DL
+OW
 Ls
 YF
 Ht
@@ -71388,7 +72246,7 @@ SG
 Vt
 Vt
 Vt
-SG
+Cn
 TF
 Ls
 Ls
@@ -71637,15 +72495,15 @@ IG
 HJ
 qY
 SG
-KL
+DW
 Xx
 ME
 vY
 re
 RW
 vY
-vY
-vY
+PL
+ZU
 PZ
 zr
 Ls
@@ -71889,18 +72747,18 @@ HJ
 SG
 SG
 HJ
-wI
+qo
 SG
 up
 vb
 SG
-Ls
+uP
 Ls
 OS
 Ls
 Jj
-Ls
-Ls
+GU
+GU
 Ls
 Ls
 OS
@@ -71914,8 +72772,8 @@ UC
 Ls
 Ls
 Av
-Tq
 Nt
+Tq
 Av
 Ls
 SB
@@ -72146,13 +73004,13 @@ HJ
 ny
 SG
 HJ
-wI
+qo
 tm
-Vh
+NU
 vZ
 sa
-Ls
-Ls
+Gl
+RK
 qs
 PA
 DN
@@ -72172,7 +73030,7 @@ tj
 tj
 OA
 OA
-OA
+Mr
 Ny
 Ny
 Ny
@@ -72396,19 +73254,19 @@ ay
 ay
 lQ
 XB
-XC
+zy
 KL
-XC
-SG
+DT
+RS
 SG
 SG
 HJ
 wQ
 UZ
 yb
-qY
+Jw
 yb
-SG
+Cn
 Ls
 Wy
 Nh
@@ -72653,10 +73511,10 @@ ay
 ay
 BP
 XB
+Nf
 KL
-KL
-XC
-SG
+DT
+RS
 SG
 NU
 HJ
@@ -72665,7 +73523,7 @@ HJ
 HJ
 HJ
 HJ
-IX
+JK
 OA
 OA
 OA
@@ -72922,7 +73780,7 @@ Ms
 Ms
 uR
 SG
-SG
+Cn
 Ny
 EV
 Np
@@ -73172,7 +74030,7 @@ XB
 HJ
 HJ
 GI
-SG
+ZS
 Ih
 Ih
 SG
@@ -73433,10 +74291,10 @@ Ia
 Kb
 KE
 TH
-WZ
+Pt
 yD
 Lm
-FM
+tn
 Ny
 wg
 Vh
@@ -73688,20 +74546,20 @@ yg
 Xw
 Ia
 YK
-HV
+qq
 TH
 ES
-KL
+DT
 QM
-SG
+tn
 Ny
 Fy
 Wp
 sx
 KN
-JZ
+YC
 Bl
-DW
+DN
 yp
 OA
 FK
@@ -73941,7 +74799,7 @@ lQ
 lQ
 HJ
 QW
-SG
+ID
 Xw
 Ia
 PS
@@ -74201,11 +75059,11 @@ HJ
 sk
 Xw
 Ia
-SG
+DT
 XY
 IZ
 ES
-SG
+DT
 WP
 Iu
 SG
@@ -74230,13 +75088,13 @@ KL
 qk
 qk
 Wu
-KL
+Qp
 OA
 BL
 Oa
 On
 Tj
-wI
+ub
 Vh
 Vh
 zz
@@ -74712,15 +75570,15 @@ ay
 BP
 Yg
 Qb
-NU
-SG
+JS
 SG
+Yk
 Ow
 Nb
 TH
 Nb
 Da
-HV
+LB
 Aq
 NJ
 Cn
@@ -74737,7 +75595,7 @@ Ls
 IR
 Ny
 Tn
-WM
+Xh
 Br
 OA
 yN
@@ -74994,8 +75852,8 @@ UC
 DU
 Ny
 Pu
-WM
-WM
+yF
+yF
 rg
 ur
 Ls
@@ -75227,13 +76085,13 @@ ay
 XB
 ra
 BK
-KL
+Yv
 DA
-SG
+Yk
 Ah
 Ez
 uu
-qk
+JZ
 sy
 LN
 qL
@@ -75488,7 +76346,7 @@ Yr
 QD
 MN
 Qe
-TR
+Wm
 NU
 SG
 zs
@@ -75765,14 +76623,14 @@ UC
 tp
 OA
 Yz
-WM
+rb
 Br
 OA
 Ul
 UC
 Ny
 Dm
-rb
+Xh
 Vj
 OA
 AE
@@ -76022,7 +76880,7 @@ UC
 tp
 Ny
 HQ
-WM
+yF
 WM
 rg
 uz
@@ -76279,7 +77137,7 @@ UC
 DU
 Ny
 xU
-WM
+yF
 LW
 OA
 Cw
@@ -76287,7 +77145,7 @@ wH
 rg
 rb
 rb
-rb
+Xh
 Ny
 Uj
 SG
@@ -76781,7 +77639,7 @@ wY
 Ld
 um
 Ld
-Vr
+FU
 Ld
 Qn
 Ld
@@ -76800,7 +77658,7 @@ Ls
 UC
 OA
 vm
-rb
+Xh
 Te
 OA
 yn
@@ -77057,10 +77915,10 @@ TV
 Hh
 OA
 UL
-rb
+Xh
 we
 OA
-Qy
+LD
 Jr
 OM
 Ny
@@ -77318,7 +78176,7 @@ OA
 OA
 OA
 Qy
-xT
+Nl
 Xj
 Ny
 ab
@@ -77829,10 +78687,10 @@ uz
 OA
 Op
 OA
-Jg
+rd
 OA
 IF
-Jr
+OL
 Lk
 OA
 ab
@@ -78089,7 +78947,7 @@ Jr
 Jr
 Jr
 xT
-Jr
+tu
 xT
 OA
 ab
@@ -78341,12 +79199,12 @@ NF
 zj
 uz
 Ny
-Jg
+SV
 Ny
-Jg
+SV
 Ny
 vX
-xT
+xo
 XA
 Ny
 ab
@@ -78604,7 +79462,7 @@ zL
 Ny
 rF
 ZX
-rF
+yW
 OA
 ab
 ab
diff --git a/_maps/map_files/Snaxi/Snaxi.dmm b/_maps/map_files/Snaxi/Snaxi.dmm
index 7f0ba39344..4618818c0f 100644
--- a/_maps/map_files/Snaxi/Snaxi.dmm
+++ b/_maps/map_files/Snaxi/Snaxi.dmm
@@ -11,7 +11,6 @@
 	dir = 4
 	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/obj/machinery/vending/security,
 /obj/machinery/firealarm{
 	dir = 8;
 	pixel_x = 24
@@ -162,7 +161,7 @@
 	dir = 4
 	},
 /obj/effect/landmark/start/warden,
-/turf/open/floor/plasteel/dark,
+/turf/open/floor/plasteel,
 /area/security/warden)
 "aff" = (
 /obj/structure/cable{
@@ -498,6 +497,7 @@
 /area/cargo/sorting)
 "anW" = (
 /obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden,
+/obj/structure/disposalpipe/segment,
 /turf/open/floor/plasteel/dark,
 /area/security/office)
 "anY" = (
@@ -586,9 +586,6 @@
 /obj/structure/cable{
 	icon_state = "1-4"
 	},
-/obj/machinery/light{
-	dir = 8
-	},
 /obj/effect/turf_decal/tile/neutral{
 	dir = 8
 	},
@@ -632,15 +629,16 @@
 /turf/open/floor/plasteel/white/side,
 /area/hallway/primary/port)
 "aqX" = (
-/obj/effect/turf_decal/tile/red{
-	dir = 4
+/obj/machinery/door/window/eastleft{
+	dir = 1
 	},
-/obj/effect/turf_decal/tile/red,
-/obj/machinery/computer/secure_data{
-	dir = 8
+/obj/effect/turf_decal/loading_area{
+	dir = 5;
+	icon_state = "steel_panel";
+	name = "steel pannel"
 	},
-/turf/open/floor/plasteel/dark,
-/area/security/office)
+/turf/open/floor/plasteel/showroomfloor,
+/area/commons/dorms)
 "arf" = (
 /obj/effect/turf_decal/tile/purple,
 /obj/effect/turf_decal/tile/purple{
@@ -874,7 +872,7 @@
 /obj/effect/turf_decal/arrows/red{
 	dir = 8
 	},
-/turf/open/floor/plasteel/dark,
+/turf/open/floor/plasteel,
 /area/security/prison)
 "auw" = (
 /obj/machinery/atmospherics/components/unary/outlet_injector/on{
@@ -913,14 +911,6 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
 	},
-/obj/machinery/door/airlock/security/glass{
-	name = "Equipment Room";
-	req_access_txt = "1"
-	},
-/obj/machinery/door/firedoor/border_only{
-	dir = 8;
-	name = "west facing firelock"
-	},
 /turf/open/floor/plasteel/dark,
 /area/security/office)
 "avL" = (
@@ -1196,7 +1186,7 @@
 /obj/effect/turf_decal/arrows/red{
 	dir = 8
 	},
-/turf/open/floor/plasteel/dark,
+/turf/open/floor/plasteel,
 /area/security/prison)
 "aBI" = (
 /obj/structure/cable{
@@ -1391,6 +1381,13 @@
 	},
 /turf/open/floor/plating,
 /area/cargo/storage)
+"aGz" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/obj/structure/disposalpipe/segment{
+	dir = 5
+	},
+/turf/open/floor/plasteel/dark,
+/area/security/office)
 "aGE" = (
 /obj/structure/cable{
 	icon_state = "4-8"
@@ -1473,17 +1470,8 @@
 /turf/open/floor/wood,
 /area/command/heads_quarters/hop)
 "aIj" = (
-/obj/structure/table,
-/obj/item/paper_bin{
-	pixel_x = -6;
-	pixel_y = 4
-	},
-/obj/item/pen/fourcolor,
-/obj/item/paper_bin/bundlenatural{
-	pixel_x = 6;
-	pixel_y = 4
-	},
-/turf/open/floor/carpet,
+/obj/machinery/vending/snack/random,
+/turf/open/floor/wood,
 /area/commons/dorms)
 "aIm" = (
 /obj/machinery/light/small,
@@ -1563,7 +1551,7 @@
 	dir = 1
 	},
 /mob/living/simple_animal/mouse/brown/Tom,
-/turf/open/floor/plasteel/dark,
+/turf/open/floor/plasteel,
 /area/security/prison)
 "aLi" = (
 /obj/structure/cable{
@@ -1670,6 +1658,8 @@
 /area/maintenance/central)
 "aOk" = (
 /obj/structure/table/wood,
+/obj/item/paper_bin,
+/obj/item/pen,
 /turf/open/floor/wood,
 /area/security/courtroom)
 "aOn" = (
@@ -2060,11 +2050,13 @@
 	dir = 4
 	},
 /obj/structure/table/wood,
-/obj/item/book/manual/wiki/security_space_law,
 /obj/item/flashlight/lamp/green{
 	pixel_x = -7;
 	pixel_y = 1
 	},
+/obj/item/book/manual/gato_spacelaw{
+	pixel_x = 8
+	},
 /turf/open/floor/wood,
 /area/security/courtroom)
 "aYl" = (
@@ -2193,7 +2185,7 @@
 /obj/machinery/atmospherics/pipe/manifold/supply/hidden{
 	dir = 8
 	},
-/obj/structure/disposalpipe/segment,
+/obj/effect/landmark/start/security_officer,
 /turf/open/floor/plasteel/dark,
 /area/security/office)
 "baF" = (
@@ -2510,6 +2502,12 @@
 /obj/effect/landmark/start/assistant,
 /turf/open/floor/wood,
 /area/hallway/secondary/exit/departure_lounge)
+"bgM" = (
+/obj/structure/sign/painting{
+	pixel_y = -32
+	},
+/turf/open/floor/carpet/royalblue,
+/area/commons/dorms)
 "bhj" = (
 /obj/machinery/portable_atmospherics/scrubber,
 /turf/open/floor/plasteel,
@@ -2833,7 +2831,7 @@
 "bsf" = (
 /obj/structure/table/wood,
 /obj/item/storage/dice,
-/turf/open/floor/plasteel/dark,
+/turf/open/floor/plasteel,
 /area/security/prison)
 "bsH" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
@@ -2967,7 +2965,7 @@
 /obj/structure/cable{
 	icon_state = "2-4"
 	},
-/turf/open/floor/plasteel/dark,
+/turf/open/floor/plasteel,
 /area/security/office)
 "bwa" = (
 /obj/machinery/door/firedoor/border_only{
@@ -2995,6 +2993,25 @@
 /obj/effect/decal/cleanable/dirt/dust,
 /turf/open/floor/plasteel/white,
 /area/maintenance/aft/secondary)
+"bwS" = (
+/obj/structure/closet/secure_closet/personal/cabinet,
+/obj/item/stack/sheet/mineral/wood,
+/obj/item/stack/sheet/mineral/wood,
+/obj/item/stack/sheet/mineral/wood,
+/obj/item/stack/sheet/mineral/wood,
+/obj/item/stack/sheet/mineral/wood,
+/obj/item/stack/sheet/mineral/wood,
+/obj/item/stack/sheet/mineral/wood,
+/obj/item/stack/sheet/mineral/wood,
+/obj/machinery/button/door{
+	id = "Dorm7";
+	name = "Dorm Bolt Control";
+	normaldoorcontrol = 1;
+	pixel_x = 25;
+	specialfunctions = 4
+	},
+/turf/open/floor/carpet/gato,
+/area/commons/dorms)
 "bwT" = (
 /obj/machinery/airalarm{
 	dir = 8;
@@ -3118,7 +3135,7 @@
 	color = "red";
 	name = "Nanotrasen wildlife department space carp plushie"
 	},
-/turf/open/floor/plasteel/dark,
+/turf/open/floor/plasteel,
 /area/security/prison)
 "bzE" = (
 /obj/effect/mapping_helpers/airlock/cyclelink_helper{
@@ -3150,18 +3167,7 @@
 /turf/open/floor/plasteel,
 /area/hallway/primary/aft)
 "bAQ" = (
-/obj/effect/turf_decal/tile/red{
-	dir = 1
-	},
-/obj/effect/turf_decal/tile/red{
-	dir = 8
-	},
-/obj/effect/turf_decal/tile/red{
-	dir = 4
-	},
-/obj/item/kirbyplants{
-	icon_state = "plant-10"
-	},
+/obj/machinery/vending/security,
 /turf/open/floor/plasteel/dark,
 /area/security/office)
 "bBN" = (
@@ -3450,8 +3456,18 @@
 	pixel_y = 7;
 	req_access_txt = "2"
 	},
-/turf/open/floor/plasteel/dark,
+/turf/open/floor/plasteel,
 /area/security/prison)
+"bKk" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/obj/structure/chair/beanbag/red{
+	dir = 8
+	},
+/turf/open/floor/wood,
+/area/commons/dorms)
 "bKm" = (
 /obj/structure/cable{
 	icon_state = "4-8"
@@ -3473,6 +3489,8 @@
 	dir = 4
 	},
 /obj/structure/table/wood,
+/obj/item/paper_bin,
+/obj/item/pen,
 /turf/open/floor/wood,
 /area/security/courtroom)
 "bLl" = (
@@ -3784,12 +3802,15 @@
 /turf/open/floor/wood,
 /area/service/theater)
 "bTq" = (
-/obj/machinery/door/airlock{
-	desc = "A small bathroom with a sink, toilet and shower.";
-	id_tag = "Bath1";
-	name = "Bathroom"
+/obj/machinery/light{
+	dir = 8
 	},
-/turf/open/floor/plasteel/freezer,
+/obj/item/clothing/shoes/winterboots,
+/obj/item/clothing/shoes/winterboots,
+/obj/item/clothing/shoes/winterboots,
+/obj/item/clothing/shoes/winterboots,
+/obj/structure/rack/shelf,
+/turf/open/floor/plasteel,
 /area/commons/dorms)
 "bTI" = (
 /obj/effect/turf_decal/vg_decals/atmos/nitrogen,
@@ -3854,7 +3875,7 @@
 /obj/machinery/light{
 	dir = 4
 	},
-/obj/item/banner/command/mundane,
+/obj/item/banner/gato,
 /turf/open/floor/carpet,
 /area/command/corporate_showroom)
 "bVg" = (
@@ -4159,7 +4180,7 @@
 /obj/structure/sign/poster/official/space_cops{
 	pixel_y = 32
 	},
-/turf/open/floor/plasteel/dark,
+/turf/open/floor/plasteel,
 /area/security/office)
 "cba" = (
 /obj/machinery/light/small{
@@ -4240,7 +4261,7 @@
 	dir = 8
 	},
 /obj/item/clothing/suit/hooded/wintercoat/security,
-/turf/open/floor/plasteel/dark,
+/turf/open/floor/plasteel,
 /area/security/warden)
 "ccK" = (
 /obj/machinery/teleport/hub,
@@ -4288,6 +4309,7 @@
 	},
 /obj/machinery/disposal/bin,
 /obj/structure/disposalpipe/trunk,
+/obj/effect/turf_decal/bot,
 /turf/open/floor/plasteel,
 /area/hallway/primary/central)
 "cdk" = (
@@ -4355,7 +4377,7 @@
 	pixel_x = -24;
 	pixel_y = -36
 	},
-/turf/open/floor/plasteel/dark,
+/turf/open/floor/plasteel,
 /area/security/brig)
 "cdS" = (
 /obj/structure/cable{
@@ -4366,9 +4388,10 @@
 "cdU" = (
 /obj/machinery/door/airlock{
 	id_tag = "Dorm5";
-	name = "Room Four"
+	name = "Room Four";
+	dir = 8
 	},
-/turf/open/floor/carpet/purple,
+/turf/open/floor/wood,
 /area/commons/dorms)
 "cea" = (
 /obj/machinery/light,
@@ -4618,10 +4641,8 @@
 /turf/open/floor/carpet,
 /area/hallway/secondary/exit/departure_lounge)
 "cjg" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
-	dir = 5
-	},
-/turf/open/floor/wood,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/turf/open/floor/carpet,
 /area/service/bar)
 "cjk" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
@@ -4645,6 +4666,7 @@
 "cjq" = (
 /obj/structure/window/reinforced,
 /obj/structure/table/wood,
+/obj/item/paper_bin,
 /turf/open/floor/carpet,
 /area/hallway/secondary/exit/departure_lounge)
 "cjE" = (
@@ -4663,6 +4685,12 @@
 	},
 /turf/open/floor/carpet,
 /area/command/meeting_room)
+"cjK" = (
+/obj/structure/chair/beanbag/red{
+	dir = 8
+	},
+/turf/open/floor/carpet/red,
+/area/commons/dorms)
 "cjL" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
@@ -4822,7 +4850,7 @@
 /obj/item/radio/intercom{
 	pixel_x = -30
 	},
-/turf/open/floor/plasteel/dark,
+/turf/open/floor/plasteel,
 /area/security/warden)
 "coh" = (
 /obj/structure/cable{
@@ -4878,7 +4906,7 @@
 /area/service/theater)
 "cph" = (
 /obj/structure/table/wood/poker,
-/turf/open/floor/wood,
+/turf/open/floor/carpet,
 /area/service/bar)
 "cpn" = (
 /obj/machinery/door/airlock/external{
@@ -5016,7 +5044,7 @@
 	pixel_x = -24;
 	pixel_y = -36
 	},
-/turf/open/floor/plasteel/dark,
+/turf/open/floor/plasteel,
 /area/security/brig)
 "ctj" = (
 /obj/effect/turf_decal/tile/neutral,
@@ -5074,7 +5102,13 @@
 /obj/machinery/atmospherics/components/unary/vent_pump/on{
 	dir = 8
 	},
-/obj/effect/landmark/start/security_officer,
+/obj/effect/turf_decal/tile/red{
+	dir = 4
+	},
+/obj/effect/turf_decal/tile/red,
+/obj/machinery/computer/secure_data{
+	dir = 8
+	},
 /turf/open/floor/plasteel/dark,
 /area/security/office)
 "cvF" = (
@@ -5369,7 +5403,13 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
 	dir = 4
 	},
-/obj/effect/landmark/start/security_officer,
+/obj/effect/turf_decal/tile/red{
+	dir = 4
+	},
+/obj/effect/turf_decal/tile/red,
+/obj/machinery/computer/security{
+	dir = 8
+	},
 /turf/open/floor/plasteel/dark,
 /area/security/office)
 "cDX" = (
@@ -5506,13 +5546,15 @@
 /obj/structure/cable{
 	icon_state = "1-2"
 	},
-/obj/machinery/vending/wardrobe/sec_wardrobe,
 /obj/effect/turf_decal/tile/red{
 	dir = 1
 	},
 /obj/effect/turf_decal/tile/red{
 	dir = 4
 	},
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
+	dir = 4
+	},
 /turf/open/floor/plasteel,
 /area/security/checkpoint/medical)
 "cHq" = (
@@ -5538,7 +5580,7 @@
 	c_tag = "Brig Genpop South"
 	},
 /obj/structure/chair/comfy/brown,
-/turf/open/floor/plasteel/dark,
+/turf/open/floor/plasteel,
 /area/security/prison)
 "cIl" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
@@ -5613,19 +5655,10 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
 	},
-/obj/machinery/turnstile{
-	dir = 8;
-	name = "Genpop Exit Turnstile";
-	req_access_txt = "70"
-	},
-/obj/machinery/door/firedoor/border_only{
-	dir = 8;
-	name = "west facing firelock"
-	},
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
-/turf/open/floor/plasteel/dark,
+/turf/open/floor/plasteel,
 /area/security/office)
 "cKj" = (
 /obj/effect/landmark/xeno_spawn,
@@ -5802,6 +5835,7 @@
 	name = "Station Intercom (General)";
 	pixel_y = 28
 	},
+/obj/structure/reagent_dispensers/water_cooler,
 /turf/open/floor/plasteel,
 /area/hallway/primary/aft)
 "cQA" = (
@@ -5846,7 +5880,7 @@
 /obj/structure/closet{
 	name = "Evidence Closet"
 	},
-/turf/open/floor/plasteel/dark,
+/turf/open/floor/plasteel,
 /area/security/office)
 "cRA" = (
 /obj/machinery/hydroponics/soil,
@@ -5924,6 +5958,9 @@
 	normaldoorcontrol = 1;
 	req_access_txt = "5"
 	},
+/obj/structure/window/reinforced{
+	dir = 4
+	},
 /turf/open/floor/plasteel/white,
 /area/medical/medbay/central)
 "cTa" = (
@@ -6237,22 +6274,9 @@
 /turf/open/floor/plasteel/dark,
 /area/medical/morgue)
 "dbW" = (
-/obj/machinery/door/airlock/security/glass{
-	id_tag = "innerbrig";
-	name = "Brig";
-	req_access_txt = "63"
-	},
-/obj/effect/mapping_helpers/airlock/cyclelink_helper{
-	dir = 4
-	},
-/obj/machinery/door/firedoor/border_only{
-	dir = 8;
-	name = "west facing firelock"
-	},
-/turf/open/floor/plasteel/dark,
+/turf/open/floor/plasteel,
 /area/security/office)
 "dcx" = (
-/obj/effect/spawner/structure/window/reinforced,
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
@@ -6268,6 +6292,7 @@
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
+/obj/effect/spawner/structure/window/reinforced,
 /turf/open/floor/plating,
 /area/security/office)
 "dcA" = (
@@ -6622,7 +6647,7 @@
 	dir = 1
 	},
 /obj/effect/turf_decal/tile/red,
-/turf/open/floor/plasteel/dark,
+/turf/open/floor/plasteel,
 /area/security/prison)
 "djq" = (
 /obj/structure/cable,
@@ -6677,9 +6702,17 @@
 /turf/open/floor/plasteel/white,
 /area/medical/medbay/central)
 "djI" = (
-/obj/structure/disposalpipe/segment{
-	dir = 5
+/obj/structure/disposalpipe/trunk{
+	dir = 8
 	},
+/obj/machinery/disposal/bin,
+/obj/effect/turf_decal/tile/red{
+	dir = 1
+	},
+/obj/effect/turf_decal/tile/red{
+	dir = 4
+	},
+/obj/effect/turf_decal/tile/red,
 /turf/open/floor/plasteel/dark,
 /area/security/office)
 "djP" = (
@@ -6868,6 +6901,19 @@
 "dnZ" = (
 /turf/open/floor/plasteel/dark,
 /area/science/server)
+"doh" = (
+/obj/structure/table,
+/obj/item/paper_bin/bundlenatural{
+	pixel_x = 6;
+	pixel_y = 4
+	},
+/obj/item/paper_bin{
+	pixel_x = -6;
+	pixel_y = 4
+	},
+/obj/item/pen/fourcolor,
+/turf/open/floor/wood,
+/area/commons/dorms)
 "don" = (
 /obj/machinery/atmospherics/pipe/manifold/supply/hidden{
 	dir = 1
@@ -7015,11 +7061,6 @@
 /turf/open/floor/plasteel/grimy,
 /area/tcommsat/computer)
 "dsw" = (
-/obj/machinery/door/airlock/security/glass{
-	id_tag = "innerbrig";
-	name = "Brig";
-	req_access_txt = "63"
-	},
 /obj/effect/mapping_helpers/airlock/cyclelink_helper{
 	dir = 8
 	},
@@ -7027,7 +7068,13 @@
 	dir = 4;
 	name = "east facing firelock"
 	},
-/turf/open/floor/plasteel/dark,
+/obj/machinery/door/airlock/security/glass{
+	id_tag = "innerbrig";
+	name = "Brig";
+	req_access_txt = "63";
+	dir = 8
+	},
+/turf/open/floor/plasteel,
 /area/security/office)
 "dsU" = (
 /obj/machinery/chem_master/condimaster{
@@ -7441,7 +7488,7 @@
 /obj/effect/turf_decal/arrows/red{
 	dir = 4
 	},
-/turf/open/floor/plasteel/dark,
+/turf/open/floor/plasteel,
 /area/security/prison)
 "dAY" = (
 /obj/effect/turf_decal/tile/yellow{
@@ -7633,7 +7680,7 @@
 	dir = 4
 	},
 /obj/effect/landmark/event_spawn,
-/turf/open/floor/plasteel/dark,
+/turf/open/floor/plasteel,
 /area/security/warden)
 "dHb" = (
 /obj/structure/disposalpipe/junction/yjunction{
@@ -7984,7 +8031,7 @@
 /obj/structure/chair/sofa/left{
 	dir = 4
 	},
-/turf/open/floor/wood,
+/turf/open/floor/carpet,
 /area/service/bar)
 "dRj" = (
 /obj/vehicle/ridden/atv/snowmobile,
@@ -8018,7 +8065,7 @@
 	pixel_x = 6;
 	pixel_y = 3
 	},
-/turf/open/floor/plasteel/dark,
+/turf/open/floor/plasteel,
 /area/security/warden)
 "dSv" = (
 /obj/effect/turf_decal/tile/neutral{
@@ -8223,7 +8270,7 @@
 /area/engineering/atmos)
 "dXv" = (
 /obj/structure/table/wood,
-/obj/item/book/manual/wiki/security_space_law,
+/obj/item/book/manual/gato_spacelaw,
 /turf/open/floor/carpet,
 /area/command/meeting_room)
 "dXG" = (
@@ -8255,13 +8302,14 @@
 /turf/open/floor/plasteel/dark,
 /area/mine/maintenance)
 "dXX" = (
-/obj/machinery/door/airlock/public/glass{
-	name = "Dormitory"
-	},
 /obj/machinery/door/firedoor/border_only{
 	dir = 8;
 	name = "west facing firelock"
 	},
+/obj/machinery/door/airlock/public/glass{
+	name = "Dormitory";
+	dir = 4
+	},
 /turf/open/floor/wood,
 /area/commons/dorms)
 "dYy" = (
@@ -8628,7 +8676,7 @@
 /turf/open/floor/plasteel,
 /area/hallway/primary/port)
 "eiB" = (
-/turf/open/floor/plasteel/dark,
+/turf/open/floor/plasteel,
 /area/security/prison)
 "eiD" = (
 /obj/effect/turf_decal/tile/red{
@@ -8688,6 +8736,10 @@
 	},
 /turf/open/floor/engine,
 /area/engineering/main)
+"ejo" = (
+/obj/structure/fireplace,
+/turf/open/floor/wood,
+/area/commons/dorms)
 "ejp" = (
 /obj/structure/cable{
 	icon_state = "1-2"
@@ -8869,7 +8921,7 @@
 	},
 /obj/machinery/computer/libraryconsole/bookmanagement,
 /obj/structure/table/wood,
-/turf/open/floor/plasteel/dark,
+/turf/open/floor/plasteel,
 /area/security/prison)
 "enT" = (
 /obj/effect/spawner/structure/window/reinforced,
@@ -9172,7 +9224,7 @@
 /obj/structure/cable{
 	icon_state = "2-4"
 	},
-/turf/open/floor/plasteel/dark,
+/turf/open/floor/plasteel,
 /area/security/prison)
 "eud" = (
 /obj/structure/cable{
@@ -9315,7 +9367,7 @@
 	dir = 4;
 	pixel_x = -24
 	},
-/turf/open/floor/plasteel/dark,
+/turf/open/floor/plasteel,
 /area/security/warden)
 "exl" = (
 /obj/structure/table/reinforced,
@@ -9368,7 +9420,7 @@
 /obj/structure/chair/sofa/right{
 	dir = 8
 	},
-/turf/open/floor/wood,
+/turf/open/floor/carpet,
 /area/service/bar)
 "eyL" = (
 /obj/structure/cable{
@@ -9640,19 +9692,10 @@
 /area/commons/dorms)
 "eHr" = (
 /obj/structure/table,
-/obj/item/storage/firstaid/regular{
-	pixel_x = 3;
-	pixel_y = -3
-	},
 /obj/item/storage/firstaid/regular,
-/obj/item/storage/firstaid/regular{
-	pixel_x = 3;
-	pixel_y = -3
-	},
-/obj/item/storage/firstaid/regular{
-	pixel_x = 3;
-	pixel_y = -3
-	},
+/obj/item/storage/firstaid/regular,
+/obj/item/storage/firstaid/regular,
+/obj/item/storage/firstaid/regular,
 /obj/effect/turf_decal/tile/blue{
 	dir = 8
 	},
@@ -10200,7 +10243,7 @@
 	pixel_x = 3;
 	pixel_y = 2
 	},
-/turf/open/floor/carpet,
+/turf/open/floor/plasteel/dark,
 /area/command/heads_quarters/hos)
 "eSH" = (
 /obj/effect/spawner/structure/window/reinforced,
@@ -10658,7 +10701,7 @@
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
-/turf/open/floor/plasteel/dark,
+/turf/open/floor/plasteel,
 /area/security/office)
 "ffC" = (
 /obj/machinery/door/airlock/maintenance,
@@ -10748,6 +10791,7 @@
 	dir = 4;
 	pixel_x = -24
 	},
+/obj/item/book/manual/gato_spacelaw,
 /turf/open/floor/wood,
 /area/command/heads_quarters/hop)
 "fhX" = (
@@ -11274,6 +11318,11 @@
 	},
 /turf/open/floor/plasteel/white,
 /area/science/lab)
+"fsA" = (
+/obj/structure/table/glass,
+/obj/item/book/lorebooks/welcome_to_gato,
+/turf/open/floor/glass/reinforced,
+/area/commons/fitness)
 "fsV" = (
 /obj/effect/turf_decal/stripes/line{
 	dir = 4
@@ -11434,7 +11483,7 @@
 /area/engineering/main)
 "fwL" = (
 /obj/effect/landmark/event_spawn,
-/turf/open/floor/carpet,
+/turf/open/floor/plasteel/dark,
 /area/service/chapel/office)
 "fwR" = (
 /obj/structure/cable{
@@ -11809,14 +11858,11 @@
 /turf/open/floor/plasteel/white,
 /area/science/lab)
 "fHK" = (
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
-	dir = 1
-	},
 /obj/structure/chair/comfy/brown{
 	color = "#596479";
 	dir = 1
 	},
-/turf/open/floor/wood,
+/turf/open/floor/carpet,
 /area/service/bar)
 "fHV" = (
 /obj/structure/cable{
@@ -11846,6 +11892,8 @@
 /area/engineering/atmos)
 "fIM" = (
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on,
+/obj/structure/table,
+/obj/item/storage/firstaid/regular,
 /turf/open/floor/wood,
 /area/commons/dorms)
 "fIN" = (
@@ -11876,7 +11924,7 @@
 	icon_state = "4-8"
 	},
 /obj/effect/landmark/event_spawn,
-/turf/open/floor/plasteel/dark,
+/turf/open/floor/plasteel,
 /area/security/prison)
 "fJA" = (
 /obj/structure/cable{
@@ -12113,7 +12161,8 @@
 	name = "prisoner headset";
 	prison_radio = 1
 	},
-/turf/open/floor/plasteel/dark,
+/obj/item/book/manual/gato_spacelaw,
+/turf/open/floor/plasteel,
 /area/security/brig)
 "fNP" = (
 /obj/structure/disposalpipe/trunk{
@@ -12280,6 +12329,12 @@
 /obj/machinery/telecomms/receiver/preset_left,
 /turf/open/floor/plasteel/dark/telecomms,
 /area/tcommsat/server)
+"fRZ" = (
+/obj/structure/sign/painting{
+	pixel_y = -32
+	},
+/turf/open/floor/carpet/gato,
+/area/commons/dorms)
 "fSf" = (
 /obj/machinery/door/airlock/medical/glass{
 	name = "Infirmary"
@@ -12324,7 +12379,7 @@
 /area/hallway/secondary/entry)
 "fSP" = (
 /obj/machinery/space_heater,
-/obj/effect/turf_decal/delivery,
+/obj/effect/turf_decal/bot,
 /turf/open/floor/plasteel,
 /area/hallway/primary/fore)
 "fTb" = (
@@ -12337,11 +12392,24 @@
 /turf/open/floor/plasteel/dark,
 /area/cargo/miningdock)
 "fTz" = (
-/obj/machinery/door/airlock{
-	id_tag = "Dorm6";
-	name = "Room Five"
+/obj/effect/turf_decal/loading_area{
+	icon_state = "drain";
+	name = "drain"
 	},
-/turf/open/floor/carpet/purple,
+/obj/machinery/shower{
+	pixel_y = 19
+	},
+/obj/structure/curtain,
+/obj/item/soap/nanotrasen,
+/obj/structure/window{
+	dir = 4
+	},
+/obj/effect/turf_decal/loading_area{
+	icon_state = "drain";
+	name = "drain";
+	dir = 1
+	},
+/turf/open/floor/plasteel/freezer,
 /area/commons/dorms)
 "fTT" = (
 /obj/machinery/door/airlock/command{
@@ -12618,6 +12686,13 @@
 	},
 /turf/open/floor/plating,
 /area/maintenance/solars/starboard/aft)
+"gbv" = (
+/obj/structure/dresser,
+/obj/structure/sign/painting{
+	pixel_y = -32
+	},
+/turf/open/floor/carpet/royalblue,
+/area/commons/dorms)
 "gbG" = (
 /obj/machinery/atmospherics/components/unary/vent_pump/on{
 	dir = 8
@@ -12665,9 +12740,8 @@
 /area/icemoon/surface/outdoors)
 "gcM" = (
 /obj/machinery/door/airlock{
-	desc = "A small bathroom with a sink, toilet and shower.";
-	id_tag = "Bath2";
-	name = "Bathroom"
+	name = "Bathroom";
+	dir = 8
 	},
 /turf/open/floor/plasteel/freezer,
 /area/commons/dorms)
@@ -12755,6 +12829,7 @@
 	dir = 8;
 	pixel_y = 28
 	},
+/obj/effect/turf_decal/bot,
 /turf/open/floor/plasteel,
 /area/hallway/primary/aft)
 "geU" = (
@@ -12788,6 +12863,11 @@
 /area/science/mixing)
 "gfr" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/obj/structure/table/wood,
+/obj/item/flashlight/lamp/green{
+	pixel_x = 1;
+	pixel_y = 5
+	},
 /turf/open/floor/wood,
 /area/hallway/secondary/exit/departure_lounge)
 "gfC" = (
@@ -12840,7 +12920,6 @@
 /obj/structure/cable{
 	icon_state = "1-2"
 	},
-/obj/machinery/vending/wardrobe/sec_wardrobe,
 /obj/effect/turf_decal/tile/red{
 	dir = 1
 	},
@@ -13240,7 +13319,7 @@
 /obj/structure/cable{
 	icon_state = "2-8"
 	},
-/turf/open/floor/plasteel/dark,
+/turf/open/floor/plasteel,
 /area/security/warden)
 "gpq" = (
 /obj/structure/cable{
@@ -13552,7 +13631,7 @@
 /area/service/hydroponics)
 "gww" = (
 /obj/machinery/computer/secure_data,
-/turf/open/floor/plasteel/dark,
+/turf/open/floor/plasteel,
 /area/security/warden)
 "gxb" = (
 /obj/structure/cable{
@@ -13580,8 +13659,14 @@
 /area/hallway/primary/central)
 "gyn" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/effect/landmark/event_spawn,
 /obj/structure/disposalpipe/segment,
+/obj/machinery/light{
+	dir = 4
+	},
+/obj/effect/turf_decal/tile/red{
+	dir = 4
+	},
+/obj/effect/turf_decal/tile/red,
 /turf/open/floor/plasteel/dark,
 /area/security/office)
 "gyI" = (
@@ -13844,7 +13929,7 @@
 	departmentType = 5;
 	pixel_x = -30
 	},
-/turf/open/floor/plasteel/dark,
+/turf/open/floor/plasteel,
 /area/security/warden)
 "gFA" = (
 /obj/machinery/light{
@@ -14106,9 +14191,12 @@
 /turf/open/floor/plasteel,
 /area/engineering/atmospherics_engine)
 "gJi" = (
-/obj/structure/sign/poster/official/ian,
-/turf/closed/wall,
-/area/maintenance/department/bridge)
+/obj/effect/turf_decal/tile/neutral{
+	dir = 8
+	},
+/obj/effect/turf_decal/tile/neutral,
+/turf/open/floor/plasteel,
+/area/commons/fitness)
 "gJy" = (
 /obj/structure/window/reinforced{
 	dir = 8
@@ -14370,6 +14458,7 @@
 /obj/structure/closet/wardrobe/cargotech,
 /obj/item/radio/headset/headset_cargo,
 /obj/item/radio/headset/headset_cargo,
+/obj/effect/turf_decal/bot,
 /turf/open/floor/plasteel,
 /area/cargo/storage)
 "gOF" = (
@@ -14430,7 +14519,7 @@
 /obj/machinery/atmospherics/components/unary/vent_pump/on{
 	dir = 1
 	},
-/turf/open/floor/wood,
+/turf/open/floor/carpet,
 /area/service/bar)
 "gQa" = (
 /obj/structure/cable{
@@ -14893,6 +14982,7 @@
 /area/science/xenobiology)
 "gZt" = (
 /obj/machinery/space_heater,
+/obj/effect/turf_decal/bot,
 /turf/open/floor/plasteel,
 /area/hallway/primary/aft)
 "gZG" = (
@@ -15005,7 +15095,7 @@
 	name = "Brig Control APC";
 	pixel_x = -25
 	},
-/turf/open/floor/plasteel/dark,
+/turf/open/floor/plasteel,
 /area/security/warden)
 "hbZ" = (
 /obj/machinery/light/small{
@@ -15062,7 +15152,7 @@
 /obj/structure/closet{
 	name = "Evidence Closet"
 	},
-/turf/open/floor/plasteel/dark,
+/turf/open/floor/plasteel,
 /area/security/office)
 "hdS" = (
 /obj/machinery/porta_turret/ai{
@@ -15547,8 +15637,9 @@
 	dir = 4
 	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/obj/structure/disposalpipe/segment{
-	dir = 4
+/obj/structure/disposalpipe/sorting/mail/flip{
+	dir = 8;
+	sortType = 8
 	},
 /turf/open/floor/plasteel/dark,
 /area/security/office)
@@ -15979,7 +16070,7 @@
 /obj/machinery/airalarm{
 	pixel_y = 26
 	},
-/turf/open/floor/plasteel/dark,
+/turf/open/floor/plasteel,
 /area/security/prison)
 "hCL" = (
 /obj/structure/cable{
@@ -16014,13 +16105,6 @@
 /turf/open/floor/plasteel/white,
 /area/science/lab)
 "hDK" = (
-/obj/effect/turf_decal/tile/red,
-/obj/effect/turf_decal/tile/red{
-	dir = 8
-	},
-/obj/effect/turf_decal/tile/red{
-	dir = 4
-	},
 /obj/effect/landmark/start/security_officer,
 /obj/structure/chair/office/dark{
 	dir = 4
@@ -16108,7 +16192,8 @@
 	dir = 8
 	},
 /obj/machinery/door/airlock/external/glass{
-	name = "Arrivals Airlock"
+	name = "Arrivals Airlock";
+	dir = 4
 	},
 /turf/open/floor/plating,
 /area/hallway/secondary/exit/departure_lounge)
@@ -16140,6 +16225,7 @@
 	dir = 4
 	},
 /obj/machinery/disposal/bin,
+/obj/effect/turf_decal/bot,
 /turf/open/floor/plasteel,
 /area/hallway/primary/central)
 "hIt" = (
@@ -16152,6 +16238,7 @@
 /obj/structure/extinguisher_cabinet{
 	pixel_y = -30
 	},
+/obj/item/book/manual/gato_spacelaw,
 /turf/open/floor/plasteel/dark,
 /area/tcommsat/computer)
 "hIR" = (
@@ -16226,7 +16313,7 @@
 /area/icemoon/surface/outdoors)
 "hKy" = (
 /obj/machinery/light,
-/turf/open/floor/plasteel/dark,
+/turf/open/floor/plasteel,
 /area/security/office)
 "hLa" = (
 /obj/effect/landmark/event_spawn,
@@ -16443,7 +16530,10 @@
 /obj/structure/reagent_dispensers/peppertank{
 	pixel_y = 32
 	},
-/obj/item/book/manual/wiki/security_space_law,
+/obj/item/book/manual/gato_spacelaw,
+/obj/item/book/manual/gato_spacelaw,
+/obj/item/book/manual/gato_spacelaw,
+/obj/item/book/manual/gato_spacelaw,
 /turf/open/floor/plasteel/dark,
 /area/security/office)
 "hQO" = (
@@ -16635,7 +16725,13 @@
 /turf/open/floor/plasteel/white,
 /area/medical/medbay/zone3)
 "hUz" = (
-/turf/open/floor/plasteel/dark,
+/obj/effect/turf_decal/tile/green{
+	dir = 4
+	},
+/obj/effect/turf_decal/tile/green{
+	dir = 1
+	},
+/turf/open/floor/plasteel,
 /area/service/hydroponics)
 "hUA" = (
 /obj/structure/cable{
@@ -16652,6 +16748,18 @@
 /obj/structure/disposalpipe/segment,
 /turf/open/floor/plasteel,
 /area/hallway/primary/port)
+"hUG" = (
+/obj/structure/table/wood,
+/obj/item/export/bottle/champagne{
+	pixel_y = 12;
+	pixel_x = -8
+	},
+/obj/item/reagent_containers/food/drinks/drinkingglass,
+/obj/item/reagent_containers/food/drinks/drinkingglass{
+	pixel_x = 8
+	},
+/turf/open/floor/carpet/gato,
+/area/commons/dorms)
 "hVh" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
 /obj/machinery/door/airlock/public/glass{
@@ -16777,7 +16885,7 @@
 /obj/structure/chair/sofa/right{
 	dir = 4
 	},
-/turf/open/floor/wood,
+/turf/open/floor/carpet,
 /area/service/bar)
 "hWX" = (
 /obj/machinery/biogenerator,
@@ -16859,6 +16967,7 @@
 /area/hallway/primary/central)
 "hYN" = (
 /obj/machinery/space_heater,
+/obj/effect/turf_decal/bot,
 /turf/open/floor/plasteel,
 /area/hallway/secondary/exit/departure_lounge)
 "hZa" = (
@@ -17016,8 +17125,12 @@
 /turf/open/floor/wood,
 /area/commons/dorms)
 "ieJ" = (
-/obj/structure/table/reinforced,
-/obj/item/storage/firstaid/regular,
+/obj/structure/window/reinforced{
+	dir = 4
+	},
+/obj/machinery/computer/med_data{
+	dir = 8
+	},
 /turf/open/floor/plasteel/white,
 /area/medical/medbay/central)
 "ifb" = (
@@ -17175,10 +17288,26 @@
 /turf/open/floor/plasteel,
 /area/hallway/primary/port)
 "iiD" = (
-/obj/structure/chair/comfy/beige{
+/obj/machinery/button/door{
+	id = "Bath1";
+	name = "Door Bolt Control";
+	normaldoorcontrol = 1;
+	pixel_x = 24;
+	pixel_y = -5;
+	specialfunctions = 4
+	},
+/obj/machinery/light/small{
 	dir = 8
 	},
-/turf/open/floor/carpet,
+/obj/structure/toilet/secret/low_loot{
+	pixel_y = 14
+	},
+/obj/effect/turf_decal/loading_area{
+	icon_state = "drain";
+	name = "drain";
+	dir = 1
+	},
+/turf/open/floor/plasteel/freezer,
 /area/commons/dorms)
 "iiY" = (
 /obj/structure/cable{
@@ -17334,7 +17463,7 @@
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
-/turf/open/floor/plasteel/dark,
+/turf/open/floor/plasteel,
 /area/security/office)
 "inZ" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/visible,
@@ -17447,6 +17576,12 @@
 	},
 /turf/open/floor/plasteel/white,
 /area/science/mixing)
+"ipS" = (
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
+	dir = 1
+	},
+/turf/open/floor/carpet,
+/area/service/bar)
 "iqi" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
 /turf/closed/wall/r_wall,
@@ -17745,6 +17880,8 @@
 /obj/structure/extinguisher_cabinet{
 	pixel_x = -27
 	},
+/obj/machinery/space_heater,
+/obj/effect/turf_decal/bot,
 /turf/open/floor/plasteel,
 /area/hallway/secondary/exit/departure_lounge)
 "ixG" = (
@@ -17987,15 +18124,15 @@
 /turf/open/floor/engine,
 /area/maintenance/aft/secondary)
 "iDT" = (
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
-	dir = 4
-	},
 /obj/effect/turf_decal/tile/red{
 	dir = 1
 	},
 /obj/effect/turf_decal/tile/red{
 	dir = 4
 	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+	dir = 4
+	},
 /turf/open/floor/plasteel,
 /area/security/checkpoint/medical)
 "iEb" = (
@@ -18028,6 +18165,14 @@
 	},
 /turf/open/floor/plasteel/white,
 /area/medical/chemistry)
+"iEp" = (
+/obj/structure/fireplace{
+	dir = 4;
+	pixel_x = -10;
+	pixel_y = -2
+	},
+/turf/open/floor/carpet/red,
+/area/commons/dorms)
 "iEr" = (
 /obj/machinery/atmospherics/components/unary/vent_pump/on{
 	dir = 1
@@ -18165,19 +18310,16 @@
 /turf/open/floor/plasteel/white,
 /area/science/mixing)
 "iIS" = (
-/obj/machinery/button/door{
-	id = "Bath2";
-	name = "Door Bolt Control";
-	normaldoorcontrol = 1;
-	pixel_x = 24;
-	pixel_y = -5;
-	specialfunctions = 4
+/obj/machinery/door/airlock{
+	desc = "A small bathroom with a sink, toilet and shower.";
+	id_tag = "Bath2";
+	name = "Bathroom"
 	},
-/obj/machinery/light/small{
-	dir = 8
+/obj/effect/turf_decal/loading_area{
+	dir = 10;
+	icon_state = "steel_panel";
+	name = "steel pannel"
 	},
-/obj/effect/landmark/blobstart,
-/obj/machinery/recharge_station,
 /turf/open/floor/plasteel/freezer,
 /area/commons/dorms)
 "iIX" = (
@@ -18422,6 +18564,7 @@
 /obj/machinery/computer/card/minor/hos{
 	dir = 4
 	},
+/obj/item/pen,
 /turf/open/floor/carpet,
 /area/command/heads_quarters/hos)
 "iPR" = (
@@ -18462,23 +18605,17 @@
 /turf/open/floor/plasteel/white,
 /area/medical/medbay/central)
 "iRs" = (
-/obj/structure/bed,
-/obj/effect/spawner/lootdrop/bedsheet,
-/obj/machinery/button/door{
-	id = "Dorm7";
-	name = "Dorm Bolt Control";
-	normaldoorcontrol = 1;
-	pixel_x = 25;
-	specialfunctions = 4
+/obj/item/radio/intercom{
+	dir = 4;
+	name = "Station Intercom (General)";
+	pixel_y = 29
 	},
-/turf/open/floor/carpet/purple,
+/obj/structure/bed/double,
+/obj/item/bedsheet/double_red,
+/turf/open/floor/carpet/red,
 /area/commons/dorms)
 "iRy" = (
-/obj/structure/closet/secure_closet/personal/cabinet,
-/obj/machinery/light/small{
-	dir = 8
-	},
-/turf/open/floor/carpet/purple,
+/turf/open/floor/carpet/royalblue,
 /area/commons/dorms)
 "iRM" = (
 /obj/structure/cable{
@@ -18522,6 +18659,7 @@
 	dir = 4
 	},
 /obj/structure/closet/emcloset,
+/obj/effect/turf_decal/bot,
 /turf/open/floor/plasteel,
 /area/hallway/primary/fore)
 "iSF" = (
@@ -18659,7 +18797,7 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
 	dir = 4
 	},
-/obj/structure/disposalpipe/segment,
+/obj/effect/landmark/start/security_officer,
 /turf/open/floor/plasteel/dark,
 /area/security/office)
 "iWt" = (
@@ -18733,11 +18871,6 @@
 	icon_state = "2-8"
 	},
 /obj/machinery/atmospherics/pipe/manifold/supply/hidden,
-/obj/effect/turf_decal/tile/red,
-/obj/effect/turf_decal/tile/red{
-	dir = 8
-	},
-/obj/structure/disposalpipe/segment,
 /turf/open/floor/plasteel/dark,
 /area/security/office)
 "iYM" = (
@@ -18784,10 +18917,9 @@
 /turf/open/floor/plasteel,
 /area/hallway/primary/port)
 "iZI" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
 /obj/structure/table/wood,
 /obj/item/ashtray,
-/turf/open/floor/wood,
+/turf/open/floor/carpet,
 /area/service/bar)
 "jad" = (
 /obj/machinery/light/small{
@@ -18868,10 +19000,12 @@
 /turf/open/floor/plating,
 /area/maintenance/disposal)
 "jcp" = (
-/obj/machinery/shower{
-	pixel_y = 20
-	},
 /obj/structure/curtain,
+/obj/effect/turf_decal/loading_area{
+	dir = 10;
+	icon_state = "steel_panel";
+	name = "steel pannel"
+	},
 /turf/open/floor/plasteel/white,
 /area/commons/dorms)
 "jcM" = (
@@ -18987,7 +19121,7 @@
 /obj/item/kirbyplants{
 	icon_state = "plant-10"
 	},
-/turf/open/floor/plasteel/dark,
+/turf/open/floor/plasteel,
 /area/security/prison)
 "jgW" = (
 /obj/structure/disposalpipe/segment,
@@ -19246,6 +19380,9 @@
 	dir = 4
 	},
 /obj/structure/closet/wardrobe/grey,
+/obj/machinery/camera{
+	c_tag = "Dorms West"
+	},
 /turf/open/floor/wood,
 /area/commons/dorms)
 "jlo" = (
@@ -19763,17 +19900,11 @@
 /turf/open/floor/engine,
 /area/maintenance/aft/secondary)
 "jye" = (
-/obj/effect/turf_decal/tile/red{
-	dir = 4
-	},
-/obj/effect/turf_decal/tile/red,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
 	dir = 4
 	},
-/obj/machinery/computer/security{
-	dir = 8
-	},
-/turf/open/floor/plasteel/dark,
+/obj/effect/spawner/structure/window/reinforced,
+/turf/open/floor/plating,
 /area/security/office)
 "jyf" = (
 /obj/machinery/atmospherics/components/binary/valve/digital/layer3{
@@ -19785,10 +19916,6 @@
 /obj/machinery/atmospherics/components/unary/vent_pump/on{
 	dir = 1
 	},
-/obj/structure/chair{
-	dir = 1
-	},
-/obj/effect/landmark/start/security_officer,
 /turf/open/floor/wood,
 /area/hallway/primary/central)
 "jyo" = (
@@ -19821,10 +19948,6 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
 	},
-/obj/effect/turf_decal/tile/red,
-/obj/effect/turf_decal/tile/red{
-	dir = 8
-	},
 /obj/machinery/camera{
 	c_tag = "Brig South";
 	dir = 1
@@ -20017,7 +20140,7 @@
 /obj/effect/turf_decal/arrows/red{
 	dir = 4
 	},
-/turf/open/floor/plasteel/dark,
+/turf/open/floor/plasteel,
 /area/security/prison)
 "jBL" = (
 /obj/effect/turf_decal/tile/purple{
@@ -20055,6 +20178,27 @@
 	},
 /turf/open/floor/plating,
 /area/maintenance/aft/secondary)
+"jCO" = (
+/obj/machinery/button/door{
+	id = "Bath2";
+	name = "Door Bolt Control";
+	normaldoorcontrol = 1;
+	pixel_x = 24;
+	pixel_y = -5;
+	specialfunctions = 4
+	},
+/obj/machinery/light/small{
+	dir = 8
+	},
+/obj/effect/landmark/blobstart,
+/obj/machinery/recharge_station,
+/obj/effect/turf_decal/loading_area{
+	icon_state = "drain";
+	name = "drain";
+	dir = 1
+	},
+/turf/open/floor/plasteel/freezer,
+/area/commons/dorms)
 "jCY" = (
 /obj/effect/turf_decal/tile/yellow{
 	dir = 4
@@ -20356,7 +20500,7 @@
 	dir = 4;
 	name = "east facing firelock"
 	},
-/turf/open/floor/plasteel/dark,
+/turf/open/floor/plasteel,
 /area/security/prison)
 "jKo" = (
 /turf/open/floor/carpet,
@@ -20512,10 +20656,8 @@
 /turf/open/floor/plasteel/white,
 /area/medical/medbay/central)
 "jNh" = (
-/obj/structure/table,
-/obj/item/paicard,
-/turf/open/floor/carpet,
-/area/commons/dorms)
+/turf/open/floor/plasteel,
+/area/security/brig)
 "jNL" = (
 /obj/structure/cable{
 	icon_state = "4-8"
@@ -20582,12 +20724,8 @@
 /turf/open/floor/plasteel,
 /area/commons/dorms)
 "jOZ" = (
-/obj/machinery/firealarm{
-	dir = 4;
-	pixel_x = -24
-	},
-/obj/machinery/vending/snack/random,
-/turf/open/floor/wood,
+/obj/structure/table/wood/poker,
+/turf/open/floor/carpet,
 /area/commons/dorms)
 "jPc" = (
 /obj/machinery/door/airlock/public/glass{
@@ -21043,6 +21181,7 @@
 	},
 /obj/item/clothing/glasses/sunglasses,
 /obj/item/taperecorder,
+/obj/item/book/manual/gato_spacelaw,
 /turf/open/floor/plasteel/grimy,
 /area/security/detectives_office)
 "jYk" = (
@@ -21059,8 +21198,8 @@
 	dir = 4
 	},
 /obj/structure/table/wood,
-/obj/item/book/manual/wiki/security_space_law,
 /obj/item/pen/red,
+/obj/item/book/manual/gato_spacelaw,
 /turf/open/floor/plasteel/cult,
 /area/service/lawoffice)
 "jYs" = (
@@ -21376,6 +21515,14 @@
 	},
 /turf/open/floor/plating/asteroid/snow/icemoon,
 /area/ai_monitored/security/armory)
+"kfb" = (
+/obj/structure/fireplace{
+	dir = 4;
+	pixel_x = -10;
+	pixel_y = -2
+	},
+/turf/open/floor/carpet/gato,
+/area/commons/dorms)
 "kfg" = (
 /obj/structure/cable{
 	icon_state = "0-8"
@@ -21392,11 +21539,11 @@
 /obj/machinery/light{
 	dir = 1
 	},
-/obj/machinery/door/airlock/security/glass{
-	id_tag = "outerbrig";
-	name = "Brig";
-	req_access_txt = "63"
+/obj/effect/turf_decal/tile/red{
+	dir = 8
 	},
+/obj/structure/table/reinforced,
+/obj/machinery/recharger,
 /turf/open/floor/plasteel/dark,
 /area/security/office)
 "kfG" = (
@@ -21496,7 +21643,7 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
 	dir = 4
 	},
-/turf/open/floor/carpet,
+/turf/open/floor/plasteel/dark,
 /area/command/heads_quarters/hos)
 "kid" = (
 /obj/machinery/atmospherics/components/unary/vent_pump/on{
@@ -21606,7 +21753,8 @@
 	},
 /obj/structure/fans/tiny,
 /obj/machinery/door/airlock/external/glass{
-	name = "Arrivals Airlock"
+	name = "Arrivals Airlock";
+	dir = 4
 	},
 /turf/open/floor/plating,
 /area/hallway/secondary/exit/departure_lounge)
@@ -21671,6 +21819,7 @@
 /area/maintenance/aft)
 "kmo" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/obj/structure/disposalpipe/segment,
 /turf/open/floor/plasteel/dark,
 /area/security/office)
 "kmx" = (
@@ -21744,7 +21893,7 @@
 	dir = 4
 	},
 /obj/machinery/disposal/bin,
-/turf/open/floor/wood,
+/turf/open/floor/carpet,
 /area/service/bar)
 "koS" = (
 /obj/structure/cable{
@@ -22118,7 +22267,7 @@
 	c_tag = "Brig Genpop North";
 	dir = 1
 	},
-/turf/open/floor/plasteel/dark,
+/turf/open/floor/plasteel,
 /area/security/prison)
 "kxn" = (
 /obj/machinery/libraryscanner,
@@ -22148,6 +22297,10 @@
 	},
 /turf/open/floor/plasteel/dark,
 /area/security/brig)
+"kxB" = (
+/obj/structure/bookcase/random,
+/turf/open/floor/wood,
+/area/commons/dorms)
 "kxE" = (
 /obj/structure/cable{
 	icon_state = "1-2"
@@ -22303,8 +22456,20 @@
 /turf/open/floor/plasteel/white,
 /area/maintenance/aft/secondary)
 "kBd" = (
-/obj/structure/disposalpipe/segment,
-/turf/open/floor/plasteel/dark,
+/obj/machinery/door/airlock/security/glass{
+	id_tag = "innerbrig";
+	name = "Brig";
+	req_access_txt = "63";
+	dir = 8
+	},
+/obj/effect/mapping_helpers/airlock/cyclelink_helper{
+	dir = 4
+	},
+/obj/machinery/door/firedoor/border_only{
+	dir = 8;
+	name = "west facing firelock"
+	},
+/turf/open/floor/plasteel,
 /area/security/office)
 "kBr" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
@@ -22711,7 +22876,7 @@
 /obj/structure/disposalpipe/segment{
 	dir = 9
 	},
-/turf/open/floor/wood,
+/turf/open/floor/carpet,
 /area/service/bar)
 "kNb" = (
 /obj/machinery/shower{
@@ -22806,8 +22971,10 @@
 /turf/open/floor/plasteel/grimy,
 /area/security/detectives_office)
 "kON" = (
-/obj/structure/table/wood,
-/turf/open/floor/carpet/purple,
+/obj/machinery/light/small{
+	dir = 1
+	},
+/turf/open/floor/carpet/red,
 /area/commons/dorms)
 "kOO" = (
 /obj/machinery/atmospherics/pipe/simple/general/visible{
@@ -22984,6 +23151,10 @@
 	},
 /turf/open/floor/plating/snowed/smoothed/icemoon,
 /area/icemoon/surface/outdoors)
+"kUr" = (
+/obj/structure/chair/sofa/left,
+/turf/open/floor/carpet,
+/area/commons/dorms)
 "kUs" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
 /turf/open/floor/plasteel/dark,
@@ -23144,17 +23315,26 @@
 /turf/open/floor/plating/snowed/smoothed/icemoon,
 /area/icemoon/surface/outdoors)
 "kYD" = (
-/obj/structure/bed,
-/obj/effect/spawner/lootdrop/bedsheet,
-/obj/machinery/button/door{
-	id = "Dorm6";
-	name = "Dorm Bolt Control";
-	normaldoorcontrol = 1;
-	pixel_x = 25;
-	specialfunctions = 4
+/obj/machinery/door/airlock/security/glass{
+	id_tag = "outerbrig";
+	name = "Brig";
+	req_access_txt = "63";
+	dir = 4
 	},
-/turf/open/floor/carpet/purple,
-/area/commons/dorms)
+/turf/open/floor/plating,
+/area/security/office)
+"kZk" = (
+/obj/effect/turf_decal/tile/red{
+	dir = 1
+	},
+/obj/effect/turf_decal/tile/neutral{
+	dir = 4
+	},
+/obj/machinery/vending/gato,
+/turf/open/floor/plasteel/white/corner{
+	dir = 4
+	},
+/area/hallway/secondary/exit/departure_lounge)
 "kZB" = (
 /obj/effect/turf_decal/tile/red{
 	dir = 4
@@ -23170,7 +23350,7 @@
 	name = "Genpop Entrance Turnstile";
 	req_access_txt = "69"
 	},
-/turf/open/floor/plasteel/dark,
+/turf/open/floor/plasteel,
 /area/security/brig)
 "kZC" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
@@ -23324,6 +23504,9 @@
 	},
 /turf/open/floor/plasteel,
 /area/hallway/primary/central)
+"ldN" = (
+/turf/open/floor/carpet,
+/area/service/bar)
 "ldU" = (
 /obj/structure/fence{
 	dir = 4
@@ -23414,6 +23597,9 @@
 /obj/item/radio/intercom{
 	pixel_y = 25
 	},
+/obj/machinery/computer/secure_data{
+	dir = 2
+	},
 /turf/open/floor/plasteel/dark,
 /area/security/office)
 "lgP" = (
@@ -23508,13 +23694,9 @@
 /turf/open/floor/plating/snowed/smoothed/icemoon,
 /area/icemoon/surface/outdoors)
 "ljt" = (
-/obj/machinery/light,
-/obj/machinery/airalarm{
-	dir = 1;
-	pixel_y = -22
-	},
-/turf/open/floor/wood,
-/area/commons/dorms)
+/obj/effect/spawner/structure/window/reinforced,
+/turf/open/floor/plating/asteroid/snow/icemoon,
+/area/icemoon/surface/outdoors)
 "ljw" = (
 /obj/structure/cable{
 	icon_state = "4-8"
@@ -23530,11 +23712,11 @@
 	name = "Head of Security RC";
 	pixel_x = 30
 	},
-/obj/structure/disposalpipe/trunk{
-	dir = 1
-	},
 /obj/machinery/disposal/bin,
-/turf/open/floor/carpet,
+/obj/structure/disposalpipe/trunk{
+	dir = 8
+	},
+/turf/open/floor/plasteel/dark,
 /area/command/heads_quarters/hos)
 "ljL" = (
 /obj/machinery/light{
@@ -23599,7 +23781,7 @@
 /area/engineering/secure_construction)
 "llg" = (
 /obj/machinery/atmospherics/pipe/manifold/supply/hidden,
-/turf/open/floor/plasteel/dark,
+/turf/open/floor/plasteel,
 /area/security/warden)
 "lln" = (
 /obj/structure/closet/firecloset,
@@ -23734,6 +23916,12 @@
 	},
 /turf/open/floor/plating,
 /area/maintenance/solars/starboard/aft)
+"loz" = (
+/obj/structure/chair/sofa/corp/corner{
+	dir = 1
+	},
+/turf/open/floor/carpet,
+/area/commons/dorms)
 "loH" = (
 /obj/machinery/computer/mecha{
 	dir = 4
@@ -23833,6 +24021,12 @@
 	},
 /turf/open/floor/plasteel/white,
 /area/medical/medbay/central)
+"lqc" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+	dir = 4
+	},
+/turf/open/floor/plasteel/dark,
+/area/service/chapel/office)
 "lqv" = (
 /obj/structure/cable{
 	icon_state = "0-8"
@@ -24095,14 +24289,11 @@
 /turf/open/floor/plasteel,
 /area/security/checkpoint/supply)
 "lwL" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
-	dir = 4
+/obj/structure/chair/sofa/left{
+	dir = 1
 	},
-/obj/structure/disposalpipe/segment{
-	dir = 4
-	},
-/turf/open/floor/plasteel/dark,
-/area/security/office)
+/turf/open/floor/carpet,
+/area/commons/dorms)
 "lwT" = (
 /obj/effect/turf_decal/tile/bar,
 /obj/effect/turf_decal/tile/bar{
@@ -24194,7 +24385,6 @@
 /turf/open/floor/engine,
 /area/science/xenobiology)
 "lzz" = (
-/obj/structure/closet/secure_closet/security/science,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
 	dir = 4
 	},
@@ -24205,6 +24395,7 @@
 /obj/effect/turf_decal/tile/red{
 	dir = 4
 	},
+/obj/machinery/vending/wardrobe/sec_wardrobe,
 /turf/open/floor/plasteel,
 /area/security/checkpoint/medical)
 "lzT" = (
@@ -24312,11 +24503,12 @@
 /turf/open/floor/plasteel/dark,
 /area/security/office)
 "lBJ" = (
-/obj/structure/curtain,
-/obj/machinery/shower{
-	pixel_y = 20
+/obj/structure/fireplace{
+	dir = 4;
+	pixel_x = -10;
+	pixel_y = -2
 	},
-/turf/open/floor/plasteel/white,
+/turf/open/floor/carpet/royalblue,
 /area/commons/dorms)
 "lBS" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
@@ -24324,6 +24516,11 @@
 	},
 /turf/open/floor/plasteel/grimy,
 /area/tcommsat/computer)
+"lBY" = (
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden,
+/obj/machinery/light,
+/turf/open/floor/wood,
+/area/commons/dorms)
 "lDe" = (
 /obj/effect/spawner/structure/window/reinforced,
 /turf/open/floor/plating,
@@ -24560,7 +24757,7 @@
 /obj/machinery/firealarm{
 	pixel_y = 24
 	},
-/obj/item/kirbyplants/photosynthetic,
+/obj/structure/reagent_dispensers/water_cooler,
 /turf/open/floor/plasteel,
 /area/maintenance/aft)
 "lJL" = (
@@ -24704,7 +24901,7 @@
 	},
 /obj/structure/table/wood,
 /obj/item/toy/cards/deck,
-/turf/open/floor/plasteel/dark,
+/turf/open/floor/plasteel,
 /area/security/prison)
 "lNZ" = (
 /obj/effect/turf_decal/delivery,
@@ -24715,10 +24912,11 @@
 /turf/open/floor/plasteel,
 /area/science/storage)
 "lOd" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/on{
+/obj/machinery/door/airlock/public/glass{
+	name = "Dormitory";
 	dir = 4
 	},
-/turf/open/floor/carpet,
+/turf/open/floor/wood,
 /area/commons/dorms)
 "lOt" = (
 /obj/machinery/light{
@@ -25170,7 +25368,7 @@
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
-/turf/open/floor/plasteel/dark,
+/turf/open/floor/plasteel,
 /area/security/prison)
 "lWC" = (
 /obj/machinery/computer/upload/borg,
@@ -25286,7 +25484,7 @@
 /obj/structure/chair/sofa/left{
 	dir = 8
 	},
-/turf/open/floor/wood,
+/turf/open/floor/carpet,
 /area/service/bar)
 "lZS" = (
 /obj/machinery/power/terminal{
@@ -25519,7 +25717,7 @@
 /area/medical/medbay/central)
 "mhT" = (
 /obj/effect/landmark/event_spawn,
-/turf/open/floor/plasteel/dark,
+/turf/open/floor/plasteel,
 /area/security/brig)
 "mhU" = (
 /obj/machinery/atmospherics/pipe/simple/general/visible{
@@ -25674,6 +25872,12 @@
 	},
 /turf/open/floor/plating,
 /area/security/prison)
+"mkJ" = (
+/obj/structure/window/reinforced,
+/obj/structure/table/wood,
+/obj/item/book/lorebooks/welcome_to_gato,
+/turf/open/floor/carpet,
+/area/hallway/secondary/exit/departure_lounge)
 "mkL" = (
 /turf/closed/indestructible/rock/glacierrock/blue,
 /area/icemoon/surface/outdoors)
@@ -25966,6 +26170,7 @@
 	pixel_x = -22
 	},
 /obj/machinery/space_heater,
+/obj/effect/turf_decal/bot,
 /turf/open/floor/plasteel,
 /area/hallway/secondary/exit/departure_lounge)
 "mrC" = (
@@ -26264,11 +26469,13 @@
 /area/science/mixing)
 "myt" = (
 /obj/structure/table/wood,
-/obj/item/book/manual/wiki/security_space_law,
 /obj/item/flashlight/lamp/green{
 	pixel_x = -7;
 	pixel_y = 1
 	},
+/obj/item/book/manual/gato_spacelaw{
+	pixel_x = 8
+	},
 /turf/open/floor/wood,
 /area/security/courtroom)
 "myH" = (
@@ -26276,7 +26483,10 @@
 	dir = 9
 	},
 /obj/effect/landmark/event_spawn,
-/turf/open/floor/carpet,
+/obj/structure/disposalpipe/segment{
+	dir = 5
+	},
+/turf/open/floor/plasteel/dark,
 /area/command/heads_quarters/hos)
 "myK" = (
 /obj/machinery/atmospherics/pipe/heat_exchanging/simple,
@@ -26370,7 +26580,7 @@
 	icon_state = "1-2"
 	},
 /obj/machinery/holopad,
-/turf/open/floor/plasteel/dark,
+/turf/open/floor/plasteel,
 /area/security/prison)
 "mBL" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
@@ -26584,6 +26794,12 @@
 /obj/effect/spawner/lootdrop/maintenance,
 /turf/open/floor/plating,
 /area/maintenance/disposal)
+"mHV" = (
+/obj/structure/chair/beanbag/blue{
+	dir = 8
+	},
+/turf/open/floor/carpet/royalblue,
+/area/commons/dorms)
 "mIc" = (
 /obj/structure/cable{
 	icon_state = "1-2"
@@ -26694,9 +26910,6 @@
 /area/science/mixing)
 "mJZ" = (
 /obj/machinery/light,
-/obj/structure/urinal{
-	pixel_y = 32
-	},
 /turf/open/floor/plasteel/freezer,
 /area/commons/dorms)
 "mKq" = (
@@ -26718,6 +26931,9 @@
 	},
 /turf/open/floor/plasteel,
 /area/commons/fitness)
+"mLz" = (
+/turf/open/floor/carpet/red,
+/area/commons/dorms)
 "mLK" = (
 /obj/structure/closet/emcloset/anchored,
 /turf/open/floor/plating,
@@ -26818,6 +27034,7 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
 	dir = 5
 	},
+/obj/effect/turf_decal/bot,
 /turf/open/floor/plasteel,
 /area/commons/fitness)
 "mNR" = (
@@ -27035,7 +27252,7 @@
 /obj/item/radio/intercom{
 	pixel_x = 28
 	},
-/turf/open/floor/plasteel/dark,
+/turf/open/floor/plasteel,
 /area/security/office)
 "mTU" = (
 /obj/structure/bed,
@@ -27050,6 +27267,16 @@
 "mTW" = (
 /turf/closed/wall/r_wall,
 /area/science/lab)
+"mTY" = (
+/obj/item/radio/intercom{
+	dir = 4;
+	name = "Station Intercom (General)";
+	pixel_y = 29
+	},
+/obj/structure/bed/double,
+/obj/item/bedsheet/double_gato,
+/turf/open/floor/carpet/gato,
+/area/commons/dorms)
 "mUh" = (
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on{
 	dir = 4
@@ -27334,6 +27561,18 @@
 /obj/machinery/light/floor,
 /turf/open/floor/plating/snowed/smoothed/icemoon,
 /area/icemoon/surface/outdoors)
+"mZz" = (
+/obj/structure/table/wood,
+/obj/item/export/bottle/wine{
+	pixel_y = 10;
+	pixel_x = -8
+	},
+/obj/item/reagent_containers/food/drinks/drinkingglass,
+/obj/item/reagent_containers/food/drinks/drinkingglass{
+	pixel_x = 8
+	},
+/turf/open/floor/carpet/red,
+/area/commons/dorms)
 "mZA" = (
 /obj/structure/table/reinforced,
 /obj/machinery/door/poddoor/shutters/preopen{
@@ -27521,8 +27760,6 @@
 /obj/structure/cable{
 	icon_state = "1-2"
 	},
-/obj/structure/chair/comfy/black,
-/obj/effect/landmark/start/depsec,
 /turf/open/floor/plasteel/dark,
 /area/hallway/secondary/exit/departure_lounge)
 "ncW" = (
@@ -27590,7 +27827,6 @@
 /area/science/xenobiology)
 "neq" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/obj/structure/closet/cabinet,
 /obj/item/clothing/suit/hooded/wintercoat,
 /obj/item/clothing/suit/hooded/wintercoat,
 /obj/item/clothing/suit/hooded/wintercoat,
@@ -27607,6 +27843,7 @@
 /obj/item/pickaxe,
 /obj/item/pickaxe,
 /obj/effect/turf_decal/delivery,
+/obj/structure/rack/shelf,
 /turf/open/floor/plasteel,
 /area/hallway/primary/fore)
 "nev" = (
@@ -27979,7 +28216,7 @@
 /obj/machinery/newscaster{
 	pixel_y = 32
 	},
-/turf/open/floor/plasteel/dark,
+/turf/open/floor/plasteel,
 /area/security/prison)
 "nos" = (
 /obj/structure/cable{
@@ -28177,6 +28414,14 @@
 	},
 /turf/open/floor/plasteel,
 /area/hallway/primary/port)
+"ntX" = (
+/obj/structure/table/wood,
+/obj/item/flashlight/lamp/green{
+	pixel_x = 1;
+	pixel_y = 5
+	},
+/turf/open/floor/wood,
+/area/hallway/secondary/exit/departure_lounge)
 "nvf" = (
 /obj/machinery/computer/shuttle/snow_taxi{
 	dir = 8
@@ -28506,7 +28751,7 @@
 	id = "permacell1";
 	name = "genpop blast door"
 	},
-/turf/open/floor/plasteel/dark,
+/turf/open/floor/plasteel,
 /area/security/prison)
 "nDs" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{
@@ -28710,10 +28955,7 @@
 "nHM" = (
 /obj/structure/table/glass,
 /obj/item/storage/firstaid/regular,
-/obj/item/storage/firstaid/regular{
-	pixel_x = 3;
-	pixel_y = -3
-	},
+/obj/item/storage/firstaid/regular,
 /obj/item/reagent_containers/spray/cleaner,
 /obj/item/storage/box/bodybags,
 /obj/item/reagent_containers/glass/bottle/charcoal{
@@ -28947,6 +29189,7 @@
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
+/obj/effect/landmark/event_spawn,
 /turf/open/floor/plasteel/dark,
 /area/security/brig)
 "nOd" = (
@@ -28994,7 +29237,7 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 6
 	},
-/turf/open/floor/wood,
+/turf/open/floor/carpet,
 /area/service/bar)
 "nPw" = (
 /obj/structure/cable{
@@ -29165,7 +29408,7 @@
 /area/service/kitchen)
 "nTN" = (
 /obj/machinery/holopad,
-/turf/open/floor/carpet,
+/turf/open/floor/plasteel/dark,
 /area/command/heads_quarters/hos)
 "nUb" = (
 /obj/effect/turf_decal/tile/blue{
@@ -29179,6 +29422,11 @@
 	},
 /obj/structure/table/reinforced,
 /obj/item/storage/fancy/donut_box,
+/obj/item/book/manual/gato_spacelaw,
+/obj/item/book/lorebooks/welcome_to_gato{
+	pixel_y = 8;
+	pixel_x = 8
+	},
 /turf/open/floor/plasteel/dark,
 /area/command/bridge)
 "nUd" = (
@@ -29536,6 +29784,13 @@
 	},
 /turf/open/floor/plasteel/dark,
 /area/service/chapel/office)
+"ocM" = (
+/obj/structure/dresser,
+/obj/structure/sign/painting{
+	pixel_y = -32
+	},
+/turf/open/floor/carpet/gato,
+/area/commons/dorms)
 "ocO" = (
 /obj/effect/turf_decal/bot,
 /obj/machinery/navbeacon{
@@ -29594,7 +29849,7 @@
 /obj/structure/cable{
 	icon_state = "1-2"
 	},
-/turf/open/floor/plasteel/dark,
+/turf/open/floor/plasteel,
 /area/security/warden)
 "oer" = (
 /obj/machinery/button/door{
@@ -29742,14 +29997,11 @@
 /turf/closed/wall/r_wall,
 /area/command/heads_quarters/captain)
 "ohR" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
-	dir = 10
-	},
 /obj/structure/chair/comfy/brown{
 	color = "#596479";
 	dir = 2
 	},
-/turf/open/floor/wood,
+/turf/open/floor/carpet,
 /area/service/bar)
 "ohT" = (
 /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
@@ -30170,6 +30422,14 @@
 	},
 /turf/open/floor/plating/snowed/smoothed/icemoon,
 /area/icemoon/surface/outdoors)
+"otH" = (
+/obj/machinery/light{
+	dir = 1;
+	pixel_y = 12
+	},
+/obj/structure/bookcase/random,
+/turf/open/floor/wood,
+/area/commons/dorms)
 "otI" = (
 /obj/effect/turf_decal/tile/brown{
 	dir = 1
@@ -30187,7 +30447,7 @@
 /obj/structure/cable{
 	icon_state = "1-4"
 	},
-/turf/open/floor/plasteel/dark,
+/turf/open/floor/plasteel,
 /area/security/prison)
 "ouW" = (
 /obj/machinery/atmospherics/pipe/simple,
@@ -30491,6 +30751,14 @@
 	},
 /turf/open/floor/plasteel/dark,
 /area/ai_monitored/turret_protected/ai_upload_foyer)
+"oDy" = (
+/obj/machinery/airalarm{
+	dir = 1;
+	pixel_y = -22
+	},
+/obj/machinery/light,
+/turf/closed/wall,
+/area/commons/dorms)
 "oDL" = (
 /turf/open/floor/wood{
 	icon_state = "wood-broken7"
@@ -30519,6 +30787,18 @@
 /obj/item/razor,
 /turf/open/floor/plasteel/freezer,
 /area/medical/surgery)
+"oEE" = (
+/obj/structure/table/wood,
+/obj/item/reagent_containers/food/drinks/drinkingglass,
+/obj/item/reagent_containers/food/drinks/drinkingglass{
+	pixel_x = 8
+	},
+/obj/item/export/bottle/whiskey{
+	pixel_y = 12;
+	pixel_x = -10
+	},
+/turf/open/floor/carpet/royalblue,
+/area/commons/dorms)
 "oEG" = (
 /obj/effect/spawner/structure/window/reinforced,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
@@ -30801,7 +31081,8 @@
 	name = "prisoner headset";
 	prison_radio = 1
 	},
-/turf/open/floor/plasteel/dark,
+/obj/item/book/manual/gato_spacelaw,
+/turf/open/floor/plasteel,
 /area/security/brig)
 "oMy" = (
 /turf/closed/wall,
@@ -31058,6 +31339,9 @@
 /obj/effect/turf_decal/tile/red{
 	dir = 4
 	},
+/obj/machinery/computer/security{
+	dir = 2
+	},
 /turf/open/floor/plasteel/dark,
 /area/security/office)
 "oRY" = (
@@ -31535,13 +31819,14 @@
 /turf/open/floor/plasteel/cafeteria,
 /area/service/kitchen)
 "piM" = (
-/obj/machinery/door/airlock/public/glass{
-	name = "Dormitory"
-	},
 /obj/machinery/door/firedoor/border_only{
 	dir = 4;
 	name = "east facing firelock"
 	},
+/obj/machinery/door/airlock/public/glass{
+	name = "Dormitory";
+	dir = 4
+	},
 /turf/open/floor/wood,
 /area/commons/dorms)
 "piO" = (
@@ -32039,7 +32324,7 @@
 /obj/structure/cable{
 	icon_state = "1-2"
 	},
-/turf/open/floor/plasteel/dark,
+/turf/open/floor/plasteel,
 /area/security/prison)
 "pwJ" = (
 /obj/machinery/atmospherics/components/unary/vent_pump/on{
@@ -32075,6 +32360,7 @@
 	dir = 4
 	},
 /obj/structure/closet/emcloset,
+/obj/effect/turf_decal/bot,
 /turf/open/floor/plasteel,
 /area/cargo/storage)
 "pxP" = (
@@ -32253,11 +32539,7 @@
 /turf/open/floor/plasteel/dark,
 /area/mine/maintenance)
 "pBN" = (
-/obj/machinery/door/airlock{
-	id_tag = "Dorm7";
-	name = "Room Six"
-	},
-/turf/open/floor/carpet/purple,
+/turf/open/floor/carpet/gato,
 /area/commons/dorms)
 "pCt" = (
 /obj/effect/spawner/structure/window/reinforced,
@@ -32282,7 +32564,7 @@
 	dir = 8
 	},
 /obj/item/toy/plush/lizardplushie,
-/turf/open/floor/plasteel/dark,
+/turf/open/floor/plasteel,
 /area/security/prison)
 "pDn" = (
 /obj/structure/lattice/catwalk,
@@ -32405,7 +32687,7 @@
 /obj/structure/closet{
 	name = "Evidence Closet"
 	},
-/turf/open/floor/plasteel/dark,
+/turf/open/floor/plasteel,
 /area/security/office)
 "pGs" = (
 /obj/machinery/conveyor{
@@ -32504,7 +32786,6 @@
 	dir = 4
 	},
 /obj/machinery/shower{
-	pixel_x = 11;
 	pixel_y = 20
 	},
 /obj/structure/disposalpipe/segment{
@@ -32529,8 +32810,6 @@
 /turf/open/floor/plasteel/white,
 /area/medical/genetics)
 "pIP" = (
-/obj/structure/bed,
-/obj/effect/spawner/lootdrop/bedsheet,
 /obj/machinery/button/door{
 	id = "Dorm5";
 	name = "Dorm Bolt Control";
@@ -32538,7 +32817,16 @@
 	pixel_x = 25;
 	specialfunctions = 4
 	},
-/turf/open/floor/carpet/purple,
+/obj/structure/closet/secure_closet/personal/cabinet,
+/obj/item/stack/sheet/mineral/wood,
+/obj/item/stack/sheet/mineral/wood,
+/obj/item/stack/sheet/mineral/wood,
+/obj/item/stack/sheet/mineral/wood,
+/obj/item/stack/sheet/mineral/wood,
+/obj/item/stack/sheet/mineral/wood,
+/obj/item/stack/sheet/mineral/wood,
+/obj/item/stack/sheet/mineral/wood,
+/turf/open/floor/carpet/royalblue,
 /area/commons/dorms)
 "pJf" = (
 /turf/open/floor/engine,
@@ -32636,7 +32924,7 @@
 "pNS" = (
 /obj/structure/table/wood/poker,
 /obj/item/toy/cards/deck,
-/turf/open/floor/wood,
+/turf/open/floor/carpet,
 /area/service/bar)
 "pOd" = (
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on,
@@ -32648,10 +32936,6 @@
 /turf/open/floor/carpet,
 /area/command/corporate_showroom)
 "pOn" = (
-/obj/structure/chair{
-	dir = 1
-	},
-/obj/effect/landmark/start/security_officer,
 /turf/open/floor/wood,
 /area/hallway/primary/central)
 "pOA" = (
@@ -32882,10 +33166,19 @@
 /turf/open/floor/plating,
 /area/maintenance/port/fore)
 "pTh" = (
-/obj/structure/table/wood,
-/obj/item/ashtray,
-/turf/open/floor/wood,
-/area/service/bar)
+/obj/structure/rack/shelf,
+/obj/item/reagent_containers/rag/towel,
+/obj/item/reagent_containers/rag/towel,
+/obj/effect/turf_decal/loading_area{
+	icon_state = "drain";
+	name = "drain";
+	dir = 1
+	},
+/obj/machinery/light/small{
+	dir = 1
+	},
+/turf/open/floor/plasteel/showroomfloor,
+/area/commons/dorms)
 "pTB" = (
 /obj/effect/turf_decal/tile/bar{
 	dir = 1
@@ -33211,6 +33504,14 @@
 	},
 /turf/open/floor/plasteel/white,
 /area/medical/medbay/central)
+"qaQ" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/obj/structure/reagent_dispensers/water_cooler,
+/turf/open/floor/wood,
+/area/commons/dorms)
 "qba" = (
 /obj/structure/disposalpipe/segment{
 	dir = 4
@@ -33273,7 +33574,7 @@
 	dir = 8;
 	name = "west facing firelock"
 	},
-/turf/open/floor/plasteel/dark,
+/turf/open/floor/plasteel,
 /area/security/prison)
 "qdm" = (
 /obj/machinery/seed_extractor,
@@ -33488,6 +33789,9 @@
 	req_access_txt = "5"
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/obj/structure/window/reinforced{
+	dir = 8
+	},
 /turf/open/floor/plasteel/white,
 /area/medical/medbay/central)
 "qid" = (
@@ -33513,11 +33817,8 @@
 /turf/open/floor/plasteel/dark,
 /area/cargo/miningdock)
 "qiD" = (
-/obj/structure/chair/comfy/beige{
-	dir = 1
-	},
-/turf/open/floor/carpet,
-/area/commons/dorms)
+/turf/open/floor/plasteel/dark,
+/area/service/chapel/office)
 "qiK" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
@@ -33656,7 +33957,7 @@
 	dir = 8
 	},
 /obj/item/toy/plush/beeplushie,
-/turf/open/floor/plasteel/dark,
+/turf/open/floor/plasteel,
 /area/security/prison)
 "qnH" = (
 /obj/machinery/power/emitter,
@@ -33791,6 +34092,10 @@
 	},
 /turf/open/floor/plating,
 /area/engineering/storage)
+"qqV" = (
+/obj/machinery/space_heater,
+/turf/open/floor/plasteel,
+/area/commons/dorms)
 "qqZ" = (
 /obj/structure/cable{
 	icon_state = "4-8"
@@ -35142,6 +35447,7 @@
 /obj/effect/turf_decal/tile/red{
 	dir = 4
 	},
+/obj/structure/table,
 /turf/open/floor/plasteel/dark,
 /area/hallway/secondary/exit/departure_lounge)
 "qXE" = (
@@ -35655,19 +35961,16 @@
 /turf/open/floor/plasteel/freezer,
 /area/medical/surgery)
 "rlm" = (
-/obj/effect/turf_decal/tile/red{
+/obj/machinery/shower{
+	pixel_y = 20
+	},
+/obj/effect/turf_decal/loading_area{
+	icon_state = "drain";
+	name = "drain";
 	dir = 1
 	},
-/obj/effect/turf_decal/tile/red{
-	dir = 4
-	},
-/obj/effect/turf_decal/tile/red,
-/obj/structure/disposalpipe/trunk{
-	dir = 8
-	},
-/obj/machinery/disposal/bin,
-/turf/open/floor/plasteel/dark,
-/area/security/office)
+/turf/open/floor/plasteel/white,
+/area/commons/dorms)
 "rmi" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
 /obj/structure/disposalpipe/segment{
@@ -35900,7 +36203,7 @@
 "rqi" = (
 /obj/effect/turf_decal/tile/red,
 /obj/machinery/space_heater,
-/obj/effect/turf_decal/delivery,
+/obj/effect/turf_decal/bot,
 /turf/open/floor/plasteel/white/corner{
 	dir = 8
 	},
@@ -36213,6 +36516,12 @@
 /obj/machinery/gear_painter,
 /turf/open/floor/plasteel,
 /area/hallway/secondary/exit/departure_lounge)
+"rAf" = (
+/obj/structure/chair/beanbag/gato{
+	dir = 8
+	},
+/turf/open/floor/wood,
+/area/commons/dorms)
 "rAG" = (
 /obj/machinery/door/airlock/external{
 	name = "Engineering External Access";
@@ -36288,6 +36597,7 @@
 	dir = 4
 	},
 /obj/structure/window/reinforced,
+/obj/item/storage/firstaid/regular,
 /turf/open/floor/plasteel/white,
 /area/medical/medbay/central)
 "rCf" = (
@@ -36633,18 +36943,29 @@
 /turf/open/floor/circuit,
 /area/ai_monitored/turret_protected/ai_upload)
 "rMJ" = (
-/obj/machinery/camera{
-	c_tag = "Dorms West"
+/obj/structure/sign/painting{
+	pixel_y = -32
 	},
-/turf/open/floor/carpet,
+/turf/open/floor/carpet/red,
 /area/commons/dorms)
 "rNh" = (
-/obj/item/radio/intercom{
-	dir = 4;
-	name = "Station Intercom (General)";
-	pixel_y = 29
+/obj/structure/closet/secure_closet/personal/cabinet,
+/obj/item/stack/sheet/mineral/wood,
+/obj/item/stack/sheet/mineral/wood,
+/obj/item/stack/sheet/mineral/wood,
+/obj/item/stack/sheet/mineral/wood,
+/obj/item/stack/sheet/mineral/wood,
+/obj/item/stack/sheet/mineral/wood,
+/obj/item/stack/sheet/mineral/wood,
+/obj/item/stack/sheet/mineral/wood,
+/obj/machinery/button/door{
+	id = "Dorm6";
+	name = "Dorm Bolt Control";
+	normaldoorcontrol = 1;
+	pixel_x = 25;
+	specialfunctions = 4
 	},
-/turf/open/floor/carpet/purple,
+/turf/open/floor/carpet/red,
 /area/commons/dorms)
 "rNy" = (
 /obj/effect/turf_decal/tile/neutral{
@@ -37005,7 +37326,7 @@
 	dir = 4
 	},
 /obj/item/toy/plush/nukeplushie,
-/turf/open/floor/plasteel/dark,
+/turf/open/floor/plasteel,
 /area/security/prison)
 "rXz" = (
 /turf/closed/wall,
@@ -37147,7 +37468,7 @@
 	pixel_y = -3;
 	req_access_txt = "2"
 	},
-/turf/open/floor/plasteel/dark,
+/turf/open/floor/plasteel,
 /area/security/warden)
 "sbw" = (
 /obj/machinery/atmospherics/pipe/manifold/supply/hidden{
@@ -37210,7 +37531,7 @@
 /obj/machinery/computer/prisoner/management{
 	dir = 8
 	},
-/turf/open/floor/plasteel/dark,
+/turf/open/floor/plasteel,
 /area/security/warden)
 "scB" = (
 /obj/machinery/power/emitter,
@@ -37464,6 +37785,12 @@
 	},
 /turf/open/floor/plasteel/dark,
 /area/command/teleporter)
+"sjE" = (
+/obj/structure/chair/sofa/corp/corner{
+	dir = 4
+	},
+/turf/open/floor/carpet,
+/area/commons/dorms)
 "sjF" = (
 /obj/structure/closet/emcloset,
 /turf/open/floor/plating,
@@ -37567,9 +37894,7 @@
 /turf/open/floor/plating,
 /area/hallway/secondary/exit/departure_lounge)
 "sli" = (
-/obj/machinery/computer/crew{
-	dir = 8
-	},
+/obj/structure/chair/office/light,
 /turf/open/floor/plasteel/white,
 /area/medical/medbay/central)
 "smh" = (
@@ -37636,7 +37961,8 @@
 	name = "prisoner headset";
 	prison_radio = 1
 	},
-/turf/open/floor/plasteel/dark,
+/obj/item/book/manual/gato_spacelaw,
+/turf/open/floor/plasteel,
 /area/security/brig)
 "smH" = (
 /obj/structure/cable{
@@ -38163,7 +38489,7 @@
 	desc = "An adorable fruit bat with a cute little hat, may or may not have a reputation for biting out eyeballs, or at least that's what the HoS'd tell you.";
 	name = "Colonel Chomps"
 	},
-/turf/open/floor/carpet,
+/turf/open/floor/plasteel/dark,
 /area/command/heads_quarters/hos)
 "sAV" = (
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on{
@@ -38689,17 +39015,14 @@
 /turf/open/floor/plating/snowed/smoothed/icemoon,
 /area/engineering/atmos)
 "sMV" = (
-/obj/effect/turf_decal/tile/red,
-/obj/effect/turf_decal/tile/red{
-	dir = 8
-	},
-/obj/machinery/door/airlock/security/glass{
-	id_tag = "outerbrig";
-	name = "Brig";
-	req_access_txt = "63"
-	},
-/turf/open/floor/plasteel/dark,
-/area/security/office)
+/obj/item/clothing/suit/hooded/wintercoat,
+/obj/item/clothing/suit/hooded/wintercoat,
+/obj/item/clothing/suit/hooded/wintercoat,
+/obj/item/clothing/suit/hooded/wintercoat,
+/obj/item/clothing/suit/hooded/wintercoat,
+/obj/structure/rack/shelf,
+/turf/open/floor/plasteel,
+/area/commons/dorms)
 "sNB" = (
 /obj/structure/cable{
 	icon_state = "4-8"
@@ -39035,7 +39358,7 @@
 "sUh" = (
 /obj/structure/table/wood/poker,
 /obj/item/clothing/mask/cigarette/cigar/havana,
-/turf/open/floor/wood,
+/turf/open/floor/carpet,
 /area/service/bar)
 "sUj" = (
 /obj/structure/chair,
@@ -39066,9 +39389,24 @@
 /obj/structure/loot_pile/maint,
 /turf/open/floor/plating,
 /area/maintenance/aft/secondary)
+"sWf" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/obj/structure/chair/beanbag/blue{
+	dir = 8
+	},
+/turf/open/floor/wood,
+/area/commons/dorms)
 "sWi" = (
-/obj/structure/table/reinforced,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/obj/structure/window/reinforced{
+	dir = 8
+	},
+/obj/machinery/computer/crew{
+	dir = 4
+	},
 /turf/open/floor/plasteel/white,
 /area/medical/medbay/central)
 "sWQ" = (
@@ -39085,11 +39423,19 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
 	},
-/obj/structure/disposalpipe/sorting/mail/flip{
-	dir = 8;
-	sortType = 7
+/obj/structure/disposalpipe/segment{
+	dir = 4
 	},
-/turf/open/floor/plasteel/dark,
+/obj/machinery/turnstile{
+	dir = 8;
+	name = "Genpop Exit Turnstile";
+	req_access_txt = "70"
+	},
+/obj/machinery/door/firedoor/border_only{
+	dir = 8;
+	name = "west facing firelock"
+	},
+/turf/open/floor/plasteel,
 /area/security/office)
 "sXs" = (
 /obj/machinery/atmospherics/components/binary/pump{
@@ -39296,6 +39642,8 @@
 	dir = 4;
 	name = "east facing firelock"
 	},
+/obj/item/paper_bin,
+/obj/item/pen,
 /turf/open/floor/plasteel/dark,
 /area/security/office)
 "tbG" = (
@@ -39495,7 +39843,7 @@
 /obj/structure/window/reinforced{
 	dir = 4
 	},
-/turf/open/floor/carpet,
+/turf/open/floor/plasteel/dark,
 /area/command/heads_quarters/hos)
 "thZ" = (
 /obj/structure/cable{
@@ -39796,7 +40144,7 @@
 	color = "#596479";
 	dir = 8
 	},
-/turf/open/floor/wood,
+/turf/open/floor/carpet,
 /area/service/bar)
 "tqc" = (
 /obj/machinery/computer/rdconsole/production{
@@ -39828,17 +40176,17 @@
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
-/obj/effect/turf_decal/tile/red,
-/obj/effect/turf_decal/tile/red{
-	dir = 4
-	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
 	dir = 4
 	},
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
-/turf/open/floor/plasteel/dark,
+/obj/machinery/door/firedoor/border_only{
+	name = "south facing firelock"
+	},
+/obj/effect/spawner/structure/window/reinforced,
+/turf/open/floor/plating,
 /area/security/office)
 "tqw" = (
 /turf/open/floor/plasteel,
@@ -39861,11 +40209,10 @@
 	pixel_x = -7;
 	pixel_y = 4
 	},
-/obj/item/book/manual/wiki/security_space_law{
-	pixel_x = 6;
-	pixel_y = 2
+/obj/item/book/manual/gato_spacelaw{
+	pixel_x = 8
 	},
-/turf/open/floor/carpet,
+/turf/open/floor/plasteel/dark,
 /area/command/heads_quarters/hos)
 "trc" = (
 /obj/machinery/atmospherics/pipe/manifold/supply/hidden,
@@ -40149,7 +40496,7 @@
 /obj/structure/chair{
 	dir = 8
 	},
-/turf/open/floor/carpet,
+/turf/open/floor/plasteel/dark,
 /area/command/heads_quarters/hos)
 "txC" = (
 /obj/structure/bed,
@@ -40205,7 +40552,7 @@
 "tzD" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
 /obj/structure/disposalpipe/segment,
-/turf/open/floor/carpet,
+/turf/open/floor/plasteel/dark,
 /area/service/chapel/office)
 "tzQ" = (
 /turf/open/floor/plasteel/freezer,
@@ -40332,7 +40679,7 @@
 	id = "permacell1";
 	name = "genpop blast door"
 	},
-/turf/open/floor/plasteel/dark,
+/turf/open/floor/plasteel,
 /area/security/prison)
 "tDS" = (
 /obj/machinery/atmospherics/components/binary/pump,
@@ -41134,7 +41481,7 @@
 	icon_state = "1-8"
 	},
 /obj/machinery/vending/sustenance,
-/turf/open/floor/plasteel/dark,
+/turf/open/floor/plasteel,
 /area/security/prison)
 "tYS" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
@@ -41196,11 +41543,10 @@
 /turf/open/floor/plasteel/chapel,
 /area/service/chapel/main)
 "uaf" = (
-/obj/structure/chair{
-	dir = 8
-	},
-/turf/open/floor/carpet,
-/area/service/chapel/office)
+/obj/structure/closet/firecloset,
+/obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
+/area/hallway/secondary/exit/departure_lounge)
 "uak" = (
 /obj/effect/turf_decal/stripes/line{
 	dir = 1
@@ -41255,6 +41601,7 @@
 	icon_state = "4-8"
 	},
 /obj/structure/chair/sofa/left,
+/obj/item/book/manual/gato_spacelaw,
 /turf/open/floor/plasteel,
 /area/security/checkpoint/supply)
 "ucu" = (
@@ -41580,7 +41927,7 @@
 	pixel_x = 24
 	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/turf/open/floor/carpet,
+/turf/open/floor/plasteel/dark,
 /area/service/chapel/office)
 "uiu" = (
 /obj/structure/disposalpipe/trunk{
@@ -41591,7 +41938,7 @@
 /area/medical/paramedic)
 "uiF" = (
 /obj/effect/landmark/start/security_officer,
-/turf/open/floor/plasteel/dark,
+/turf/open/floor/plasteel,
 /area/security/office)
 "uju" = (
 /obj/machinery/camera{
@@ -41645,6 +41992,7 @@
 	icon_state = "4-8"
 	},
 /obj/structure/chair/sofa/left,
+/obj/item/book/manual/gato_spacelaw,
 /turf/open/floor/plasteel,
 /area/security/checkpoint/medical)
 "ukj" = (
@@ -41723,19 +42071,15 @@
 /turf/open/floor/plasteel/white,
 /area/medical/medbay/central)
 "ulj" = (
-/obj/machinery/button/door{
-	id = "Bath1";
-	name = "Door Bolt Control";
-	normaldoorcontrol = 1;
-	pixel_x = 24;
-	pixel_y = -5;
-	specialfunctions = 4
+/obj/machinery/door/airlock{
+	desc = "A small bathroom with a sink, toilet and shower.";
+	id_tag = "Bath1";
+	name = "Bathroom"
 	},
-/obj/machinery/light/small{
-	dir = 8
-	},
-/obj/structure/toilet/secret/low_loot{
-	pixel_y = 14
+/obj/effect/turf_decal/loading_area{
+	dir = 10;
+	icon_state = "steel_panel";
+	name = "steel pannel"
 	},
 /turf/open/floor/plasteel/freezer,
 /area/commons/dorms)
@@ -41823,7 +42167,7 @@
 	},
 /obj/structure/disposalpipe/sorting/mail/flip{
 	dir = 8;
-	sortType = 8
+	sortType = 7
 	},
 /turf/open/floor/plasteel/dark,
 /area/security/office)
@@ -41851,6 +42195,12 @@
 /obj/structure/disposalpipe/segment,
 /turf/open/floor/plasteel,
 /area/hallway/primary/aft)
+"uoF" = (
+/obj/machinery/atmospherics/components/unary/vent_pump/on{
+	dir = 4
+	},
+/turf/open/floor/wood,
+/area/commons/dorms)
 "uoK" = (
 /obj/machinery/door/airlock/engineering/glass{
 	name = "Supermatter Engine Room";
@@ -42486,7 +42836,7 @@
 	name = "Chapel Office APC";
 	pixel_y = 23
 	},
-/turf/open/floor/carpet,
+/turf/open/floor/plasteel/dark,
 /area/service/chapel/office)
 "uBY" = (
 /obj/machinery/atmospherics/pipe/simple/supply/visible{
@@ -42852,7 +43202,10 @@
 /obj/effect/turf_decal/tile/red{
 	dir = 4
 	},
-/obj/structure/chair/comfy/black,
+/obj/structure/chair/comfy/black{
+	dir = 4
+	},
+/obj/effect/landmark/start/depsec,
 /turf/open/floor/plasteel/dark,
 /area/hallway/secondary/exit/departure_lounge)
 "uJo" = (
@@ -43008,7 +43361,7 @@
 	color = "#596479";
 	dir = 4
 	},
-/turf/open/floor/wood,
+/turf/open/floor/carpet,
 /area/service/bar)
 "uNm" = (
 /obj/structure/cable{
@@ -43018,6 +43371,15 @@
 /obj/structure/disposalpipe/junction/yjunction,
 /turf/open/floor/plasteel,
 /area/hallway/primary/central)
+"uNJ" = (
+/obj/effect/turf_decal/tile/red{
+	dir = 4
+	},
+/obj/effect/turf_decal/tile/red{
+	dir = 1
+	},
+/turf/open/floor/plasteel/dark,
+/area/security/office)
 "uOj" = (
 /obj/machinery/light/small{
 	dir = 4
@@ -43073,7 +43435,7 @@
 /obj/structure/cable{
 	icon_state = "1-2"
 	},
-/turf/open/floor/plasteel/dark,
+/turf/open/floor/plasteel,
 /area/security/office)
 "uQF" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
@@ -43288,10 +43650,14 @@
 "uVx" = (
 /obj/structure/table/wood,
 /obj/item/storage/fancy/donut_box,
-/obj/item/book/manual/wiki/security_space_law,
 /obj/structure/extinguisher_cabinet{
 	pixel_y = -31
 	},
+/obj/item/book/manual/gato_spacelaw,
+/obj/item/book/lorebooks/welcome_to_gato{
+	pixel_y = 8;
+	pixel_x = 8
+	},
 /turf/open/floor/wood,
 /area/command/heads_quarters/captain)
 "uVz" = (
@@ -43302,7 +43668,8 @@
 /obj/effect/turf_decal/tile/red{
 	dir = 4
 	},
-/obj/structure/chair/comfy/black,
+/obj/item/book/manual/gato_spacelaw,
+/obj/structure/table,
 /turf/open/floor/plasteel/dark,
 /area/hallway/secondary/exit/departure_lounge)
 "uVB" = (
@@ -43337,6 +43704,7 @@
 /obj/machinery/light{
 	dir = 4
 	},
+/obj/structure/table,
 /turf/open/floor/plasteel/dark,
 /area/hallway/secondary/exit/departure_lounge)
 "uWR" = (
@@ -43448,6 +43816,7 @@
 	icon_state = "4-8"
 	},
 /obj/structure/table,
+/obj/item/book/lorebooks/welcome_to_gato,
 /turf/open/floor/carpet,
 /area/commons/dorms)
 "uYW" = (
@@ -43469,7 +43838,7 @@
 	name = "Genpop Exit Turnstile";
 	req_access_txt = "70"
 	},
-/turf/open/floor/plasteel/dark,
+/turf/open/floor/plasteel,
 /area/security/brig)
 "uZo" = (
 /obj/effect/turf_decal/tile/green{
@@ -43686,7 +44055,7 @@
 /obj/structure/bed,
 /obj/item/bedsheet/syndie,
 /obj/item/toy/plush/mammal/fox,
-/turf/open/floor/plasteel/dark,
+/turf/open/floor/plasteel,
 /area/security/prison)
 "vcR" = (
 /obj/structure/cable{
@@ -43817,7 +44186,7 @@
 /area/science/server)
 "vgT" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/turf/open/floor/wood,
+/turf/open/floor/carpet,
 /area/service/bar)
 "vgY" = (
 /obj/machinery/field/generator,
@@ -43828,7 +44197,7 @@
 	dir = 4
 	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/turf/open/floor/wood,
+/turf/open/floor/carpet,
 /area/service/bar)
 "vhC" = (
 /turf/open/floor/plasteel/chapel{
@@ -43843,6 +44212,7 @@
 	dir = 1
 	},
 /obj/machinery/disposal/bin,
+/obj/effect/turf_decal/bot,
 /turf/open/floor/plasteel,
 /area/hallway/primary/fore)
 "vim" = (
@@ -43972,6 +44342,7 @@
 	},
 /obj/structure/disposalpipe/trunk,
 /obj/machinery/disposal/bin,
+/obj/effect/turf_decal/bot,
 /turf/open/floor/plasteel,
 /area/cargo/storage)
 "vjJ" = (
@@ -44089,6 +44460,12 @@
 	},
 /turf/open/floor/engine/plasma,
 /area/engineering/atmos)
+"vkM" = (
+/obj/machinery/light/small{
+	dir = 1
+	},
+/turf/open/floor/carpet/gato,
+/area/commons/dorms)
 "vlf" = (
 /obj/machinery/computer/robotics{
 	dir = 4
@@ -44332,12 +44709,11 @@
 /turf/open/floor/plasteel/grimy,
 /area/service/chapel/main)
 "vrc" = (
-/obj/effect/spawner/structure/window/reinforced,
 /obj/structure/cable,
 /obj/machinery/door/poddoor/preopen{
 	id = "hos"
 	},
-/obj/structure/disposalpipe/segment,
+/obj/effect/spawner/structure/window/reinforced,
 /turf/open/floor/plating,
 /area/command/heads_quarters/hos)
 "vrC" = (
@@ -44345,7 +44721,7 @@
 	dir = 4
 	},
 /obj/machinery/holopad,
-/turf/open/floor/plasteel/dark,
+/turf/open/floor/plasteel,
 /area/security/warden)
 "vrG" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
@@ -44443,6 +44819,10 @@
 /obj/machinery/vending/clothing,
 /turf/open/floor/plasteel,
 /area/hallway/primary/fore)
+"vux" = (
+/obj/structure/reagent_dispensers/water_cooler,
+/turf/open/floor/plasteel,
+/area/hallway/primary/port)
 "vuB" = (
 /obj/structure/table/optable,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
@@ -44588,6 +44968,11 @@
 /obj/effect/spawner/structure/window/reinforced,
 /turf/open/floor/plating,
 /area/science/lab)
+"vyO" = (
+/obj/structure/table/wood,
+/obj/item/book/lorebooks/welcome_to_gato,
+/turf/open/floor/wood,
+/area/hallway/secondary/exit/departure_lounge)
 "vyU" = (
 /obj/structure/cable{
 	icon_state = "1-2"
@@ -44691,7 +45076,7 @@
 /obj/effect/turf_decal/tile/red{
 	dir = 1
 	},
-/turf/open/floor/plasteel/dark,
+/turf/open/floor/plasteel,
 /area/security/prison)
 "vAn" = (
 /obj/structure/table/reinforced,
@@ -45061,6 +45446,7 @@
 	dir = 1;
 	name = "north facing firelock"
 	},
+/obj/structure/disposalpipe/segment,
 /turf/open/floor/carpet,
 /area/command/heads_quarters/hos)
 "vIb" = (
@@ -45394,6 +45780,16 @@
 "vPp" = (
 /turf/open/floor/carpet,
 /area/commons/dorms)
+"vPw" = (
+/obj/item/radio/intercom{
+	dir = 4;
+	name = "Station Intercom (General)";
+	pixel_y = 29
+	},
+/obj/structure/bed/double,
+/obj/item/bedsheet/double_blue,
+/turf/open/floor/carpet/royalblue,
+/area/commons/dorms)
 "vPH" = (
 /obj/structure/cable{
 	icon_state = "1-2"
@@ -45629,6 +46025,7 @@
 	dir = 4
 	},
 /obj/structure/table/wood,
+/obj/item/paper_bin,
 /turf/open/floor/plasteel/dark,
 /area/command/bridge)
 "vVO" = (
@@ -45869,12 +46266,11 @@
 /turf/open/floor/plasteel/white,
 /area/command/heads_quarters/cmo)
 "wbR" = (
-/obj/effect/turf_decal/tile/red,
-/obj/effect/turf_decal/tile/red{
-	dir = 8
+/obj/structure/toilet{
+	dir = 4
 	},
-/turf/open/floor/plasteel/dark,
-/area/security/office)
+/turf/open/floor/plasteel/freezer,
+/area/commons/dorms)
 "wcc" = (
 /obj/machinery/atmospherics/pipe/heat_exchanging/simple,
 /obj/structure/chair/sofa{
@@ -45898,7 +46294,7 @@
 /obj/item/radio/intercom{
 	pixel_x = 28
 	},
-/turf/open/floor/plasteel/dark,
+/turf/open/floor/plasteel,
 /area/security/prison)
 "wcz" = (
 /obj/structure/cable{
@@ -45945,6 +46341,7 @@
 /area/ai_monitored/turret_protected/aisat/service)
 "wdF" = (
 /obj/structure/closet/emcloset,
+/obj/effect/turf_decal/bot,
 /turf/open/floor/plasteel,
 /area/hallway/secondary/exit/departure_lounge)
 "wdR" = (
@@ -45974,7 +46371,7 @@
 /area/commons/dorms)
 "wev" = (
 /obj/machinery/computer/security,
-/turf/open/floor/plasteel/dark,
+/turf/open/floor/plasteel,
 /area/security/warden)
 "weT" = (
 /obj/item/kirbyplants{
@@ -46125,6 +46522,15 @@
 /obj/item/radio/intercom{
 	pixel_y = -26
 	},
+/obj/machinery/door/airlock/security/glass{
+	name = "Equipment Room";
+	req_access_txt = "1";
+	dir = 8
+	},
+/obj/machinery/door/firedoor/border_only{
+	dir = 8;
+	name = "west facing firelock"
+	},
 /turf/open/floor/plasteel/dark,
 /area/security/office)
 "wgE" = (
@@ -46203,12 +46609,12 @@
 /turf/open/floor/plasteel/dark,
 /area/command/teleporter)
 "wiR" = (
-/obj/effect/spawner/structure/window/reinforced,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+/obj/structure/chair/comfy/brown{
+	color = "#596479";
 	dir = 4
 	},
-/turf/open/floor/plating,
-/area/security/office)
+/turf/open/floor/carpet,
+/area/service/bar)
 "wjb" = (
 /obj/structure/window/reinforced,
 /turf/open/floor/plating,
@@ -46262,6 +46668,7 @@
 	dir = 4
 	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/obj/structure/disposalpipe/segment,
 /turf/open/floor/plasteel/dark,
 /area/security/office)
 "wlf" = (
@@ -46652,6 +47059,7 @@
 /obj/structure/extinguisher_cabinet{
 	pixel_x = -27
 	},
+/obj/effect/turf_decal/bot,
 /turf/open/floor/plasteel,
 /area/hallway/secondary/exit/departure_lounge)
 "wyg" = (
@@ -46717,6 +47125,9 @@
 	c_tag = "Escape Arm Holding Area";
 	dir = 4
 	},
+/obj/structure/chair/comfy/black{
+	dir = 4
+	},
 /turf/open/floor/plasteel/dark,
 /area/hallway/secondary/exit/departure_lounge)
 "wzX" = (
@@ -47033,6 +47444,12 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
 /turf/open/floor/plasteel/white,
 /area/medical/medbay/central)
+"wHN" = (
+/obj/structure/chair/sofa/corp{
+	dir = 4
+	},
+/turf/open/floor/carpet,
+/area/commons/dorms)
 "wHX" = (
 /obj/machinery/atmospherics/pipe/simple/orange/visible{
 	dir = 5
@@ -47189,6 +47606,7 @@
 /obj/effect/turf_decal/tile/blue{
 	dir = 4
 	},
+/obj/structure/reagent_dispensers/water_cooler,
 /turf/open/floor/plasteel,
 /area/hallway/primary/port)
 "wMp" = (
@@ -47432,6 +47850,12 @@
 	},
 /turf/open/floor/plating/snowed/smoothed/icemoon,
 /area/engineering/atmospherics_engine)
+"wQs" = (
+/obj/machinery/light/small{
+	dir = 1
+	},
+/turf/open/floor/carpet/royalblue,
+/area/commons/dorms)
 "wQu" = (
 /obj/machinery/vr_sleeper{
 	dir = 4
@@ -47442,7 +47866,7 @@
 /obj/effect/turf_decal/tile/red{
 	dir = 1
 	},
-/turf/open/floor/plasteel/dark,
+/turf/open/floor/plasteel,
 /area/security/prison)
 "wQx" = (
 /obj/structure/cable{
@@ -47634,11 +48058,9 @@
 /turf/open/floor/plasteel,
 /area/engineering/atmos)
 "wWH" = (
-/obj/machinery/computer/med_data{
-	dir = 8
-	},
-/turf/open/floor/plasteel/white,
-/area/medical/medbay/central)
+/obj/structure/table/wood,
+/turf/open/floor/carpet,
+/area/service/bar)
 "wXm" = (
 /obj/effect/turf_decal/tile/blue{
 	dir = 4
@@ -47885,7 +48307,7 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
 	},
-/turf/open/floor/plasteel/dark,
+/turf/open/floor/plasteel,
 /area/security/warden)
 "xfX" = (
 /obj/machinery/light/small{
@@ -47989,6 +48411,12 @@
 	},
 /turf/open/floor/plating,
 /area/maintenance/bar)
+"xhQ" = (
+/obj/structure/chair/beanbag/gato{
+	dir = 8
+	},
+/turf/open/floor/carpet/gato,
+/area/commons/dorms)
 "xhR" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
@@ -48236,6 +48664,9 @@
 /obj/item/radio/intercom{
 	pixel_x = -30
 	},
+/obj/structure/chair/comfy/black{
+	dir = 4
+	},
 /turf/open/floor/plasteel/dark,
 /area/hallway/secondary/exit/departure_lounge)
 "xoE" = (
@@ -48341,11 +48772,12 @@
 /turf/open/floor/wood,
 /area/command/heads_quarters/hop)
 "xqy" = (
-/obj/machinery/light{
+/obj/machinery/door/airlock{
+	id_tag = "Dorm7";
+	name = "Room Six";
 	dir = 8
 	},
-/obj/structure/chair/comfy/beige,
-/turf/open/floor/carpet,
+/turf/open/floor/wood,
 /area/commons/dorms)
 "xqC" = (
 /obj/machinery/airalarm{
@@ -48575,6 +49007,13 @@
 	},
 /turf/open/floor/plating,
 /area/maintenance/aft/secondary)
+"xxK" = (
+/obj/structure/dresser,
+/obj/structure/sign/painting{
+	pixel_y = -32
+	},
+/turf/open/floor/carpet/red,
+/area/commons/dorms)
 "xyg" = (
 /obj/structure/disposalpipe/trunk{
 	dir = 8
@@ -48693,6 +49132,10 @@
 	c_tag = "Dorms Northwest";
 	dir = 4
 	},
+/obj/machinery/firealarm{
+	dir = 4;
+	pixel_x = -24
+	},
 /turf/open/floor/wood,
 /area/commons/dorms)
 "xAS" = (
@@ -48890,7 +49333,7 @@
 /obj/effect/turf_decal/tile/red{
 	dir = 4
 	},
-/obj/structure/closet/secure_closet/security/cargo,
+/obj/machinery/vending/wardrobe/sec_wardrobe,
 /turf/open/floor/plasteel,
 /area/security/checkpoint/supply)
 "xEv" = (
@@ -48980,6 +49423,12 @@
 	},
 /turf/open/floor/plasteel,
 /area/hallway/primary/fore)
+"xGu" = (
+/obj/structure/urinal{
+	pixel_y = 32
+	},
+/turf/open/floor/plasteel/freezer,
+/area/commons/dorms)
 "xGI" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
 /obj/effect/landmark/event_spawn,
@@ -49069,7 +49518,7 @@
 /area/service/janitor)
 "xJr" = (
 /obj/machinery/computer/arcade/battle,
-/turf/open/floor/plasteel/dark,
+/turf/open/floor/plasteel,
 /area/security/prison)
 "xJz" = (
 /obj/structure/disposalpipe/segment{
@@ -49125,6 +49574,14 @@
 /obj/effect/turf_decal/tile/purple,
 /turf/open/floor/plasteel/white,
 /area/medical/genetics)
+"xLd" = (
+/obj/machinery/door/airlock{
+	id_tag = "Dorm6";
+	name = "Room Five";
+	dir = 8
+	},
+/turf/open/floor/wood,
+/area/commons/dorms)
 "xLW" = (
 /obj/machinery/atmospherics/components/unary/vent_pump/on{
 	dir = 8
@@ -49399,19 +49856,11 @@
 /turf/open/floor/circuit/telecomms/mainframe,
 /area/tcommsat/server)
 "xUw" = (
-/obj/effect/turf_decal/tile/red,
-/obj/effect/turf_decal/tile/red{
-	dir = 4
-	},
-/obj/machinery/light{
-	dir = 4
-	},
 /obj/machinery/firealarm{
 	dir = 8;
 	pixel_x = 24
 	},
-/obj/structure/disposalpipe/segment,
-/turf/open/floor/plasteel/dark,
+/turf/closed/wall/r_wall,
 /area/security/office)
 "xUy" = (
 /obj/machinery/light{
@@ -49819,9 +50268,15 @@
 /turf/open/floor/plating,
 /area/maintenance/department/electrical)
 "yeh" = (
-/obj/machinery/light,
-/turf/open/floor/wood,
-/area/commons/dorms)
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+	dir = 4
+	},
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/structure/reagent_dispensers/water_cooler,
+/turf/open/floor/plasteel,
+/area/commons/fitness)
 "yez" = (
 /obj/machinery/atmospherics/components/unary/vent_pump/on{
 	dir = 4
@@ -49950,7 +50405,7 @@
 "yhE" = (
 /obj/structure/bed,
 /obj/item/bedsheet/syndie,
-/turf/open/floor/plasteel/dark,
+/turf/open/floor/plasteel,
 /area/security/brig)
 "yhF" = (
 /obj/item/stack/rods,
@@ -195146,7 +195601,7 @@ aFq
 jIv
 aFq
 ckC
-fbg
+vux
 vag
 iFH
 ntS
@@ -198488,7 +198943,7 @@ nEu
 xNs
 hWD
 fSm
-wWH
+hWD
 sli
 gQk
 hWD
@@ -208817,7 +209272,7 @@ cQA
 cQA
 cQA
 cQA
-oSV
+jNh
 csd
 cQA
 ngq
@@ -209329,7 +209784,7 @@ sgP
 cQA
 cQA
 fNL
-oSV
+jNh
 xZA
 jRr
 czv
@@ -209586,7 +210041,7 @@ sgP
 cQA
 cQA
 yhE
-oSV
+jNh
 ckK
 oSV
 eQx
@@ -210100,7 +210555,7 @@ sgP
 cQA
 cQA
 cdO
-oSV
+jNh
 hac
 oSV
 eQx
@@ -210127,7 +210582,7 @@ sgP
 sgP
 vWc
 nHH
-uaf
+nHH
 nHH
 dOg
 aYz
@@ -210383,9 +210838,9 @@ rIA
 bCX
 sgP
 vWc
-mfA
-mfA
-mfA
+qiD
+qiD
+qiD
 ocT
 blt
 dCU
@@ -210641,7 +211096,7 @@ cOM
 yfW
 vWc
 pkX
-mfA
+qiD
 nZZ
 vrJ
 mfA
@@ -210899,7 +211354,7 @@ mYj
 oiF
 uBT
 fwL
-kHq
+lqc
 soS
 mfA
 xBT
@@ -211139,7 +211594,7 @@ tke
 uoc
 iGE
 gyn
-iGE
+aGz
 bat
 iVF
 iXD
@@ -211155,7 +211610,7 @@ qwT
 kgU
 oiF
 pxP
-mfA
+qiD
 icl
 lpm
 mfA
@@ -211390,8 +211845,8 @@ yko
 sHr
 nHX
 rFB
-ohU
-qPj
+lDe
+kYD
 tqv
 sXh
 kBd
@@ -211648,13 +212103,13 @@ dsX
 rNS
 rFB
 kfj
-sMV
+qPj
 dcx
 cKi
 dbW
 qlt
-rlm
-aqX
+lDe
+lDe
 jye
 wgw
 qlt
@@ -211905,14 +212360,14 @@ myt
 bKS
 rFB
 oRt
-wbR
+qPj
 loV
-lwL
+cKi
 hKy
 qlt
-lDe
-lDe
-wiR
+jjx
+cXn
+ayv
 avx
 qlt
 caZ
@@ -212165,11 +212620,11 @@ lgz
 hDK
 lOX
 inw
-qPj
+dbW
 qlt
-jjx
-cXn
-ayv
+uNJ
+qPj
+qPj
 oLa
 fHV
 uQt
@@ -212586,25 +213041,25 @@ djs
 djs
 djs
 djs
-djs
-djs
-djs
-djs
-djs
-btn
-btn
-btn
-btn
-btn
-btn
-btn
-btn
-sgP
-sgP
-sgP
-sgP
-sgP
-sgP
+fvR
+fvR
+fvR
+fvR
+fvR
+fvR
+fvR
+fvR
+fvR
+fvR
+fvR
+fvR
+fvR
+fvR
+rXE
+rXE
+rXE
+rXE
+rXE
 sgP
 rBc
 dPG
@@ -212843,25 +213298,25 @@ djs
 djs
 djs
 djs
-djs
-djs
-djs
-djs
-djs
-btn
-btn
-btn
-btn
-btn
-btn
-btn
-btn
-sgP
-sgP
-sgP
-sgP
-sgP
-sgP
+fvR
+pTh
+uJS
+wbR
+fvR
+pTh
+uJS
+wbR
+fvR
+pTh
+uJS
+wbR
+fvR
+kxB
+sjE
+wHN
+wHN
+loz
+rXE
 sgP
 rBc
 dPG
@@ -213100,24 +213555,24 @@ djs
 djs
 djs
 djs
-djs
-djs
-djs
-djs
-djs
-btn
-btn
-btn
-btn
-btn
-btn
-btn
-btn
 fvR
-rXE
-rXE
-rXE
-rXE
+fTz
+aqX
+mRB
+fvR
+fTz
+aqX
+mRB
+fvR
+fTz
+aqX
+mRB
+fvR
+otH
+kUr
+jOZ
+jOZ
+lwL
 rXE
 sgP
 aDT
@@ -213357,24 +213812,24 @@ djs
 djs
 djs
 djs
-djs
-djs
-djs
-djs
-djs
-btn
-btn
-btn
-btn
-btn
-btn
-btn
-btn
 fvR
-aIj
-xqy
-jNh
-qiD
+fvR
+fvR
+gcM
+fvR
+fvR
+fvR
+gcM
+fvR
+fvR
+fvR
+gcM
+fvR
+kxB
+vPp
+vPp
+vPp
+vPp
 rXE
 sgP
 sqK
@@ -213431,14 +213886,14 @@ ban
 sYu
 vHw
 vHw
-ban
+vyO
 tgK
 tMu
-vHw
+vyO
 vHw
 bgE
 ban
-wdF
+uaf
 jrw
 eqI
 hGt
@@ -213450,7 +213905,7 @@ uda
 gxD
 oxd
 uAh
-uda
+pOn
 qlt
 lBm
 mtG
@@ -213614,24 +214069,24 @@ djs
 djs
 djs
 djs
-djs
-djs
-djs
-djs
-djs
-btn
-btn
-btn
-btn
-btn
-btn
-btn
-sgP
 fvR
-vPp
-vPp
-iiD
-vPp
+hUG
+kfb
+pBN
+fvR
+mZz
+iEp
+mLz
+fvR
+oEE
+lBJ
+iRy
+fvR
+ejo
+cep
+cep
+cep
+doh
 rXE
 sgP
 sfl
@@ -213691,7 +214146,7 @@ dkW
 gfr
 lDz
 tMu
-nCH
+ntX
 nCH
 nCH
 ban
@@ -213871,26 +214326,26 @@ djs
 djs
 djs
 djs
-btn
-btn
-btn
-fvR
-fvR
-fvR
-fvR
-fvR
-fvR
-fvR
-fvR
-fvR
 fvR
+xhQ
+pBN
+fRZ
 fvR
+cjK
+mLz
 rMJ
-lOd
-vPp
-vPp
 fvR
-sgP
+mHV
+iRy
+bgM
+fvR
+fvR
+rXE
+lOd
+oDy
+fvR
+fvR
+ltb
 rBc
 ooT
 sgP
@@ -214128,26 +214583,26 @@ djs
 djs
 djs
 djs
-btn
-btn
-sgP
 fvR
-iRy
-kON
+vkM
+pBN
+ocM
 fvR
-iRy
 kON
+mLz
+xxK
 fvR
+wQs
 iRy
-kON
+gbv
 fvR
 qBR
 sCk
-nfZ
-ljt
-fvR
-fvR
-fvR
+uoF
+rXE
+sMV
+bTq
+rXE
 rBc
 dPG
 sgP
@@ -214385,25 +214840,25 @@ djs
 djs
 djs
 djs
-sgP
-sgP
-sgP
 fvR
-rNh
+mTY
+pBN
+bwS
+fvR
 iRs
-fvR
+mLz
 rNh
-kYD
 fvR
-rNh
+vPw
+iRy
 pIP
 fvR
 rFl
 cep
 nfZ
-cep
 eHl
 kwd
+kwd
 kuT
 sqK
 dPG
@@ -214642,15 +215097,15 @@ djs
 djs
 djs
 djs
-sgP
+fvR
+fvR
+xqy
 fvR
 fvR
 fvR
-pBN
+xLd
 fvR
 fvR
-fTz
-fvR
 fvR
 cdU
 fvR
@@ -214658,9 +215113,9 @@ fvR
 jld
 cep
 nfZ
-cep
 eHl
 kwd
+kwd
 kuT
 sqK
 dPG
@@ -214899,9 +215354,9 @@ djs
 djs
 djs
 djs
-sgP
-rXE
-jOZ
+ljt
+aIj
+cep
 sKn
 cep
 ptH
@@ -214915,8 +215370,8 @@ aJo
 eQc
 cep
 nfZ
-cep
 rXE
+qqV
 eCQ
 rXE
 rBc
@@ -215156,13 +215611,13 @@ btn
 btn
 btn
 sgP
-sgP
-rXE
+ljt
 nrk
 cep
 cep
 cep
 cep
+cep
 kVC
 fra
 fra
@@ -215171,11 +215626,11 @@ fra
 fra
 dxg
 fra
-ajs
-yeh
-rXE
-rXE
-rXE
+lBY
+fvR
+fvR
+fvR
+fvR
 rBc
 dPG
 sgP
@@ -215225,7 +215680,7 @@ uak
 wwT
 iod
 xoM
-rKo
+kZk
 ban
 llO
 nCH
@@ -215413,24 +215868,24 @@ btn
 btn
 btn
 sgP
-sgP
-rXE
+ljt
 aax
+cep
 thi
-cep
-cep
+rAf
+rAf
 fIM
 xgp
 fqV
-fqV
-fqV
-fqV
+qaQ
+sWf
+bKk
 gma
 rqm
 cep
 nfZ
 rXE
-orj
+sgP
 sgP
 sgP
 rBc
@@ -215670,7 +216125,7 @@ btn
 btn
 btn
 btn
-sgP
+ltb
 fvR
 fvR
 fvR
@@ -216263,7 +216718,7 @@ ban
 isI
 tMu
 kmx
-cjq
+mkJ
 ban
 htS
 izF
@@ -216508,7 +216963,7 @@ xov
 boo
 eht
 hYN
-ncq
+hYN
 ixt
 tsG
 ban
@@ -218243,9 +218698,9 @@ btn
 btn
 btn
 sgP
-sgP
-fvR
-lBJ
+ltb
+rlm
+jcp
 uJS
 yif
 ehU
@@ -218500,8 +218955,8 @@ btn
 btn
 btn
 btn
-sgP
-fvR
+ltb
+rlm
 jcp
 mRB
 fPC
@@ -218757,9 +219212,9 @@ btn
 btn
 btn
 btn
-sgP
-fvR
-lBJ
+ltb
+rlm
+jcp
 qbG
 uXY
 gHF
@@ -219014,12 +219469,12 @@ btn
 btn
 btn
 btn
-sgP
-fvR
+ltb
 fvR
 fvR
 fvR
 mRB
+mRB
 fvR
 mIZ
 ogZ
@@ -219272,10 +219727,10 @@ sgP
 sgP
 btn
 sgP
-btn
-fvR
+ltb
+iiD
 ulj
-bTq
+mRB
 mRB
 fvR
 ulT
@@ -219529,10 +219984,10 @@ btn
 sgP
 sgP
 sgP
-btn
-fvR
+ltb
 fvR
 fvR
+xGu
 mJZ
 fvR
 fvR
@@ -219786,10 +220241,10 @@ btn
 btn
 sgP
 sgP
-btn
-fvR
+ltb
+jCO
 iIS
-gcM
+mRB
 mRB
 fvR
 mIZ
@@ -223140,7 +223595,7 @@ pFN
 pFN
 pFN
 wEb
-mSC
+yeh
 piO
 wFB
 mjs
@@ -223651,7 +224106,7 @@ mWU
 iyL
 pFN
 yft
-mfV
+fsA
 pFN
 don
 sOj
@@ -226986,11 +227441,11 @@ fVV
 bTn
 vho
 cjg
-fIe
-fIe
-fIe
+cjg
+ipS
+ldN
 uMM
-fIe
+wiR
 fIe
 jPc
 lfC
@@ -227245,9 +227700,9 @@ koH
 ohR
 iZI
 fHK
-fIe
-pTh
-fIe
+ldN
+iZI
+wWH
 sRT
 xSr
 lfC
@@ -227502,9 +227957,9 @@ kMY
 nPo
 vgT
 gPU
-fIe
+ldN
+tpV
 tpV
-fIe
 fIe
 jPc
 mZR
diff --git a/_maps/shuttles/arrival_snaxi.dmm b/_maps/shuttles/arrival_snaxi.dmm
index 95d4ae973d..348081e569 100644
--- a/_maps/shuttles/arrival_snaxi.dmm
+++ b/_maps/shuttles/arrival_snaxi.dmm
@@ -10,33 +10,52 @@
 	name = "Arrivals Shuttle Airlock"
 	},
 /obj/structure/fans/tiny,
-/turf/open/floor/mineral/titanium/blue,
+/turf/open/floor/plating,
 /area/shuttle/arrival)
 "d" = (
 /obj/effect/spawner/structure/window/shuttle,
 /turf/open/floor/plating,
 /area/shuttle/arrival)
 "e" = (
-/obj/structure/closet/wardrobe/black,
-/turf/open/floor/mineral/titanium/blue,
+/obj/effect/turf_decal/stripes/line{
+	dir = 1
+	},
+/obj/effect/turf_decal/stripes/white/line{
+	dir = 1
+	},
+/turf/open/floor/mineral/titanium,
 /area/shuttle/arrival)
 "f" = (
-/turf/open/floor/mineral/titanium/blue,
+/turf/open/floor/mineral/titanium,
 /area/shuttle/arrival)
 "g" = (
-/obj/machinery/computer/arcade,
-/turf/open/floor/mineral/titanium/blue,
+/obj/structure/chair/comfy/shuttle{
+	dir = 8
+	},
+/turf/open/floor/mineral/titanium/old/white,
 /area/shuttle/arrival)
 "h" = (
-/obj/structure/closet/wardrobe/grey,
 /obj/machinery/light/small{
 	dir = 1
 	},
-/turf/open/floor/mineral/titanium/blue,
+/obj/structure/closet/emcloset,
+/obj/effect/turf_decal/stripes/line{
+	dir = 1
+	},
+/obj/effect/turf_decal/stripes/white/line{
+	dir = 1
+	},
+/turf/open/floor/mineral/titanium,
 /area/shuttle/arrival)
 "i" = (
-/obj/structure/closet/wardrobe/green,
-/turf/open/floor/mineral/titanium/blue,
+/obj/structure/closet/firecloset,
+/obj/effect/turf_decal/stripes/line{
+	dir = 1
+	},
+/obj/effect/turf_decal/stripes/white/line{
+	dir = 1
+	},
+/turf/open/floor/mineral/titanium,
 /area/shuttle/arrival)
 "j" = (
 /obj/machinery/requests_console{
@@ -47,7 +66,14 @@
 /obj/machinery/light{
 	dir = 1
 	},
-/turf/open/floor/mineral/titanium/blue,
+/obj/structure/closet/wardrobe/grey,
+/obj/effect/turf_decal/stripes/line{
+	dir = 1
+	},
+/obj/effect/turf_decal/stripes/white/line{
+	dir = 1
+	},
+/turf/open/floor/mineral/titanium/old/white,
 /area/shuttle/arrival)
 "k" = (
 /obj/structure/shuttle/engine/heater{
@@ -62,8 +88,13 @@
 /obj/machinery/light{
 	dir = 1
 	},
-/obj/structure/closet/wardrobe/mixed,
-/turf/open/floor/mineral/titanium/blue,
+/obj/effect/turf_decal/stripes/line{
+	dir = 1
+	},
+/obj/effect/turf_decal/stripes/white/line{
+	dir = 1
+	},
+/turf/open/floor/mineral/titanium,
 /area/shuttle/arrival)
 "n" = (
 /obj/docking_port/mobile/arrivals{
@@ -78,22 +109,26 @@
 /obj/structure/table,
 /obj/item/storage/firstaid/regular,
 /obj/machinery/light/small,
-/turf/open/floor/mineral/titanium/blue,
+/obj/effect/turf_decal/stripes/line,
+/obj/effect/turf_decal/stripes/white/line,
+/turf/open/floor/mineral/titanium,
 /area/shuttle/arrival)
 "p" = (
 /obj/structure/table,
 /obj/item/storage/toolbox/emergency,
-/turf/open/floor/mineral/titanium/blue,
+/obj/effect/turf_decal/stripes/line,
+/obj/effect/turf_decal/stripes/white/line,
+/turf/open/floor/mineral/titanium,
 /area/shuttle/arrival)
 "q" = (
 /obj/machinery/light,
-/turf/open/floor/mineral/titanium/blue,
+/obj/effect/turf_decal/stripes/line,
+/obj/effect/turf_decal/stripes/white/line,
+/turf/open/floor/mineral/titanium,
 /area/shuttle/arrival)
 "r" = (
-/obj/structure/chair/comfy/shuttle{
-	dir = 8
-	},
-/turf/open/floor/mineral/titanium,
+/obj/structure/closet/wardrobe/black,
+/turf/open/floor/mineral/titanium/old/white,
 /area/shuttle/arrival)
 "s" = (
 /obj/item/radio/intercom{
@@ -101,11 +136,21 @@
 	pixel_y = -29
 	},
 /obj/machinery/light,
-/turf/open/floor/mineral/titanium/blue,
+/obj/structure/closet/wardrobe/black,
+/obj/effect/turf_decal/stripes/line,
+/obj/effect/turf_decal/stripes/white/line,
+/turf/open/floor/mineral/titanium/old/white,
+/area/shuttle/arrival)
+"t" = (
+/obj/effect/turf_decal/stripes/line{
+	dir = 1
+	},
+/turf/open/floor/mineral/titanium,
 /area/shuttle/arrival)
 "x" = (
-/obj/structure/closet/emcloset,
-/turf/open/floor/mineral/titanium/blue,
+/obj/effect/turf_decal/stripes/line,
+/obj/effect/turf_decal/stripes/white/line,
+/turf/open/floor/mineral/titanium,
 /area/shuttle/arrival)
 "z" = (
 /obj/structure/shuttle/engine/propulsion/burst/right{
@@ -113,6 +158,20 @@
 	},
 /turf/open/floor/plating/airless,
 /area/shuttle/arrival)
+"C" = (
+/obj/effect/turf_decal/stripes/line,
+/turf/open/floor/mineral/titanium,
+/area/shuttle/arrival)
+"J" = (
+/obj/machinery/computer/arcade{
+	dir = 8
+	},
+/turf/open/floor/mineral/titanium/old/white,
+/area/shuttle/arrival)
+"P" = (
+/obj/structure/closet/wardrobe/green,
+/turf/open/floor/mineral/titanium/old/white,
+/area/shuttle/arrival)
 
 (1,1,1) = {"
 a
@@ -126,9 +185,9 @@ a
 (2,1,1) = {"
 b
 b
-r
-r
-r
+g
+g
+g
 b
 b
 "}
@@ -144,9 +203,9 @@ b
 (4,1,1) = {"
 b
 i
-r
-r
-r
+g
+g
+g
 p
 b
 "}
@@ -162,44 +221,44 @@ b
 (6,1,1) = {"
 b
 m
-r
-r
-r
+g
+g
+g
 q
 b
 "}
 (7,1,1) = {"
 d
-g
-f
+e
 f
 f
 f
+x
 d
 "}
 (8,1,1) = {"
 c
-f
-r
-r
-r
-f
+t
+g
+g
+g
+C
 c
 "}
 (9,1,1) = {"
 c
+t
 f
 f
 f
-f
-f
+C
 c
 "}
 (10,1,1) = {"
 b
 j
-r
-r
+P
+J
 r
 s
 b
diff --git a/code/datums/station_traits/negative_traits.dm b/code/datums/station_traits/negative_traits.dm
index 7f04b88d66..60632e17eb 100644
--- a/code/datums/station_traits/negative_traits.dm
+++ b/code/datums/station_traits/negative_traits.dm
@@ -279,7 +279,7 @@
 	report_message = "A radioactive stormfront is passing through your station's system. Expect an increased likelihood of radiation storms passing over your station, as well the potential for multiple radiation storms to occur during your shift."
 	trait_type = STATION_TRAIT_NEGATIVE
 	trait_flags = NONE
-	weight = 2
+	weight = 0 //GS13 - radstorm bad
 	event_control_path = /datum/round_event_control/radiation_storm
-	weight_multiplier = 1.5
+	weight_multiplier = 0 //GS13 radstorm bad
 	max_occurrences_modifier = 0 //GS13 - radstorm bad
diff --git a/code/datums/station_traits/neutral_traits.dm b/code/datums/station_traits/neutral_traits.dm
index 38358da334..5cf46013f1 100644
--- a/code/datums/station_traits/neutral_traits.dm
+++ b/code/datums/station_traits/neutral_traits.dm
@@ -19,7 +19,7 @@
 /datum/station_trait/unique_ai
 	name = "Unique AI"
 	trait_type = STATION_TRAIT_NEUTRAL
-	weight = 5
+	weight = 3 //gs13 - lowered this a little
 	show_in_report = TRUE
 	report_message = "For experimental purposes, this station AI might show divergence from default lawset. Do not meddle with this experiment."
 	trait_to_give = STATION_TRAIT_UNIQUE_AI
@@ -86,7 +86,7 @@
 /datum/station_trait/glitched_pdas
 	name = "PDA glitch"
 	trait_type = STATION_TRAIT_NEUTRAL
-	weight = 15
+	weight = 8 //gs13 - lowered by half
 	show_in_report = TRUE
 	report_message = "Something seems to be wrong with the PDAs issued to you all this shift. Nothing too bad though."
 	trait_to_give = STATION_TRAIT_PDA_GLITCHED
@@ -94,7 +94,7 @@
 /datum/station_trait/announcement_intern
 	name = "Announcement Intern"
 	trait_type = STATION_TRAIT_NEUTRAL
-	weight = 1
+	weight = 2 //gs13 - raised slightly, intern's goated
 	show_in_report = TRUE
 	report_message = "Please be nice to him."
 	blacklist = list(/datum/station_trait/announcement_medbot)
@@ -117,11 +117,12 @@
 
 /datum/station_trait/randomizing_station_name
 	name = "Randomizing station name"
+	weight = 10 //gs13 - it didn't have any weight
 	show_in_report = TRUE
 	report_message = "Due to legal reasons or other, we might not be able to settle on a station name."
 	trait_processes = TRUE
 	COOLDOWN_DECLARE(randomizing_cooldown)
-	var/trigger_every = 30 MINUTES
+	var/trigger_every = 90 MINUTES //GS13 - nerfed it a bit, a little too annoying
 	blacklist = list(/datum/station_trait/randomizing_station_name/fast, /datum/station_trait/randomizing_station_name/slow)
 
 /datum/station_trait/randomizing_station_name/on_round_start()
@@ -162,10 +163,12 @@
 
 /datum/station_trait/randomizing_station_name/fast
 	name = "Randomizing station name - Fast"
-	trigger_every = 15 MINUTES
+	trigger_every = 1 HOURS //GS13 - change every 15 minutes is a little too fast
+	weight = 8 //gs13 - it didn't have any weight
 	blacklist = list(/datum/station_trait/randomizing_station_name, /datum/station_trait/randomizing_station_name/slow)
 
 /datum/station_trait/randomizing_station_name/slow
 	name = "Randomizing station name - Slow"
-	trigger_every = 1 HOURS
+	trigger_every = 2 HOURS //GS13 - rounds are long, let's make it REALLY slow
+	weight = 10 //gs13 - it didn't have any weight
 	blacklist = list(/datum/station_trait/randomizing_station_name/fast, /datum/station_trait/randomizing_station_name)
diff --git a/code/datums/station_traits/positive_traits.dm b/code/datums/station_traits/positive_traits.dm
index 70358166d3..2c25b43a84 100644
--- a/code/datums/station_traits/positive_traits.dm
+++ b/code/datums/station_traits/positive_traits.dm
@@ -1,6 +1,6 @@
-#define PARTY_COOLDOWN_LENGTH_MIN 6 MINUTES
-#define PARTY_COOLDOWN_LENGTH_MAX 12 MINUTES
-
+#define PARTY_COOLDOWN_LENGTH_MIN 30 MINUTES
+#define PARTY_COOLDOWN_LENGTH_MAX 60 MINUTES
+//GS13 - raised both of these vars, on longer rounds they were really spammy
 
 /datum/station_trait/lucky_winner
 	name = "Lucky winner"
@@ -180,7 +180,7 @@
 
 /datum/station_trait/deathrattle_department/cargo
 	trait_flags = NONE
-	weight = 1
+	weight = 2 //gs13 - raised slightly, they get a little prone to dying
 	department_to_apply_to = DEPARTMENT_BITFLAG_CARGO
 	department_name = "Cargo"
 
diff --git a/code/game/machinery/doors/airlock.dm b/code/game/machinery/doors/airlock.dm
index 8b6ac964d0..1683fe5575 100644
--- a/code/game/machinery/doors/airlock.dm
+++ b/code/game/machinery/doors/airlock.dm
@@ -43,7 +43,7 @@
 
 /obj/machinery/door/airlock
 	name = "airlock"
-	icon = 'GainStation13/icons/obj/doors/airlocks/station/public.dmi' //GS13 Edit: perspective sprites
+	icon = 'hyperstation/icons/obj/doors/base.dmi' //GS13 Edit: perspective sprites
 	icon_state = "closed"
 	max_integrity = 300
 	var/normal_integrity = AIRLOCK_INTEGRITY_N
@@ -88,8 +88,13 @@
 	var/wiretypepath = /datum/wires/airlock // which set of per round randomized wires this airlock type has.
 	var/airlock_material //material of inner filling; if its an airlock with glass, this should be set to "glass"
 	//GS13 Edit Start: perspective sprites
-	var/overlays_file = 'GainStation13/icons/obj/doors/airlocks/station/overlays.dmi'
-	var/note_overlay_file = 'GainStation13/icons/obj/doors/airlocks/station/overlays.dmi' //Used for papers and photos pinned to the airlock
+	var/overlays_file = 'hyperstation/icons/obj/doors/overlays.dmi'
+	var/note_overlay_file = 'hyperstation/icons/obj/doors/overlays.dmi' //Used for papers and photos pinned to the airlock
+	var/color_overlay_file = 'hyperstation/icons/obj/doors/color.dmi'
+	var/strip_overlay_file = 'hyperstation/icons/obj/doors/strip.dmi'
+	//colours! modular wow!
+	var/basecolor = ""
+	var/stripcolor = rgb(130,160,90)
 	//GS13 End
 
 	var/cyclelinkeddir = 0
@@ -462,6 +467,8 @@
 	var/mutable_appearance/panel_overlay
 	var/mutable_appearance/weld_overlay
 	var/mutable_appearance/damag_overlay
+	var/mutable_appearance/strip_overlay //gs13 - new airlocks
+	var/mutable_appearance/color_overlay //gs13 - new airlocks
 	var/mutable_appearance/sparks_overlay
 	var/mutable_appearance/note_overlay
 	var/notetype = note_type()
@@ -469,6 +476,12 @@
 	switch(state)
 		if(AIRLOCK_CLOSED)
 			frame_overlay = get_airlock_overlay("closed", icon)
+			//gs13 edit start - colored airlocks
+			color_overlay = get_airlock_overlay("closed", color_overlay_file)
+			strip_overlay = get_airlock_overlay("closed", strip_overlay_file)
+			color_overlay.color = basecolor
+			strip_overlay.color = stripcolor
+			//gs13 edit end
 			if(airlock_material)
 				filling_overlay = get_airlock_overlay("[airlock_material]_closed", overlays_file)
 			else
@@ -497,6 +510,12 @@
 			if(!hasPower())
 				return
 			frame_overlay = get_airlock_overlay("closed", icon)
+			//gs13 edit start - colored airlocks
+			color_overlay = get_airlock_overlay("closed", color_overlay_file)
+			strip_overlay = get_airlock_overlay("closed", strip_overlay_file)
+			color_overlay.color = basecolor
+			strip_overlay.color = stripcolor
+			//gs13 edit end
 			if(airlock_material)
 				filling_overlay = get_airlock_overlay("[airlock_material]_closed", overlays_file)
 			else
@@ -539,6 +558,12 @@
 
 		if(AIRLOCK_CLOSING)
 			frame_overlay = get_airlock_overlay("closing", icon)
+			//gs13 edit start - colored airlocks
+			color_overlay = get_airlock_overlay("closing", color_overlay_file)
+			strip_overlay = get_airlock_overlay("closing", strip_overlay_file)
+			color_overlay.color = basecolor
+			strip_overlay.color = stripcolor
+			//gs13 edit end
 			if(airlock_material)
 				filling_overlay = get_airlock_overlay("[airlock_material]_closing", overlays_file)
 			else
@@ -555,6 +580,12 @@
 
 		if(AIRLOCK_OPEN)
 			frame_overlay = get_airlock_overlay("open", icon)
+			//gs13 edit start - colored airlocks
+			color_overlay = get_airlock_overlay("open", color_overlay_file)
+			strip_overlay = get_airlock_overlay("open", strip_overlay_file)
+			color_overlay.color = basecolor
+			strip_overlay.color = stripcolor
+			//gs13 edit end
 			if(airlock_material)
 				filling_overlay = get_airlock_overlay("[airlock_material]_open", overlays_file)
 			else
@@ -571,6 +602,12 @@
 
 		if(AIRLOCK_OPENING)
 			frame_overlay = get_airlock_overlay("opening", icon)
+			//gs13 edit start - colored airlocks
+			color_overlay = get_airlock_overlay("opening", color_overlay_file)
+			strip_overlay = get_airlock_overlay("opening", strip_overlay_file)
+			color_overlay.color = basecolor
+			strip_overlay.color = stripcolor
+			//gs13 edit end
 			if(airlock_material)
 				filling_overlay = get_airlock_overlay("[airlock_material]_opening", overlays_file)
 			else
@@ -587,6 +624,12 @@
 
 	cut_overlays()
 	add_overlay(frame_overlay)
+	//gs13 edit start - colored airlocks
+	if (basecolor)
+		add_overlay(color_overlay)
+	if (stripcolor)
+		add_overlay(strip_overlay)
+	//gs13 edit end
 	add_overlay(filling_overlay)
 	if(lights_overlay)
 		add_overlay(lights_overlay)
diff --git a/code/game/machinery/doors/airlock_types.dm b/code/game/machinery/doors/airlock_types.dm
index 2222ea5cf1..984c5f2186 100644
--- a/code/game/machinery/doors/airlock_types.dm
+++ b/code/game/machinery/doors/airlock_types.dm
@@ -6,19 +6,22 @@
 	abandoned = TRUE
 
 /obj/machinery/door/airlock/command
-	icon = 'GainStation13/icons/obj/doors/airlocks/station/command.dmi' //GS13 Edit: perspective sprites
+	basecolor = rgb(0,110,200)
+	stripcolor = rgb(115,200,255)
 	assemblytype = /obj/structure/door_assembly/door_assembly_com
 	wiretypepath = /datum/wires/airlock/command
 	normal_integrity = 450
 
 /obj/machinery/door/airlock/security
-	icon = 'GainStation13/icons/obj/doors/airlocks/station/security.dmi' //GS13 Edit: perspective sprites
+	basecolor = rgb(235,50,50) //gs13 - modular colored airlocks
+	stripcolor = rgb(255, 213, 25) //gs13 - modular colored airlocks
 	assemblytype = /obj/structure/door_assembly/door_assembly_sec
 	wiretypepath = /datum/wires/airlock/security
 	normal_integrity = 450
 
 /obj/machinery/door/airlock/engineering
-	icon = 'GainStation13/icons/obj/doors/airlocks/station/engineering.dmi' //GS13 Edit: perspective sprites
+	basecolor = rgb(235,190,0) //gs13 - modular colored airlocks
+	stripcolor = rgb(50,50,50) //gs13 - modular colored airlocks
 	assemblytype = /obj/structure/door_assembly/door_assembly_eng
 	wiretypepath = /datum/wires/airlock/engineering
 
@@ -26,13 +29,12 @@
 	abandoned = TRUE
 
 /obj/machinery/door/airlock/medical
-	icon = 'GainStation13/icons/obj/doors/airlocks/station/medical.dmi' //GS13 Edit: perspective sprites
+	basecolor = rgb(250,250,250) //gs13 - modular colored airlocks
+	stripcolor = rgb(0,255,255)//gs13 - modular colored airlocks
 	assemblytype = /obj/structure/door_assembly/door_assembly_med
 	wiretypepath = /datum/wires/airlock/medical
 
 /obj/machinery/door/airlock/maintenance
-	name = "maintenance access"
-	icon = 'GainStation13/icons/obj/doors/airlocks/station/maintenance.dmi' //GS13 Edit: perspective sprites
 	assemblytype = /obj/structure/door_assembly/door_assembly_mai
 	normal_integrity = 250
 
@@ -41,18 +43,19 @@
 
 /obj/machinery/door/airlock/maintenance/external
 	name = "external airlock access"
-	icon = 'GainStation13/icons/obj/doors/airlocks/station/maintenanceexternal.dmi' //GS13 Edit: perspective sprites
 	assemblytype = /obj/structure/door_assembly/door_assembly_extmai
 
 /obj/machinery/door/airlock/mining
 	name = "mining airlock"
-	icon = 'GainStation13/icons/obj/doors/airlocks/station/mining.dmi' //GS13 Edit: perspective sprites
+	basecolor = rgb(222, 150, 50) //gs13 - modular colored airlocks
+	stripcolor = rgb(162, 95, 28) //gs13 - modular colored airlocks
 	assemblytype = /obj/structure/door_assembly/door_assembly_min
 	wiretypepath = /datum/wires/airlock/cargo
 
 /obj/machinery/door/airlock/atmos
 	name = "atmospherics airlock"
-	icon = 'GainStation13/icons/obj/doors/airlocks/station/atmos.dmi' //GS13 Edit: perspective sprites
+	basecolor = rgb(131,163,93)
+	stripcolor = ""
 	assemblytype = /obj/structure/door_assembly/door_assembly_atmo
 	wiretypepath = /datum/wires/airlock/engineering
 
@@ -60,22 +63,24 @@
 	abandoned = TRUE
 
 /obj/machinery/door/airlock/research
-	icon = 'GainStation13/icons/obj/doors/airlocks/station/research.dmi' //GS13 Edit: perspective sprites
+	basecolor = rgb(250,250,250) //gs13 - modular colored airlocks
+	stripcolor = rgb(150,30,255) //gs13 - modular colored airlocks
 	assemblytype = /obj/structure/door_assembly/door_assembly_research
 	wiretypepath = /datum/wires/airlock/science
 
 /obj/machinery/door/airlock/freezer
 	name = "freezer airlock"
-	icon = 'GainStation13/icons/obj/doors/airlocks/station/freezer.dmi' //GS13 Edit: perspective sprites
 	assemblytype = /obj/structure/door_assembly/door_assembly_fre
 
 /obj/machinery/door/airlock/science
-	icon = 'GainStation13/icons/obj/doors/airlocks/station/science.dmi' //GS13 Edit: perspective sprites
+	basecolor = rgb(250,250,250) //gs13 - modular colored airlocks
+	stripcolor = rgb(150,30,255) //gs13 - modular colored airlocks
 	assemblytype = /obj/structure/door_assembly/door_assembly_science
 	wiretypepath = /datum/wires/airlock/science
 
 /obj/machinery/door/airlock/virology
-	icon = 'GainStation13/icons/obj/doors/airlocks/station/virology.dmi' //GS13 Edit: perspective sprites
+	basecolor = rgb(250,250,250) //gs13 - modular colored airlocks
+	stripcolor = rgb(0,255,255) //gs13 - modular colored airlocks
 	assemblytype = /obj/structure/door_assembly/door_assembly_viro
 	wiretypepath = /datum/wires/airlock/medical
 
@@ -87,6 +92,8 @@
 /obj/machinery/door/airlock/glass
 	opacity = 0
 	glass = TRUE
+	basecolor = ""
+	stripcolor = ""
 
 /obj/machinery/door/airlock/glass/incinerator
 	autoclose = FALSE
@@ -181,6 +188,7 @@
 	name = "gold airlock"
 	icon = 'GainStation13/icons/obj/doors/airlocks/station/gold.dmi' //GS13 Edit: perspective sprites
 	assemblytype = /obj/structure/door_assembly/door_assembly_gold
+	stripcolor = 0 //gs13 - modular airlocks
 
 /obj/machinery/door/airlock/gold/glass
 	opacity = 0
@@ -190,6 +198,7 @@
 	name = "silver airlock"
 	icon = 'GainStation13/icons/obj/doors/airlocks/station/silver.dmi' //GS13 Edit: perspective sprites
 	assemblytype = /obj/structure/door_assembly/door_assembly_silver
+	stripcolor = 0 //gs13 - modular airlocks
 
 /obj/machinery/door/airlock/silver/glass
 	opacity = 0
@@ -201,6 +210,7 @@
 	assemblytype = /obj/structure/door_assembly/door_assembly_diamond
 	normal_integrity = 1000
 	explosion_block = 2
+	stripcolor = 0 //gs13 - modular airlocks
 
 /obj/machinery/door/airlock/diamond/glass
 	normal_integrity = 950
@@ -212,6 +222,7 @@
 	icon = 'GainStation13/icons/obj/doors/airlocks/station/uranium.dmi' //GS13 Edit: perspective sprites
 	assemblytype = /obj/structure/door_assembly/door_assembly_uranium
 	var/last_event = 0
+	stripcolor = 0 //gs13 - modular airlocks
 
 /obj/machinery/door/airlock/uranium/process()
 	if(world.time > last_event+20)
@@ -233,6 +244,7 @@
 	desc = "No way this can end badly."
 	icon = 'GainStation13/icons/obj/doors/airlocks/station/plasma.dmi' //GS13 Edit: perspective sprites
 	assemblytype = /obj/structure/door_assembly/door_assembly_plasma
+	stripcolor = 0 //gs13 - modular airlocks
 
 /obj/machinery/door/airlock/plasma/temperature_expose(datum/gas_mixture/air, exposed_temperature, exposed_volume)
 	if(exposed_temperature > 300)
@@ -275,6 +287,7 @@
 	icon = 'GainStation13/icons/obj/doors/airlocks/station/bananium.dmi' //GS13 Edit: perspective sprites
 	assemblytype = /obj/structure/door_assembly/door_assembly_bananium
 	doorOpen = 'sound/items/bikehorn.ogg'
+	stripcolor = 0 //gs13 - modular airlocks
 
 /obj/machinery/door/airlock/bananium/glass
 	opacity = 0
@@ -284,6 +297,7 @@
 	name = "sandstone airlock"
 	icon = 'GainStation13/icons/obj/doors/airlocks/station/sandstone.dmi' //GS13 Edit: perspective sprites
 	assemblytype = /obj/structure/door_assembly/door_assembly_sandstone
+	stripcolor = 0 //gs13 - modular airlocks
 
 /obj/machinery/door/airlock/sandstone/glass
 	opacity = 0
@@ -293,6 +307,7 @@
 	name = "wooden airlock"
 	icon = 'GainStation13/icons/obj/doors/airlocks/station/wood.dmi' //GS13 Edit: perspective sprites
 	assemblytype = /obj/structure/door_assembly/door_assembly_wood
+	stripcolor = 0 //gs13 - modular airlocks
 
 /obj/machinery/door/airlock/wood/glass
 	opacity = 0
@@ -304,6 +319,7 @@
 	icon = 'GainStation13/icons/obj/doors/airlocks/shuttle/shuttle.dmi' //GS13 Edit: perspective sprites
 	overlays_file = 'GainStation13/icons/obj/doors/airlocks/shuttle/overlays.dmi' //GS13 Edit: perspective sprites
 	normal_integrity = 400
+	stripcolor = 0 //gs13 - modular airlocks
 
 /obj/machinery/door/airlock/titanium/glass
 	normal_integrity = 350
@@ -315,6 +331,7 @@
 	icon = 'GainStation13/icons/obj/doors/airlocks/clockwork/pinion_airlock.dmi' //GS13 Edit: perspective sprites
 	overlays_file = 'GainStation13/icons/obj/doors/airlocks/clockwork/overlays.dmi' //GS13 Edit: perspective sprites
 	assemblytype = /obj/structure/door_assembly/door_assembly_bronze
+	stripcolor = 0 //gs13 - modular airlocks
 
 /obj/machinery/door/airlock/bronze/seethru
 	assemblytype = /obj/structure/door_assembly/door_assembly_bronze/seethru
@@ -330,6 +347,7 @@
 	icon = 'GainStation13/icons/obj/doors/airlocks/station2/glass.dmi' //GS13 Edit: perspective sprites
 	overlays_file = 'GainStation13/icons/obj/doors/airlocks/station2/overlays.dmi' //GS13 Edit: perspective sprites
 	assemblytype = /obj/structure/door_assembly/door_assembly_public
+	stripcolor = 0 //gs13 - modular airlocks
 
 /obj/machinery/door/airlock/public/glass
 	opacity = 0
@@ -360,6 +378,7 @@
 	overlays_file = 'GainStation13/icons/obj/doors/airlocks/external/overlays.dmi' //GS13 Edit: perspective sprites
 	note_overlay_file = 'GainStation13/icons/obj/doors/airlocks/external/overlays.dmi' //GS13 Edit: perspective sprites
 	assemblytype = /obj/structure/door_assembly/door_assembly_ext
+	stripcolor = 0 //gs13 - modular airlocks
 
 /obj/machinery/door/airlock/external/glass
 	opacity = 0
@@ -377,11 +396,13 @@
 	normal_integrity = 1000
 	security_level = 6
 	explosion_block = 2
+	stripcolor = 0 //gs13 - modular airlocks
 
 /obj/machinery/door/airlock/grunge
 	icon = 'GainStation13/icons/obj/doors/airlocks/centcom/centcom.dmi' //GS13 Edit: perspective sprites
 	overlays_file = 'GainStation13/icons/obj/doors/airlocks/centcom/overlays.dmi' //GS13 Edit: perspective sprites
 	assemblytype = /obj/structure/door_assembly/door_assembly_grunge
+	stripcolor = 0 //gs13 - modular airlocks
 
 /obj/machinery/door/airlock/grunge/abandoned
 	abandoned = TRUE
@@ -400,6 +421,7 @@
 	explosion_block = 2
 	normal_integrity = 400 // reverse engieneerd: 400 * 1.5 (sec lvl 6) = 600 = original
 	security_level = 6
+	stripcolor = 0 //gs13 - modular airlocks
 
 //////////////////////////////////
 /*
@@ -412,6 +434,7 @@
 	overlays_file = 'GainStation13/icons/obj/doors/airlocks/hatch/overlays.dmi' //GS13 Edit: perspective sprites
 	note_overlay_file = 'GainStation13/icons/obj/doors/airlocks/hatch/overlays.dmi' //GS13 Edit: perspective sprites
 	assemblytype = /obj/structure/door_assembly/door_assembly_hatch
+	stripcolor = 0 //gs13 - modular airlocks
 
 /obj/machinery/door/airlock/maintenance_hatch
 	name = "maintenance hatch"
@@ -419,6 +442,7 @@
 	overlays_file = 'GainStation13/icons/obj/doors/airlocks/hatch/overlays.dmi' //GS13 Edit: perspective sprites
 	note_overlay_file = 'GainStation13/icons/obj/doors/airlocks/hatch/overlays.dmi' //GS13 Edit: perspective sprites
 	assemblytype = /obj/structure/door_assembly/door_assembly_mhatch
+	stripcolor = 0 //gs13 - modular airlocks
 
 /obj/machinery/door/airlock/maintenance_hatch/abandoned
 	abandoned = TRUE
@@ -437,6 +461,7 @@
 	normal_integrity = 500
 	security_level = 1
 	damage_deflection = 30
+	stripcolor = 0 //gs13 - modular airlocks
 
 //////////////////////////////////
 /*
@@ -448,6 +473,7 @@
 	icon = 'GainStation13/icons/obj/doors/airlocks/shuttle/shuttle.dmi' //GS13 Edit: perspective sprites
 	overlays_file = 'GainStation13/icons/obj/doors/airlocks/shuttle/overlays.dmi' //GS13 Edit: perspective sprites
 	assemblytype = /obj/structure/door_assembly/door_assembly_shuttle
+	stripcolor = 0 //gs13 - modular airlocks
 
 /obj/machinery/door/airlock/shuttle/glass
 	opacity = 0
@@ -466,6 +492,7 @@
 	aiControlDisabled = 1
 	normal_integrity = 700
 	security_level = 1
+	stripcolor = 0 //gs13 - modular airlocks
 
 //////////////////////////////////
 /*
@@ -484,6 +511,7 @@
 	var/openingoverlaytype = /obj/effect/temp_visual/cult/door
 	var/friendly = FALSE
 	var/stealthy = FALSE
+	stripcolor = 0 //gs13 - modular airlocks
 
 /obj/machinery/door/airlock/cult/Initialize(mapload)
 	. = ..()
@@ -560,6 +588,7 @@
 	overlays_file = 'GainStation13/icons/obj/doors/airlocks/cult/unruned/overlays.dmi' //GS13 Edit: perspective sprites
 	assemblytype = /obj/structure/door_assembly/door_assembly_cult/unruned
 	openingoverlaytype = /obj/effect/temp_visual/cult/door/unruned
+	stripcolor = 0 //gs13 - modular airlocks
 
 /obj/machinery/door/airlock/cult/unruned/friendly
 	friendly = TRUE
@@ -592,6 +621,7 @@
 	damage_deflection = 30
 	normal_integrity = 240
 	var/construction_state = GEAR_SECURE //Pinion airlocks have custom deconstruction
+	stripcolor = 0 //gs13 - modular airlocks
 
 /obj/machinery/door/airlock/clockwork/Initialize(mapload)
 	. = ..()
@@ -705,6 +735,7 @@
 	assemblytype = null
 	glass = TRUE
 	bound_width = 64 // 2x1
+	stripcolor = 0 //gs13 - modular airlocks
 
 /obj/machinery/door/airlock/glass_large/narsie_act()
 	return
diff --git a/code/modules/vending/_vending.dm b/code/modules/vending/_vending.dm
index 66f1b0486d..73264ecb19 100644
--- a/code/modules/vending/_vending.dm
+++ b/code/modules/vending/_vending.dm
@@ -45,7 +45,7 @@
 /obj/machinery/vending
 	name = "\improper Vendomat"
 	desc = "A generic vending machine."
-	icon = 'icons/obj/vending.dmi'
+	icon = 'GainStation13/icons/obj/vending.dmi' //GS13 icons
 	icon_state = "generic"
 	layer = BELOW_OBJ_LAYER
 	density = TRUE
diff --git a/hyperstation/icons/obj/doors/base.dmi b/hyperstation/icons/obj/doors/base.dmi
new file mode 100644
index 0000000000..4d62d12fba
Binary files /dev/null and b/hyperstation/icons/obj/doors/base.dmi differ
diff --git a/hyperstation/icons/obj/doors/color.dmi b/hyperstation/icons/obj/doors/color.dmi
new file mode 100644
index 0000000000..fd4de10aae
Binary files /dev/null and b/hyperstation/icons/obj/doors/color.dmi differ
diff --git a/hyperstation/icons/obj/doors/overlays.dmi b/hyperstation/icons/obj/doors/overlays.dmi
new file mode 100644
index 0000000000..0d128d91ba
Binary files /dev/null and b/hyperstation/icons/obj/doors/overlays.dmi differ
diff --git a/hyperstation/icons/obj/doors/strip.dmi b/hyperstation/icons/obj/doors/strip.dmi
new file mode 100644
index 0000000000..0a148076e8
Binary files /dev/null and b/hyperstation/icons/obj/doors/strip.dmi differ