From 803cca4903bad8b7f96981bb282dde487b82b8a4 Mon Sep 17 00:00:00 2001
From: Sylvette <96358436+SylvetteSylph@users.noreply.github.com>
Date: Sat, 27 Jun 2026 22:34:43 -0400
Subject: [PATCH 01/13] Update pubbystation.dmm

---
 _maps/map_files/Pubbystation/pubbystation.dmm | 248 +++++++++---------
 1 file changed, 121 insertions(+), 127 deletions(-)

diff --git a/_maps/map_files/Pubbystation/pubbystation.dmm b/_maps/map_files/Pubbystation/pubbystation.dmm
index 50ffcc40003289..598a0288220186 100644
--- a/_maps/map_files/Pubbystation/pubbystation.dmm
+++ b/_maps/map_files/Pubbystation/pubbystation.dmm
@@ -162,7 +162,6 @@
 	},
 /obj/machinery/newscaster/directional/north,
 /obj/effect/turf_decal/siding/thinplating_new/dark,
-/obj/machinery/light/small/directional/north,
 /turf/open/floor/iron/dark/smooth_half{
 	dir = 1
 	},
@@ -915,6 +914,7 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
 	dir = 4
 	},
+/obj/machinery/light/directional/west,
 /turf/open/floor/iron,
 /area/station/cargo/drone_bay)
 "aeu" = (
@@ -5239,11 +5239,9 @@
 /turf/open/floor/iron/white/small,
 /area/station/command/heads_quarters/captain/private)
 "avI" = (
-/obj/structure/sink{
-	pixel_y = 28
-	},
 /obj/item/soap/deluxe,
 /obj/item/bikehorn/rubberducky,
+/obj/structure/sink/directional/south,
 /turf/open/floor/iron/white/small,
 /area/station/command/heads_quarters/captain/private)
 "avJ" = (
@@ -7629,14 +7627,10 @@
 /turf/open/floor/plating,
 /area/station/commons/storage/emergency/starboard)
 "aEZ" = (
-/obj/structure/sink{
-	dir = 4;
-	pixel_x = -12;
-	pixel_y = 2
-	},
 /obj/structure/mirror{
 	pixel_x = -28
 	},
+/obj/structure/sink/directional/east,
 /turf/open/floor/iron/kitchen/diagonal,
 /area/station/commons/toilet/restrooms)
 "aFa" = (
@@ -8587,10 +8581,13 @@
 /area/station/hallway/primary/central/fore)
 "aJY" = (
 /obj/structure/closet/secure_closet/medical3,
-/obj/machinery/camera/autoname/motion/directional/east,
 /obj/effect/turf_decal/tile/pine_green/half/contrasted{
 	dir = 4
 	},
+/obj/machinery/camera/directional/east{
+	c_tag = "Medbay Main Hallway- CMO";
+	network = list("ss13","medbay")
+	},
 /turf/open/floor/iron/dark,
 /area/station/medical/coldroom)
 "aKa" = (
@@ -8919,13 +8916,9 @@
 /turf/open/floor/iron/white/smooth_large,
 /area/station/commons/cryopods)
 "aLE" = (
-/obj/structure/sink{
-	dir = 4;
-	pixel_x = -12;
-	pixel_y = 2
-	},
 /obj/effect/landmark/generic_maintenance_landmark,
 /obj/machinery/light_switch/directional/west,
+/obj/structure/sink/directional/east,
 /turf/open/floor/iron/kitchen/herringbone,
 /area/station/commons/toilet/auxiliary)
 "aLF" = (
@@ -9524,8 +9517,8 @@
 /turf/open/floor/iron,
 /area/station/cargo/warehouse)
 "aOP" = (
-/obj/machinery/light/small/directional/north,
 /obj/machinery/light_switch/directional/north,
+/obj/machinery/light/directional/north,
 /turf/open/floor/plating,
 /area/station/cargo/warehouse)
 "aOQ" = (
@@ -10474,9 +10467,6 @@
 /turf/open/floor/iron,
 /area/station/cargo/office)
 "aTc" = (
-/obj/machinery/door/airlock/mining/glass{
-	name = "Cargo Bay"
-	},
 /obj/machinery/door/firedoor,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
 	dir = 8
@@ -10486,6 +10476,9 @@
 	},
 /obj/effect/mapping_helpers/airlock/access/any/supply/general,
 /obj/effect/mapping_helpers/airlock/access/any/supply/general,
+/obj/machinery/door/airlock/mining/glass{
+	name = "Cargo Lobby"
+	},
 /turf/open/floor/iron,
 /area/station/cargo/office)
 "aTk" = (
@@ -11246,7 +11239,7 @@
 	pixel_y = -2
 	},
 /obj/machinery/door/firedoor,
-/obj/machinery/door/window/right/directional/north{
+/obj/machinery/door/window/left/directional/north{
 	req_access = list("shipping");
 	name = "Cargo Desk"
 	},
@@ -12495,7 +12488,8 @@
 	dir = 9
 	},
 /obj/machinery/disposal/delivery_chute{
-	dir = 4
+	dir = 4;
+	name = "delisvery chute"
 	},
 /obj/structure/disposalpipe/trunk{
 	dir = 2
@@ -12855,11 +12849,8 @@
 "bdi" = (
 /obj/item/reagent_containers/cup/bucket,
 /obj/item/mop,
-/obj/structure/sink{
-	dir = 8;
-	pixel_x = 11
-	},
 /obj/machinery/airalarm/directional/east,
+/obj/structure/sink/directional/west,
 /turf/open/floor/iron,
 /area/station/service/janitor)
 "bdj" = (
@@ -14329,12 +14320,12 @@
 "bjW" = (
 /obj/structure/closet/crate/freezer/blood,
 /obj/structure/window/spawner/directional/west,
-/obj/machinery/camera/autoname/motion/directional/north,
 /obj/machinery/button/door/directional/north{
 	name = "Entrance Lockdown";
 	id = "exam"
 	},
 /obj/item/reagent_containers/blood/insectoid,
+/obj/machinery/camera/directional/north,
 /turf/open/floor/iron/white/textured_large,
 /area/station/medical/treatment_center)
 "bjY" = (
@@ -14481,7 +14472,7 @@
 	},
 /obj/effect/mapping_helpers/airlock/access/any/science/robotics,
 /obj/machinery/door/airlock/public/glass{
-	name = "Mech Bay"
+	name = "Robotics Lab"
 	},
 /turf/open/floor/iron/dark/side,
 /area/station/science/robotics/lab)
@@ -14564,10 +14555,10 @@
 /turf/open/floor/iron/terracotta,
 /area/station/medical/medbay/central)
 "blb" = (
-/obj/machinery/light/directional/east,
 /obj/effect/turf_decal/tile/pine_green/half{
 	dir = 4
 	},
+/obj/structure/sink/directional/west,
 /turf/open/floor/iron/white/textured_large,
 /area/station/medical/surgery)
 "blc" = (
@@ -14770,8 +14761,8 @@
 /obj/effect/turf_decal/tile/pine_green/half/contrasted{
 	dir = 1
 	},
-/obj/machinery/camera/autoname/motion/directional/north,
 /obj/structure/table/optable,
+/obj/machinery/camera/directional/north,
 /turf/open/floor/iron/white/textured_large,
 /area/station/medical/surgery)
 "bml" = (
@@ -14780,6 +14771,7 @@
 	},
 /obj/machinery/smartfridge/organ,
 /obj/item/wrench/medical,
+/obj/machinery/light/directional/east,
 /turf/open/floor/iron/white/textured_large,
 /area/station/medical/surgery)
 "bmn" = (
@@ -16172,8 +16164,8 @@
 	},
 /obj/effect/mapping_helpers/airlock/access/any/science/rd,
 /obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/public/glass{
-	name = "Server Room"
+/obj/machinery/door/airlock/command/glass{
+	name = "Server Access"
 	},
 /turf/open/floor/iron/dark,
 /area/station/science/server)
@@ -16203,15 +16195,15 @@
 	cycle_id = "sci-gene-passthrough"
 	},
 /obj/effect/mapping_helpers/airlock/access/any/science/xenobio,
-/obj/machinery/door/airlock/public/glass{
-	name = "Xenobiology Lab"
-	},
 /obj/effect/turf_decal/siding/dark_blue/corner,
 /obj/effect/turf_decal/siding/dark_blue/corner{
 	dir = 4
 	},
 /obj/effect/turf_decal/tile/office_blue/fourcorners,
 /obj/effect/mapping_helpers/airlock/access/any/science/general,
+/obj/machinery/door/airlock/public{
+	name = "Xenobiology Lab"
+	},
 /turf/open/floor/iron/white,
 /area/station/science/xenobiology)
 "btB" = (
@@ -16966,7 +16958,7 @@
 	dir = 8
 	},
 /obj/machinery/door/airlock/multi_tile/public/glass{
-	name = "Research Division";
+	name = "Research and Development";
 	dir = 8
 	},
 /turf/open/floor/iron,
@@ -17065,9 +17057,6 @@
 /obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{
 	cycle_id = "sci-entrance"
 	},
-/obj/machinery/door/airlock/public{
-	name = "R&D"
-	},
 /obj/effect/turf_decal/siding/dark_blue/corner,
 /obj/effect/turf_decal/siding/dark_blue/corner{
 	dir = 4
@@ -17076,6 +17065,9 @@
 	dir = 4
 	},
 /obj/effect/mapping_helpers/airlock/access/any/science/general,
+/obj/machinery/door/airlock/public{
+	name = "Research Division"
+	},
 /turf/open/floor/iron/white,
 /area/station/science/lab)
 "bxt" = (
@@ -17102,10 +17094,10 @@
 /obj/effect/turf_decal/tile/office_blue/half/contrasted{
 	dir = 8
 	},
+/obj/effect/mapping_helpers/airlock/access/any/science/general,
 /obj/machinery/door/airlock/public{
-	name = "R&D"
+	name = "Research Division"
 	},
-/obj/effect/mapping_helpers/airlock/access/any/science/general,
 /turf/open/floor/iron/white,
 /area/station/science/lab)
 "bxx" = (
@@ -17348,10 +17340,6 @@
 /obj/structure/disposalpipe/segment{
 	dir = 6
 	},
-/obj/structure/sink{
-	dir = 4;
-	pixel_x = -11
-	},
 /obj/structure/cable,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
 	dir = 8
@@ -17360,6 +17348,7 @@
 	dir = 4
 	},
 /obj/structure/sign/semiotic/maintenance/directional/west,
+/obj/structure/sink/directional/east,
 /turf/open/floor/iron/white/small,
 /area/station/science/research)
 "byE" = (
@@ -17443,14 +17432,11 @@
 	},
 /area/station/hallway/primary/aft)
 "byQ" = (
-/obj/structure/sink{
-	dir = 4;
-	pixel_x = -12
-	},
 /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
 	dir = 1
 	},
 /obj/machinery/firealarm/directional/south,
