From 9a7ce01890562d19aa4cf412cc2d2bce5fe4a808 Mon Sep 17 00:00:00 2001
From: Shoddd <148718717+Shoddd@users.noreply.github.com>
Date: Thu, 20 Feb 2025 20:33:41 -0500
Subject: [PATCH] Some helio fixes (#5529)

## About The Pull Request
Fixes blueshield door access
Adds trash piles
fixes https://github.com/Monkestation/Monkestation2.0/issues/5519
fixes https://github.com/Monkestation/Monkestation2.0/issues/5551
fixes https://github.com/Monkestation/Monkestation2.0/issues/5513
fixes https://github.com/Monkestation/Monkestation2.0/issues/5558

added a dog to shaft miner room

## Why It's Good For The Game
fixes bug and adds maints stuff

shaft miner room is really empty, cute little puppy named "Goliath" for
them

## Changelog

:cl:
fix: Several heliostation fixes and qol
/:cl:

---------

Co-authored-by: shodd <linkmonissussy@gmail.com>
Co-authored-by: ThePooba <81843097+ThePooba@users.noreply.github.com>
---
 _maps/map_files/Heliostation/Heliostation.dmm | 517 +++++++-----------
 1 file changed, 209 insertions(+), 308 deletions(-)

diff --git a/_maps/map_files/Heliostation/Heliostation.dmm b/_maps/map_files/Heliostation/Heliostation.dmm
index a7c6b636e6d8..090e68a7965e 100644
--- a/_maps/map_files/Heliostation/Heliostation.dmm
+++ b/_maps/map_files/Heliostation/Heliostation.dmm
@@ -540,14 +540,22 @@
 	},
 /obj/effect/turf_decal/tile/red/opposingcorners,
 /obj/structure/cable,
+/obj/structure/table/reinforced,
+/obj/machinery/chem_dispenser/drinks/beer{
+	pixel_x = 0;
+	pixel_y = 7
+	},
 /turf/open/floor/iron/white,
 /area/station/security/prison/mess)
 "acM" = (
 /obj/effect/decal/cleanable/dirt,
-/obj/structure/closet/crate/bin,
-/obj/effect/spawner/random/contraband/prison,
 /obj/effect/turf_decal/tile/red/opposingcorners,
 /obj/structure/cable,
+/obj/structure/table/reinforced,
+/obj/machinery/chem_dispenser/drinks{
+	pixel_y = 7;
+	pixel_x = 0
+	},
 /turf/open/floor/iron/white,
 /area/station/security/prison/mess)
 "acP" = (
@@ -1010,14 +1018,16 @@
 /turf/open/floor/wood/large,
 /area/station/security/prison/visit)
 "aeZ" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/structure/cable,
+/obj/structure/window/spawner/directional/north,
+/obj/effect/turf_decal/siding/wood{
+	dir = 1
+	},
 /obj/effect/turf_decal/siding/green{
-	dir = 8
+	dir = 1
 	},
+/obj/machinery/vending/hydronutrients,
 /turf/open/floor/iron,
-/area/station/service/hydroponics)
+/area/station/service/hydroponics/garden)
 "afa" = (
 /obj/item/kirbyplants/random,
 /turf/open/floor/wood/large,
@@ -1716,7 +1726,7 @@
 /turf/open/floor/iron,
 /area/station/security/prison/visit)
 "aid" = (
-/obj/machinery/hydroponics/soil,
+/obj/machinery/growing/soil,
 /turf/open/floor/grass,
 /area/station/security/prison/garden)
 "aif" = (
@@ -3945,6 +3955,7 @@
 	dir = 4
 	},
 /obj/effect/decal/cleanable/oil/streak,
+/obj/machinery/computer/order_console/bitrunning,
 /turf/open/misc/asteroid,
 /area/station/security/prison/rec)
 "aws" = (
@@ -6017,6 +6028,7 @@
 /area/station/ai_monitored/turret_protected/aisat/hallway)
 "aJm" = (
 /obj/structure/grille/broken,
+/obj/structure/trash_pile,
 /turf/open/floor/plating,
 /area/station/maintenance/port/fore)
 "aJn" = (
@@ -8192,6 +8204,7 @@
 /area/station/maintenance/solars/port/fore)
 "aRl" = (
 /obj/machinery/light/small/directional/west,
+/obj/structure/trash_pile,
 /turf/open/floor/plating,
 /area/station/maintenance/port/fore)
 "aRm" = (
@@ -8859,9 +8872,7 @@
 	dir = 1
 	},
 /obj/effect/turf_decal/siding/wood,
-/obj/machinery/hydroponics/soil{
-	pixel_y = 7
-	},
+/obj/machinery/growing/soil,
 /turf/open/floor/grass,
 /area/station/service/hydroponics/garden)
 "aTW" = (
@@ -9041,9 +9052,7 @@
 /obj/effect/turf_decal/siding/wood/end{
 	dir = 4
 	},
-/obj/machinery/hydroponics/soil{
-	pixel_y = 7
-	},
+/obj/machinery/growing/soil,
 /turf/open/floor/grass,
 /area/station/service/hydroponics/garden)
 "aUD" = (
@@ -9078,15 +9087,6 @@
 	},
 /turf/open/floor/plating,
 /area/station/maintenance/aft/lesser)
-"aUJ" = (
-/obj/machinery/hydroponics/soil{
-	pixel_y = 7
-	},
-/obj/effect/turf_decal/siding/wood/end{
-	dir = 8
-	},
-/turf/open/floor/grass,
-/area/station/service/hydroponics/garden)
 "aUO" = (
 /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
 	dir = 1
@@ -10628,15 +10628,6 @@
 	},
 /turf/open/floor/iron/grimy,
 /area/station/service/chapel/office)
-"bba" = (
-/obj/structure/chair/office/light{
-	dir = 8
-	},
-/obj/effect/landmark/blobstart,
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/landmark/event_spawn,
-/turf/open/floor/wood,
-/area/station/commons/vacant_room/office)
 "bbb" = (
 /obj/machinery/firealarm/directional/east,
 /turf/open/floor/iron/dark,
@@ -12385,11 +12376,6 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /turf/open/floor/iron/white,
 /area/station/medical/virology)
