diff --git a/_maps/map_files/BoxStation/BoxStation.dmm b/_maps/map_files/BoxStation/BoxStation.dmm
index ea7de86e9c5..40981dea6fa 100644
--- a/_maps/map_files/BoxStation/BoxStation.dmm
+++ b/_maps/map_files/BoxStation/BoxStation.dmm
@@ -14,7 +14,7 @@
 	},
 /obj/machinery/vending/boozeomat,
 /obj/item/radio/intercom/directional/east,
-/obj/structure/fish_mount/bar/directional/north,
+/obj/structure/noticeboard/directional/north,
 /turf/open/floor/iron,
 /area/station/service/bar)
 "aac" = (
@@ -3398,7 +3398,7 @@
 /area/station/service/lawoffice)
 "aux" = (
 /obj/structure/sign/clock/directional/east,
-/obj/machinery/photocopier/prebuilt,
+/obj/structure/filingcabinet/employment,
 /turf/open/floor/carpet/blue,
 /area/station/service/lawoffice)
 "auy" = (
@@ -3516,10 +3516,10 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
 	dir = 8
 	},
-/obj/structure/fans/tiny,
 /obj/machinery/door/airlock/wood{
 	name = "Pool and Sauna"
 	},
+/obj/structure/plasticflaps/kitchen,
 /turf/open/floor/iron/dark,
 /area/station/common/pool/sauna)
 "auV" = (
@@ -5002,6 +5002,7 @@
 	name = "Kitchen Service Hall"
 	},
 /obj/effect/mapping_helpers/airlock/access/any/service/kitchen,
+/obj/structure/plasticflaps/kitchen,
 /turf/open/floor/iron/cafeteria,
 /area/station/service/kitchen)
 "aAf" = (
@@ -16511,7 +16512,7 @@
 "boD" = (
 /obj/structure/table,
 /obj/machinery/light/directional/north,
-/obj/item/surgery_tray/full,
+/obj/effect/spawner/surgery_tray,
 /turf/open/floor/iron/dark,
 /area/station/science/robotics/lab)
 "boE" = (
@@ -19993,6 +19994,7 @@
 	},
 /obj/machinery/atmospherics/pipe/smart/manifold4w/general/hidden,
 /obj/effect/mapping_helpers/airlock/access/any/science/rd,
+/obj/structure/plasticflaps/kitchen,
 /turf/open/floor/iron/dark,
 /area/station/science/server)
 "bAC" = (
@@ -28578,7 +28580,6 @@
 /obj/effect/turf_decal/tile/brown/half/contrasted{
 	dir = 1
 	},
-/obj/machinery/light/small/directional/north,
 /turf/open/floor/iron,
 /area/station/cargo/warehouse)
 "cjX" = (
@@ -32273,11 +32274,11 @@
 	},
 /obj/effect/turf_decal/tile/blue,
 /obj/structure/table/glass,
-/obj/item/surgery_tray/full,
 /obj/machinery/vending/wallmed{
 	pixel_x = 32
 	},
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
+/obj/effect/spawner/surgery_tray/full,
 /turf/open/floor/iron/white,
 /area/station/medical/surgery/fore)
 "cET" = (
@@ -33787,6 +33788,7 @@
 	pixel_x = 27;
 	pixel_y = -8
 	},
+/obj/machinery/photocopier/prebuilt,
 /turf/open/floor/wood/tile,
 /area/station/service/lawoffice)
 "cZy" = (
@@ -36334,11 +36336,11 @@
 /turf/open/floor/iron/smooth_large,
 /area/station/engineering/main)
 "eIf" = (
-/obj/structure/noticeboard/directional/east,
 /obj/effect/turf_decal/siding/wood{
 	dir = 4
 	},
 /obj/machinery/jukebox/no_access,
+/obj/structure/fish_mount/bar/directional/east,
 /turf/open/floor/stone,
 /area/station/service/bar)
 "eIo" = (
@@ -38079,7 +38081,7 @@
 	},
 /obj/machinery/button/door{
 	id = "salonpriv";
-	name = "Dorm Bolt Control";
+	name = "Spa Bolt Control";
 	normaldoorcontrol = 1;
 	specialfunctions = 4;
 	pixel_y = 31
@@ -39761,6 +39763,7 @@
 "gWy" = (
 /obj/effect/turf_decal/tile/neutral/fourcorners,
 /obj/structure/cable,
+/obj/structure/plasticflaps/kitchen,
 /turf/open/floor/iron/dark,
 /area/station/tcommsat/computer)
 "gWB" = (
@@ -42802,8 +42805,8 @@
 /area/station/maintenance/abandon_cafeteria)
 "iMV" = (
 /obj/structure/table/reinforced,
-/obj/item/surgery_tray/full/morgue,
 /obj/effect/decal/cleanable/cobweb,
+/obj/effect/spawner/surgery_tray/full/morgue,
 /turf/open/floor/iron/dark,
 /area/station/medical/morgue)
 "iNi" = (
@@ -44503,11 +44506,11 @@
 	dir = 8
 	},
 /obj/structure/table/glass,
-/obj/item/surgery_tray/full,
 /obj/machinery/vending/wallmed{
 	pixel_x = -32
 	},
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
+/obj/effect/spawner/surgery_tray/full,
 /turf/open/floor/iron/white,
 /area/station/medical/surgery)
 "jMf" = (
@@ -50024,9 +50027,10 @@
 /turf/open/space/basic,
 /area/space/nearstation)
 "nmM" = (
-/obj/structure/filingcabinet/employment,
 /obj/structure/cable,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/structure/table/wood,
+/obj/item/fish_tank/lawyer,
 /turf/open/floor/wood/tile,
 /area/station/service/lawoffice)
 "nmV" = (
@@ -50322,6 +50326,12 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /turf/open/floor/iron/dark,
 /area/station/engineering/main)
+"nzu" = (
+/obj/effect/turf_decal/tile/brown/half/contrasted,
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/light/directional/south,
+/turf/open/floor/iron,
+/area/station/cargo/warehouse)
 "nzv" = (
 /obj/machinery/airalarm/directional/east,
 /turf/open/floor/iron/grimy,
@@ -55307,6 +55317,12 @@
 	},
 /turf/open/floor/plating,
 /area/station/maintenance/fore)
+"qKs" = (
+/obj/machinery/atmospherics/components/unary/delam_scram/directional/north{
+	pixel_y = 32
+	},
+/turf/open/floor/engine,
+/area/station/engineering/supermatter)
 "qKx" = (
 /obj/structure/cable,
 /obj/machinery/status_display/evac/directional/east,
@@ -56218,6 +56234,7 @@
 /obj/effect/mapping_helpers/airlock/access/any/science/xenobio,
 /obj/effect/mapping_helpers/airlock/locked,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/general/hidden,
+/obj/structure/plasticflaps/kitchen,
 /turf/open/floor/iron/white,
 /area/station/science/xenobiology)
 "rjU" = (
@@ -57798,7 +57815,7 @@
 	pixel_y = 6
 	},
 /obj/item/clothing/glasses/hud/health/sunglasses{
-	pixel_y = 10;
+	pixel_y = 11;
 	pixel_x = 3
 	},
 /turf/open/floor/iron/dark,