+/obj/structure/sink/directional/east,
 /turf/open/floor/iron/white/small,
 /area/station/science/lab)
 "byR" = (
@@ -17770,12 +17756,12 @@
 /obj/effect/turf_decal/tile/purple/half/contrasted{
 	dir = 1
 	},
-/obj/machinery/door/airlock/public/glass{
-	name = "Research Director's Office"
-	},
 /obj/structure/curtain/bounty{
 	color = "BACAFF"
 	},
+/obj/machinery/door/airlock/command/glass{
+	name = "Research Director's Office"
+	},
 /turf/open/floor/iron/white/small,
 /area/station/command/heads_quarters/rd)
 "bAt" = (
@@ -18174,8 +18160,8 @@
 /obj/effect/turf_decal/tile/pine_green{
 	dir = 8
 	},
-/obj/machinery/camera/autoname/motion/directional/south,
 /obj/structure/filingcabinet/medical,
+/obj/machinery/camera/autoname/directional/south,
 /turf/open/floor/iron/white,
 /area/station/command/heads_quarters/cmo)
 "bCi" = (
@@ -20515,11 +20501,16 @@
 /area/station/science/ordnance/burnchamber)
 "bOv" = (
 /obj/structure/table,
-/obj/item/paper_bin,
-/obj/effect/spawner/random/bureaucracy/pen,
+/obj/item/paper_bin{
+	pixel_y = 4
+	},
+/obj/effect/spawner/random/bureaucracy/pen{
+	pixel_y = 4
+	},
 /obj/effect/turf_decal/tile/pine_green/half/contrasted{
 	dir = 4
 	},
+/obj/machinery/light_switch/directional/east,
 /turf/open/floor/iron/white/textured_large,
 /area/station/medical/psychology)
 "bOw" = (
@@ -24568,10 +24559,7 @@
 /turf/open/floor/iron/grimy,
 /area/station/service/chapel/monastery)
 "chu" = (
-/obj/structure/sink{
-	dir = 8;
-	pixel_x = 11
-	},
+/obj/structure/sink/directional/west,
 /turf/open/floor/iron/showroomfloor,
 /area/station/service/chapel/monastery)
 "chv" = (
@@ -24639,10 +24627,7 @@
 /turf/open/floor/iron/showroomfloor,
 /area/station/service/chapel/monastery)
 "chU" = (
-/obj/structure/sink{
-	dir = 8;
-	pixel_x = 11
-	},
+/obj/structure/sink/directional/west,
 /turf/open/floor/iron,
 /area/station/service/chapel/storage)
 "chV" = (
@@ -28839,7 +28824,6 @@
 /turf/open/floor/wood,
 /area/station/commons/lounge)
 "dFn" = (
-/obj/machinery/light/small/directional/west,
 /obj/structure/table/reinforced,
 /obj/item/surgery_tray/full/morgue,
 /obj/item/autopsy_scanner,
@@ -29476,7 +29460,7 @@
 /obj/structure/chair/comfy/lime{
 	dir = 1
 	},
-/obj/machinery/camera/autoname/motion/directional/west,
+/obj/machinery/camera/directional/west,
 /turf/open/floor/iron/terracotta,
 /area/station/medical/medbay/central)
 "eel" = (
@@ -29548,7 +29532,8 @@
 	},
 /obj/machinery/light/directional/south,
 /obj/machinery/disposal/delivery_chute{
-	dir = 4
+	dir = 4;
+	name = "Bay to Deliveries"
 	},
 /obj/structure/disposalpipe/trunk{
 	dir = 2
@@ -30458,8 +30443,8 @@
 	cycle_id = "sci-rnd-servers"
 	},
 /obj/effect/mapping_helpers/airlock/access/any/science/rd,
-/obj/machinery/door/airlock/public/glass{
-	name = "Server Room"
+/obj/machinery/door/airlock/command/glass{
+	name = "Server Access"
 	},
 /turf/open/floor/iron/dark,
 /area/station/science/server)
@@ -32561,11 +32546,7 @@
 /turf/open/floor/iron/dark/small,
 /area/station/science/xenobiology)
 "gyj" = (
-/obj/structure/sink{
-	dir = 4;
-	pixel_x = -12;
-	pixel_y = 2
-	},
+/obj/structure/sink/directional/east,
 /turf/open/floor/iron/dark,
 /area/station/science/xenobiology)
 "gzy" = (
@@ -33813,9 +33794,13 @@
 /obj/effect/turf_decal/tile/pine_green{
 	dir = 8
 	},
-/obj/item/paper_bin,
+/obj/item/paper_bin{
+	pixel_y = 4
+	},
 /obj/structure/table,
-/obj/effect/spawner/random/bureaucracy/pen,
+/obj/effect/spawner/random/bureaucracy/pen{
+	pixel_y = 4
+	},
 /turf/open/floor/iron/white,
 /area/station/command/heads_quarters/cmo)
 "hBT" = (
@@ -34257,15 +34242,12 @@
 /turf/open/floor/plating,
 /area/station/maintenance/department/science/xenobiology)
 "hTl" = (
-/obj/structure/sink{
-	dir = 8;
-	pixel_x = 12
-	},
 /obj/structure/mirror{
 	icon_state = "mirror_broke";
 	pixel_y = 28
 	},
 /obj/machinery/light/small/directional/north,
+/obj/structure/sink/directional/west,
 /turf/open/floor/plating,
 /area/station/maintenance/department/science/xenobiology)
 "hTq" = (
@@ -34301,6 +34283,7 @@
 /obj/effect/turf_decal/siding/thinplating_new/dark/corner{
 	dir = 8
 	},
+/obj/machinery/light/directional/north,
 /turf/open/floor/iron/dark/smooth_half{
 	dir = 1
 	},
@@ -34625,7 +34608,8 @@
 	dir = 8
 	},
 /obj/machinery/disposal/delivery_chute{
-	dir = 4
+	dir = 4;
+	name = "Shuttle to Bay"
 	},
 /obj/machinery/conveyor{
 	dir = 8;
@@ -34897,7 +34881,9 @@
 /area/station/salvage_bay)
 "isC" = (
 /obj/structure/table/glass,
-/obj/item/paper_bin,
+/obj/item/paper_bin{
+	pixel_y = 4
+	},
 /obj/effect/turf_decal/siding/wood{
 	dir = 5
 	},
@@ -34939,9 +34925,11 @@
 /area/station/salvage_bay)
 "ivy" = (
 /obj/structure/table,
-/obj/item/clipboard,
+/obj/item/clipboard{
+	pixel_y = 4
+	},
 /obj/item/reagent_containers/cup/glass/coffee{
-	pixel_x = 12;
+	pixel_x = 16;
 	pixel_y = 4
 	},
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
@@ -35335,13 +35323,10 @@
 /turf/open/floor/iron/dark/small,
 /area/station/science/robotics/lab)
 "iJI" = (
-/obj/structure/sink{
-	dir = 8;
-	pixel_x = 11
-	},
 /obj/effect/turf_decal/tile/green/half/contrasted{
 	dir = 4
 	},
+/obj/structure/sink/directional/west,
 /turf/open/floor/iron/white,
 /area/station/medical/virology)
 "iJN" = (
@@ -35381,15 +35366,13 @@
 /turf/open/floor/iron/dark,
 /area/station/ai_monitored/turret_protected/aisat_interior)
 "iLl" = (
-/obj/structure/sink{
-	pixel_y = 29
-	},
 /obj/effect/turf_decal/siding/dark_blue{
 	dir = 4
 	},
 /obj/effect/turf_decal/tile/office_blue/anticorner/contrasted{
 	dir = 4
 	},
+/obj/structure/sink/directional/south,
 /turf/open/floor/iron/white,
 /area/station/science/genetics)
 "iLF" = (
@@ -35891,15 +35874,11 @@
 /turf/open/space/basic,
 /area/space/nearstation)
 "jhD" = (
-/obj/structure/sink{
-	dir = 4;
-	pixel_x = -12;
-	pixel_y = 2
-	},
 /obj/machinery/requests_console/directional/west{
 	name = "Abandoned Bar Requests Console"
 	},
 /obj/effect/mapping_helpers/broken_floor,
+/obj/structure/sink/directional/east,
 /turf/open/floor/plating,
 /area/station/service/abandoned_gambling_den)
 "jhJ" = (
@@ -36278,6 +36257,7 @@
 /obj/effect/turf_decal/bot,
 /obj/structure/cable,
 /obj/structure/disposalpipe/segment,
+/obj/machinery/light/small/directional/west,
 /turf/open/floor/iron,
 /area/station/hallway/primary/central/aft)
 "jzI" = (
@@ -37519,7 +37499,8 @@
 	dir = 8
 	},
 /obj/structure/disposaloutlet{
-	dir = 4
+	dir = 4;
+	name = "Warehouse to Shuttle"
 	},
 /obj/machinery/conveyor{
 	dir = 4;
@@ -38455,6 +38436,10 @@
 "lig" = (
 /obj/structure/table,
 /obj/machinery/airalarm/directional/west,
+/obj/item/reagent_containers/cup/fish_feed{
+	pixel_x = -4;
+	pixel_y = 2
+	},
 /turf/open/floor/wood/large,
 /area/station/medical/psychology)
 "liG" = (
@@ -41475,7 +41460,8 @@
 /area/station/service/chapel/funeral)
 "nBt" = (
 /obj/structure/disposaloutlet{
-	dir = 8
+	dir = 8;
+	name = "Bay to Deliveries"
 	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 5
@@ -41922,9 +41908,6 @@
 /turf/open/floor/iron,
 /area/station/service/hydroponics)
 "nTU" = (
-/obj/machinery/door/airlock/mining/glass{
-	name = "Cargo Bay"
-	},
 /obj/structure/disposalpipe/segment,
 /obj/machinery/door/firedoor,
 /obj/structure/cable,
@@ -41935,6 +41918,9 @@
 	dir = 4
 	},
 /obj/effect/mapping_helpers/airlock/access/all/supply/general,
+/obj/machinery/door/airlock/mining/glass{
+	name = "Delivery Office"
+	},
 /turf/open/floor/iron,
 /area/station/cargo/sorting)
 "nUo" = (
@@ -42878,10 +42864,7 @@
 /obj/effect/turf_decal/stripes/line{
 	dir = 4
 	},
-/obj/structure/sink{
-	dir = 8;
-	pixel_x = 11
-	},
+/obj/structure/sink/directional/west,
 /turf/open/floor/iron/dark/textured,
 /area/station/engineering/storage_shared)
 "oAR" = (
@@ -43505,9 +43488,7 @@
 /obj/effect/turf_decal/trimline/pine_green/line{
 	dir = 1
 	},
-/obj/structure/sink{
-	pixel_y = 17
-	},
+/obj/structure/sink/directional/south,
 /turf/open/floor/iron/white/smooth_half,
 /area/station/medical/medbay/central)
 "oXV" = (
@@ -44368,6 +44349,7 @@
 /obj/effect/turf_decal/tile/pine_green/half/contrasted{
 	dir = 8
 	},
+/obj/machinery/light_switch/directional/west,
 /turf/open/floor/iron/dark,
 /area/station/medical/coldroom)
 "pEa" = (
@@ -44839,6 +44821,10 @@
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/plating,
 /area/station/salvage_bay)
+"pVZ" = (
+/obj/structure/sink/directional/west,
+/turf/open/floor/iron/white/textured_large,
+/area/station/medical/treatment_center)
 "pWb" = (
 /obj/structure/disposalpipe/segment{
 	dir = 4
@@ -46619,11 +46605,8 @@
 /turf/open/floor/iron/dark/smooth_large,
 /area/station/medical/paramedic)
 "rli" = (
-/obj/structure/sink{
-	dir = 8;
-	pixel_x = 11
-	},
 /obj/effect/landmark/start/hangover,
+/obj/structure/sink/directional/west,
 /turf/open/floor/iron/showroomfloor,
 /area/station/service/chapel/monastery)
 "rlj" = (
@@ -46967,9 +46950,9 @@
 /area/station/maintenance/fore)
 "rvH" = (
 /obj/structure/window/spawner/directional/east,
-/obj/machinery/camera/autoname/motion/directional/north,
 /obj/structure/closet/crate/freezer/blood,
 /obj/item/reagent_containers/blood/insectoid,
+/obj/machinery/camera/directional/north,
 /turf/open/floor/iron/white/textured_large,
 /area/station/medical/treatment_center)
 "rvO" = (
@@ -47045,6 +47028,7 @@
 	},
 /obj/effect/turf_decal/trimline/brown/filled/corner,
 /obj/structure/sign/semiotic/maintenance/directional/north,
+/obj/machinery/light/small/directional/north,
 /turf/open/floor/iron,
 /area/station/cargo/storage)
 "ryR" = (
@@ -47807,7 +47791,7 @@
 /area/station/maintenance/department/engine)
 "rXT" = (
 /obj/structure/closet/crate/freezer/blood,
-/obj/machinery/camera/autoname/motion/directional/west,
+/obj/machinery/camera/directional/west,
 /turf/open/floor/iron/kitchen_coldroom/freezerfloor,
 /area/station/medical/coldroom)
 "rYk" = (
@@ -51046,10 +51030,12 @@
 "uhd" = (
 /obj/item/storage/backpack/duffelbag/deforest_medkit/stocked{
 	pixel_x = 0;
-	pixel_y = 14
+	pixel_y = 6
 	},
 /obj/structure/table/glass,
-/obj/item/storage/backpack/duffelbag/deforest_medkit/stocked,
+/obj/item/storage/backpack/duffelbag/deforest_medkit/stocked{
+	pixel_y = -10
+	},
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /turf/open/floor/iron/dark,
 /area/station/medical/coldroom)
@@ -51126,7 +51112,8 @@
 	dir = 4
 	},
 /obj/machinery/disposal/delivery_chute{
-	dir = 1
+	dir = 1;
+	name = "Warehouse to Shuttle"
 	},
 /obj/effect/turf_decal/stripes/end,
 /obj/structure/plasticflaps/opaque,
@@ -51213,6 +51200,7 @@
 	pixel_y = -1
 	},
 /obj/effect/spawner/random/bureaucracy/pen,