-"biK" = (
-/obj/item/kirbyplants/fern,
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/wood,
-/area/station/commons/vacant_room/office)
 "biL" = (
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -12851,7 +12837,6 @@
 /area/station/science/explab)
 "bki" = (
 /obj/structure/reagent_dispensers/watertank,
-/obj/effect/turf_decal/siding/green,
 /turf/open/floor/iron,
 /area/station/service/hydroponics/garden)
 "bko" = (
@@ -13202,9 +13187,7 @@
 /obj/effect/turf_decal/siding/wood/end{
 	dir = 8
 	},
-/obj/machinery/hydroponics/soil{
-	pixel_y = 7
-	},
+/obj/machinery/growing/soil,
 /turf/open/floor/grass,
 /area/station/service/hydroponics/garden)
 "blF" = (
@@ -13709,7 +13692,6 @@
 /area/station/security/range)
 "bny" = (
 /obj/machinery/conveyor{
-	dir = 1;
 	id = "QMLoad"
 	},
 /obj/effect/turf_decal/stripes/line{
@@ -13719,7 +13701,6 @@
 /area/station/cargo/storage)
 "bnz" = (
 /obj/machinery/conveyor{
-	dir = 1;
 	id = "QMLoad2"
 	},
 /obj/effect/turf_decal/stripes/line{
@@ -14826,10 +14807,8 @@
 /obj/effect/turf_decal/siding/wood/end{
 	dir = 4
 	},
-/obj/machinery/hydroponics/soil{
-	pixel_y = 7
-	},
 /obj/item/radio/intercom/directional/east,
+/obj/machinery/growing/soil,
 /turf/open/floor/grass,
 /area/station/service/hydroponics/garden)
 "brm" = (
@@ -14842,7 +14821,6 @@
 "brn" = (
 /obj/machinery/holopad,
 /obj/effect/decal/cleanable/dirt,
-/obj/effect/landmark/generic_maintenance_landmark,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /turf/open/floor/iron/grimy,
 /area/station/commons/vacant_room/office)
@@ -15553,9 +15531,7 @@
 /area/station/hallway/primary/port)
 "btW" = (
 /obj/structure/table,
-/obj/item/paper/guides/jobs/hydroponics,
-/obj/item/reagent_containers/cup/watering_can,
-/obj/item/reagent_containers/cup/watering_can,
+/obj/machinery/splicer,
 /turf/open/floor/iron/dark,
 /area/station/service/hydroponics)
 "btX" = (
@@ -16133,22 +16109,18 @@
 /turf/closed/wall,
 /area/station/commons/vacant_room/office)
 "bwN" = (
-/obj/machinery/door/airlock/engineering{
-	name = "Vacant Office"
+/obj/effect/turf_decal/stripes/line,
+/obj/effect/turf_decal/stripes/line{
+	dir = 1
 	},
-/obj/effect/mapping_helpers/airlock/abandoned,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/effect/turf_decal/tile/yellow{
-	color = "#FFD700";
-	dir = 1;
-	name = "Engineering yellow corner"
-	},
-/obj/effect/turf_decal/tile/yellow{
-	color = "#FFD700";
-	name = "Engineering yellow corner"
+/obj/effect/mapping_helpers/airlock/access/any/science/maintenance,
+/obj/machinery/door/airlock/grunge{
+	name = "Blacksmithing Section"
 	},
-/obj/effect/mapping_helpers/airlock/access/any/engineering/construction,
+/obj/effect/mapping_helpers/airlock/access/any/supply/general,
+/obj/effect/mapping_helpers/airlock/access/any/science/general,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /turf/open/floor/iron,
 /area/station/commons/vacant_room/office)
 "bwO" = (
@@ -17057,8 +17029,8 @@
 	},
 /area/station/hallway/secondary/entry)
 "bBn" = (
-/obj/effect/spawner/structure/window,
-/turf/open/floor/plating,
+/obj/structure/machine/assembly_bench,
+/turf/open/floor/wood,
 /area/station/commons/vacant_room/office)
 "bBx" = (
 /obj/item/reagent_containers/cup/bucket,
@@ -17365,7 +17337,9 @@
 /area/station/service/janitor)
 "bDr" = (
 /obj/structure/table,
-/obj/item/book/manual/hydroponics_pod_people,
+/obj/item/reagent_containers/cup/bottle/nutrient/ez,
+/obj/item/reagent_containers/cup/bottle/nutrient/ez,
+/obj/item/paper/guides/jobs/hydroponics,
 /turf/open/floor/iron/dark,
 /area/station/service/hydroponics)
 "bDt" = (
@@ -17765,7 +17739,7 @@
 /area/station/service/chapel)
 "bGo" = (
 /obj/structure/table,
-/obj/item/toy/figure/botanist,
+/obj/machinery/plantgenes,
 /turf/open/floor/iron/dark,
 /area/station/service/hydroponics)
 "bGs" = (
@@ -21687,13 +21661,13 @@
 /turf/open/floor/plating,
 /area/station/cargo/office)
 "cqM" = (
-/obj/machinery/conveyor{
-	dir = 9;
-	id = "QMLoad"
-	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 10
 	},
+/obj/machinery/conveyor/inverted{
+	dir = 9;
+	id = "QMLoad"
+	},
 /turf/open/floor/iron,
 /area/station/cargo/storage)
 "cqP" = (
@@ -21758,7 +21732,7 @@
 /area/station/ai_monitored/command/storage/eva)
 "crg" = (
 /obj/machinery/conveyor{
-	dir = 8;
+	dir = 4;
 	id = "QMLoad"
 	},
 /obj/machinery/door/poddoor{
@@ -21989,6 +21963,9 @@
 /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
 	dir = 4
 	},
+/obj/machinery/gbp_redemption{
+	pixel_y = 6
+	},
 /turf/open/floor/iron,
 /area/station/cargo/lobby)
 "csR" = (
@@ -22179,6 +22156,7 @@
 /area/station/cargo/miningoffice)
 "cvg" = (
 /obj/effect/decal/cleanable/robot_debris,
+/obj/structure/trash_pile,
 /turf/open/floor/plating,
 /area/station/maintenance/port)
 "cvl" = (
@@ -22211,13 +22189,13 @@
 /turf/open/floor/plating,
 /area/station/maintenance/department/crew_quarters/dorms)
 "cvB" = (
-/obj/machinery/conveyor{
-	dir = 5;
-	id = "QMLoad2"
-	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 9
 	},
+/obj/machinery/conveyor/inverted{
+	dir = 5;
+	id = "QMLoad2"
+	},
 /turf/open/floor/iron,
 /area/station/cargo/storage)
 "cvH" = (
@@ -22275,7 +22253,7 @@
 	name = "Supply Dock Loading Door"
 	},
 /obj/machinery/conveyor{
-	dir = 4;
+	dir = 8;
 	id = "QMLoad2"
 	},
 /obj/effect/turf_decal/siding/brown,
@@ -22663,6 +22641,7 @@
 "czC" = (
 /obj/structure/disposalpipe/segment,
 /obj/effect/decal/cleanable/dirt,
+/obj/structure/trash_pile,
 /turf/open/floor/plating,
 /area/station/maintenance/department/science/xenobiology)
 "czD" = (
@@ -26632,6 +26611,11 @@
 "cXW" = (
 /obj/item/radio/intercom/directional/south,
 /obj/item/radio/intercom/directional/south,
+/obj/structure/bed/dogbed,
+/mob/living/basic/pet/dog/bullterrier/walter/smallter{
+	name = "Goliath";
+	real_name = "Goliath"
+	},
 /turf/open/floor/iron/dark,
 /area/station/cargo/miningoffice)
 "cYb" = (
@@ -27343,7 +27327,6 @@
 /turf/open/floor/plating,
 /area/station/maintenance/port/fore)
 "dlL" = (
-/obj/machinery/hydroponics/soil,
 /obj/structure/railing{
 	dir = 8
 	},
@@ -27353,6 +27336,7 @@
 	},
 /obj/item/shovel/spade,
 /obj/effect/decal/cleanable/dirt,
+/obj/machinery/growing/soil,
 /turf/open/floor/iron/half,
 /area/station/service/hydroponics/garden/abandoned)
 "dma" = (
@@ -27526,6 +27510,9 @@
 /obj/structure/disposalpipe/segment,
 /obj/machinery/duct,
 /obj/effect/turf_decal/siding/green,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/structure/cable,
 /turf/open/floor/iron,
 /area/station/service/hydroponics)
 "dpC" = (
@@ -28227,8 +28214,8 @@
 /obj/effect/turf_decal/stripes/corner{
 	dir = 4
 	},
-/obj/structure/table_frame,
 /obj/structure/sign/warning/vacuum/external/directional/north,
+/obj/structure/trash_pile,
 /turf/open/floor/iron,
 /area/station/maintenance/department/medical)
 "dDG" = (
@@ -29135,8 +29122,8 @@
 /turf/open/floor/iron/white,
 /area/station/science/research)
 "ecw" = (
-/obj/machinery/hydroponics/soil,
 /obj/item/shovel/spade,
+/obj/machinery/growing/soil,
 /turf/open/floor/grass,
 /area/station/security/prison/garden)
 "ecC" = (
@@ -29534,14 +29521,12 @@
 /area/shipbreak)
 "elg" = (
 /obj/structure/sign/departments/maint/alt/directional/west,
-/obj/structure/plasticflaps/opaque,
 /obj/machinery/navbeacon{
 	codes_txt = "delivery;dir=1";
 	location = "Hydroponics"
 	},
 /obj/effect/turf_decal/bot,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/structure/cable,
+/obj/structure/plasticflaps/opaque,
 /turf/open/floor/iron,
 /area/station/service/hydroponics)
 "elq" = (
@@ -29997,9 +29982,8 @@
 /area/station/ai_monitored/turret_protected/aisat_interior)
 "evl" = (
 /obj/structure/sign/poster/contraband/random/directional/north,
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/garbage,
-/turf/open/floor/plating,
+/obj/machinery/material_analyzer,
+/turf/open/floor/wood,
 /area/station/commons/vacant_room/office)
 "evm" = (
 /obj/effect/turf_decal/box/corners,
@@ -30551,6 +30535,10 @@
 /obj/structure/cable,
 /turf/open/floor/iron/dark/telecomms,
 /area/station/tcommsat/server)
+"eFB" = (
+/obj/structure/trash_pile,
+/turf/open/floor/catwalk_floor/iron_smooth,
+/area/station/maintenance/port)
 "eFJ" = (
 /obj/effect/mapping_helpers/burnt_floor,
 /obj/structure/sign/warning/no_smoking/directional/east,
@@ -32303,6 +32291,10 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /turf/open/floor/plating,
 /area/station/maintenance/fore)
+"fsl" = (
+/obj/structure/trash_pile,
+/turf/open/floor/plating,
+/area/station/maintenance/port/fore)
 "fss" = (
 /obj/effect/spawner/random/trash/garbage,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -33903,12 +33895,12 @@
 	dir = 1
 	},
 /obj/effect/turf_decal/trimline/green/line,
-/obj/machinery/hydroponics/soil,
 /obj/structure/railing{
 	dir = 8
 	},
 /obj/machinery/light_switch/directional/south,
 /obj/effect/decal/cleanable/dirt,
+/obj/machinery/growing/soil,
 /turf/open/floor/iron/half,
 /area/station/service/hydroponics/garden/abandoned)
 "fZI" = (
@@ -34023,7 +34015,6 @@
 	dir = 1
 	},
 /obj/machinery/airalarm/directional/south,
-/obj/effect/decal/cleanable/dirt,
 /turf/open/floor/iron/grimy,
 /area/station/commons/vacant_room/office)
 "gcp" = (
@@ -34264,19 +34255,8 @@
 /turf/open/floor/wood,
 /area/station/service/cafeteria)
 "giA" = (
-/obj/structure/table/wood,
-/obj/item/folder{
-	pixel_x = -4
-	},
-/obj/item/flashlight/lamp/bananalamp{
-	pixel_x = 6;
-	pixel_y = 15
-	},
-/obj/item/pen{
-	pixel_x = -6
-	},
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/turf/open/floor/carpet,
+/turf/open/floor/wood,
 /area/station/commons/vacant_room/office)
 "giC" = (
 /obj/structure/closet/crate/bin,
@@ -34724,7 +34704,7 @@
 /obj/effect/decal/remains/human,
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/turf/open/floor/plating,
+/turf/open/floor/iron/grimy,
 /area/station/commons/vacant_room/office)
 "gsR" = (
 /obj/effect/turf_decal/trimline/neutral/filled/line,
@@ -35107,10 +35087,8 @@
 /obj/effect/turf_decal/siding/wood/end{
 	dir = 4
 	},
-/obj/machinery/hydroponics/soil{
-	pixel_y = 7
-	},
 /obj/structure/disposalpipe/segment,
+/obj/machinery/growing/soil,
 /turf/open/floor/grass,
 /area/station/service/hydroponics/garden)
 "gCF" = (
@@ -35128,23 +35106,10 @@
 /turf/open/floor/plating,
 /area/station/maintenance/department/science/xenobiology)
 "gCS" = (
-/obj/structure/table/wood,
 /obj/effect/turf_decal/siding/wood{
 	dir = 10
 	},
-/obj/item/phone{
-	desc = "Supposedly a direct line to Nanotrasen Central Command. It's not even plugged in.";
-	pixel_x = -3;
-	pixel_y = 14
-	},
-/obj/item/reagent_containers/cup/glass/mug/britcup{
-	pixel_x = 6;
-	pixel_y = 10
-	},
-/obj/item/taperecorder{
-	pixel_x = -2
-	},
-/obj/effect/decal/cleanable/dirt,
+/obj/structure/table/wood,
 /turf/open/floor/wood,
 /area/station/commons/vacant_room/office)
 "gCV" = (
@@ -35461,13 +35426,13 @@
 /turf/open/floor/engine,
 /area/station/engineering/supermatter/room)
 "gIW" = (
-/obj/machinery/hydroponics/soil,
 /obj/effect/turf_decal/trimline/green/line{
 	dir = 1
 	},
 /obj/effect/turf_decal/trimline/green/line,
 /obj/structure/sign/poster/contraband/kudzu/directional/east,
 /obj/effect/decal/cleanable/dirt,
+/obj/machinery/growing/soil,
 /turf/open/floor/iron/half,
 /area/station/service/hydroponics/garden/abandoned)
 "gIY" = (
@@ -36134,7 +36099,6 @@
 /turf/open/floor/plating,
 /area/station/maintenance/department/cargo)
 "gVY" = (
-/obj/structure/closet/secure_closet/personal/cabinet,
 /obj/structure/sign/calendar/directional/south,
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/iron/grimy,
@@ -36595,6 +36559,7 @@
 /turf/open/floor/catwalk_floor/iron_dark,
 /area/station/maintenance/department/bridge)
 "heg" = (
+/obj/structure/trash_pile,
 /turf/open/floor/iron,
 /area/station/maintenance/aft/lesser)
 "hej" = (
@@ -37393,12 +37358,12 @@
 /turf/open/floor/iron,
 /area/station/engineering/lobby)
 "hrN" = (
-/obj/machinery/hydroponics/soil,
 /obj/structure/railing{
 	dir = 8
 	},
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/spawner/random/food_or_drink/seed,
+/obj/machinery/growing/soil,
 /turf/open/floor/plating,
 /area/station/service/hydroponics/garden/abandoned)
 "hsj" = (
@@ -37673,11 +37638,6 @@
 /obj/effect/turf_decal/stripes/line,
 /turf/open/floor/plating,
 /area/station/security/range)
-"hya" = (
-/obj/structure/noticeboard/directional/east,
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/wood,
-/area/station/commons/vacant_room/office)
 "hyj" = (
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
 	dir = 8
@@ -38418,7 +38378,6 @@
 /area/station/medical/abandoned)
 "hLp" = (
 /obj/machinery/conveyor{
-	dir = 1;
 	id = "QMLoad2"
 	},
 /obj/effect/turf_decal/stripes/line{
@@ -40047,8 +40006,6 @@
 /obj/effect/turf_decal/siding/wood/corner{
 	dir = 1
 	},
-/obj/effect/mapping_helpers/burnt_floor,
-/obj/effect/decal/cleanable/confetti,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /turf/open/floor/wood,
@@ -41789,7 +41746,7 @@
 /turf/open/floor/iron/dark/smooth_large,
 /area/station/maintenance/disposal/incinerator)
 "iZK" = (
-/obj/effect/spawner/random/trash/bacteria,
+/obj/structure/trash_pile,
 /turf/open/floor/plating,
 /area/station/maintenance/department/medical)
 "iZV" = (
@@ -41992,6 +41949,13 @@
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/iron,
 /area/station/maintenance/department/science/xenobiology)
+"jeL" = (
+/obj/structure/disposalpipe/segment{
+	dir = 4
+	},
+/obj/structure/trash_pile,
+/turf/open/floor/plating,
+/area/station/maintenance/port/fore)
 "jfe" = (
 /obj/machinery/computer/security,
 /obj/effect/turf_decal/tile/red/fourcorners,
@@ -42470,10 +42434,9 @@
 /turf/open/floor/iron,
 /area/station/hallway/primary/starboard)
 "jmX" = (
-/obj/machinery/newscaster/directional/east,
-/obj/item/kirbyplants/random,
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plating,
+/obj/structure/anvil,
+/turf/open/floor/wood,
 /area/station/commons/vacant_room/office)
 "jnp" = (
 /obj/effect/turf_decal/bot,
@@ -42941,6 +42904,10 @@
 	},
 /turf/open/floor/iron/dark,
 /area/station/science/ordnance)
+"jwE" = (
+/obj/structure/trash_pile,
+/turf/open/floor/plating,
+/area/station/maintenance/starboard/fore)
 "jwI" = (
 /obj/machinery/power/port_gen/pacman/pre_loaded,
 /obj/effect/turf_decal/bot,
@@ -43694,7 +43661,7 @@
 /area/station/science/ordnance/burnchamber)
 "jKZ" = (
 /obj/effect/decal/cleanable/dirt,
-/obj/effect/spawner/random/trash/garbage,
+/obj/structure/trash_pile,
 /turf/open/floor/plating,
 /area/station/maintenance/port/greater)
 "jLb" = (
@@ -44242,7 +44209,7 @@
 "jVW" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/cobweb,
-/obj/effect/spawner/random/trash/food_packaging,
+/obj/structure/trash_pile,
 /turf/open/floor/iron,
 /area/station/maintenance/port)
 "jWm" = (
@@ -44881,7 +44848,6 @@
 	},
 /area/station/ai_monitored/turret_protected/ai)
 "kig" = (
-/obj/effect/mapping_helpers/burnt_floor,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /turf/open/floor/iron/grimy,
 /area/station/commons/vacant_room/office)