@@ -59490,10 +59507,13 @@
 /turf/open/floor/iron/dark,
 /area/station/hallway/primary/fore)
 "tmn" = (
-/obj/item/fish_tank/lawyer,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/turf/open/floor/wood/tile,
-/area/station/service/lawoffice)
+/obj/effect/turf_decal/tile/brown/half/contrasted{
+	dir = 1
+	},
+/obj/structure/cable,
+/obj/machinery/light/directional/north,
+/turf/open/floor/iron,
+/area/station/cargo/warehouse)
 "tmu" = (
 /obj/structure/lattice/catwalk,
 /obj/machinery/atmospherics/components/unary/passive_vent{
@@ -59847,10 +59867,10 @@
 	},
 /obj/item/radio/intercom/directional/north,
 /obj/structure/table/glass,
-/obj/item/surgery_tray/full,
+/obj/effect/spawner/surgery_tray,
 /obj/item/clothing/gloves/latex,
-/obj/item/reagent_containers/spray/cleaner,
 /obj/item/clothing/mask/surgical,
+/obj/item/reagent_containers/spray/cleaner,
 /turf/open/floor/iron/white,
 /area/station/security/medical)
 "txF" = (
@@ -62687,6 +62707,7 @@
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
+/obj/structure/sign/eyechart/directional/north,
 /turf/open/floor/iron/white,
 /area/station/medical/medbay/central)
 "voq" = (
@@ -66239,7 +66260,6 @@
 /obj/effect/turf_decal/tile/brown/half/contrasted{
 	dir = 8
 	},
-/obj/machinery/light/small/directional/west,
 /turf/open/floor/iron,
 /area/station/cargo/warehouse)
 "xtO" = (
@@ -66341,6 +66361,7 @@
 	name = "Kitchen Cold Room"
 	},
 /obj/effect/mapping_helpers/airlock/access/any/service/kitchen,
+/obj/structure/plasticflaps/kitchen,
 /turf/open/floor/iron/cafeteria,
 /area/station/service/kitchen)
 "xvG" = (
@@ -88102,7 +88123,7 @@ lhN
 rfN
 bdL
 cdb
-igh
+nzu
 lGF
 xzh
 xzh
@@ -88611,7 +88632,7 @@ axp
 axp
 eCg
 lGF
-kIb
+tmn
 wRT
 czn
 amH
@@ -97395,7 +97416,7 @@ cDw
 cDE
 cEa
 cMD
-cMH
+qKs
 cEz
 cMH
 cMD
@@ -97820,7 +97841,7 @@ grR
 nmM
 aqa
 asg
-tmn
+asg
 hQK
 qcV
 dFo
diff --git a/_maps/map_files/KiloStation/KiloStation.dmm b/_maps/map_files/KiloStation/KiloStation.dmm
index 65fe0d5048b..e51d9333d3d 100644
--- a/_maps/map_files/KiloStation/KiloStation.dmm
+++ b/_maps/map_files/KiloStation/KiloStation.dmm
@@ -14161,7 +14161,7 @@
 /obj/effect/turf_decal/tile/neutral{
 	dir = 1
 	},
-/turf/open/floor/iron/dark,
+/turf/open/floor/circuit/green,
 /area/station/service/bar/backroom)
 "ePm" = (
 /turf/open/floor/iron,
@@ -15216,12 +15216,15 @@
 /turf/open/floor/iron/showroomfloor,
 /area/station/maintenance/port/lesser)
 "fiQ" = (
-/obj/structure/table/wood,
-/obj/item/pinpointer/nuke,
-/obj/item/disk/nuclear,
 /obj/effect/turf_decal/tile/neutral/half/contrasted{
 	dir = 8
 	},
+/obj/structure/extinguisher_cabinet/directional/east,
+/obj/machinery/greenscreen_camera{
+	dir = 1;
+	pixel_y = 12;
+	pixel_x = -3
+	},
 /turf/open/floor/iron/dark,
 /area/station/command/heads_quarters/captain)
 "fiR" = (
@@ -15647,16 +15650,7 @@
 /area/station/maintenance/port/greater)
 "foU" = (
 /obj/structure/table/wood,
-/obj/item/folder/blue{
-	pixel_x = 4;
-	pixel_y = 4
-	},
-/obj/item/folder/red,
-/obj/item/clothing/glasses/sunglasses/big{
-	pixel_x = 4;
-	pixel_y = 8
-	},
-/obj/item/clothing/glasses/sunglasses/big,
+/obj/item/fish_tank/lawyer,
 /turf/open/floor/carpet/green,
 /area/station/service/lawoffice)
 "fph" = (
@@ -17975,7 +17969,6 @@
 /area/station/science/ordnance/bomb)
 "fWB" = (
 /obj/machinery/airalarm/directional/west,
-/obj/machinery/rnd/production/techfab/department/service,
 /obj/effect/turf_decal/delivery,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /obj/machinery/light/directional/west,
@@ -17983,6 +17976,10 @@
 /obj/effect/turf_decal/tile/neutral/half/contrasted{
 	dir = 4
 	},
+/obj/structure/table,
+/obj/item/stack/package_wrap,
+/obj/item/stack/package_wrap,
+/obj/item/hand_labeler,
 /turf/open/floor/iron/dark,
 /area/station/hallway/secondary/service)
 "fWK" = (
@@ -28278,6 +28275,7 @@
 	name = "Kitchen Cold Room Maintenance"
 	},
 /obj/effect/mapping_helpers/airlock/access/all/service/kitchen,
+/obj/structure/plasticflaps/kitchen,
 /turf/open/floor/iron/dark,
 /area/station/maintenance/department/bridge)
 "jgI" = (
@@ -30493,12 +30491,6 @@
 /area/station/maintenance/port/fore)
 "jUi" = (
 /obj/structure/table,
-/obj/item/tank/internals/anesthetic{
-	pixel_x = -5
-	},
-/obj/item/tank/internals/anesthetic{
-	pixel_x = -5
-	},
 /obj/machinery/vending/wallmed/directional/north{
 	pixel_x = -32
 	},
@@ -30507,7 +30499,13 @@
 /obj/effect/turf_decal/tile/neutral/half/contrasted{
 	dir = 4
 	},
-/obj/item/surgery_tray/full,
+/obj/effect/spawner/surgery_tray/full,
+/obj/item/tank/internals/anesthetic{
+	pixel_x = -5
+	},
+/obj/item/tank/internals/anesthetic{
+	pixel_x = -5
+	},
 /turf/open/floor/iron/dark,
 /area/station/medical/virology)
 "jUz" = (
@@ -31413,10 +31411,10 @@
 /turf/open/floor/iron/dark,
 /area/station/service/hydroponics/garden)
 "kmo" = (
-/obj/effect/turf_decal/bot,
 /obj/effect/turf_decal/tile/neutral/half/contrasted{
 	dir = 8
 	},
+/obj/effect/turf_decal/bot,
 /turf/open/floor/iron/dark,
 /area/station/engineering/main)
 "kmt" = (
@@ -32580,10 +32578,6 @@
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/plating,
 /area/station/maintenance/aft)
-"kHs" = (
-/obj/machinery/modular_computer/preset/cargochat/engineering,
-/turf/open/floor/iron/dark,
-/area/station/engineering/main)
 "kHw" = (
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -34458,6 +34452,10 @@
 	},
 /obj/structure/noticeboard/directional/north,
 /obj/effect/turf_decal/tile/neutral/half/contrasted,