+/obj/machinery/light/directional/west,
 /turf/open/floor/iron/dark,
 /area/station/medical/morgue)
 "ulV" = (
@@ -51240,10 +51228,10 @@
 	cycle_id = "sci-gene-passthrough"
 	},
 /obj/effect/mapping_helpers/airlock/access/any/science/xenobio,
-/obj/machinery/door/airlock/public/glass{
+/obj/effect/turf_decal/tile/office_blue/fourcorners,
+/obj/machinery/door/airlock/public{
 	name = "Xenobiology Lab"
 	},
-/obj/effect/turf_decal/tile/office_blue/fourcorners,
 /turf/open/floor/iron/white,
 /area/station/science/xenobiology)
 "umh" = (
@@ -52239,8 +52227,8 @@
 	cycle_id = "sci-maint-passthrough"
 	},
 /obj/effect/mapping_helpers/airlock/access/any/science/xenobio,
-/obj/machinery/door/airlock/public/glass{
-	name = "Containment Pen Access"
+/obj/machinery/door/airlock/public{
+	name = "Containment Pen"
 	},
 /turf/open/floor/iron,
 /area/station/science/xenobiology)
@@ -53047,10 +53035,12 @@
 "vEL" = (
 /obj/item/storage/backpack/duffelbag/deforest_surgical{
 	pixel_x = 0;
-	pixel_y = 15
+	pixel_y = 6
 	},
 /obj/structure/table/glass,
-/obj/item/storage/backpack/duffelbag/deforest_surgical,
+/obj/item/storage/backpack/duffelbag/deforest_surgical{
+	pixel_y = -10
+	},
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /turf/open/floor/iron/dark,
 /area/station/medical/coldroom)
@@ -53291,7 +53281,7 @@
 /area/station/maintenance/department/science/central)
 "vQz" = (
 /obj/machinery/door/airlock/mining/glass{
-	name = "Cargo Bay"
+	name = "Cargo Warehouse"
 	},
 /obj/structure/disposalpipe/segment,
 /obj/machinery/door/firedoor,
@@ -53586,6 +53576,7 @@
 "vZw" = (
 /obj/machinery/firealarm/directional/west,
 /obj/structure/cable,
+/obj/structure/sink/directional/east,
 /turf/open/floor/iron/white/textured_large,
 /area/station/medical/treatment_center)
 "vZJ" = (
@@ -55605,13 +55596,14 @@
 	pixel_y = 8
 	},
 /obj/item/folder/blue{
-	pixel_x = 9
+	pixel_x = 11
 	},
 /obj/structure/table,
 /obj/item/radio/headset/headset_sci{
 	name = "RD Hotline";
 	desc = "A headset provided by science to collaborate on the treatment of mechanical patients.";
-	icon_state = "rob_headset"
+	icon_state = "rob_headset";
+	pixel_x = -6
 	},
 /turf/open/floor/iron/white,
 /area/station/command/heads_quarters/cmo)