@@ -46219,7 +46185,6 @@
 /turf/open/floor/iron,
 /area/station/hallway/secondary/exit/departure_lounge)
 "kJV" = (
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
 /obj/structure/disposalpipe/segment,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/machinery/duct,
@@ -46227,6 +46192,8 @@
 	name = "Hydroponics Maintenance"
 	},
 /obj/effect/mapping_helpers/airlock/access/all/service/hydroponics,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/structure/cable,
 /turf/open/floor/iron,
 /area/station/service/hydroponics)
 "kKa" = (
@@ -46963,7 +46930,6 @@
 /area/station/security/checkpoint/engineering)
 "kZo" = (
 /obj/machinery/conveyor{
-	dir = 1;
 	id = "QMLoad"
 	},
 /obj/effect/turf_decal/stripes/line{
@@ -47583,9 +47549,9 @@
 /turf/open/floor/iron/white,
 /area/station/medical/chemistry)
 "loa" = (
-/obj/machinery/hydroponics/soil,
 /obj/item/cultivator,
 /obj/structure/cable,
+/obj/machinery/growing/soil,
 /turf/open/floor/grass,
 /area/station/security/prison/garden)
 "lob" = (
@@ -47949,7 +47915,6 @@
 /turf/open/floor/iron,
 /area/station/cargo/office)
 "lvY" = (
-/obj/effect/decal/cleanable/dirt,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/structure/cable,
@@ -48783,7 +48748,7 @@
 "lMJ" = (
 /obj/effect/mapping_helpers/burnt_floor,
 /obj/effect/decal/cleanable/shreds,
-/turf/open/floor/carpet,
+/turf/open/floor/wood,
 /area/station/commons/vacant_room/office)
 "lML" = (
 /obj/machinery/door/firedoor,
@@ -49043,6 +49008,7 @@
 /obj/effect/turf_decal/siding/green/end{
 	dir = 4
 	},
+/obj/machinery/composters,
 /turf/open/floor/iron,
 /area/station/service/hydroponics/garden)
 "lRq" = (
@@ -49603,9 +49569,7 @@
 /turf/open/floor/iron/white,
 /area/station/science/research)
 "mdh" = (
-/obj/structure/table/wood,
-/obj/machinery/computer/libraryconsole,
-/turf/open/floor/carpet,
+/turf/open/floor/wood,
 /area/station/commons/vacant_room/office)
 "mdr" = (
 /obj/effect/decal/cleanable/dirt,
@@ -49841,6 +49805,10 @@
 /obj/effect/landmark/start/station_engineer,
 /turf/open/floor/iron,
 /area/station/engineering/storage)
+"mjb" = (
+/obj/structure/trash_pile,
+/turf/open/floor/plating,
+/area/station/maintenance/port)
 "mjd" = (
 /obj/effect/turf_decal/tile/neutral/half/contrasted{
 	dir = 1
@@ -50281,6 +50249,11 @@
 /obj/effect/spawner/structure/window/reinforced,
 /turf/open/floor/plating,
 /area/station/command/heads_quarters/nt_rep)
+"mrN" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/trash_pile,
+/turf/open/floor/iron,
+/area/station/maintenance/port)
 "mrU" = (
 /obj/machinery/power/apc/auto_name/directional/east,
 /obj/structure/cable,
@@ -51388,7 +51361,7 @@
 "mMJ" = (
 /obj/structure/window/reinforced/spawner/directional/east,
 /obj/item/shovel/spade,
-/obj/machinery/hydroponics/constructable,
+/obj/machinery/growing/tray,
 /turf/open/floor/grass,
 /area/station/security/prison/garden)
 "mNb" = (
@@ -51689,6 +51662,7 @@
 "mTD" = (
 /obj/effect/turf_decal/loading_area,
 /obj/effect/decal/cleanable/dirt,
+/obj/structure/trash_pile,
 /turf/open/floor/iron,
 /area/station/maintenance/department/medical)
 "mTH" = (
@@ -52053,10 +52027,9 @@
 /turf/open/floor/iron,
 /area/station/security/prison)
 "nbZ" = (
-/obj/machinery/photocopier,
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/cobweb/cobweb2,
-/turf/open/floor/plating,
+/turf/open/floor/wood,
 /area/station/commons/vacant_room/office)
 "ncm" = (
 /obj/effect/mapping_helpers/burnt_floor,
@@ -52301,6 +52274,7 @@
 /turf/open/floor/plating,
 /area/station/maintenance/port/fore)
 "ngv" = (
+/obj/structure/trash_pile,
 /turf/open/floor/plating,
 /area/station/medical/abandoned)
 "ngB" = (
@@ -54304,9 +54278,6 @@
 /turf/open/floor/iron/dark,
 /area/station/science/ordnance)
 "nRe" = (
-/obj/structure/chair/office{
-	dir = 1
-	},
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/iron/grimy,
 /area/station/commons/vacant_room/office)
@@ -54955,9 +54926,6 @@
 /turf/open/floor/iron,
 /area/station/commons/fitness/recreation)
 "oeM" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/structure/cable,
 /obj/effect/turf_decal/siding/green{
 	dir = 8
 	},
@@ -55125,21 +55093,8 @@
 /turf/open/floor/iron,
 /area/station/commons/storage/primary)
 "ohO" = (
-/obj/structure/table/wood,
-/obj/item/reagent_containers/cup/glass/bottle/grappa{
-	pixel_x = 5;
-	pixel_y = 12
-	},
-/obj/item/reagent_containers/cup/glass/drinkingglass/filled{
-	pixel_x = -5;
-	pixel_y = 4
-	},
-/obj/item/reagent_containers/cup/glass/drinkingglass/filled{
-	pixel_x = 1;
-	pixel_y = 2
-	},
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/carpet,
+/turf/open/floor/wood,
 /area/station/commons/vacant_room/office)
 "ohS" = (
 /obj/structure/reagent_dispensers/watertank/high,
@@ -55687,6 +55642,11 @@
 /obj/effect/turf_decal/stripes/corner,
 /turf/open/floor/iron/dark,
 /area/station/science/ordnance)
+"osh" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/trash_pile,
+/turf/open/floor/iron,
+/area/station/maintenance/aft/lesser)
 "otq" = (
 /obj/machinery/recharge_station,
 /obj/effect/turf_decal/box,
@@ -56924,7 +56884,7 @@
 /obj/effect/mapping_helpers/burnt_floor,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/turf/open/floor/plating,
+/turf/open/floor/wood,
 /area/station/commons/vacant_room/office)
 "oPH" = (
 /obj/structure/table/wood,
@@ -57732,7 +57692,6 @@
 /turf/open/floor/iron,
 /area/station/hallway/secondary/entry)
 "peV" = (
-/obj/effect/decal/cleanable/dirt,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /turf/open/floor/iron/grimy,
@@ -58580,7 +58539,7 @@
 "pvU" = (
 /obj/structure/plasticflaps/opaque,
 /obj/machinery/conveyor{
-	dir = 4;
+	dir = 8;
 	id = "QMLoad2"
 	},
 /obj/effect/turf_decal/siding/brown,
@@ -58704,7 +58663,7 @@
 	name = "Supply Dock Loading Door"
 	},
 /obj/machinery/conveyor{
-	dir = 4;
+	dir = 8;
 	id = "QMLoad2"
 	},
 /obj/effect/turf_decal/siding/brown{
@@ -58823,7 +58782,7 @@
 /obj/machinery/door/airlock/command/glass{
 	name = "Control Room"
 	},
-/obj/effect/mapping_helpers/airlock/access/all/engineering/ce,
+/obj/effect/mapping_helpers/airlock/access/any/engineering/tcoms,
 /turf/open/floor/iron,
 /area/station/tcommsat/computer)
 "pCn" = (
@@ -59607,7 +59566,7 @@
 /obj/machinery/duct,
 /obj/effect/turf_decal/siding/green,
 /obj/structure/table,
-/obj/machinery/splicer,
+/obj/item/toy/figure/botanist,
 /turf/open/floor/iron,
 /area/station/service/hydroponics)
 "pRH" = (
@@ -59949,11 +59908,6 @@
 	},
 /area/station/security/checkpoint/medical)
 "pZP" = (
-/obj/structure/chair/sofa/right/brown{
-	dir = 4
-	},
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/insectguts,
 /turf/open/floor/iron/grimy,
 /area/station/commons/vacant_room/office)
 "qaa" = (
@@ -60128,9 +60082,6 @@
 	},
 /obj/structure/window/spawner/directional/north,
 /obj/structure/window/spawner/directional/west,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/structure/cable,
 /obj/effect/turf_decal/siding/green{
 	dir = 10
 	},
@@ -60265,11 +60216,7 @@
 /turf/open/floor/iron,
 /area/station/maintenance/department/medical)
 "qeY" = (
-/obj/structure/chair/sofa/middle/brown{
-	dir = 4
-	},
 /obj/structure/sign/poster/contraband/random/directional/west,
-/obj/effect/decal/cleanable/dirt,
 /obj/machinery/light/broken/directional/west,
 /turf/open/floor/iron/grimy,
 /area/station/commons/vacant_room/office)