+/obj/item/flesh_shears{
+	pixel_y = 6;
+	pixel_x = 9
+	},
 /turf/open/floor/iron/dark,
 /area/station/science/genetics)
 "lkp" = (
@@ -35531,7 +35529,12 @@
 "lBj" = (
 /obj/structure/table/wood,
 /obj/structure/cable,
-/obj/item/book/manual/wiki/security_space_law,
+/obj/item/book/manual/wiki/security_space_law{
+	pixel_x = 6
+	},
+/obj/machinery/recharger{
+	pixel_x = -6
+	},
 /turf/open/floor/carpet/royalblack,
 /area/station/command/heads_quarters/captain)
 "lBk" = (
@@ -35892,10 +35895,8 @@
 /obj/structure/displaycase/forsale/kitchen{
 	pixel_y = 4
 	},
-/obj/structure/sign/picture_frame/portrait/bar{
-	pixel_y = 32
-	},
 /obj/machinery/door/firedoor,
+/obj/structure/fish_mount/bar/directional/north,
 /turf/open/floor/wood,
 /area/station/service/bar)
 "lHX" = (
@@ -38434,8 +38435,8 @@
 /area/station/security/prison/garden)
 "myS" = (
 /obj/effect/turf_decal/box,
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
 /obj/structure/cable,
+/obj/structure/plasticflaps/kitchen,
 /turf/open/floor/engine,
 /area/station/tcommsat/computer)
 "myU" = (
@@ -40039,7 +40040,7 @@
 /turf/open/floor/iron/dark,
 /area/station/hallway/primary/central)
 "nan" = (
-/turf/open/floor/iron/dark,
+/turf/closed/wall,
 /area/station/engineering/main)
 "naw" = (
 /obj/machinery/light/directional/west,
@@ -40649,7 +40650,6 @@
 /obj/machinery/door/airlock/engineering/glass{
 	name = "Server Room"
 	},
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/effect/mapping_helpers/airlock/cyclelink_helper{
 	dir = 1
 	},
@@ -41533,7 +41533,7 @@
 /obj/structure/table,
 /obj/effect/turf_decal/bot,
 /obj/effect/turf_decal/tile/neutral/half/contrasted,
-/obj/item/surgery_tray/full,
+/obj/effect/spawner/surgery_tray/full,
 /turf/open/floor/iron/dark,
 /area/station/medical/surgery/fore)
 "nCc" = (
@@ -50007,22 +50007,20 @@
 	pixel_x = -6;
 	pixel_y = 14
 	},
-/obj/item/book/manual/wiki/security_space_law{
-	pixel_x = 6;
-	pixel_y = -2
+/obj/item/folder/red,
+/obj/item/folder/blue{
+	pixel_x = 4;
+	pixel_y = 4
 	},
-/obj/item/toy/figure/lawyer{
-	pixel_x = 5;
-	pixel_y = 5
-	},
-/obj/item/pen{
-	pixel_x = -8;
-	pixel_y = -4
+/obj/item/clothing/glasses/sunglasses/big{
+	pixel_x = 4;
+	pixel_y = 8
 	},
 /obj/item/pen/red{
 	pixel_x = -6;
 	pixel_y = -1
 	},
+/obj/item/clothing/glasses/sunglasses/big,
 /turf/open/floor/carpet/green,
 /area/station/service/lawoffice)
 "qwi" = (
@@ -51145,7 +51143,6 @@
 /obj/machinery/light_switch/directional/south{
 	pixel_x = -8
 	},
-/obj/structure/filingcabinet,
 /obj/effect/turf_decal/bot,
 /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
 	dir = 8
@@ -51153,6 +51150,7 @@
 /obj/effect/turf_decal/tile/neutral/half/contrasted{
 	dir = 8
 	},
+/obj/machinery/computer/security/wooden_tv,
 /turf/open/floor/iron/dark,
 /area/station/command/heads_quarters/captain/private)
 "qRS" = (
@@ -51755,6 +51753,10 @@
 /area/station/engineering/atmos)
 "rbp" = (
 /obj/structure/sign/departments/cargo/directional/east,
+/obj/machinery/modular_computer/preset/cargochat/engineering{
+	dir = 8
+	},
+/obj/effect/turf_decal/bot,
 /turf/open/floor/iron/dark,
 /area/station/engineering/main)
 "rbz" = (
@@ -52515,6 +52517,7 @@
 	},
 /obj/machinery/atmospherics/pipe/smart/manifold4w/dark/visible,
 /obj/effect/mapping_helpers/airlock/access/all/science/rd,
+/obj/structure/plasticflaps/kitchen,
 /turf/open/floor/iron/dark,
 /area/station/science/server)
 "roI" = (
@@ -55748,6 +55751,14 @@
 	pixel_x = 5;
 	pixel_y = 5
 	},
+/obj/item/book/manual/wiki/security_space_law{
+	pixel_x = 6;
+	pixel_y = -2
+	},
+/obj/item/toy/figure/lawyer{
+	pixel_x = 5;
+	pixel_y = 5
+	},
 /turf/open/floor/carpet/green,
 /area/station/service/lawoffice)
 "son" = (
@@ -60263,7 +60274,6 @@
 	color = "#c45c57";
 	dir = 8
 	},
-/obj/structure/noticeboard/directional/north,
 /obj/machinery/status_display/ai/directional/north,
 /turf/open/floor/carpet/royalblack,
 /area/station/command/heads_quarters/captain)
@@ -61829,6 +61839,7 @@
 /obj/effect/turf_decal/tile/neutral/half/contrasted{
 	dir = 4
 	},
+/obj/machinery/rnd/production/techfab/department/service,
 /turf/open/floor/iron/dark,
 /area/station/hallway/secondary/service)
 "ugY" = (
@@ -62288,7 +62299,6 @@
 /obj/effect/turf_decal/siding/wood{
 	dir = 4
 	},
-/obj/item/fish_tank/lawyer,
 /turf/open/floor/wood,
 /area/station/service/lawoffice)
 "unS" = (
@@ -63641,7 +63651,6 @@
 /turf/open/floor/plating,
 /area/station/maintenance/port/fore)
 "uMf" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /obj/structure/cable,
 /obj/effect/turf_decal/stripes/line{
@@ -66550,7 +66559,7 @@
 	},
 /obj/effect/turf_decal/stripes/white/line,
 /obj/structure/table,
-/obj/item/surgery_tray/full/morgue,
+/obj/effect/spawner/surgery_tray/full/morgue,
 /turf/open/floor/iron/dark,
 /area/station/medical/morgue)
 "vJh" = (
@@ -66871,6 +66880,7 @@
 /obj/machinery/door/firedoor,
 /obj/effect/mapping_helpers/airlock/access/all/service/kitchen,
 /obj/effect/turf_decal/tile/neutral/fourcorners,
+/obj/structure/plasticflaps/kitchen,
 /turf/open/floor/iron/dark,
 /area/station/service/kitchen/coldroom)
 "vNl" = (
@@ -72418,16 +72428,14 @@
 "xBi" = (
 /obj/structure/cable,
 /obj/effect/decal/cleanable/dirt,
-/obj/structure/table,
 /obj/structure/disposalpipe/junction/flip{
 	dir = 1
 	},
-/obj/item/stack/package_wrap,
-/obj/item/stack/package_wrap,
-/obj/item/hand_labeler,
 /obj/effect/turf_decal/tile/neutral/anticorner/contrasted{
 	dir = 8
 	},
+/obj/structure/table,
+/obj/effect/spawner/random/food_or_drink/donkpockets,
 /turf/open/floor/iron/dark,
 /area/station/hallway/secondary/service)
 "xBs" = (
@@ -73055,7 +73063,7 @@
 	dir = 1
 	},
 /obj/structure/table,
-/obj/item/surgery_tray/full,
+/obj/effect/spawner/surgery_tray/full,
 /turf/open/floor/iron/dark,
 /area/station/medical/surgery/aft)
 "xLk" = (
@@ -73519,8 +73527,9 @@
 /turf/open/floor/iron,
 /area/station/service/hydroponics)
 "xUk" = (
-/obj/machinery/computer/security/wooden_tv,
 /obj/structure/table/wood,
+/obj/item/pinpointer/nuke,
+/obj/item/disk/nuclear,
 /turf/open/floor/carpet/royalblue,
 /area/station/command/heads_quarters/captain)
 "xUm" = (
@@ -74203,13 +74212,10 @@
 /turf/open/floor/iron,
 /area/station/hallway/primary/central/fore)
 "yeA" = (
-/obj/structure/extinguisher_cabinet/directional/north,
-/obj/structure/table/wood,
-/obj/item/crowbar/red,
-/obj/machinery/recharger,
 /obj/effect/turf_decal/tile/neutral/half/contrasted{
 	dir = 8
 	},
+/obj/structure/sign/poster/greenscreen/directional/north,
 /turf/open/floor/iron/dark,
 /area/station/command/heads_quarters/captain)
 "yeH" = (
@@ -112083,7 +112089,7 @@ cAq
 oQk
 wSh
 cuV
-kHs
+nan
 rbp
 nan
 cuV
diff --git a/_maps/map_files/VoidRaptor/VoidRaptor.dmm b/_maps/map_files/VoidRaptor/VoidRaptor.dmm
index 29eab1cd619..127099dcf6a 100644
--- a/_maps/map_files/VoidRaptor/VoidRaptor.dmm
+++ b/_maps/map_files/VoidRaptor/VoidRaptor.dmm
@@ -8244,9 +8244,6 @@
 /turf/open/floor/wood/large,
 /area/station/hallway/secondary/exit/departure_lounge)
 "cyi" = (
-/obj/effect/turf_decal/trimline/brown/filled/line{
-	dir = 5
-	},
 /obj/machinery/modular_computer/preset/cargochat/security{
 	dir = 1
 	},
@@ -8258,6 +8255,9 @@
 	},
 /obj/machinery/light_switch/directional/south,
 /obj/effect/turf_decal/bot,