@@ -55838,7 +55830,7 @@
 /area/station/maintenance/department/engine)
 "xud" = (
 /obj/machinery/door/airlock/mining/glass{
-	name = "Cargo Bay"
+	name = "Cargo Shuttle Dock"
 	},
 /obj/machinery/door/firedoor,
 /obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{
@@ -56073,7 +56065,9 @@
 /obj/structure/disposalpipe/trunk{
 	dir = 4
 	},
-/obj/structure/disposaloutlet,
+/obj/structure/disposaloutlet{
+	name = "Shuttle to Bay"
+	},
 /obj/structure/plasticflaps/opaque,
 /turf/open/floor/iron,
 /area/station/cargo/storage)
@@ -85117,7 +85111,7 @@ sMg
 bin
 dYh
 bjY
-tgT
+pVZ
 pku
 qib
 iGi

From 7b514425fd9ee177ecb9bdaf80f48355f0dba8b8 Mon Sep 17 00:00:00 2001
From: Sylvette <96358436+SylvetteSylph@users.noreply.github.com>
Date: Sat, 27 Jun 2026 22:41:08 -0400
Subject: [PATCH 02/13] Filing cabinets, for paperwork autism.

---
 _maps/map_files/Pubbystation/pubbystation.dmm | 32 +++++++++++--------
 1 file changed, 18 insertions(+), 14 deletions(-)

diff --git a/_maps/map_files/Pubbystation/pubbystation.dmm b/_maps/map_files/Pubbystation/pubbystation.dmm
index 598a0288220186..cd91a3b6cae3dc 100644
--- a/_maps/map_files/Pubbystation/pubbystation.dmm
+++ b/_maps/map_files/Pubbystation/pubbystation.dmm
@@ -2308,7 +2308,6 @@
 "akJ" = (
 /obj/structure/table/reinforced,
 /obj/item/storage/box/shipping{
-	pixel_x = -6;
 	pixel_y = 6
 	},
 /obj/machinery/door/window/left/directional/south{
@@ -5735,6 +5734,16 @@
 "axC" = (
 /turf/closed/wall,
 /area/station/maintenance/solars/port/fore)
+"axD" = (
+/obj/machinery/conveyor_switch/oneway{
+	dir = 8;
+	id = "CrateReturn";
+	name = "Crate Returns";
+	pixel_x = 8;
+	pixel_y = 11
+	},
+/turf/open/floor/iron,
+/area/station/cargo/sorting)
 "axE" = (
 /obj/machinery/door/poddoor/preopen{
 	id = "prison release";
@@ -43363,6 +43372,10 @@
 /obj/effect/mapping_helpers/mail_sorting/science/xenobiology,
 /turf/open/floor/plating,
 /area/station/maintenance/department/science/central)
+"oTm" = (
+/obj/structure/sink/directional/west,
+/turf/open/floor/iron/white/textured_large,
+/area/station/medical/treatment_center)
 "oTp" = (
 /obj/machinery/light/small/directional/north,
 /obj/structure/disposalpipe/segment{
@@ -44821,10 +44834,6 @@
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/plating,
 /area/station/salvage_bay)
-"pVZ" = (
-/obj/structure/sink/directional/west,
-/turf/open/floor/iron/white/textured_large,
-/area/station/medical/treatment_center)
 "pWb" = (
 /obj/structure/disposalpipe/segment{
 	dir = 4
@@ -46977,6 +46986,7 @@
 	dir = 4
 	},
 /obj/effect/turf_decal/trimline/brown/filled/line,
+/obj/structure/filingcabinet,
 /turf/open/floor/iron,
 /area/station/cargo/storage)
 "rxa" = (
@@ -50524,14 +50534,8 @@
 /turf/open/floor/carpet/blue,
 /area/station/hallway/primary/aft)
 "tOf" = (
-/obj/machinery/conveyor_switch/oneway{
-	dir = 8;
-	id = "CrateReturn";
-	name = "Crate Returns";
-	pixel_x = -8;
-	pixel_y = 11
-	},
 /obj/machinery/firealarm/directional/north,
+/obj/structure/filingcabinet,
 /turf/open/floor/iron,
 /area/station/cargo/sorting)
 "tOn" = (
@@ -85111,7 +85115,7 @@ sMg
 bin
 dYh
 bjY
-pVZ
+oTm
 pku
 qib
 iGi
@@ -93834,7 +93838,7 @@ sre
 piM
 xPQ
 aWu
-bat
+axD
 prO
 ajQ
 pvZ

From 195069b355cd75105a1cefea68cd57f8e80ec1ec Mon Sep 17 00:00:00 2001
From: Sylvette <96358436+SylvetteSylph@users.noreply.github.com>
Date: Sat, 27 Jun 2026 23:13:56 -0400
Subject: [PATCH 03/13] more

---
 _maps/map_files/Pubbystation/pubbystation.dmm | 81 ++++++++++---------
 1 file changed, 44 insertions(+), 37 deletions(-)

diff --git a/_maps/map_files/Pubbystation/pubbystation.dmm b/_maps/map_files/Pubbystation/pubbystation.dmm
index cd91a3b6cae3dc..e61a66b0c8f664 100644
--- a/_maps/map_files/Pubbystation/pubbystation.dmm
+++ b/_maps/map_files/Pubbystation/pubbystation.dmm
@@ -195,6 +195,7 @@
 "aaQ" = (
 /obj/item/exodrone,
 /obj/machinery/exodrone_launcher,
+/obj/machinery/camera/directional/north,
 /turf/open/floor/plating,
 /area/station/cargo/drone_bay)
 "aaR" = (
@@ -1566,7 +1567,11 @@
 /obj/effect/turf_decal/trimline/brown/filled/line{
 	dir = 5
 	},
-/obj/machinery/icecream_vat,
+/obj/structure/table/glass,
+/obj/machinery/fax{
+	fax_name = "Service Hallway";
+	name = "Service Fax Machine"
+	},
 /turf/open/floor/iron/dark,
 /area/station/hallway/secondary/service)
 "ahY" = (
@@ -5734,16 +5739,6 @@
 "axC" = (
 /turf/closed/wall,
 /area/station/maintenance/solars/port/fore)
-"axD" = (
-/obj/machinery/conveyor_switch/oneway{
-	dir = 8;
-	id = "CrateReturn";
-	name = "Crate Returns";
-	pixel_x = 8;
-	pixel_y = 11
-	},
-/turf/open/floor/iron,
-/area/station/cargo/sorting)
 "axE" = (
 /obj/machinery/door/poddoor/preopen{
 	id = "prison release";
@@ -9577,7 +9572,7 @@
 	dir = 8
 	},
 /obj/machinery/airalarm/directional/north,
-/obj/structure/maintenance_loot_structure/file_cabinet/random,
+/obj/structure/filingcabinet,
 /turf/open/floor/wood,
 /area/station/command/heads_quarters/qm)
 "aPb" = (
@@ -11899,8 +11894,7 @@
 /turf/open/floor/iron/cafeteria,
 /area/station/service/kitchen)
 "aYT" = (
-/obj/structure/table/wood,
-/obj/machinery/reagentgrinder,
+/obj/machinery/vending/dinnerware,
 /turf/open/floor/iron/cafeteria,
 /area/station/service/kitchen)
 "aYU" = (
@@ -11914,8 +11908,8 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
 	dir = 4
 	},
-/obj/machinery/vending/dinnerware,
 /obj/effect/turf_decal/weather/snow/corner,
+/obj/machinery/icecream_vat,
 /turf/open/floor/iron/freezer,
 /area/station/service/kitchen/coldroom)
 "aYY" = (
@@ -12498,7 +12492,7 @@
 	},
 /obj/machinery/disposal/delivery_chute{
 	dir = 4;
-	name = "delisvery chute"
+	name = "Deliveries to Disposals"
 	},
 /obj/structure/disposalpipe/trunk{
 	dir = 2
@@ -12645,6 +12639,9 @@
 /obj/machinery/airalarm/directional/north,
 /obj/structure/table/reinforced/titaniumglass,
 /obj/machinery/burner_plate,
+/obj/machinery/reagentgrinder{
+	pixel_x = 14
+	},
 /turf/open/floor/iron/cafeteria,
 /area/station/service/kitchen)
 "bcg" = (
@@ -18091,6 +18088,9 @@
 /area/station/maintenance/department/medical/morgue)
 "bBZ" = (
 /obj/effect/turf_decal/tile/pine_green/half/contrasted,
+/obj/machinery/modular_computer/preset/cargochat/medical{
+	dir = 1
+	},
 /turf/open/floor/iron/white,
 /area/station/medical/storage)
 "bCa" = (
@@ -22922,14 +22922,15 @@
 /turf/open/floor/plating,
 /area/station/service/chapel/asteroid/monastery)
 "bXO" = (
-/obj/effect/turf_decal/stripes/line{
-	dir = 8
-	},
-/obj/machinery/camera/directional/west{
-	c_tag = "Drone Bay Ext."
+/obj/machinery/conveyor_switch/oneway{
+	dir = 8;
+	id = "CrateReturn";
+	name = "Crate Returns";
+	pixel_x = 8;
+	pixel_y = 11
 	},
-/turf/open/floor/plating,
-/area/station/cargo/drone_bay)
+/turf/open/floor/iron,
+/area/station/cargo/sorting)
 "bXU" = (
 /obj/effect/spawner/random/maintenance,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -27214,8 +27215,10 @@
 /area/station/service/library)
 "czp" = (
 /obj/structure/table/wood,
-/obj/item/disk/nuclear/fake,
-/obj/item/barcodescanner,
+/obj/machinery/fax{
+	name = "Library Fax Machine";
+	fax_name = "Library"
+	},
 /turf/open/floor/iron/dark,
 /area/station/service/library)
 "czr" = (
@@ -27229,6 +27232,7 @@
 /area/station/service/library)
 "czu" = (
 /obj/structure/table/wood,
+/obj/item/barcodescanner,
 /turf/open/floor/iron/dark,
 /area/station/service/library)
 "czv" = (
@@ -32866,8 +32870,9 @@
 /area/station/solars/port/fore)
 "gKz" = (
 /obj/structure/table/wood,
-/obj/item/kirbyplants/organic/plant22{
-	pixel_y = 8
+/obj/machinery/fax{
+	name = "Chapel Fax Machine";
+	fax_name = "Chapel"
 	},
 /turf/open/floor/iron/dark,
 /area/station/service/chapel/office)
@@ -33346,13 +33351,15 @@
 /area/station/hallway/primary/central/aft)
 "hjh" = (
 /obj/structure/sign/poster/official/random/directional/south,
-/obj/machinery/modular_computer/preset/cargochat/medical{
-	dir = 1
-	},
 /obj/effect/turf_decal/siding/wood{
 	dir = 1
 	},
 /obj/structure/sign/semiotic/warning/directional/west,
+/obj/structure/table/glass,
+/obj/machinery/fax{
+	fax_name = "Medical";
+	name = "Medical Fax Machine"
+	},
 /turf/open/floor/wood/tile,
 /area/station/medical/break_room)
 "hju" = (
@@ -33786,6 +33793,10 @@
 "hzy" = (
 /turf/open/floor/iron/chapel,
 /area/station/service/chapel)
+"hAd" = (
+/obj/structure/sink/directional/west,
+/turf/open/floor/iron/white/textured_large,
+/area/station/medical/treatment_center)
 "hAF" = (
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
 	dir = 8
@@ -43372,10 +43383,6 @@
 /obj/effect/mapping_helpers/mail_sorting/science/xenobiology,
 /turf/open/floor/plating,
 /area/station/maintenance/department/science/central)
-"oTm" = (
-/obj/structure/sink/directional/west,
-/turf/open/floor/iron/white/textured_large,
-/area/station/medical/treatment_center)
 "oTp" = (
 /obj/machinery/light/small/directional/north,
 /obj/structure/disposalpipe/segment{
@@ -85115,7 +85122,7 @@ sMg
 bin
 dYh
 bjY
-oTm
+hAd
 pku
 qib
 iGi
@@ -93838,7 +93845,7 @@ sre
 piM
 xPQ
 aWu
-axD
+bXO
 prO
 ajQ
 pvZ
@@ -102567,7 +102574,7 @@ aFi
 odG
 aEj
 wmE
-bXO
+wmE
 ofR
 qfa
 sZh

From 94aee62008cea83d6c7919e31edd57e72413f3a2 Mon Sep 17 00:00:00 2001
From: Sylvette <96358436+SylvetteSylph@users.noreply.github.com>
Date: Sat, 27 Jun 2026 23:19:57 -0400
Subject: [PATCH 04/13] Processor floats too high.

---
 _maps/map_files/Pubbystation/pubbystation.dmm | 45 +++++++------------
 1 file changed, 15 insertions(+), 30 deletions(-)

diff --git a/_maps/map_files/Pubbystation/pubbystation.dmm b/_maps/map_files/Pubbystation/pubbystation.dmm
index e61a66b0c8f664..67c46208f83832 100644
--- a/_maps/map_files/Pubbystation/pubbystation.dmm
+++ b/_maps/map_files/Pubbystation/pubbystation.dmm
@@ -22922,15 +22922,9 @@
 /turf/open/floor/plating,
 /area/station/service/chapel/asteroid/monastery)
 "bXO" = (
-/obj/machinery/conveyor_switch/oneway{
-	dir = 8;
-	id = "CrateReturn";
-	name = "Crate Returns";
-	pixel_x = 8;
-	pixel_y = 11
-	},
-/turf/open/floor/iron,
-/area/station/cargo/sorting)
+/obj/structure/sink/directional/west,
+/turf/open/floor/iron/white/textured_large,
+/area/station/medical/treatment_center)
 "bXU" = (
 /obj/effect/spawner/random/maintenance,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -28103,10 +28097,8 @@
 	name = "Kitchen Requests Console"
 	},
 /obj/effect/mapping_helpers/requests_console/supplies,
-/obj/machinery/processor{
-	pixel_y = 6
-	},
 /obj/structure/table/reinforced/titaniumglass,
+/obj/machinery/processor,
 /turf/open/floor/iron/cafeteria,
 /area/station/service/kitchen)
 "daO" = (
@@ -33793,10 +33785,6 @@
 "hzy" = (
 /turf/open/floor/iron/chapel,
 /area/station/service/chapel)
-"hAd" = (
-/obj/structure/sink/directional/west,
-/turf/open/floor/iron/white/textured_large,
-/area/station/medical/treatment_center)
 "hAF" = (
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
 	dir = 8
@@ -43499,18 +43487,15 @@
 /turf/open/floor/plating,
 /area/station/maintenance/solars/starboard/aft)
 "oXU" = (
-/obj/structure/disposalpipe/segment{
-	dir = 4
-	},
-/obj/effect/turf_decal/siding{
-	dir = 1
-	},
-/obj/effect/turf_decal/trimline/pine_green/line{
-	dir = 1
+/obj/machinery/conveyor_switch/oneway{
+	dir = 8;
+	id = "CrateReturn";
+	name = "Crate Returns";
+	pixel_x = 8;
+	pixel_y = 11
 	},
-/obj/structure/sink/directional/south,
-/turf/open/floor/iron/white/smooth_half,
-/area/station/medical/medbay/central)
+/turf/open/floor/iron,
+/area/station/cargo/sorting)
 "oXV" = (
 /obj/structure/window/reinforced/spawner/directional/north,
 /obj/structure/window/reinforced/spawner/directional/west,
@@ -81786,7 +81771,7 @@ fxE
 bkY
 wjK
 whr
-oXU
+bqY
 ciy
 mEo
 qRO
@@ -85122,7 +85107,7 @@ sMg
 bin
 dYh
 bjY
-hAd
+bXO
 pku
 qib
 iGi
@@ -93845,7 +93830,7 @@ sre
 piM
 xPQ
 aWu
-bXO
+oXU
 prO
 ajQ
 pvZ

From 9a54dce4141f47a5723c3226b4164937cd9cb606 Mon Sep 17 00:00:00 2001
From: Sylvette <96358436+SylvetteSylph@users.noreply.github.com>
Date: Sat, 27 Jun 2026 23:26:19 -0400
Subject: [PATCH 05/13] Centers the fish food.

---
 _maps/map_files/Pubbystation/pubbystation.dmm | 29 +++++++++----------
 1 file changed, 14 insertions(+), 15 deletions(-)

diff --git a/_maps/map_files/Pubbystation/pubbystation.dmm b/_maps/map_files/Pubbystation/pubbystation.dmm
index 67c46208f83832..8a7ab581bded40 100644
--- a/_maps/map_files/Pubbystation/pubbystation.dmm
+++ b/_maps/map_files/Pubbystation/pubbystation.dmm
@@ -22922,9 +22922,15 @@
 /turf/open/floor/plating,
 /area/station/service/chapel/asteroid/monastery)
 "bXO" = (
-/obj/structure/sink/directional/west,
-/turf/open/floor/iron/white/textured_large,
-/area/station/medical/treatment_center)
+/obj/machinery/conveyor_switch/oneway{
+	dir = 8;
+	id = "CrateReturn";
+	name = "Crate Returns";
+	pixel_x = 8;
+	pixel_y = 11
+	},
+/turf/open/floor/iron,
+/area/station/cargo/sorting)
 "bXU" = (
 /obj/effect/spawner/random/maintenance,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -38445,7 +38451,6 @@
 /obj/structure/table,
 /obj/machinery/airalarm/directional/west,
 /obj/item/reagent_containers/cup/fish_feed{
-	pixel_x = -4;
 	pixel_y = 2
 	},
 /turf/open/floor/wood/large,
@@ -43487,15 +43492,9 @@
 /turf/open/floor/plating,
 /area/station/maintenance/solars/starboard/aft)
 "oXU" = (
-/obj/machinery/conveyor_switch/oneway{
-	dir = 8;
-	id = "CrateReturn";
-	name = "Crate Returns";
-	pixel_x = 8;
-	pixel_y = 11
-	},
-/turf/open/floor/iron,
-/area/station/cargo/sorting)
+/obj/structure/sink/directional/west,
+/turf/open/floor/iron/white/textured_large,
+/area/station/medical/treatment_center)
 "oXV" = (
 /obj/structure/window/reinforced/spawner/directional/north,
 /obj/structure/window/reinforced/spawner/directional/west,
@@ -85107,7 +85106,7 @@ sMg
 bin
 dYh
 bjY
-bXO
+oXU
 pku
 qib
 iGi
@@ -93830,7 +93829,7 @@ sre
 piM
 xPQ
 aWu
-oXU
+bXO
 prO
 ajQ
 pvZ

From a4660b82b4c6915013ebf7b9df293e90124521c2 Mon Sep 17 00:00:00 2001
From: Sylvette <96358436+SylvetteSylph@users.noreply.github.com>
Date: Sun, 28 Jun 2026 19:21:10 -0400
Subject: [PATCH 06/13] Shifted blender and food cart, added kitchen air alarm
 helper.

---
 _maps/map_files/Pubbystation/pubbystation.dmm | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/_maps/map_files/Pubbystation/pubbystation.dmm b/_maps/map_files/Pubbystation/pubbystation.dmm
index 8a7ab581bded40..9d2a3654988259 100644
--- a/_maps/map_files/Pubbystation/pubbystation.dmm
+++ b/_maps/map_files/Pubbystation/pubbystation.dmm
@@ -10653,7 +10653,11 @@
 /obj/effect/turf_decal/weather/snow/corner{
 	dir = 4
 	},
-/obj/item/storage/epic_loot_cooler,
+/obj/structure/rack,
+/obj/item/hand_labeler,
+/obj/item/stack/package_wrap,
+/obj/item/wrench,
+/obj/item/crowbar,
 /turf/open/floor/iron/freezer,
 /area/station/service/kitchen/coldroom)
 "aUb" = (
@@ -12639,9 +12643,7 @@
 /obj/machinery/airalarm/directional/north,
 /obj/structure/table/reinforced/titaniumglass,
 /obj/machinery/burner_plate,
-/obj/machinery/reagentgrinder{
-	pixel_x = 14
-	},
+/obj/effect/mapping_helpers/airalarm/tlv_kitchen,
 /turf/open/floor/iron/cafeteria,
 /area/station/service/kitchen)
 "bcg" = (
@@ -13343,7 +13345,8 @@
 	name = "Kitchen Window Shutters Control";
 	req_access = list("kitchen")
 	},
-/obj/machinery/food_cart,
+/obj/structure/table/reinforced/titaniumglass,
+/obj/machinery/reagentgrinder,
 /turf/open/floor/iron/kitchen/small,
 /area/station/service/kitchen)
 "bfr" = (
@@ -14950,11 +14953,10 @@
 "bns" = (
 /obj/machinery/power/apc/auto_name/directional/north,
 /obj/structure/cable,
-/obj/item/crowbar,
-/obj/item/wrench,
 /obj/effect/turf_decal/weather/snow/corner{
 	dir = 1
 	},
+/obj/item/storage/epic_loot_cooler,
 /turf/open/floor/iron/freezer,
 /area/station/service/kitchen/coldroom)
 "bnu" = (
@@ -35454,9 +35456,7 @@
 	dir = 4
 	},
 /obj/effect/turf_decal/weather/snow/corner,
-/obj/structure/rack,
-/obj/item/hand_labeler,
-/obj/item/stack/package_wrap,
+/obj/machinery/food_cart,
 /turf/open/floor/iron/freezer,
 /area/station/service/kitchen/coldroom)
 "iNT" = (

From b5d0d6896a6ea4dab14954161f88b3e5073e7261 Mon Sep 17 00:00:00 2001
From: Sylvette <96358436+SylvetteSylph@users.noreply.github.com>
Date: Sun, 28 Jun 2026 19:37:19 -0400
Subject: [PATCH 07/13] Why are we lacking filing cabinets? Why are we lacking
 folders?

---
 _maps/map_files/Pubbystation/pubbystation.dmm | 68 +++++++++++++++----
 1 file changed, 54 insertions(+), 14 deletions(-)

diff --git a/_maps/map_files/Pubbystation/pubbystation.dmm b/_maps/map_files/Pubbystation/pubbystation.dmm
index 9d2a3654988259..a02b6dae4e5fb1 100644
--- a/_maps/map_files/Pubbystation/pubbystation.dmm
+++ b/_maps/map_files/Pubbystation/pubbystation.dmm
@@ -1844,7 +1844,7 @@
 /obj/effect/turf_decal/tile/red/half/contrasted{
 	dir = 1
 	},
-/obj/structure/maintenance_loot_structure/file_cabinet/random,
+/obj/structure/filingcabinet,
 /turf/open/floor/iron,
 /area/station/security/office)
 "ajm" = (
@@ -4918,6 +4918,9 @@
 	name = "Brig Desk";
 	req_access = list("security")
 	},
+/obj/item/folder/red{
+	pixel_y = 2
+	},
 /turf/open/floor/iron/dark,
 /area/station/security/brig)
 "auE" = (
@@ -6774,7 +6777,7 @@
 /turf/open/floor/plating,
 /area/station/maintenance/department/security/brig)
 "aCe" = (
-/obj/structure/maintenance_loot_structure/file_cabinet/random,
+/obj/structure/filingcabinet/employment,
 /turf/open/floor/wood,
 /area/station/service/lawoffice)
 "aCf" = (
@@ -8434,6 +8437,7 @@
 	dir = 1
 	},
 /obj/structure/table/reinforced/rglass,
+/obj/item/folder/blue,
 /turf/open/floor/iron/dark/smooth_large,
 /area/station/medical/paramedic)
 "aIX" = (
@@ -9082,7 +9086,7 @@
 /obj/machinery/airalarm/directional/north,
 /obj/machinery/power/apc/auto_name/directional/east,
 /obj/structure/cable,
-/obj/structure/maintenance_loot_structure/file_cabinet/random,
+/obj/structure/filingcabinet,
 /turf/open/floor/iron,
 /area/station/security/checkpoint/supply)
 "aMm" = (
@@ -9572,7 +9576,7 @@
 	dir = 8
 	},
 /obj/machinery/airalarm/directional/north,
-/obj/structure/filingcabinet,
+/obj/structure/filingcabinet/white,
 /turf/open/floor/wood,
 /area/station/command/heads_quarters/qm)
 "aPb" = (
@@ -12331,7 +12335,7 @@
 "baU" = (
 /obj/machinery/airalarm/directional/south,
 /obj/effect/turf_decal/tile/red/anticorner/contrasted,
-/obj/structure/maintenance_loot_structure/file_cabinet/random,
+/obj/structure/filingcabinet/white,
 /turf/open/floor/iron,
 /area/station/security/checkpoint/customs)
 "baV" = (
@@ -18726,7 +18730,7 @@
 /obj/effect/turf_decal/tile/red/anticorner/contrasted{
 	dir = 8
 	},
-/obj/structure/maintenance_loot_structure/file_cabinet/random,
+/obj/structure/filingcabinet,
 /turf/open/floor/iron,
 /area/station/security/checkpoint/science)
 "bEX" = (
@@ -25112,6 +25116,7 @@
 "clp" = (
 /obj/structure/table/wood,
 /obj/machinery/computer/libraryconsole/bookmanagement,
+/obj/structure/window/spawner/directional/north,
 /turf/open/floor/iron/dark,
 /area/station/service/library)
 "cls" = (
@@ -27211,16 +27216,19 @@
 /obj/structure/table/wood,
 /obj/item/flashlight/lamp/green{
 	pixel_x = 1;
-	pixel_y = 5
+	pixel_y = -6
 	},
+/obj/structure/window/spawner/directional/north,
+/obj/structure/window/spawner/directional/west,
 /turf/open/floor/iron/dark,
 /area/station/service/library)
 "czp" = (
 /obj/structure/table/wood,
 /obj/machinery/fax{
 	name = "Library Fax Machine";
-	fax_name = "Library"
+	fax_name = "Library Desk"
 	},
+/obj/structure/window/spawner/directional/north,
 /turf/open/floor/iron/dark,
 /area/station/service/library)
 "czr" = (
@@ -27298,12 +27306,15 @@
 "czN" = (
 /obj/structure/table/wood,
 /obj/item/storage/bag/books,
+/obj/structure/window/spawner/directional/south,
+/obj/structure/window/spawner/directional/west,
 /turf/open/floor/iron/dark,
 /area/station/service/library)
 "czO" = (
 /obj/machinery/modular_computer/preset/curator{
 	dir = 1
 	},
+/obj/structure/window/spawner/directional/south,
 /turf/open/floor/iron/dark,
 /area/station/service/library)
 "czP" = (
@@ -27311,6 +27322,7 @@
 /obj/item/stack/package_wrap,
 /obj/item/coin/gold,
 /obj/item/instrument/saxophone,
+/obj/structure/window/spawner/directional/south,
 /turf/open/floor/iron/dark,
 /area/station/service/library)
 "czQ" = (
@@ -27320,6 +27332,10 @@
 	network = list("ss13","monastery")
 	},
 /obj/structure/extinguisher_cabinet/directional/east,
+/obj/machinery/door/window/right/directional/south{
+	req_access = list("library");
+	name = "Library Desk"
+	},
 /turf/open/floor/iron/dark,
 /area/station/service/library)
 "cAi" = (
@@ -27845,6 +27861,17 @@
 /obj/effect/spawner/random/engineering/atmospherics_portable,
 /turf/open/floor/plating,
 /area/station/maintenance/department/science/central)
+"cKb" = (
+/obj/machinery/door/window/right/directional/north{
+	name = "Secure Art Exhibit";
+	req_access = list("library")
+	},
+/obj/machinery/door/window/right/directional/north{
+	name = "Secure Art Exhibit";
+	req_access = list("library")
+	},
+/turf/open/floor/iron/dark,
+/area/station/service/library/artgallery)
 "cKA" = (
 /obj/effect/landmark/generic_maintenance_landmark,
 /obj/effect/turf_decal/siding/dark_blue/corner,
@@ -27917,8 +27944,9 @@
 	dir = 4
 	},
 /obj/structure/detectiveboard/directional/south,
-/obj/structure/maintenance_loot_structure/file_cabinet/random,
 /obj/machinery/light/small/directional/south,
+/obj/item/folder/red,
+/obj/structure/filingcabinet/security,
 /turf/open/floor/carpet,
 /area/station/security/detectives_office)
 "cPO" = (
@@ -27997,6 +28025,13 @@
 /obj/machinery/bouldertech/refinery/smelter,
 /turf/open/floor/iron,
 /area/station/cargo/miningfoundry)
+"cSG" = (
+/obj/machinery/door/window/right/directional/north{
+	name = "Library Desk";
+	req_access = list("library")
+	},
+/turf/open/floor/iron/dark,
+/area/station/service/library)
 "cSJ" = (
 /obj/structure/table/wood,
 /obj/item/toy/cards/deck/wizoff,
@@ -31902,7 +31937,7 @@
 	},
 /obj/effect/turf_decal/siding/wood,
 /obj/structure/window/reinforced/spawner/directional/south,
-/obj/structure/maintenance_loot_structure/file_cabinet/random,
+/obj/structure/filingcabinet,
 /turf/open/floor/carpet/green,
 /area/station/command/heads_quarters/captain)
 "fWL" = (
@@ -32872,7 +32907,7 @@
 /obj/structure/table/wood,
 /obj/machinery/fax{
 	name = "Chapel Fax Machine";
-	fax_name = "Chapel"
+	fax_name = "Chapel Office"
 	},
 /turf/open/floor/iron/dark,
 /area/station/service/chapel/office)
@@ -40201,6 +40236,10 @@
 	dir = 1;
 	pixel_y = 4
 	},