@@ -60392,12 +60339,6 @@
 /obj/structure/cable,
 /turf/open/floor/wood/parquet,
 /area/station/command/heads_quarters/ce)
-"qiA" = (
-/obj/effect/mapping_helpers/burnt_floor,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/turf/open/floor/iron/grimy,
-/area/station/commons/vacant_room/office)
 "qiJ" = (
 /obj/machinery/light/small/directional/north,
 /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
@@ -62601,12 +62542,7 @@
 	},
 /area/station/ai_monitored/turret_protected/aisat/hallway)
 "qZI" = (
-/obj/structure/chair/sofa/left/brown{
-	dir = 4
-	},
-/obj/item/toy/plush/goatplushie,
 /obj/structure/extinguisher_cabinet/directional/west,
-/obj/effect/decal/cleanable/dirt,
 /turf/open/floor/plating,
 /area/station/commons/vacant_room/office)
 "qZJ" = (
@@ -62930,8 +62866,8 @@
 "rgk" = (
 /obj/structure/window/reinforced/spawner/directional/west,
 /obj/item/cultivator,
-/obj/machinery/hydroponics/constructable,
 /obj/structure/cable,
+/obj/machinery/growing/tray,
 /turf/open/floor/grass,
 /area/station/security/prison/garden)
 "rgr" = (
@@ -64564,8 +64500,7 @@
 /area/station/medical/morgue)
 "rLc" = (
 /obj/structure/table,
-/obj/item/reagent_containers/cup/bottle/nutrient/ez,
-/obj/item/reagent_containers/cup/bottle/nutrient/ez,
+/obj/machinery/smartfridge/disks,
 /turf/open/floor/iron/dark,
 /area/station/service/hydroponics)
 "rLU" = (
@@ -65597,7 +65532,6 @@
 /area/station/engineering/atmos)
 "slx" = (
 /obj/machinery/light_switch/directional/north,
-/obj/effect/decal/cleanable/dirt,
 /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
 /turf/open/floor/iron/grimy,
 /area/station/commons/vacant_room/office)
@@ -65992,17 +65926,6 @@
 	},
 /turf/open/floor/iron,
 /area/station/engineering/hallway)