+/obj/effect/turf_decal/trimline/brown/filled/line{
+	dir = 9
+	},
 /turf/open/floor/iron/smooth_large,
 /area/station/security/lockers)
 "cyj" = (
@@ -13991,10 +13991,8 @@
 /turf/open/floor/iron/large,
 /area/station/commons/fitness/recreation)
 "ecY" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
-	dir = 4
-	},
 /obj/structure/cable,
+/obj/structure/plasticflaps/kitchen,
 /turf/open/floor/engine,
 /area/station/tcommsat/computer)
 "edi" = (
@@ -16320,6 +16318,8 @@
 "eKs" = (
 /obj/structure/filingcabinet/medical,
 /obj/effect/turf_decal/trimline/blue/filled/line,
+/obj/machinery/power/apc/auto_name/directional/south,
+/obj/structure/cable,
 /turf/open/floor/iron/white/smooth_edge{
 	dir = 1
 	},
@@ -17997,13 +17997,13 @@
 	critical_machine = 1;
 	name = "Medical Freezer"
 	},
-/obj/structure/fans/tiny,
 /obj/effect/turf_decal/stripes/line{
 	dir = 1
 	},
 /obj/effect/turf_decal/stripes/line,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/structure/plasticflaps/kitchen,
 /turf/open/floor/iron/showroomfloor,
 /area/station/medical/coldroom)
 "flP" = (
@@ -24809,7 +24809,6 @@
 /area/station/security/brig)
 "hjo" = (
 /obj/effect/mapping_helpers/airlock/access/all/engineering/tcoms,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/effect/mapping_helpers/airlock/cyclelink_helper{
 	dir = 8
 	},
@@ -26502,7 +26501,7 @@
 /area/station/hallway/primary/aft)
 "hHR" = (
 /obj/effect/spawner/random/medical/two_percent_xeno_egg_spawner,
-/turf/open/floor/engine,
+/turf/open/floor/circuit/green,
 /area/station/science/xenobiology)
 "hHT" = (
 /obj/effect/turf_decal/tile/red/anticorner{
@@ -32434,13 +32433,11 @@
 /turf/closed/wall,
 /area/station/maintenance/port/upper)
 "jqH" = (
-/obj/machinery/power/apc/auto_name/directional/east,
 /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /obj/effect/turf_decal/trimline/blue/filled/line{
 	dir = 4
 	},
-/obj/structure/cable,
 /turf/open/floor/iron/white/smooth_edge{
 	dir = 8
 	},
@@ -32934,6 +32931,9 @@
 	},
 /obj/effect/turf_decal/trimline/brown/filled/mid_joiner,
 /obj/effect/turf_decal/bot,
+/obj/structure/table,
+/obj/item/aquarium_kit,
+/obj/item/storage/toolbox/fishing,
 /turf/open/floor/iron/smooth_large,
 /area/station/hallway/secondary/service)
 "jvJ" = (
@@ -34488,14 +34488,16 @@
 /turf/open/floor/iron/white/smooth_edge,
 /area/station/science/xenobiology)
 "jSl" = (
-/obj/effect/turf_decal/bot,
-/obj/effect/turf_decal/trimline/brown/filled/mid_joiner,
-/obj/effect/turf_decal/trimline/brown/filled/line{
-	dir = 10
+/obj/machinery/modular_computer/preset/cargochat/science,
+/obj/effect/turf_decal/trimline/brown/filled/end,
+/obj/effect/turf_decal/trimline/brown/filled/mid_joiner{
+	dir = 4
 	},
 /obj/effect/turf_decal/trimline/brown/filled/mid_joiner{
 	dir = 8
 	},
+/obj/effect/turf_decal/trimline/brown/filled/mid_joiner,
+/obj/effect/turf_decal/bot,
 /turf/open/floor/iron/smooth_large,
 /area/station/science/auxlab)
 "jSm" = (
@@ -35373,6 +35375,7 @@
 	pixel_y = 32
 	},
 /obj/item/fish_tank/lawyer,
+/obj/structure/table/wood,
 /turf/open/floor/iron/grimy,
 /area/station/service/lawoffice)
 "kgb" = (
@@ -35648,9 +35651,6 @@
 /obj/structure/cable,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/effect/turf_decal/trimline/red/filled/warning{
-	dir = 6
-	},
 /obj/effect/landmark/start/security_officer,
 /turf/open/floor/iron/dark/smooth_edge{
 	dir = 1
@@ -36727,6 +36727,10 @@
 	},
 /obj/machinery/airalarm/directional/west,
 /obj/effect/turf_decal/bot,
+/obj/structure/disposalpipe/trunk{
+	dir = 8
+	},
+/obj/machinery/disposal/bin,
 /turf/open/floor/iron/smooth_large,
 /area/station/medical/storage)
 "kyQ" = (
@@ -37340,13 +37344,13 @@
 	name = "Server Access"
 	},
 /obj/machinery/atmospherics/pipe/smart/manifold4w/general/hidden,
-/obj/structure/fans/tiny,
 /obj/effect/turf_decal/stripes/line{
 	dir = 4
 	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/obj/structure/plasticflaps/kitchen,
 /turf/open/floor/iron/dark/smooth_large,
 /area/station/science/server)
 "kFT" = (
@@ -37587,8 +37591,8 @@
 	name = "Coldroom"
 	},
 /obj/effect/mapping_helpers/airlock/access/all/service/kitchen,
-/obj/structure/fans/tiny,
 /obj/structure/cable,
+/obj/structure/plasticflaps/kitchen,
 /turf/open/floor/iron/freezer,
 /area/station/service/kitchen/coldroom)
 "kIi" = (
@@ -38197,9 +38201,9 @@
 /area/station/command/heads_quarters/captain/private)
 "kRg" = (
 /obj/structure/table/reinforced,
-/obj/item/surgery_tray/full,
 /obj/machinery/status_display/evac/directional/south,
 /obj/item/reagent_containers/spray/cleaner,
+/obj/effect/spawner/surgery_tray/full/morgue,
 /turf/open/floor/iron/dark/smooth_large,
 /area/station/medical/morgue)
 "kRi" = (
@@ -38887,7 +38891,6 @@
 /obj/effect/turf_decal/trimline/purple/filled/corner{
 	dir = 1
 	},
-/obj/effect/spawner/random/engineering/tracking_beacon,
 /turf/open/floor/iron/white/smooth_corner{
 	dir = 1
 	},
@@ -41215,11 +41218,11 @@
 	dir = 6
 	},
 /obj/effect/turf_decal/tile/blue/full,
-/obj/item/surgery_tray/full,
 /obj/structure/sign/poster/official/random/directional/south,
 /obj/structure/sign/nanotrasen{
 	pixel_x = 32
 	},