+/obj/item/folder/blue{
+	pixel_x = 16;
+	pixel_y = 2
+	},
 /turf/open/floor/iron/white/textured_large,
 /area/station/medical/psychology)
 "myc" = (
@@ -41460,7 +41499,7 @@
 "nAh" = (
 /obj/effect/turf_decal/tile/red/half/contrasted,
 /obj/machinery/light/small/directional/south,
-/obj/structure/maintenance_loot_structure/file_cabinet/random,
+/obj/structure/filingcabinet,
 /turf/open/floor/iron,
 /area/station/security/checkpoint/medical)
 "nAF" = (
@@ -45780,6 +45819,7 @@
 	pixel_x = -4;
 	pixel_y = 12
 	},
+/obj/item/folder/red,
 /turf/open/floor/iron,
 /area/station/security/office)
 "qBo" = (
@@ -73883,7 +73923,7 @@ cjp
 cAK
 xja
 cAK
-cAK
+cSG
 tqH
 cAK
 czQ
@@ -74642,7 +74682,7 @@ kkU
 kkU
 kkU
 pQA
-tqW
+cKb
 fwx
 whJ
 cfN

From ea7369f4a04a2179fd98e34cfdbe4753bfe10f01 Mon Sep 17 00:00:00 2001
From: Sylvette <96358436+SylvetteSylph@users.noreply.github.com>
Date: Sun, 28 Jun 2026 19:51:22 -0400
Subject: [PATCH 08/13] More folders, library changes.

---
 _maps/map_files/Pubbystation/pubbystation.dmm | 112 ++++++++++--------
 1 file changed, 63 insertions(+), 49 deletions(-)

diff --git a/_maps/map_files/Pubbystation/pubbystation.dmm b/_maps/map_files/Pubbystation/pubbystation.dmm
index a02b6dae4e5fb1..bd076a19eb9ee4 100644
--- a/_maps/map_files/Pubbystation/pubbystation.dmm
+++ b/_maps/map_files/Pubbystation/pubbystation.dmm
@@ -4142,6 +4142,9 @@
 /obj/machinery/light/directional/north,
 /obj/structure/table/reinforced,
 /obj/effect/turf_decal/tile/dark_green/full,
+/obj/item/folder/blue{
+	pixel_y = 3
+	},
 /turf/open/floor/iron/white/smooth_large,
 /area/station/command/bridge)
 "arL" = (
@@ -5933,6 +5936,7 @@
 /area/station/commons/dorms)
 "ayq" = (
 /obj/structure/table/wood,
+/obj/item/folder,
 /turf/open/floor/carpet/donk,
 /area/station/commons/dorms)
 "ayu" = (
@@ -6777,7 +6781,7 @@
 /turf/open/floor/plating,
 /area/station/maintenance/department/security/brig)
 "aCe" = (
-/obj/structure/filingcabinet/employment,
+/obj/structure/filingcabinet,
 /turf/open/floor/wood,
 /area/station/service/lawoffice)
 "aCf" = (
@@ -7462,12 +7466,20 @@
 /area/station/command/heads_quarters/captain)
 "aEy" = (
 /obj/structure/table/wood,
-/obj/item/hand_tele,
+/obj/item/hand_tele{
+	pixel_x = -3
+	},
+/obj/item/folder/blue{
+	pixel_y = 3;
+	pixel_x = 15
+	},
 /turf/open/floor/carpet/green,
 /area/station/command/heads_quarters/captain)
 "aEz" = (
 /obj/structure/table/wood,
-/obj/item/storage/photo_album,
+/obj/item/storage/photo_album{
+	pixel_x = 2
+	},
 /obj/effect/turf_decal/siding/wood{
 	dir = 4
 	},
@@ -8437,7 +8449,9 @@
 	dir = 1
 	},
 /obj/structure/table/reinforced/rglass,