-"suO" = (
-/obj/structure/table/wood,
-/obj/item/papercutter{
-	pixel_x = 3;
-	pixel_y = 4
-	},
-/obj/item/hand_labeler,
-/obj/item/stack/package_wrap,
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/carpet,
-/area/station/commons/vacant_room/office)
 "suT" = (
 /obj/structure/table/wood,
 /obj/item/stamp/denied{
@@ -66109,10 +66032,10 @@
 /turf/open/misc/asteroid/airless,
 /area/lavaland/surface)
 "sxb" = (
-/obj/effect/mapping_helpers/burnt_floor,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/turf/open/floor/carpet,
+/obj/machinery/arc_forge,
+/turf/open/floor/wood,
 /area/station/commons/vacant_room/office)
 "sxj" = (
 /obj/machinery/atmospherics/components/binary/pump{
@@ -66845,13 +66768,13 @@
 /turf/open/floor/iron,
 /area/station/security/checkpoint/escape)
 "sJB" = (
-/obj/machinery/hydroponics/soil,
 /obj/effect/turf_decal/trimline/green/line,
 /obj/effect/turf_decal/trimline/green/line{
 	dir = 1
 	},
 /obj/effect/decal/cleanable/cobweb/cobweb2,
 /obj/effect/decal/cleanable/dirt,
+/obj/machinery/growing/soil,
 /turf/open/floor/iron/half,
 /area/station/service/hydroponics/garden/abandoned)
 "sJH" = (
@@ -66974,8 +66897,8 @@
 /obj/machinery/duct,
 /obj/effect/turf_decal/siding/green,
 /obj/structure/table,
-/obj/machinery/smartfridge/disks,
 /obj/machinery/light/directional/south,
+/obj/item/book/manual/hydroponics_pod_people,
 /turf/open/floor/iron,
 /area/station/service/hydroponics)
 "sMm" = (
@@ -68121,7 +68044,6 @@
 /area/station/service/cafeteria)
 "tfy" = (
 /obj/machinery/firealarm/directional/west,
-/obj/machinery/computer/order_console/bitrunning,
 /obj/effect/turf_decal/tile/neutral/half/contrasted{
 	dir = 1
 	},
@@ -68594,21 +68516,9 @@
 /turf/open/floor/iron,
 /area/station/security/brig)
 "tpU" = (
-/obj/structure/table/wood,
 /obj/effect/turf_decal/siding/wood{
 	dir = 9
 	},
-/obj/item/newspaper{
-	pixel_x = 4
-	},
-/obj/item/flashlight/lamp{
-	pixel_x = -5;
-	pixel_y = 9
-	},
-/obj/item/clothing/glasses/regular{
-	pixel_x = 4
-	},
-/obj/effect/decal/cleanable/dirt,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /turf/open/floor/wood,
@@ -68702,14 +68612,6 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /turf/open/floor/plastic,
 /area/station/security/prison/shower)
-"trM" = (
-/obj/structure/sign/picture_frame/portrait{
-	pixel_x = -32
-	},
-/obj/structure/filingcabinet,
-/obj/effect/mapping_helpers/broken_floor,
-/turf/open/floor/iron/grimy,
-/area/station/commons/vacant_room/office)
 "trP" = (
 /obj/machinery/status_display/evac/directional/north,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -68784,12 +68686,7 @@
 /turf/open/floor/iron/dark/smooth_large,
 /area/station/maintenance/disposal/incinerator)
 "ttV" = (
-/obj/item/kirbyplants/random/dead{
-	desc = "Dead plant. I thought all office plants were fake.";
-	name = "Neglected Office Plant"
-	},
 /obj/machinery/power/apc/auto_name/directional/south,
-/obj/effect/decal/cleanable/dirt,
 /obj/structure/cable,
 /turf/open/floor/iron/grimy,
 /area/station/commons/vacant_room/office)
@@ -68846,7 +68743,7 @@
 /area/station/security/prison/visit)
 "tuB" = (
 /obj/machinery/conveyor{
-	dir = 8;
+	dir = 4;
 	id = "QMLoad"
 	},
 /obj/structure/plasticflaps/opaque,
@@ -69336,7 +69233,6 @@
 	},
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/vomit,
-/obj/effect/spawner/random/structure/barricade,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /turf/open/floor/wood,
@@ -70039,20 +69935,10 @@
 /turf/open/floor/iron/dark,
 /area/station/engineering/atmos)
 "tQk" = (
-/obj/structure/table/wood,
 /obj/effect/turf_decal/siding/wood{
 	dir = 8
 	},
-/obj/item/clipboard{
-	pixel_x = -2;
-	pixel_y = 10
-	},
-/obj/item/folder/yellow{
-	pixel_x = 2;
-	pixel_y = -1
-	},
-/obj/item/toy/figure/wizard,
-/obj/effect/decal/cleanable/dirt,
+/obj/structure/table/wood,
 /turf/open/floor/wood,
 /area/station/commons/vacant_room/office)
 "tQr" = (
@@ -70602,6 +70488,7 @@
 	dir = 4
 	},
 /obj/effect/decal/cleanable/dirt,