+/obj/effect/spawner/surgery_tray/full,
 /turf/open/floor/iron/freezer,
 /area/station/medical/surgery)
 "lGO" = (
@@ -41639,6 +41642,7 @@
 /obj/machinery/atmospherics/pipe/heat_exchanging/junction{
 	dir = 1
 	},
+/obj/structure/plasticflaps/kitchen,
 /turf/open/floor/catwalk_floor/iron_smooth,
 /area/station/maintenance/department/medical/central)
 "lMC" = (
@@ -41766,6 +41770,9 @@
 "lOd" = (
 /obj/effect/spawner/random/maintenance/four,
 /obj/effect/spawner/random/entertainment/money,
+/obj/structure/disposalpipe/segment{
+	dir = 4
+	},
 /turf/open/floor/plating,
 /area/station/maintenance/department/medical)
 "lOi" = (
@@ -43195,7 +43202,7 @@
 /obj/effect/turf_decal/tile/red/opposingcorners{
 	dir = 1
 	},
-/obj/structure/sign/poster/official/high_class_martini/directional/north,
+/obj/structure/fish_mount/bar/directional/north,
 /turf/open/floor/iron,
 /area/station/commons/lounge)
 "mhe" = (
@@ -46179,7 +46186,6 @@
 /obj/structure/cable,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/machinery/light_switch/directional/east,
-/obj/item/kirbyplants/monkey,
 /obj/machinery/camera/directional/east{
 	c_tag = "Research Division - Circuits Lab";
 	name = "science camera";
@@ -47071,7 +47077,8 @@
 /area/station/security/office)
 "nko" = (
 /obj/effect/landmark/event_spawn,
-/turf/open/floor/engine,
+/obj/effect/spawner/random/engineering/tracking_beacon,
+/turf/open/floor/circuit/green,
 /area/station/science/xenobiology)
 "nku" = (
 /obj/machinery/door/firedoor,
@@ -47690,6 +47697,12 @@
 "ntF" = (
 /obj/structure/window/reinforced/spawner/directional/south,
 /obj/structure/table/wood,
+/obj/item/paper_bin{
+	pixel_y = 4
+	},
+/obj/item/pen/fountain{
+	pixel_y = 4
+	},
 /obj/item/flashlight/lamp/green{
 	pixel_x = 7
 	},
@@ -48177,18 +48190,22 @@
 	},
 /area/station/engineering/power_room)
 "nAa" = (
-/obj/effect/turf_decal/trimline/brown/filled/line{
-	dir = 9
-	},
 /obj/machinery/firealarm/directional/south,
-/obj/effect/turf_decal/trimline/brown/filled/mid_joiner{
-	dir = 8
+/obj/effect/turf_decal/trimline/red/filled/warning{
+	dir = 4
 	},
-/obj/effect/turf_decal/trimline/brown/filled/mid_joiner{
+/obj/structure/table/reinforced,
+/obj/machinery/recharger{
+	pixel_x = -6;
+	pixel_y = 2
+	},
+/obj/machinery/recharger{
+	pixel_x = 6;
+	pixel_y = 2
+	},
+/turf/open/floor/iron/dark/smooth_edge{
 	dir = 1
 	},
-/obj/effect/turf_decal/bot,
-/turf/open/floor/iron/smooth_large,
 /area/station/security/lockers)
 "nAb" = (
 /obj/structure/cable,
@@ -49612,6 +49629,10 @@
 	dir = 1
 	},
 /obj/machinery/airalarm/directional/south,
+/obj/structure/frame/computer{
+	anchored = 1;
+	dir = 1
+	},
 /turf/open/floor/iron/smooth_large,
 /area/station/engineering/lobby)
 "nUe" = (
@@ -50310,10 +50331,10 @@
 	dir = 5
 	},
 /obj/effect/turf_decal/tile/blue/full,
-/obj/item/surgery_tray/full,
 /obj/structure/sign/nanotrasen{
 	pixel_x = 32
 	},
+/obj/effect/spawner/surgery_tray/full,
 /turf/open/floor/iron/freezer,
 /area/station/medical/surgery)
 "ofo" = (
@@ -51677,16 +51698,7 @@
 /obj/effect/turf_decal/siding/wood{
 	dir = 9
 	},
-/obj/structure/table/wood/fancy/royalblue,
-/obj/item/paper_bin{
-	pixel_y = 4
-	},
-/obj/item/pen/fountain{
-	pixel_y = 4
-	},
-/obj/item/melee/chainofcommand{
-	pixel_y = 5
-	},
+/obj/structure/sign/poster/greenscreen/directional/north,
 /turf/open/floor/wood/large,
 /area/station/command/heads_quarters/captain)
 "oyG" = (
@@ -54561,6 +54573,7 @@
 /obj/effect/turf_decal/trimline/blue/filled/line{
 	dir = 8
 	},
+/obj/structure/sign/eyechart/directional/west,
 /turf/open/floor/iron/white/smooth_edge{
 	dir = 4
 	},
@@ -54790,6 +54803,12 @@
 	dir = 8
 	},
 /area/station/hallway/primary/central/aft)
+"pom" = (
+/obj/structure/disposalpipe/segment{
+	dir = 4
+	},
+/turf/closed/wall,
+/area/station/maintenance/department/medical)
 "por" = (
 /obj/machinery/atmospherics/pipe/smart/simple/orange/visible{
 	dir = 9
@@ -59269,6 +59288,7 @@
 	name = "Kitchen Maintenance"
 	},
 /obj/effect/mapping_helpers/airlock/access/all/service/kitchen,
+/obj/structure/plasticflaps/kitchen,
 /turf/open/floor/catwalk_floor/iron_smooth,
 /area/station/maintenance/starboard/greater)
 "qzL" = (
@@ -61623,6 +61643,9 @@
 	name = "Captain's Desk";
 	req_access = list("captain")
 	},
+/obj/item/melee/chainofcommand{
+	pixel_y = 5
+	},
 /turf/open/floor/carpet/royalblue,
 /area/station/command/heads_quarters/captain)
 "rib" = (
@@ -68173,6 +68196,17 @@
 	dir = 4
 	},
 /area/station/science/ordnance)
+"sYN" = (
+/obj/effect/turf_decal/siding/wood{
+	dir = 8
+	},
+/obj/machinery/greenscreen_camera{
+	dir = 1;
+	pixel_x = 4;
+	pixel_y = 16
+	},
+/turf/open/floor/wood/large,
+/area/station/command/heads_quarters/captain)
 "sYS" = (
 /obj/effect/mapping_helpers/ianbirthday,
 /turf/open/floor/carpet/executive,
@@ -76954,7 +76988,7 @@
 "vtU" = (
 /obj/structure/cable,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/effect/turf_decal/trimline/red/filled/warning,
+/obj/effect/turf_decal/trimline/red/filled/corner,
 /turf/open/floor/iron/dark/smooth_edge{
 	dir = 1
 	},
@@ -77658,7 +77692,6 @@
 /obj/structure/cable,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/effect/turf_decal/trimline/red/filled/corner,
 /turf/open/floor/iron/dark/smooth_corner,
 /area/station/security/lockers)
 "vEz" = (
@@ -78081,16 +78114,8 @@
 /turf/open/floor/iron/dark/smooth_large,
 /area/station/hallway/secondary/command)
 "vJV" = (
-/obj/effect/turf_decal/bot,
-/obj/machinery/modular_computer/preset/cargochat/science,
-/obj/effect/turf_decal/trimline/brown/filled/mid_joiner,
-/obj/effect/turf_decal/trimline/brown/filled/line{
-	dir = 6
-	},
-/obj/effect/turf_decal/trimline/brown/filled/mid_joiner{
-	dir = 4
-	},
-/turf/open/floor/iron/smooth_large,
+/obj/item/kirbyplants/monkey,
+/turf/open/floor/iron/white,
 /area/station/science/auxlab)
 "vJY" = (
 /obj/structure/chair/comfy/black,
@@ -78418,9 +78443,7 @@
 	dir = 5
 	},
 /obj/machinery/vending/boozeomat,
-/obj/structure/sign/painting/library{
-	pixel_x = 32
-	},
+/obj/machinery/status_display/evac/directional/east,
 /turf/open/floor/wood/large,
 /area/station/command/heads_quarters/captain)
 "vOI" = (
@@ -83676,7 +83699,6 @@
 /turf/open/floor/iron/kitchen,
 /area/station/service/kitchen/abandoned)
 "xnl" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/structure/cable,
 /turf/open/floor/engine,
 /area/station/tcommsat/computer)