-/obj/item/folder/blue,
+/obj/item/folder/white{
+	pixel_y = 2
+	},
 /turf/open/floor/iron/dark/smooth_large,
 /area/station/medical/paramedic)
 "aIX" = (
@@ -25114,9 +25128,8 @@
 /turf/open/floor/iron/dark,
 /area/station/service/library/lounge)
 "clp" = (
-/obj/structure/table/wood,
-/obj/machinery/computer/libraryconsole/bookmanagement,
 /obj/structure/window/spawner/directional/north,
+/obj/machinery/modular_computer/preset/curator,
 /turf/open/floor/iron/dark,
 /area/station/service/library)
 "cls" = (
@@ -27224,11 +27237,8 @@
 /area/station/service/library)
 "czp" = (
 /obj/structure/table/wood,
-/obj/machinery/fax{
-	name = "Library Fax Machine";
-	fax_name = "Library Desk"
-	},
 /obj/structure/window/spawner/directional/north,
+/obj/item/storage/bag/books,
 /turf/open/floor/iron/dark,
 /area/station/service/library)
 "czr" = (
@@ -27280,6 +27290,10 @@
 /area/station/service/library)
 "czD" = (
 /obj/structure/table/wood,
+/obj/item/folder{
+	pixel_x = -2;
+	pixel_y = 2
+	},
 /obj/item/folder/yellow,
 /turf/open/floor/iron/dark,
 /area/station/service/library)
@@ -27305,24 +27319,26 @@
 /area/station/medical/morgue)
 "czN" = (
 /obj/structure/table/wood,
-/obj/item/storage/bag/books,
 /obj/structure/window/spawner/directional/south,
 /obj/structure/window/spawner/directional/west,
+/obj/machinery/libraryscanner,
 /turf/open/floor/iron/dark,
 /area/station/service/library)
 "czO" = (
-/obj/machinery/modular_computer/preset/curator{
+/obj/structure/window/spawner/directional/south,
+/obj/machinery/computer/libraryconsole/bookmanagement{
 	dir = 1
 	},
-/obj/structure/window/spawner/directional/south,
+/obj/structure/table/wood,
 /turf/open/floor/iron/dark,
 /area/station/service/library)
 "czP" = (
 /obj/structure/table/wood,
-/obj/item/stack/package_wrap,
-/obj/item/coin/gold,
-/obj/item/instrument/saxophone,
 /obj/structure/window/spawner/directional/south,
+/obj/machinery/fax{
+	name = "Library Fax Machine";
+	fax_name = "Library Desk"
+	},
 /turf/open/floor/iron/dark,
 /area/station/service/library)
 "czQ" = (
@@ -27861,17 +27877,6 @@
 /obj/effect/spawner/random/engineering/atmospherics_portable,
 /turf/open/floor/plating,
 /area/station/maintenance/department/science/central)
-"cKb" = (
-/obj/machinery/door/window/right/directional/north{
-	name = "Secure Art Exhibit";
-	req_access = list("library")
-	},
-/obj/machinery/door/window/right/directional/north{
-	name = "Secure Art Exhibit";
-	req_access = list("library")
-	},
-/turf/open/floor/iron/dark,
-/area/station/service/library/artgallery)
 "cKA" = (
 /obj/effect/landmark/generic_maintenance_landmark,
 /obj/effect/turf_decal/siding/dark_blue/corner,
@@ -27968,6 +27973,13 @@
 /obj/effect/spawner/random/bureaucracy/pen,
 /turf/open/floor/iron/dark/small,
 /area/station/science/genetics)
+"cPY" = (
+/obj/machinery/door/window/right/directional/north{
+	name = "Library Desk";
+	req_access = list("library")
+	},
+/turf/open/floor/iron/dark,
+/area/station/service/library)
 "cQs" = (
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /turf/open/floor/iron,
@@ -28025,13 +28037,6 @@
 /obj/machinery/bouldertech/refinery/smelter,
 /turf/open/floor/iron,
 /area/station/cargo/miningfoundry)
-"cSG" = (
-/obj/machinery/door/window/right/directional/north{
-	name = "Library Desk";
-	req_access = list("library")
-	},
-/turf/open/floor/iron/dark,
-/area/station/service/library)
 "cSJ" = (
 /obj/structure/table/wood,
 /obj/item/toy/cards/deck/wizoff,
@@ -33044,9 +33049,16 @@
 /turf/open/floor/carpet,
 /area/station/commons/dorms)
 "gQI" = (
-/obj/machinery/libraryscanner,
+/obj/machinery/door/window/right/directional/north{
+	name = "Secure Art Exhibit";
+	req_access = list("library")
+	},
+/obj/machinery/door/window/right/directional/north{
+	name = "Secure Art Exhibit";
+	req_access = list("library")
+	},
 /turf/open/floor/iron/dark,
-/area/station/service/library)
+/area/station/service/library/artgallery)
 "gQM" = (
 /obj/structure/maintenance_loot_structure/large_crate/medical,
 /turf/open/floor/plating,
@@ -38820,6 +38832,10 @@
 /area/station/hallway/primary/central/fore)
 "lsK" = (
 /obj/effect/landmark/start/coroner,
+/obj/item/reagent_containers/cup/bottle/formaldehyde{
+	pixel_x = 32;
+	pixel_y = 11
+	},
 /turf/open/floor/iron/dark,
 /area/station/medical/morgue)
 "ltf" = (
@@ -40236,9 +40252,9 @@
 	dir = 1;
 	pixel_y = 4
 	},
-/obj/item/folder/blue{
+/obj/item/folder/white{
 	pixel_x = 16;
-	pixel_y = 2
+	pixel_y = 3
 	},
 /turf/open/floor/iron/white/textured_large,
 /area/station/medical/psychology)
@@ -45819,7 +45835,9 @@
 	pixel_x = -4;
 	pixel_y = 12
 	},