+/obj/structure/trash_pile,
 /turf/open/floor/iron/dark/textured_half{
 	dir = 1
 	},
@@ -71290,6 +71177,11 @@
 /obj/structure/ghost_critter_spawn,
 /turf/open/floor/plating,
 /area/station/maintenance/department/science)
+"urc" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/trash_pile,
+/turf/open/floor/iron,
+/area/station/maintenance/port/greater)
 "ure" = (
 /obj/structure/chair,
 /obj/effect/turf_decal/tile/neutral/half/contrasted{
@@ -72349,9 +72241,9 @@
 /area/station/hallway/primary/starboard)
 "uPx" = (
 /obj/structure/table,
-/obj/item/reagent_containers/spray/plantbgone,
 /obj/structure/sign/poster/contraband/random/directional/west,
-/obj/machinery/plantgenes,
+/obj/item/reagent_containers/cup/watering_can,
+/obj/item/reagent_containers/cup/watering_can,
 /turf/open/floor/iron,
 /area/station/service/hydroponics)
 "uPD" = (
@@ -73414,7 +73306,7 @@
 /area/station/maintenance/disposal/incinerator)
 "vnd" = (
 /obj/machinery/conveyor{
-	dir = 8;
+	dir = 4;
 	id = "QMLoad"
 	},
 /obj/machinery/door/poddoor{
@@ -74223,8 +74115,8 @@
 /turf/open/floor/iron/smooth,
 /area/station/security/execution/education)
 "vCl" = (
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plating,
+/obj/effect/landmark/event_spawn,
+/turf/open/floor/wood,
 /area/station/commons/vacant_room/office)
 "vCx" = (
 /obj/effect/landmark/start/hangover,
@@ -74260,6 +74152,11 @@
 	},
 /turf/open/space/basic,
 /area/space)
+"vDZ" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/trash_pile,
+/turf/open/floor/plating,
+/area/station/maintenance/department/science)
 "vEc" = (
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -74374,11 +74271,6 @@
 	},
 /turf/open/floor/iron/dark,
 /area/station/science/ordnance)