@@ -85974,6 +85996,12 @@
 "xVm" = (
 /turf/closed/wall/r_wall,
 /area/station/maintenance/disposal/incinerator)
+"xVu" = (
+/obj/structure/disposalpipe/junction/flip{
+	dir = 2
+	},
+/turf/open/floor/catwalk_floor/iron_smooth,
+/area/station/maintenance/department/medical)
 "xVB" = (
 /obj/structure/cable,
 /turf/open/floor/pod/dark,
@@ -110348,7 +110376,7 @@ xtu
 hkM
 hkM
 xtu
-xtu
+xVu
 xtu
 fpl
 gqB
@@ -110862,7 +110890,7 @@ gJm
 eiV
 sAM
 sAM
-sAM
+pom
 kOq
 uyk
 tNX
@@ -115401,7 +115429,7 @@ eRz
 hyg
 sOq
 oyz
-foI
+sYN
 foI
 dil
 lAu
diff --git a/_maps/map_files/biodome/biodome.dmm b/_maps/map_files/biodome/biodome.dmm
index 8eb837a8fb2..515af3b4531 100644
--- a/_maps/map_files/biodome/biodome.dmm
+++ b/_maps/map_files/biodome/biodome.dmm
@@ -76,7 +76,8 @@
 /turf/open/floor/iron,
 /area/station/security/prison/garden)
 "abE" = (
-/obj/machinery/vending/cigarette,
+/obj/structure/disposalpipe/segment,
+/obj/structure/displaycase/captain,
 /turf/open/floor/wood/tile,
 /area/station/command/heads_quarters/captain)
 "abH" = (
@@ -2022,12 +2023,8 @@
 /turf/open/floor/iron,
 /area/station/commons/fitness)
 "aIB" = (
-/obj/structure/rack,
-/obj/item/chair/plastic,
-/obj/item/chair/plastic{
-	pixel_y = 5
-	},
-/obj/effect/spawner/random/bureaucracy/briefcase,
+/obj/structure/table/wood,
+/obj/item/fish_tank/lawyer,
 /turf/open/floor/wood,
 /area/station/service/lawoffice)
 "aII" = (
@@ -3516,7 +3513,8 @@
 /turf/open/floor/iron,
 /area/station/hallway/primary/central/aft)
 "bix" = (
-/obj/machinery/vending/boozeomat,
+/obj/structure/disposalpipe/segment,
+/obj/machinery/vending/cigarette,
 /turf/open/floor/wood/tile,
 /area/station/command/heads_quarters/captain)
 "biy" = (
@@ -4303,6 +4301,13 @@
 "bwV" = (
 /turf/open/openspace,
 /area/station/medical/medbay/central)
+"bxe" = (
+/obj/effect/turf_decal/tile/blue/half/contrasted{
+	dir = 4
+	},
+/obj/structure/sign/eyechart/directional/east,
+/turf/open/floor/iron/white,
+/area/station/medical/medbay/central)
 "bxk" = (
 /obj/structure/table/wood,
 /obj/item/flashlight/lamp/green{
@@ -4445,7 +4450,6 @@
 /area/station/cargo/warehouse)
 "bzb" = (
 /obj/structure/table,
-/obj/machinery/computer/security/telescreen/research/directional/north,
 /obj/structure/reagent_dispensers/wall/peppertank/directional/east,
 /obj/machinery/light_switch/directional/south,
 /turf/open/floor/iron/dark,
@@ -4892,8 +4896,8 @@
 /turf/open/floor/plating,
 /area/station/maintenance/department/electrical)
 "bIO" = (
-/obj/structure/displaycase/captain,
 /obj/effect/turf_decal/siding/yellow/corner,
+/obj/item/kirbyplants/random,
 /turf/open/floor/wood/tile,
 /area/station/command/heads_quarters/captain)
 "bIP" = (
@@ -7188,6 +7192,7 @@
 /area/station/service/janitor)
 "cwO" = (
 /obj/structure/cable,
+/obj/structure/plasticflaps/kitchen,
 /turf/open/floor/iron/dark,
 /area/station/tcommsat/computer)
 "cwR" = (
@@ -8456,11 +8461,9 @@
 /turf/open/floor/wood/parquet,
 /area/station/command/heads_quarters/qm)
 "cSs" = (
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
-	dir = 4
-	},
-/turf/open/floor/wood,
-/area/station/service/lawoffice)
+/obj/machinery/status_display/evac/directional/east,
+/turf/open/floor/wood/tile,
+/area/station/command/heads_quarters/captain)
 "cSA" = (
 /obj/machinery/door/firedoor/border_only{
 	dir = 4
@@ -8860,7 +8863,6 @@
 /area/station/hallway/primary/aft)
 "daE" = (
 /obj/machinery/firealarm/directional/west,
-/obj/machinery/computer/security/telescreen/rd,
 /obj/effect/turf_decal/tile/purple/half/contrasted{
 	dir = 8
 	},
@@ -9493,10 +9495,11 @@
 /turf/open/floor/iron/dark,
 /area/station/hallway/primary/starboard)
 "dmh" = (
-/obj/machinery/light/cold/directional/north,
-/obj/structure/closet/secure_closet/freezer/meat,
-/turf/open/floor/iron/kitchen_coldroom/freezerfloor,
-/area/station/service/kitchen/coldroom)
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
+	dir = 1
+	},
+/turf/open/floor/wood,
+/area/station/service/lawoffice)
 "dmn" = (
 /obj/machinery/light/directional/north,
 /obj/effect/turf_decal/tile/purple/half/contrasted{
@@ -14356,6 +14359,7 @@
 /obj/effect/mapping_helpers/airlock/access/all/science/rd,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/general/hidden,
 /obj/structure/cable,
+/obj/structure/plasticflaps/kitchen,
 /turf/open/floor/plating,
 /area/station/science/server)
 "eSK" = (
@@ -16762,7 +16766,7 @@
 /turf/open/floor/iron,
 /area/station/hallway/primary/starboard)
 "fLX" = (
-/obj/structure/window/spawner/directional/north,
+/obj/machinery/light/cold/directional/north,
 /turf/open/floor/iron/kitchen_coldroom/freezerfloor,
 /area/station/service/kitchen/coldroom)
 "fMa" = (
@@ -17977,6 +17981,7 @@
 	},
 /obj/item/radio/off,
 /obj/machinery/firealarm/directional/east,
+/obj/machinery/computer/security/telescreen/research/directional/south,
 /turf/open/floor/iron/dark,
 /area/station/security/checkpoint/science)
 "gfH" = (
@@ -19715,8 +19720,8 @@
 /area/station/science/xenobiology)
 "gJD" = (
 /obj/structure/cable,
-/obj/machinery/computer/security/telescreen/ce/directional/west,
 /obj/effect/turf_decal/tile/neutral/full,
+/obj/machinery/computer/security/telescreen/ce/directional/east,
 /turf/open/floor/iron,
 /area/station/command/heads_quarters/ce)
 "gJS" = (
@@ -20247,6 +20252,7 @@
 /obj/effect/turf_decal/tile/brown/anticorner/contrasted{
 	dir = 8
 	},
+/obj/machinery/computer/security/telescreen/cargo_sec/directional/west,
 /turf/open/floor/iron/dark/smooth_large,
 /area/station/security/checkpoint/supply)
 "gUy" = (
@@ -23193,6 +23199,7 @@
 /obj/effect/turf_decal/tile/purple/anticorner{
 	dir = 8
 	},
+/obj/machinery/computer/security/telescreen/rd/directional/west,
 /turf/open/floor/iron/dark,
 /area/station/command/heads_quarters/rd)
 "hZZ" = (
@@ -23478,10 +23485,10 @@
 /turf/open/floor/iron/dark,
 /area/station/service/chapel)
 "ifq" = (
-/obj/machinery/computer/security/telescreen/cmo/directional/west,
 /obj/effect/turf_decal/tile/dark_blue/half/contrasted{
 	dir = 4
 	},
+/obj/machinery/computer/security/telescreen/cmo/directional/east,
 /turf/open/floor/iron/white/side{
 	dir = 8
 	},
@@ -23871,11 +23878,11 @@
 /obj/machinery/computer/records/security{
 	dir = 8
 	},
-/obj/machinery/computer/security/telescreen/engine/directional/west,
 /obj/item/radio/intercom/directional/south,
 /obj/effect/turf_decal/trimline/red/filled/line{
 	dir = 6
 	},
+/obj/machinery/computer/security/telescreen/engine/directional/east,
 /turf/open/floor/iron/dark,
 /area/station/security/checkpoint/engineering)
 "imJ" = (
@@ -24262,6 +24269,13 @@
 	},
 /turf/open/floor/plating,
 /area/station/maintenance/fore/greater)