-/obj/item/folder/red,
+/obj/item/folder/red{
+	pixel_x = 4
+	},
 /turf/open/floor/iron,
 /area/station/security/office)
 "qBo" = (
@@ -48594,10 +48612,6 @@
 "syr" = (
 /obj/structure/filingcabinet/chestdrawer,
 /obj/structure/window/reinforced/spawner/directional/east,
-/obj/item/reagent_containers/cup/bottle/formaldehyde{
-	pixel_x = 0;
-	pixel_y = 11
-	},
 /turf/open/floor/iron/dark,
 /area/station/medical/morgue)
 "syt" = (
@@ -55630,9 +55644,6 @@
 /obj/item/stamp/head/cmo{
 	pixel_y = 8
 	},
-/obj/item/folder/blue{
-	pixel_x = 11
-	},
 /obj/structure/table,
 /obj/item/radio/headset/headset_sci{
 	name = "RD Hotline";
@@ -55640,6 +55651,9 @@
 	icon_state = "rob_headset";
 	pixel_x = -6
 	},
+/obj/item/folder/white{
+	pixel_x = 11
+	},
 /turf/open/floor/iron/white,
 /area/station/command/heads_quarters/cmo)
 "xlA" = (
@@ -73667,7 +73681,7 @@ cAK
 cyZ
 cAK
 czp
-gQI
+cAK
 cAK
 czP
 cAK
@@ -73923,7 +73937,7 @@ cjp
 cAK
 xja
 cAK
-cSG
+cPY
 tqH
 cAK
 czQ
@@ -74682,7 +74696,7 @@ kkU
 kkU
 kkU
 pQA
-cKb
+gQI
 fwx
 whJ
 cfN

From 376a9c8473853c6a860be51fcbd3c23ba811ca0a Mon Sep 17 00:00:00 2001
From: Sylvette <96358436+SylvetteSylph@users.noreply.github.com>
Date: Sun, 28 Jun 2026 19:53:27 -0400
Subject: [PATCH 09/13] Added back some of the tuoys because I felt bad

---
 _maps/map_files/Pubbystation/pubbystation.dmm | 53 ++++++++++++-------
 1 file changed, 33 insertions(+), 20 deletions(-)

diff --git a/_maps/map_files/Pubbystation/pubbystation.dmm b/_maps/map_files/Pubbystation/pubbystation.dmm
index bd076a19eb9ee4..373ed256271a6a 100644
--- a/_maps/map_files/Pubbystation/pubbystation.dmm
+++ b/_maps/map_files/Pubbystation/pubbystation.dmm
@@ -27321,7 +27321,10 @@
 /obj/structure/table/wood,
 /obj/structure/window/spawner/directional/south,
 /obj/structure/window/spawner/directional/west,
-/obj/machinery/libraryscanner,
+/obj/machinery/libraryscanner{
+	pixel_x = 4;
+	pixel_y = 4
+	},
 /turf/open/floor/iron/dark,
 /area/station/service/library)
 "czO" = (
@@ -27973,13 +27976,6 @@
 /obj/effect/spawner/random/bureaucracy/pen,
 /turf/open/floor/iron/dark/small,
 /area/station/science/genetics)
-"cPY" = (
-/obj/machinery/door/window/right/directional/north{
-	name = "Library Desk";
-	req_access = list("library")
-	},
-/turf/open/floor/iron/dark,
-/area/station/service/library)
 "cQs" = (
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /turf/open/floor/iron,
@@ -33049,14 +33045,8 @@
 /turf/open/floor/carpet,
 /area/station/commons/dorms)
 "gQI" = (
-/obj/machinery/door/window/right/directional/north{
-	name = "Secure Art Exhibit";
-	req_access = list("library")
-	},
-/obj/machinery/door/window/right/directional/north{
-	name = "Secure Art Exhibit";
-	req_access = list("library")
-	},
+/obj/structure/table/wood,
+/obj/item/stack/package_wrap,
 /turf/open/floor/iron/dark,
 /area/station/service/library/artgallery)
 "gQM" = (
@@ -44398,6 +44388,11 @@
 	},
 /turf/open/floor/engine,
 /area/station/engineering/supermatter/room)
+"pDK" = (
+/obj/structure/table/wood/fancy,
+/obj/item/instrument/saxophone,
+/turf/open/floor/carpet,
+/area/station/service/library)
 "pDW" = (
 /obj/structure/grille,
 /obj/structure/lattice,
@@ -48724,6 +48719,13 @@
 	},
 /turf/open/floor/iron,
 /area/station/cargo/sorting)
+"sBp" = (
+/obj/machinery/door/window/right/directional/north{
+	name = "Library Desk";
+	req_access = list("library")
+	},
+/turf/open/floor/iron/dark,
+/area/station/service/library)
 "sBA" = (
 /obj/machinery/firealarm/directional/north,
 /obj/effect/turf_decal/tile/red/half/contrasted{
@@ -48815,6 +48817,17 @@
 /obj/structure/cable,
 /turf/open/floor/iron/dark,
 /area/station/service/library/artgallery)
+"sEK" = (
+/obj/machinery/door/window/right/directional/north{
+	name = "Secure Art Exhibit";
+	req_access = list("library")
+	},
+/obj/machinery/door/window/right/directional/north{
+	name = "Secure Art Exhibit";
+	req_access = list("library")
+	},
+/turf/open/floor/iron/dark,
+/area/station/service/library/artgallery)
 "sEN" = (
 /turf/open/floor/iron/white,
 /area/station/medical/virology)
@@ -71368,7 +71381,7 @@ iBp
 cyZ
 cAK
 czl
-czr
+pDK
 czr
 czI
 pcn
@@ -73937,7 +73950,7 @@ cjp
 cAK
 xja
 cAK
-cPY
+sBp
 tqH
 cAK
 czQ
@@ -74696,7 +74709,7 @@ kkU
 kkU
 kkU
 pQA
-gQI
+sEK
 fwx
 whJ
 cfN
@@ -76226,7 +76239,7 @@ whJ
 nVN
 gkQ
 gkQ
-gkQ
+gQI
 xkB
 vsJ
 uIv

From bff31449d1dc5cf5c387aea4a11b54db73bc9a73 Mon Sep 17 00:00:00 2001
From: Sylvette <96358436+SylvetteSylph@users.noreply.github.com>
Date: Sun, 28 Jun 2026 20:03:31 -0400
Subject: [PATCH 10/13] Just a minor nudge of the scanner control interface

---
 _maps/map_files/Pubbystation/pubbystation.dmm | 54 +++++++++----------
 1 file changed, 27 insertions(+), 27 deletions(-)

diff --git a/_maps/map_files/Pubbystation/pubbystation.dmm b/_maps/map_files/Pubbystation/pubbystation.dmm
index 373ed256271a6a..8dc2077fb32c8b 100644
--- a/_maps/map_files/Pubbystation/pubbystation.dmm
+++ b/_maps/map_files/Pubbystation/pubbystation.dmm
@@ -19496,6 +19496,11 @@
 /obj/machinery/computer/security/telescreen/entertainment,
 /turf/closed/wall/r_wall,
 /area/station/ai_monitored/turret_protected/ai_upload)
+"bJu" = (
+/obj/structure/table/wood/fancy,
+/obj/item/instrument/saxophone,
+/turf/open/floor/carpet,
+/area/station/service/library)
 "bJD" = (
 /obj/structure/sign/departments/engineering/directional/south,
 /obj/machinery/door/firedoor,
@@ -27323,7 +27328,7 @@
 /obj/structure/window/spawner/directional/west,
 /obj/machinery/libraryscanner{
 	pixel_x = 4;
-	pixel_y = 4
+	pixel_y = 8
 	},
 /turf/open/floor/iron/dark,
 /area/station/service/library)
@@ -30333,6 +30338,17 @@
 	},
 /turf/open/floor/iron/kitchen/small,
 /area/station/medical/break_room)
+"eOC" = (
+/obj/machinery/door/window/right/directional/north{
+	name = "Secure Art Exhibit";
+	req_access = list("library")
+	},
+/obj/machinery/door/window/right/directional/north{
+	name = "Secure Art Exhibit";
+	req_access = list("library")
+	},
+/turf/open/floor/iron/dark,
+/area/station/service/library/artgallery)
 "eOJ" = (
 /obj/structure/cable,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
@@ -44388,11 +44404,6 @@
 	},
 /turf/open/floor/engine,
 /area/station/engineering/supermatter/room)
-"pDK" = (
-/obj/structure/table/wood/fancy,
-/obj/item/instrument/saxophone,
-/turf/open/floor/carpet,
-/area/station/service/library)
 "pDW" = (
 /obj/structure/grille,
 /obj/structure/lattice,
@@ -44614,6 +44625,13 @@
 /obj/machinery/light/directional/west,
 /turf/open/floor/wood/large,
 /area/station/medical/psychology)
+"pJw" = (
+/obj/machinery/door/window/right/directional/north{
+	name = "Library Desk";
+	req_access = list("library")
+	},
+/turf/open/floor/iron/dark,
+/area/station/service/library)
 "pJT" = (
 /obj/structure/table,
 /obj/item/storage/toolbox/electrical{
@@ -48719,13 +48737,6 @@
 	},
 /turf/open/floor/iron,
 /area/station/cargo/sorting)