-"vGW" = (
-/obj/structure/reagent_dispensers/water_cooler,
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/iron/grimy,
-/area/station/commons/vacant_room/office)
 "vHl" = (
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /obj/structure/cable,
@@ -75425,8 +75317,8 @@
 /area/station/cargo/lobby)
 "vYw" = (
 /obj/effect/decal/cleanable/dirt,
-/obj/effect/spawner/random/trash/botanical_waste,
 /obj/structure/cable,
+/obj/structure/trash_pile,
 /turf/open/floor/plating,
 /area/station/maintenance/department/medical)
 "vYA" = (
@@ -77101,6 +76993,10 @@
 /obj/machinery/light/floor/has_bulb,
 /turf/open/floor/engine,
 /area/station/science/xenobiology)
+"wHQ" = (
+/obj/structure/trash_pile,
+/turf/open/floor/plating,
+/area/station/maintenance/aft/lesser)
 "wHR" = (
 /obj/structure/table,
 /obj/item/radio/off,
@@ -78142,9 +78038,8 @@
 /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
 	dir = 8
 	},
-/obj/effect/decal/cleanable/dirt,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/turf/open/floor/carpet,
+/turf/open/floor/wood,
 /area/station/commons/vacant_room/office)
 "xgI" = (
 /obj/structure/rack,
@@ -79875,9 +79770,9 @@
 	dir = 1
 	},
 /obj/effect/turf_decal/trimline/green/line,