+"isV" = (
+/obj/structure/table/wood,
+/obj/item/folder/yellow,
+/obj/effect/spawner/random/decoration/ornament,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/turf/open/floor/wood,
+/area/station/service/lawoffice)
 "ito" = (
 /obj/structure/table,
 /obj/item/holosign_creator/atmos{
@@ -26368,10 +26382,13 @@
 /turf/open/floor/iron/dark,
 /area/station/hallway/primary/aft)
 "jgn" = (
-/obj/structure/closet/secure_closet/freezer/fridge,
-/obj/structure/window/spawner/directional/north,
-/turf/open/floor/iron/kitchen_coldroom/freezerfloor,
-/area/station/service/kitchen/coldroom)
+/obj/machinery/greenscreen_camera{
+	dir = 4;
+	pixel_x = -4;
+	pixel_y = 6
+	},
+/turf/open/floor/wood/tile,
+/area/station/command/heads_quarters/captain)
 "jgr" = (
 /turf/open/floor/plating,
 /area/station/cargo/drone_bay)
@@ -26433,6 +26450,7 @@
 	dir = 1;
 	network = "tcommsat"
 	},
+/obj/machinery/computer/security/telescreen/tcomms/directional/south,
 /turf/open/floor/iron/dark,
 /area/station/tcommsat/computer)
 "jib" = (
@@ -27235,6 +27253,15 @@
 /obj/structure/cable,
 /turf/open/floor/wood,
 /area/station/command/heads_quarters/nt_rep)
+"jxX" = (
+/obj/machinery/door/airlock/public/glass,
+/obj/machinery/door/firedoor,
+/obj/machinery/button/door/directional/west{
+	name = "Observation Shutters";
+	id = "nt_rep_priv_2"
+	},
+/turf/open/floor/iron,
+/area/station/hallway/primary/central/fore)
 "jyh" = (
 /obj/structure/closet/emcloset,
 /obj/machinery/camera/directional/east{
@@ -28243,10 +28270,6 @@
 /obj/effect/turf_decal/trimline/purple/line{
 	dir = 8
 	},
-/obj/machinery/button/door/directional/west{
-	name = "Observation Shutters";
-	id = "nt_rep_priv_2"
-	},
 /turf/open/floor/iron,
 /area/station/hallway/primary/central/fore)
 "jQc" = (
@@ -31184,6 +31207,7 @@
 	c_tag = "Service - Cold Room"
 	},
 /obj/machinery/light/cold/directional/east,
+/obj/structure/closet/secure_closet/freezer/fridge,
 /turf/open/floor/iron/kitchen_coldroom/freezerfloor,
 /area/station/service/kitchen/coldroom)
 "kMq" = (
@@ -36280,8 +36304,8 @@
 /area/station/security/detectives_office)
 "mtL" = (
 /obj/structure/table/glass,
-/obj/item/surgery_tray/full,
 /obj/effect/turf_decal/tile/blue/fourcorners,
+/obj/effect/spawner/surgery_tray/full,
 /turf/open/floor/iron/white,
 /area/station/medical/surgery/fore)
 "mtV" = (
@@ -36490,8 +36514,8 @@
 /area/station/science/ordnance/office)
 "mxY" = (
 /obj/structure/table/glass,
-/obj/item/surgery_tray/full,
 /obj/effect/turf_decal/tile/blue/fourcorners,
+/obj/effect/spawner/surgery_tray/full,
 /turf/open/floor/iron/white,
 /area/station/medical/surgery/aft)
 "myn" = (
@@ -38664,10 +38688,10 @@
 /turf/open/floor/plating,
 /area/station/maintenance/central/greater)
 "nkE" = (
-/obj/machinery/computer/security/telescreen/minisat/directional/west,
 /obj/effect/turf_decal/siding/yellow{
 	dir = 8
 	},
+/obj/machinery/computer/security/telescreen/minisat/directional/east,
 /turf/open/floor/wood/tile,
 /area/station/command/heads_quarters/captain)
 "nkL" = (
@@ -44889,10 +44913,11 @@
 /turf/open/floor/iron,
 /area/station/hallway/primary/central/aft)
 "pom" = (
-/obj/machinery/door/window/right/directional/north{
-	name = "Freezer";
-	req_access = list("kitchen")
+/obj/structure/plasticflaps/kitchen,
+/obj/machinery/door/airlock/freezer{
+	name = "Coldroom"
 	},
+/obj/effect/mapping_helpers/airlock/access/all/service/kitchen,
 /turf/open/floor/iron/kitchen_coldroom/freezerfloor,
 /area/station/service/kitchen/coldroom)
 "pon" = (
@@ -45553,6 +45578,12 @@
 /obj/structure/disposalpipe/trunk,
 /turf/open/floor/plating,
 /area/station/commons/storage/primary)
+"pCy" = (
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
+	dir = 1
+	},
+/turf/open/floor/wood,
+/area/station/service/lawoffice)
 "pCz" = (
 /obj/structure/cable,
 /turf/open/floor/carpet,
@@ -45581,6 +45612,7 @@
 /obj/effect/turf_decal/tile/brown/half/contrasted{
 	dir = 1
 	},
+/obj/machinery/computer/security/telescreen/entertainment/directional/east,
 /turf/open/floor/iron,
 /area/station/cargo/lobby)
 "pDc" = (
@@ -45856,7 +45888,7 @@
 /turf/open/floor/iron/herringbone,
 /area/station/hallway/primary/central)
 "pHD" = (
-/obj/machinery/computer/security/telescreen/vault,
+/obj/machinery/computer/security/telescreen/vault/directional/north,
 /turf/open/floor/carpet,
 /area/station/command/heads_quarters/qm)
 "pHT" = (
@@ -46026,7 +46058,7 @@
 /area/station/biodome/aft)
 "pKz" = (
 /obj/structure/sign/calendar/directional/south,
-/obj/item/kirbyplants/random,
+/obj/structure/sign/poster/greenscreen/directional/east,
 /turf/open/floor/wood/tile,
 /area/station/command/heads_quarters/captain)
 "pKF" = (
@@ -46400,9 +46432,12 @@
 /area/station/maintenance/department/security/brig)
 "pRf" = (
 /obj/machinery/light_switch/directional/east,
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
-	dir = 8
+/obj/structure/rack,
+/obj/item/chair/plastic{
+	pixel_y = 5
 	},
+/obj/item/chair/plastic,
+/obj/effect/spawner/random/bureaucracy/briefcase,
 /turf/open/floor/wood,
 /area/station/service/lawoffice)
 "pRM" = (
@@ -47387,6 +47422,7 @@
 "qkU" = (
 /obj/machinery/light_switch/directional/west,
 /obj/machinery/light/cold/directional/west,
+/obj/structure/closet/secure_closet/freezer/meat,
 /turf/open/floor/iron/kitchen_coldroom/freezerfloor,
 /area/station/service/kitchen/coldroom)
 "qlm" = (
@@ -51312,6 +51348,10 @@
 	},
 /obj/machinery/power/apc/auto_name/directional/west,
 /obj/structure/cable,
+/obj/item/flesh_shears{
+	pixel_y = 6;
+	pixel_x = 9
+	},
 /turf/open/floor/iron/dark/small,
 /area/station/science/genetics)
 "rxC" = (
@@ -54949,14 +54989,11 @@
 /turf/open/floor/grass,
 /area/station/service/kitchen/diner)
 "sNP" = (
-/obj/machinery/computer/security/telescreen/cmo/directional/west{
-	desc = "Used for monitoring medbay to ensure patient safety.";
-	name = "Medbay Monitor"
-	},
 /obj/structure/table/reinforced,
 /obj/machinery/recharger{
 	pixel_y = 4
 	},
+/obj/machinery/computer/security/telescreen/cmo/directional/east,
 /turf/open/floor/iron/dark/smooth_large,
 /area/station/security/checkpoint/medical)
 "sOd" = (
@@ -55436,7 +55473,7 @@
 "sWw" = (
 /obj/structure/window/reinforced/spawner/directional/north,
 /obj/structure/table/reinforced,
-/obj/item/surgery_tray/full,
+/obj/effect/spawner/surgery_tray/full/morgue,
 /obj/item/table_clock{
 	pixel_y = 8
 	},
@@ -57727,7 +57764,7 @@
 /obj/machinery/computer/shuttle/mining{
 	dir = 4
 	},
-/obj/machinery/computer/security/telescreen/auxbase/directional/east,
+/obj/machinery/computer/security/telescreen/auxbase/directional/west,
 /turf/open/floor/iron,
 /area/station/construction/mining/aux_base)
 "tIJ" = (
@@ -59433,7 +59470,7 @@
 /area/station/medical/chemistry)
 "uru" = (
 /obj/structure/table/wood,
-/obj/item/folder/yellow,
+/obj/item/paper_bin,
 /obj/item/stamp/law,
 /turf/open/floor/wood,
 /area/station/service/lawoffice)
@@ -60979,6 +61016,7 @@
 	dir = 1
 	},
 /obj/machinery/light/directional/north,