-"sBp" = (
-/obj/machinery/door/window/right/directional/north{
-	name = "Library Desk";
-	req_access = list("library")
-	},
-/turf/open/floor/iron/dark,
-/area/station/service/library)
 "sBA" = (
 /obj/machinery/firealarm/directional/north,
 /obj/effect/turf_decal/tile/red/half/contrasted{
@@ -48817,17 +48828,6 @@
 /obj/structure/cable,
 /turf/open/floor/iron/dark,
 /area/station/service/library/artgallery)
-"sEK" = (
-/obj/machinery/door/window/right/directional/north{
-	name = "Secure Art Exhibit";
-	req_access = list("library")
-	},
-/obj/machinery/door/window/right/directional/north{
-	name = "Secure Art Exhibit";
-	req_access = list("library")
-	},
-/turf/open/floor/iron/dark,
-/area/station/service/library/artgallery)
 "sEN" = (
 /turf/open/floor/iron/white,
 /area/station/medical/virology)
@@ -71381,7 +71381,7 @@ iBp
 cyZ
 cAK
 czl
-pDK
+bJu
 czr
 czI
 pcn
@@ -73950,7 +73950,7 @@ cjp
 cAK
 xja
 cAK
-sBp
+pJw
 tqH
 cAK
 czQ
@@ -74709,7 +74709,7 @@ kkU
 kkU
 kkU
 pQA
-sEK
+eOC
 fwx
 whJ
 cfN

From 57aea5574bd976f5c7bd4a12a36053218fac0e02 Mon Sep 17 00:00:00 2001
From: Sylvette <96358436+SylvetteSylph@users.noreply.github.com>
Date: Sun, 28 Jun 2026 20:13:28 -0400
Subject: [PATCH 11/13] I lied; replaced two tables with shelving and racks,
 gave robotics a medical records laptop.

---
 _maps/map_files/Pubbystation/pubbystation.dmm | 114 +++++++++---------
 1 file changed, 57 insertions(+), 57 deletions(-)

diff --git a/_maps/map_files/Pubbystation/pubbystation.dmm b/_maps/map_files/Pubbystation/pubbystation.dmm
index 8dc2077fb32c8b..e77d1e8f7c8a60 100644
--- a/_maps/map_files/Pubbystation/pubbystation.dmm
+++ b/_maps/map_files/Pubbystation/pubbystation.dmm
@@ -14666,6 +14666,7 @@
 /area/station/hallway/primary/aft)
 "blE" = (
 /obj/structure/filingcabinet/chestdrawer,
+/obj/item/folder/white,
 /turf/open/floor/iron/dark/small,
 /area/station/science/robotics/lab)
 "blF" = (
@@ -14891,17 +14892,16 @@
 /area/station/science/robotics/lab)
 "bmO" = (
 /obj/structure/table,
-/obj/item/bodypart/head/robot/android/zhp{
-	pixel_y = -6;
-	pixel_x = 5
-	},
-/obj/item/bodypart/arm/left/robot/android/zhp{
-	pixel_x = -6;
-	dir = 8
+/obj/item/bodypart/head/robot/android/zhp,
+/obj/item/radio/headset/headset_rob{
+	pixel_x = -2;
+	pixel_y = -3;
+	keyslot = /obj/item/encryptionkey/headset_medsci
 	},
-/obj/item/mmi{
-	pixel_x = 5;
-	pixel_y = 10
+/obj/item/radio/headset/headset_rob{
+	pixel_x = 7;
+	pixel_y = 1;
+	keyslot = /obj/item/encryptionkey/headset_medsci
 	},
 /turf/open/floor/iron/white/smooth_large,
 /area/station/science/robotics/lab)
@@ -15243,6 +15243,11 @@
 	pixel_y = 8;
 	pixel_x = -3
 	},
+/obj/item/bodypart/arm/left/robot/android/zhp{
+	pixel_x = -2;
+	dir = 8;
+	pixel_y = 12
+	},
 /turf/open/floor/iron/white/textured_large,
 /area/station/science/robotics/lab)
 "bpb" = (
@@ -15423,15 +15428,10 @@
 "bqg" = (
 /obj/structure/table,
 /obj/machinery/newscaster/directional/west,
-/obj/item/radio/headset/headset_rob{
-	pixel_x = 7;
-	pixel_y = 1;
-	keyslot = /obj/item/encryptionkey/headset_medsci
-	},
-/obj/item/radio/headset/headset_rob{
-	pixel_x = -2;
-	pixel_y = -3;
-	keyslot = /obj/item/encryptionkey/headset_medsci
+/obj/machinery/computer/records/medical/laptop{
+	dir = 4;
+	pixel_y = 3;
+	pixel_x = 1
 	},
 /turf/open/floor/iron/dark/small,
 /area/station/science/robotics/lab)
@@ -16140,11 +16140,11 @@
 /obj/item/healthanalyzer,
 /obj/item/stack/cable_coil,
 /obj/item/stack/cable_coil,
-/obj/structure/table,
 /obj/machinery/airalarm/directional/south,
 /obj/effect/turf_decal/siding{
 	dir = 4
 	},
+/obj/structure/rack,
 /turf/open/floor/iron/dark,
 /area/station/science/robotics/lab)
 "bta" = (
@@ -19496,11 +19496,6 @@
 /obj/machinery/computer/security/telescreen/entertainment,
 /turf/closed/wall/r_wall,
 /area/station/ai_monitored/turret_protected/ai_upload)
-"bJu" = (
-/obj/structure/table/wood/fancy,
-/obj/item/instrument/saxophone,
-/turf/open/floor/carpet,
-/area/station/service/library)
 "bJD" = (
 /obj/structure/sign/departments/engineering/directional/south,
 /obj/machinery/door/firedoor,
@@ -30338,17 +30333,6 @@
 	},
 /turf/open/floor/iron/kitchen/small,
 /area/station/medical/break_room)
-"eOC" = (
-/obj/machinery/door/window/right/directional/north{
-	name = "Secure Art Exhibit";
-	req_access = list("library")
-	},
-/obj/machinery/door/window/right/directional/north{
-	name = "Secure Art Exhibit";
-	req_access = list("library")
-	},
-/turf/open/floor/iron/dark,
-/area/station/service/library/artgallery)
 "eOJ" = (
 /obj/structure/cable,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
@@ -30685,6 +30669,13 @@
 	},
 /turf/open/floor/iron/white,
 /area/station/medical/storage)
+"faf" = (
+/obj/machinery/door/window/right/directional/north{
+	name = "Library Desk";
+	req_access = list("library")
+	},
+/turf/open/floor/iron/dark,
+/area/station/service/library)
 "faA" = (
 /obj/effect/landmark/blobstart,
 /obj/effect/decal/cleanable/dirt,
@@ -33061,8 +33052,14 @@
 /turf/open/floor/carpet,
 /area/station/commons/dorms)
 "gQI" = (
-/obj/structure/table/wood,
-/obj/item/stack/package_wrap,
+/obj/machinery/door/window/right/directional/north{
+	name = "Secure Art Exhibit";
+	req_access = list("library")
+	},
+/obj/machinery/door/window/right/directional/north{
+	name = "Secure Art Exhibit";
+	req_access = list("library")
+	},
 /turf/open/floor/iron/dark,
 /area/station/service/library/artgallery)
 "gQM" = (
@@ -44625,13 +44622,6 @@
 /obj/machinery/light/directional/west,
 /turf/open/floor/wood/large,
 /area/station/medical/psychology)
-"pJw" = (
-/obj/machinery/door/window/right/directional/north{
-	name = "Library Desk";
-	req_access = list("library")
-	},
-/turf/open/floor/iron/dark,
-/area/station/service/library)
 "pJT" = (
 /obj/structure/table,
 /obj/item/storage/toolbox/electrical{
@@ -44663,6 +44653,11 @@
 	},
 /turf/open/floor/engine,
 /area/station/engineering/supermatter/room)
+"pLk" = (
+/obj/structure/table/wood/fancy,
+/obj/item/instrument/saxophone,
+/turf/open/floor/carpet,
+/area/station/service/library)
 "pLw" = (
 /obj/machinery/holopad,
 /obj/effect/turf_decal/tile/blue/half/contrasted{
@@ -46407,26 +46402,26 @@
 /area/station/engineering/lobby)
 "qZN" = (
 /obj/item/assembly/prox_sensor{
-	pixel_x = -8;
+	pixel_x = -4;
 	pixel_y = 4
 	},
+/obj/effect/turf_decal/siding{
+	dir = 4
+	},
+/obj/structure/shelf,
 /obj/item/assembly/prox_sensor{
-	pixel_x = -8;
+	pixel_x = -4;
 	pixel_y = 4
 	},
 /obj/item/assembly/prox_sensor{
-	pixel_x = -8;
+	pixel_x = -4;
 	pixel_y = 4
 	},
 /obj/item/assembly/prox_sensor{
-	pixel_x = -8;
+	pixel_x = -4;
 	pixel_y = 4
 	},
 /obj/item/crowbar,
-/obj/structure/table,
-/obj/effect/turf_decal/siding{
-	dir = 4
-	},
 /turf/open/floor/iron/dark/smooth_edge{
 	dir = 8
 	},
@@ -47007,6 +47002,11 @@
 /obj/effect/landmark/start/hangover,
 /turf/open/floor/iron/dark,
 /area/station/service/library)
+"rvB" = (
+/obj/structure/table/wood,
+/obj/item/stack/package_wrap,
+/turf/open/floor/iron/dark,
+/area/station/service/library/artgallery)
 "rvC" = (
 /obj/structure/disposalpipe/segment,
 /obj/structure/cable,
@@ -71381,7 +71381,7 @@ iBp
 cyZ
 cAK
 czl
-bJu
+pLk
 czr
 czI
 pcn
@@ -73950,7 +73950,7 @@ cjp
 cAK
 xja
 cAK
-pJw
+faf
 tqH
 cAK
 czQ
@@ -74709,7 +74709,7 @@ kkU
 kkU
 kkU
 pQA
-eOC
+gQI
 fwx
 whJ
 cfN
@@ -76239,7 +76239,7 @@ whJ
 nVN
 gkQ
 gkQ
-gQI
+rvB
 xkB
 vsJ
 uIv

From b1d076900338ece0233e85d62e90ad3f7a5ea707 Mon Sep 17 00:00:00 2001
From: Sylvette <96358436+SylvetteSylph@users.noreply.github.com>
Date: Sun, 28 Jun 2026 22:25:50 -0400
Subject: [PATCH 12/13] Resolving failed linter due to mistakenly placed door..

---
 _maps/map_files/Pubbystation/pubbystation.dmm | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

diff --git a/_maps/map_files/Pubbystation/pubbystation.dmm b/_maps/map_files/Pubbystation/pubbystation.dmm
index e77d1e8f7c8a60..4b15523815da84 100644
--- a/_maps/map_files/Pubbystation/pubbystation.dmm
+++ b/_maps/map_files/Pubbystation/pubbystation.dmm
@@ -33051,17 +33051,6 @@
 /obj/machinery/firealarm/directional/south,
 /turf/open/floor/carpet,
 /area/station/commons/dorms)
-"gQI" = (
-/obj/machinery/door/window/right/directional/north{
-	name = "Secure Art Exhibit";
-	req_access = list("library")
-	},
-/obj/machinery/door/window/right/directional/north{
-	name = "Secure Art Exhibit";
-	req_access = list("library")
-	},
-/turf/open/floor/iron/dark,
-/area/station/service/library/artgallery)
 "gQM" = (
 /obj/structure/maintenance_loot_structure/large_crate/medical,
 /turf/open/floor/plating,
@@ -74709,7 +74698,7 @@ kkU
 kkU
 kkU
 pQA
-gQI
+tqW
 fwx
 whJ
 cfN

From ccbf3de6586a08604543d05f8caf912d51eaf0e3 Mon Sep 17 00:00:00 2001
From: Sylvette <96358436+SylvetteSylph@users.noreply.github.com>
Date: Sun, 28 Jun 2026 22:26:46 -0400
Subject: [PATCH 13/13] Actually, those windoors are bad too. Fixing that.

---
 _maps/map_files/Pubbystation/pubbystation.dmm | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/_maps/map_files/Pubbystation/pubbystation.dmm b/_maps/map_files/Pubbystation/pubbystation.dmm
index 4b15523815da84..efd7d42209f47e 100644
--- a/_maps/map_files/Pubbystation/pubbystation.dmm
+++ b/_maps/map_files/Pubbystation/pubbystation.dmm
@@ -33051,6 +33051,13 @@
 /obj/machinery/firealarm/directional/south,
 /turf/open/floor/carpet,
 /area/station/commons/dorms)
+"gQI" = (
+/obj/machinery/door/window/left/directional/north{
+	req_access = list("library");
+	name = "Secure Art Exhibit"
+	},
+/turf/open/floor/iron/dark,
+/area/station/service/library/artgallery)
 "gQM" = (
 /obj/structure/maintenance_loot_structure/large_crate/medical,
 /turf/open/floor/plating,
@@ -74698,7 +74705,7 @@ kkU
 kkU
 kkU
 pQA
-tqW
+gQI
 fwx
 whJ
 cfN