-/obj/machinery/hydroponics/soil,
 /obj/effect/spawner/random/food_or_drink/seed,
 /obj/effect/decal/cleanable/dirt,
+/obj/machinery/growing/soil,
 /turf/open/floor/iron/half,
 /area/station/service/hydroponics/garden/abandoned)
 "xMy" = (
@@ -80401,14 +80296,20 @@
 /turf/open/floor/iron,
 /area/station/security/holding_cell)
 "xXC" = (
-/obj/machinery/door/airlock/maintenance{
-	name = "Vacant Office Maintenance"
+/obj/effect/turf_decal/stripes/line,
+/obj/effect/turf_decal/stripes/line{
+	dir = 1
 	},
-/obj/effect/mapping_helpers/airlock/access/any/engineering/construction,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/effect/mapping_helpers/airlock/access/any/science/maintenance,
+/obj/machinery/door/airlock/grunge{
+	name = "Blacksmithing Section"
+	},
+/obj/effect/mapping_helpers/airlock/access/any/supply/general,
+/obj/effect/mapping_helpers/airlock/access/any/science/general,
 /obj/structure/cable,
-/turf/open/floor/plating,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/turf/open/floor/iron,
 /area/station/maintenance/port/greater)
 "xXJ" = (
 /obj/effect/spawner/structure/window/reinforced/tinted,
@@ -80454,6 +80355,7 @@
 /obj/structure/cable,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/effect/mapping_helpers/airlock/access/any/command/blueshield,
 /turf/open/floor/wood/parquet,
 /area/station/command/gateway)
 "xYO" = (
@@ -81067,9 +80969,8 @@
 /turf/open/floor/iron/dark/textured,
 /area/station/science/breakroom)
 "ykM" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/glass,
 /obj/machinery/light/small/directional/south,
+/obj/structure/table/wood,
 /turf/open/floor/iron/grimy,
 /area/station/commons/vacant_room/office)
 "ykT" = (
@@ -95660,7 +95561,7 @@ nCC
 aaa
 nCC
 nCC
-gXw
+mrN
 mih
 gCj
 nCC
@@ -96958,7 +96859,7 @@ jAb
 qxH
 mLN
 bWu
-qjW
+mjb
 gYn
 cbP
 fGN
@@ -97939,7 +97840,7 @@ aSe
 aTc
 azQ
 aVg
-aWl
+jeL
 aCR
 aXY
 bJf
@@ -98759,7 +98660,7 @@ lTj
 dDf
 oXv
 oXv
-oXv
+eFB
 vqX
 aaa
 aaa
@@ -98991,7 +98892,7 @@ xTF
 bsI
 rHM
 bwM
-vGW
+pZP
 qZI
 qeY
 pZP
@@ -99249,7 +99150,7 @@ tKH
 tKH
 bwN
 peV
-qiA
+peV
 diS
 diS
 lvY
@@ -99524,7 +99425,7 @@ uNc
 ioE
 xIZ
 cXm
-gXw
+mrN
 nCC
 aaa
 aaa
@@ -99762,7 +99663,7 @@ xTF
 bsI
 bsI
 bwM
-vCl
+tQk
 tpU
 tQk
 gCS
@@ -100021,7 +99922,7 @@ bsI
 bwM
 evl
 isd
-bba
+ohO
 pmJ
 kBP
 uGE
@@ -100278,9 +100179,9 @@ oax
 bwM
 jmX
 oPG
-hya
+mdh
 vCl
-biK
+mdh
 uGE
 roC
 aSE
@@ -100533,11 +100434,11 @@ xTF
 bsI
 dps
 bwM
-bwM
-tEm
-bwM
 bBn
-bwM
+tEm
+mdh
+mdh
+mdh
 uGE
 roC
 dqG
@@ -100790,11 +100691,11 @@ xTF
 bsI
 bvN
 bwM
-suO
+mdh
 sxb
 mdh
 nRe
-trM
+pZP
 uGE
 hAy
 qtA
@@ -101305,10 +101206,10 @@ bsI
 cXw
 bwM
 nbZ
-vCl
+ohO
 lMJ
 hyj
-vCl
+nRe
 uGE
 nAS
 kuB
@@ -105131,7 +105032,7 @@ aOe
 hsq
 aAQ
 xlx
-aCR
+fsl
 rmD
 aGQ
 aWl
@@ -105889,7 +105790,7 @@ aDr
 aEg
 aEk
 aCR
-aCR
+fsl
 azQ
 aGU
 aCR
@@ -106457,7 +106358,7 @@ bLQ
 jdv
 uPx
 oeM
-aeZ
+aKc
 qdk
 elg
 jhF
@@ -106714,7 +106615,7 @@ bLR
 cWk
 hny
 gvt
-hny
+gvt
 dpB
 kJV
 vfB
@@ -108262,7 +108163,7 @@ dvd
 kfY
 bzq
 uGE
-nnH
+urc
 ntr
 qCC
 oPI
@@ -111649,7 +111550,7 @@ kNp
 nPb
 cCZ
 gQf
-ncL
+osh
 kHY
 kJa
 txr
@@ -115427,7 +115328,7 @@ bfZ
 bhh
 pcp
 bjY
-bDP
+bki
 wlx
 bDP
 bDP
@@ -116196,13 +116097,13 @@ jOj
 aYK
 qZT
 bhk
-ovj
+aeZ
 bsF
 blE
 bnl
 blE
 lFR
-aUJ
+blE
 blB
 vxy
 bub
@@ -116454,7 +116355,7 @@ aYK
 bgd
 bhj
 ovj
-bki
+bsF
 aTV
 bnl
 aTV
@@ -119097,7 +118998,7 @@ aaa
 kHY
 xUc
 wuL
-wuL
+wHQ
 kHY
 aaa
 aaa
@@ -119542,7 +119443,7 @@ dfl
 dfl
 aYK
 aYK
-aZO
+jwE
 qrn
 dnD
 mzy
@@ -121589,7 +121490,7 @@ aEd
 sDc
 sDc
 mTD
-aHx
+iZK
 qeN
 aEd
 rRi
@@ -131131,7 +131032,7 @@ fVC
 bFH
 dbT
 evs
-poi
+vDZ
 bJT
 bJT
 bxD