+/obj/structure/fish_mount/bar/directional/north,
 /turf/open/floor/wood/large,
 /area/station/commons/lounge)
 "uVv" = (
@@ -63467,6 +63505,7 @@
 /obj/structure/cable,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/structure/plasticflaps/kitchen,
 /turf/open/floor/iron/kitchen_coldroom/freezerfloor,
 /area/station/service/kitchen/coldroom)
 "vPB" = (
@@ -64012,7 +64051,7 @@
 /obj/structure/rack,
 /obj/item/screwdriver,
 /obj/item/wirecutters,
-/obj/machinery/computer/security/telescreen/test_chamber,
+/obj/machinery/computer/security/telescreen/test_chamber/directional/north,
 /turf/open/floor/iron,
 /area/station/science/xenobiology)
 "vZj" = (
@@ -66934,7 +66973,7 @@
 	c_tag = "Research - Ordnance Launch Lab";
 	network = list("ss13","rd")
 	},
-/obj/machinery/computer/security/telescreen/ordnance,
+/obj/machinery/computer/security/telescreen/ordnance/directional/east,
 /turf/open/floor/iron/dark,
 /area/station/science/ordnance/testlab)
 "wTE" = (
@@ -67208,6 +67247,7 @@
 "wYk" = (
 /obj/structure/table/wood,
 /obj/effect/spawner/random/decoration/ornament,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /turf/open/floor/wood,
 /area/station/service/lawoffice)
 "wYp" = (
@@ -68167,6 +68207,7 @@
 	dir = 4
 	},
 /obj/structure/disposalpipe/segment,
+/obj/machinery/vending/boozeomat,
 /turf/open/floor/wood,
 /area/station/command/heads_quarters/captain)
 "xqG" = (
@@ -68770,10 +68811,6 @@
 	},
 /turf/open/floor/wood/large,
 /area/station/science/breakroom)
-"xBf" = (
-/obj/structure/holosign/barrier/atmos/tram,
-/turf/open/openspace,
-/area/station/biodome)
 "xBp" = (
 /obj/item/paper/crumpled{
 	pixel_x = 7
@@ -69144,13 +69181,13 @@
 /turf/open/space,
 /area/space/nearstation)
 "xHr" = (
-/obj/machinery/computer/security/telescreen/normal/directional/east,
 /obj/machinery/computer/warrant{
 	dir = 4
 	},
 /obj/effect/turf_decal/tile/red/half/contrasted{
 	dir = 8
 	},
+/obj/machinery/computer/security/telescreen/normal/directional/west,
 /turf/open/floor/iron/dark,
 /area/station/security/brig/entrance)
 "xHA" = (
@@ -109873,9 +109910,9 @@ kgA
 rWX
 nXi
 xqB
-shm
-abE
 bix
+abE
+shm
 gHP
 bMe
 bwO
@@ -110132,7 +110169,7 @@ oHx
 vEK
 upY
 bmc
-bmc
+jgn
 gHP
 doI
 qlZ
@@ -110388,7 +110425,7 @@ vYg
 xlG
 mba
 bmc
-bmc
+cSs
 pKz
 gHP
 bMe
@@ -117361,7 +117398,7 @@ oEV
 kbW
 qlQ
 fVB
-cSs
+tuE
 uru
 pND
 dpm
@@ -117619,8 +117656,8 @@ kvb
 kOa
 rdu
 oCW
-wYk
-tuE
+isV
+dmh
 dpm
 mBf
 mBf
@@ -118134,7 +118171,7 @@ aIB
 oUB
 fGx
 wYk
-tuE
+pCy
 dpm
 hNy
 cCZ
@@ -160774,7 +160811,7 @@ hac
 woD
 knD
 aqD
-kSr
+bxe
 nha
 eve
 waq
@@ -168462,8 +168499,8 @@ sZD
 sZD
 ggF
 snd
-psv
 xSi
+ykV
 qkU
 iIg
 snd
@@ -168976,7 +169013,7 @@ sZD
 sZD
 dZM
 snd
-ykV
+psv
 hwS
 aYm
 lCR
@@ -169233,8 +169270,8 @@ sZD
 sZD
 rrw
 snd
-dmh
-xSi
+snd
+fLX
 rvN
 cGd
 snd
@@ -169490,7 +169527,7 @@ ctt
 aHW
 aaI
 gym
-fLX
+snd
 pdI
 rvN
 cGd
@@ -170004,7 +170041,7 @@ sZD
 sZD
 snd
 ktI
-jgn
+snd
 kMo
 hTu
 rTe
@@ -170261,7 +170298,7 @@ sZD
 sZD
 snd
 obD
-obD
+snd
 snd
 snd
 snd
@@ -177711,7 +177748,7 @@ sZD
 sZD
 sZD
 sZD
-xBf
+rAq
 rAq
 rAq
 rAq
@@ -178240,7 +178277,7 @@ jzd
 jzd
 jzd
 jzd
-xLH
+jxX
 eCJ
 neH
 neH