diff --git a/_maps/map_files/Birdshot/birdshot.dmm b/_maps/map_files/Birdshot/birdshot.dmm
index 3eced9d6217..adb01371a9b 100644
--- a/_maps/map_files/Birdshot/birdshot.dmm
+++ b/_maps/map_files/Birdshot/birdshot.dmm
@@ -264,7 +264,10 @@
 /area/station/medical/virology)
 "agp" = (
 /obj/structure/table/wood,
+<<<<<<< HEAD
 /obj/item/cigarette/cigar/cohiba,
+=======
+>>>>>>> e29081ffacf ([MIRROR] Birdshot Service Fixes (#3333))
 /turf/open/floor/carpet,
 /area/station/commons/dorms)
 "agy" = (
@@ -1543,23 +1546,6 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /turf/open/floor/plating,
 /area/station/maintenance/central/lesser)
-"aGI" = (
-/obj/structure/table,
-/obj/effect/decal/cleanable/dirt,
-/obj/item/trash/can/food/pine_nuts{
-	pixel_x = 16;
-	pixel_y = 6
-	},
-/obj/machinery/cell_charger{
-	pixel_x = -1;
-	pixel_y = 2
-	},
-/obj/item/stock_parts/power_store/cell/high{
-	pixel_x = -1;
-	pixel_y = 1
-	},
-/turf/open/floor/iron/dark,
-/area/station/commons/storage/tools)
 "aGU" = (
 /obj/machinery/light/small/directional/west,
 /turf/open/floor/iron,
@@ -2259,6 +2245,17 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /turf/open/floor/iron/dark/small,
 /area/station/engineering/supermatter/room)
+<<<<<<< HEAD
+=======
+"aXg" = (
+/obj/structure/cable,
+/obj/structure/table/reinforced,
+/obj/machinery/cell_charger,
+/obj/machinery/status_display/ai/directional/north,
+/obj/machinery/camera/autoname/directional/north,
+/turf/open/floor/iron,
+/area/station/engineering/storage/tech)
+>>>>>>> e29081ffacf ([MIRROR] Birdshot Service Fixes (#3333))
 "aXy" = (
 /obj/effect/turf_decal/siding/wideplating{
 	dir = 1
@@ -3372,7 +3369,10 @@
 /obj/structure/rack,
 /obj/item/weldingtool/mini,
 /obj/item/tank/internals/emergency_oxygen/empty,
+<<<<<<< HEAD
 /obj/item/cigarette/rollie,
+=======
+>>>>>>> e29081ffacf ([MIRROR] Birdshot Service Fixes (#3333))
 /turf/open/floor/iron/dark/smooth_large,
 /area/station/maintenance/central/lesser)
 "bxs" = (
@@ -3862,28 +3862,6 @@
 /obj/machinery/chem_heater/withbuffer,
 /turf/open/floor/iron/dark,
 /area/station/medical/pharmacy)
-"bHp" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/closet/crate,
-/obj/item/stock_parts/power_store/cell/high{
-	pixel_x = -11;
-	pixel_y = 2
-	},
-/obj/item/reagent_containers/cup/glass/bottle/vodka,
-/obj/item/food/grown/citrus/orange,
-/obj/item/food/grown/citrus/orange{
-	pixel_x = 4;
-	pixel_y = 2
-	},
-/obj/item/food/grown/grapes/green{
-	pixel_y = -4;
-	pixel_x = -6
-	},
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
-	dir = 8
-	},
-/turf/open/floor/iron/small,
-/area/station/maintenance/department/engine/atmos)
 "bHs" = (
 /obj/structure/rack,
 /obj/effect/spawner/random/maintenance,
@@ -4907,9 +4885,12 @@
 	pixel_y = 9;
 	pixel_x = 14
 	},
+<<<<<<< HEAD
 /obj/item/cigarette{
 	pixel_y = 2
 	},
+=======
+>>>>>>> e29081ffacf ([MIRROR] Birdshot Service Fixes (#3333))
 /turf/open/floor/iron/small,
 /area/station/engineering/atmos/pumproom)
 "cdg" = (
@@ -5326,6 +5307,7 @@
 /obj/structure/cable,
 /turf/open/floor/iron/white/small,
 /area/station/command/heads_quarters/cmo)
+<<<<<<< HEAD
 "clV" = (
 /obj/structure/table,
 /obj/effect/mapping_helpers/broken_floor,
@@ -5338,6 +5320,8 @@
 /obj/machinery/light/small/directional/south,
 /turf/open/floor/iron/smooth,
 /area/station/command/gateway)
+=======
+>>>>>>> e29081ffacf ([MIRROR] Birdshot Service Fixes (#3333))
 "clX" = (
 /obj/structure/railing/corner,
 /turf/open/floor/wood,
@@ -6379,6 +6363,21 @@
 	},
 /turf/open/floor/iron/small,
 /area/station/maintenance/port/lesser)
+"cGb" = (
+/obj/item/stack/sheet/iron/fifty,
+/obj/item/stack/rods/fifty,
+/obj/item/stack/sheet/glass/fifty,
+/obj/item/electronics/airlock,
+/obj/item/electronics/airlock,
+/obj/item/stack/sheet/mineral/plasma{
+	amount = 30
+	},
+/obj/item/gps,
+/obj/structure/closet/crate/engineering,
+/obj/machinery/light/cold/directional/east,
+/obj/item/clothing/gloves/color/yellow,
+/turf/open/floor/iron/dark/small,
+/area/station/engineering/storage_shared)
 "cGj" = (
 /turf/closed/wall/r_wall,
 /area/station/security/execution/education)
@@ -9557,10 +9556,13 @@
 	pixel_x = -6;
 	pixel_y = 3
 	},
+<<<<<<< HEAD
 /obj/item/cigarette{
 	pixel_x = 5;
 	pixel_y = 2
 	},
+=======
+>>>>>>> e29081ffacf ([MIRROR] Birdshot Service Fixes (#3333))
 /turf/open/floor/iron/dark,
 /area/station/security/lockers)
 "dYj" = (
@@ -10375,14 +10377,15 @@
 /obj/effect/landmark/navigate_destination/aiupload,
 /turf/open/floor/iron/white,
 /area/station/hallway/primary/starboard)
-"enq" = (
-/obj/structure/cable,
-/obj/structure/table/reinforced,
-/obj/machinery/cell_charger,
-/obj/item/stock_parts/power_store/cell/high,
-/obj/machinery/status_display/ai/directional/north,
-/obj/machinery/camera/autoname/directional/north,
+"enD" = (
+/obj/effect/turf_decal/tile/green{
+	dir = 8
+	},
+/obj/effect/turf_decal/tile/blue/opposingcorners,
+/obj/machinery/camera/autoname/directional/west,
+/obj/machinery/light_switch/directional/west,
 /turf/open/floor/iron,
+<<<<<<< HEAD
 /area/station/engineering/storage/tech)
 "enD" = (
 /obj/effect/turf_decal/tile/green{
@@ -10392,6 +10395,8 @@
 /obj/machinery/camera/autoname/directional/west,
 /obj/machinery/light_switch/directional/west,
 /turf/open/floor/iron,
+=======
+>>>>>>> e29081ffacf ([MIRROR] Birdshot Service Fixes (#3333))
 /area/station/service/hydroponics)
 "enE" = (
 /obj/item/cultivator/rake,
@@ -11146,20 +11151,6 @@
 	},
 /turf/open/floor/catwalk_floor,
 /area/station/engineering/break_room)
-"eDr" = (
-/obj/structure/table/glass,
-/obj/machinery/cell_charger,
-/obj/item/stock_parts/power_store/cell,
-/obj/machinery/status_display/evac/directional/north,
-/obj/structure/sign/directions/supply/directional/west,
-/obj/structure/sign/directions/engineering/directional/west{
-	pixel_y = 8
-	},
-/obj/structure/sign/directions/command/directional/west{
-	pixel_y = -8
-	},
-/turf/open/floor/iron/white,
-/area/station/hallway/primary/starboard)
 "eDt" = (
 /obj/effect/turf_decal/stripes/white/line{
 	dir = 1
@@ -11746,6 +11737,14 @@
 /obj/machinery/airalarm/directional/north,
 /turf/open/floor/iron/showroomfloor,
 /area/station/medical/coldroom)
+<<<<<<< HEAD
+=======
+"ePg" = (
+/obj/structure/table,
+/obj/machinery/cell_charger,
+/turf/open/floor/circuit,
+/area/station/maintenance/port/aft)
+>>>>>>> e29081ffacf ([MIRROR] Birdshot Service Fixes (#3333))
 "ePn" = (
 /obj/structure/disposalpipe/segment,
 /obj/machinery/light/small/directional/south,
@@ -12837,6 +12836,13 @@
 /obj/effect/landmark/start/depsec/science,
 /turf/open/floor/iron,
 /area/station/security/checkpoint/science)
+"fnm" = (
+/obj/structure/filingcabinet/chestdrawer,
+/obj/item/book/manual/wiki/engineering_guide{
+	pixel_y = 6
+	},
+/turf/open/floor/iron/grimy,
+/area/station/engineering/main)
 "fnw" = (
 /obj/structure/chair{
 	pixel_y = -2
@@ -16980,7 +16986,10 @@
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/table,
 /obj/item/stack/spacecash/c1,
+<<<<<<< HEAD
 /obj/item/cigarette/cigar/havana,
+=======
+>>>>>>> e29081ffacf ([MIRROR] Birdshot Service Fixes (#3333))
 /turf/open/floor/light/colour_cycle/dancefloor_b,
 /area/station/maintenance/starboard/central)
 "gJS" = (
@@ -17434,6 +17443,14 @@
 	},
 /turf/open/floor/plating,
 /area/station/service/chapel/funeral)
+"gSQ" = (
+/obj/structure/table/glass,
+/obj/item/folder/blue{
+	pixel_x = -3;
+	pixel_y = 2
+	},
+/turf/open/floor/carpet/executive,
+/area/station/command/meeting_room)
 "gSX" = (
 /obj/machinery/computer/piratepad_control/civilian{
 	dir = 1
@@ -17573,6 +17590,12 @@
 /obj/item/kirbyplants/random,
 /turf/open/floor/iron/white,
 /area/station/medical/medbay/lobby)
+"gUo" = (
+/obj/structure/table/greyscale,
+/obj/item/clothing/gloves/color/yellow,
+/obj/item/wrench,
+/turf/open/floor/iron/grimy,
+/area/station/engineering/main)
 "gUC" = (
 /obj/structure/disposalpipe/segment{
 	dir = 6
@@ -17812,6 +17835,7 @@
 /obj/effect/spawner/structure/window/reinforced,
 /turf/open/floor/plating,
 /area/station/security/checkpoint/escape)
+<<<<<<< HEAD
 "gZy" = (
 /obj/structure/table,
 /obj/machinery/cell_charger{
@@ -17827,6 +17851,8 @@
 /obj/machinery/firealarm/directional/west,
 /turf/open/floor/iron,
 /area/station/command/teleporter)
+=======
+>>>>>>> e29081ffacf ([MIRROR] Birdshot Service Fixes (#3333))
 "gZM" = (
 /obj/item/kirbyplants/random,
 /obj/machinery/light/cold/directional/east,
@@ -18315,6 +18341,19 @@
 	dir = 4
 	},
 /area/station/commons/storage/tools)
+"hgb" = (
+/obj/structure/table,
+/obj/effect/decal/cleanable/dirt,
+/obj/item/trash/can/food/pine_nuts{
+	pixel_x = 16;
+	pixel_y = 6
+	},
+/obj/machinery/cell_charger{
+	pixel_x = -1;
+	pixel_y = 2
+	},
+/turf/open/floor/iron/dark,
+/area/station/commons/storage/tools)
 "hgd" = (
 /obj/structure/table,
 /obj/item/clothing/head/collectable/paper{
@@ -19658,6 +19697,17 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /turf/open/floor/iron/dark,
 /area/station/maintenance/department/engine/atmos)
+"hAQ" = (
+/obj/structure/table,
+/obj/effect/mapping_helpers/broken_floor,
+/obj/machinery/cell_charger,
+/obj/item/clothing/mask/breath{
+	pixel_x = 15;
+	pixel_y = 5
+	},
+/obj/machinery/light/small/directional/south,
+/turf/open/floor/iron/smooth,
+/area/station/command/gateway)
 "hAW" = (
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -22844,30 +22894,6 @@
 /obj/structure/chair/stool/directional/east,
 /turf/open/floor/iron/cafeteria,
 /area/station/security/prison/mess)
-"iGM" = (
-/obj/effect/turf_decal/bot,
-/obj/machinery/light/cold/dim/directional/east,
-/obj/machinery/newscaster/directional/east,
-/obj/structure/cable,
-/obj/structure/table/reinforced,
-/obj/item/paper_bin{
-	pixel_x = 5;
-	pixel_y = 19
-	},
-/obj/item/pen{
-	pixel_x = 5;
-	pixel_y = 20
-	},
-/obj/machinery/cell_charger{
-	pixel_x = 2;
-	pixel_y = 1
-	},
-/obj/item/stock_parts/power_store/cell/high{
-	pixel_x = 2;
-	pixel_y = 2
-	},
-/turf/open/floor/iron/smooth,
-/area/station/engineering/break_room)
 "iGO" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/broken_flooring/pile/directional/east,
@@ -22935,22 +22961,6 @@
 	},
 /turf/open/floor/iron/dark/textured_edge,
 /area/station/command/heads_quarters/hop)
-"iIK" = (
-/obj/effect/turf_decal/bot,
-/obj/structure/rack,
-/obj/item/stack/sheet/plasteel/fifty,
-/obj/item/stack/sheet/plastic/five,
-/obj/item/stack/sheet/rglass/fifty,
-/obj/item/storage/medkit/fire{
-	pixel_x = 1;
-	pixel_y = 4
-	},
-/obj/machinery/airalarm/directional/east,
-/obj/item/stock_parts/power_store/cell/emproof{
-	pixel_y = 9
-	},
-/turf/open/floor/iron/small,
-/area/station/engineering/break_room)
 "iIN" = (
 /obj/structure/cable,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -23216,12 +23226,6 @@
 /obj/machinery/recharge_station,
 /turf/open/floor/plating,
 /area/station/maintenance/department/bridge)
-"iLZ" = (
-/obj/structure/table,
-/obj/machinery/cell_charger,
-/obj/item/stock_parts/power_store/cell/high,
-/turf/open/floor/circuit,
-/area/station/maintenance/port/aft)
 "iMg" = (
 /obj/structure/closet/crate,
 /obj/effect/turf_decal/stripes/line{
@@ -24139,6 +24143,15 @@
 "jaQ" = (
 /turf/open/floor/catwalk_floor/iron_dark,
 /area/station/security/processing)
+"jbc" = (
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/obj/effect/turf_decal/stripes/line{
+	dir = 4
+	},
+/obj/structure/table/reinforced,
+/obj/machinery/cell_charger,
+/turf/open/floor/iron/dark,
+/area/station/science/robotics/lab)
 "jbd" = (
 /obj/structure/cable,
 /obj/effect/spawner/structure/window/reinforced,
@@ -24217,6 +24230,10 @@
 /obj/machinery/door/window/right/directional/south,
 /turf/open/floor/plating,
 /area/station/service/chapel/funeral)
+"jcx" = (
+/obj/structure/filingcabinet/chestdrawer,
+/turf/open/floor/iron/grimy,
+/area/station/engineering/main)
 "jcE" = (
 /obj/structure/cable,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -25600,6 +25617,18 @@
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/iron/smooth,
 /area/station/cargo/warehouse)
+"jCY" = (
+/obj/structure/table/greyscale,
+/obj/item/screwdriver,
+/obj/item/stack/cable_coil/cut{
+	pixel_x = 11;
+	pixel_y = 7
+	},
+/obj/machinery/camera/directional/west{
+	c_tag = "Engineering - Office"
+	},
+/turf/open/floor/iron/grimy,
+/area/station/engineering/main)
 "jCZ" = (
 /obj/machinery/door/window/brigdoor/left/directional/west{
 	id = "Cell 1";
@@ -27147,12 +27176,15 @@
 /obj/machinery/airalarm/directional/south,
 /turf/open/floor/iron/smooth,
 /area/station/maintenance/solars/starboard/fore)
+<<<<<<< HEAD
 "kbI" = (
 /obj/structure/table/glass,
 /obj/machinery/cell_charger,
 /obj/item/stock_parts/power_store/cell,
 /turf/open/floor/iron/white,
 /area/station/science/auxlab/firing_range)
+=======
+>>>>>>> e29081ffacf ([MIRROR] Birdshot Service Fixes (#3333))
 "kci" = (
 /obj/structure/cable,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -27804,18 +27836,6 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /turf/open/floor/iron/small,
 /area/station/maintenance/department/engine/atmos)
-"kmP" = (
-/obj/effect/turf_decal/tile/purple/opposingcorners,
-/obj/effect/turf_decal/siding/green{
-	dir = 9
-	},
-/obj/structure/table,
-/obj/machinery/cell_charger,
-/obj/item/stock_parts/power_store/cell/high,
-/obj/machinery/power/apc/auto_name/directional/west,
-/obj/structure/cable,
-/turf/open/floor/iron/cafeteria,
-/area/station/science/circuits)
 "kmT" = (
 /obj/structure/closet/firecloset,
 /turf/open/floor/plating,
@@ -29690,6 +29710,24 @@
 /obj/effect/mapping_helpers/airlock/abandoned,
 /turf/open/floor/wood,
 /area/station/maintenance/starboard/greater)
+"kWg" = (
+/obj/structure/table/greyscale,
+/obj/item/pen{
+	pixel_x = 13;
+	pixel_y = 4
+	},
+/obj/machinery/light/small/directional/south,
+/obj/item/flatpack{
+	board = /obj/item/circuitboard/machine/flatpacker;
+	pixel_x = -6;
+	pixel_y = 5
+	},
+/obj/item/multitool{
+	pixel_x = 7;
+	pixel_y = -2
+	},
+/turf/open/floor/iron/grimy,
+/area/station/engineering/main)
 "kWk" = (
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -30139,10 +30177,13 @@
 	pixel_x = 5;
 	pixel_y = 9
 	},
+<<<<<<< HEAD
 /obj/item/cigarette/candy{
 	pixel_x = -3;
 	pixel_y = 10
 	},
+=======
+>>>>>>> e29081ffacf ([MIRROR] Birdshot Service Fixes (#3333))
 /obj/item/food/gumball{
 	pixel_x = 2;
 	pixel_y = 5
@@ -30665,6 +30706,19 @@
 	},
 /turf/open/floor/iron,
 /area/station/cargo/storage)
+"lkQ" = (
+/obj/effect/turf_decal/bot,
+/obj/structure/rack,
+/obj/item/stack/sheet/plasteel/fifty,
+/obj/item/stack/sheet/plastic/five,
+/obj/item/stack/sheet/rglass/fifty,
+/obj/item/storage/medkit/fire{
+	pixel_x = 1;
+	pixel_y = 4
+	},
+/obj/machinery/airalarm/directional/east,
+/turf/open/floor/iron/small,
+/area/station/engineering/break_room)
 "lkR" = (
 /obj/structure/cable,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -31927,13 +31981,6 @@
 /obj/item/radio/intercom/directional/west,
 /turf/open/floor/iron/smooth,
 /area/station/command/gateway)
-"lGJ" = (
-/obj/structure/filingcabinet/chestdrawer,
-/obj/item/book/manual/wiki/engineering_guide{
-	pixel_y = 6
-	},
-/turf/open/floor/iron/grimy,
-/area/station/engineering/main)
 "lGK" = (
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -32468,6 +32515,7 @@
 /area/station/engineering/atmos)
 "lNF" = (
 /obj/effect/spawner/random/entertainment/lighter,
+<<<<<<< HEAD
 /obj/item/cigarette/rollie/mindbreaker{
 	pixel_x = -2;
 	pixel_y = 6
@@ -32475,6 +32523,8 @@
 /obj/item/cigarette/rollie/trippy{
 	pixel_x = 4
 	},
+=======
+>>>>>>> e29081ffacf ([MIRROR] Birdshot Service Fixes (#3333))
 /obj/effect/mapping_helpers/burnt_floor,
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/plating,
@@ -32996,9 +33046,12 @@
 	pixel_x = 5;
 	pixel_y = -5
 	},
+<<<<<<< HEAD
 /obj/item/cigarette/cigar/cohiba{
 	pixel_y = 4
 	},
+=======
+>>>>>>> e29081ffacf ([MIRROR] Birdshot Service Fixes (#3333))
 /turf/open/floor/iron/dark/small,
 /area/station/commons/fitness/locker_room)
 "lWz" = (
@@ -33150,10 +33203,13 @@
 	pixel_x = -3;
 	pixel_y = 10
 	},
+<<<<<<< HEAD
 /obj/item/cigarette/cigar{
 	pixel_x = -1;
 	pixel_y = -2
 	},
+=======
+>>>>>>> e29081ffacf ([MIRROR] Birdshot Service Fixes (#3333))
 /obj/item/lighter{
 	pixel_x = 11;
 	pixel_y = -7
@@ -33428,17 +33484,6 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /turf/open/floor/plating,
 /area/station/maintenance/starboard/aft)
-"mcj" = (
-/obj/effect/turf_decal/tile/yellow/opposingcorners,
-/obj/structure/table/reinforced/titaniumglass,
-/obj/item/rcl/pre_loaded,
-/obj/item/stock_parts/power_store/cell/high{
-	pixel_y = 17
-	},
-/obj/machinery/light/small/directional/south,
-/obj/structure/secure_safe/directional/east,
-/turf/open/floor/iron,
-/area/station/command/heads_quarters/ce)
 "mcl" = (
 /obj/structure/alien/weeds,
 /obj/effect/gibspawner/xeno,
@@ -34688,12 +34733,6 @@
 /obj/machinery/light/small/directional/east,
 /turf/open/misc/sandy_dirt,
 /area/station/hallway/primary/central/fore)
-"mAK" = (
-/obj/structure/table/greyscale,
-/obj/item/clothing/gloves/color/yellow,
-/obj/item/wrench,
-/turf/open/floor/iron/grimy,
-/area/station/engineering/main)
 "mAL" = (
 /obj/structure/window/reinforced/spawner/directional/north,
 /turf/open/floor/iron,
@@ -34950,22 +34989,6 @@
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/circuit,
 /area/station/tcommsat/server)
-"mFH" = (
-/obj/structure/table/greyscale,
-/obj/item/screwdriver,
-/obj/item/stack/cable_coil/cut{
-	pixel_x = 11;
-	pixel_y = 7
-	},
-/obj/machinery/camera/directional/west{
-	c_tag = "Engineering - Office"
-	},
-/obj/item/stock_parts/power_store/cell/emproof{
-	pixel_x = -6;
-	pixel_y = 9
-	},
-/turf/open/floor/iron/grimy,
-/area/station/engineering/main)
 "mFL" = (
 /obj/structure/table,
 /obj/effect/turf_decal/siding/thinplating_new/terracotta{
@@ -35016,10 +35039,13 @@
 	pixel_y = 2
 	},
 /obj/item/wrench,
+<<<<<<< HEAD
 /obj/item/cigarette/xeno{
 	pixel_x = -3;
 	pixel_y = -9
 	},
+=======
+>>>>>>> e29081ffacf ([MIRROR] Birdshot Service Fixes (#3333))
 /obj/item/clothing/head/utility/welding,
 /turf/open/floor/iron/small,
 /area/station/maintenance/department/engine/atmos)
@@ -35512,22 +35538,6 @@
 /obj/effect/turf_decal/tile/neutral/fourcorners,
 /turf/open/floor/iron,
 /area/station/hallway/primary/aft)
-"mOx" = (
-/obj/item/stack/sheet/iron/fifty,
-/obj/item/stack/rods/fifty,
-/obj/item/stack/sheet/glass/fifty,
-/obj/item/electronics/airlock,
-/obj/item/electronics/airlock,
-/obj/item/stock_parts/power_store/cell/high,
-/obj/item/stack/sheet/mineral/plasma{
-	amount = 30
-	},
-/obj/item/gps,
-/obj/structure/closet/crate/engineering,
-/obj/machinery/light/cold/directional/east,
-/obj/item/clothing/gloves/color/yellow,
-/turf/open/floor/iron/dark/small,
-/area/station/engineering/storage_shared)
 "mOI" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/light/small/directional/south,
@@ -38228,8 +38238,9 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /turf/open/floor/iron/smooth,
 /area/station/cargo/warehouse)
-"nLM" = (
+"nLN" = (
 /obj/structure/cable,
+<<<<<<< HEAD
 /obj/structure/table/reinforced,
 /obj/item/stack/cable_coil{
 	pixel_x = -3;
@@ -38243,6 +38254,8 @@
 /area/station/engineering/storage/tech)
 "nLN" = (
 /obj/structure/cable,
+=======
+>>>>>>> e29081ffacf ([MIRROR] Birdshot Service Fixes (#3333))
 /obj/structure/disposalpipe/segment,
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/plating,
@@ -39022,6 +39035,7 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /obj/machinery/door/airlock/public/glass{
 	name = "Cargo Botique"
+<<<<<<< HEAD
 	},
 /obj/machinery/door/firedoor,
 /turf/open/floor/iron/textured_half{
@@ -39032,16 +39046,14 @@
 /obj/effect/turf_decal/tile/neutral/fourcorners,
 /obj/effect/turf_decal/stripes/line{
 	dir = 4
+=======
+>>>>>>> e29081ffacf ([MIRROR] Birdshot Service Fixes (#3333))
 	},
-/obj/structure/table/reinforced,
-/obj/machinery/cell_charger,
-/obj/item/stock_parts/power_store/cell/high{
-	pixel_x = 4;
-	pixel_y = 5
+/obj/machinery/door/firedoor,
+/turf/open/floor/iron/textured_half{
+	dir = 1
 	},
-/obj/item/stock_parts/power_store/cell/high,
-/turf/open/floor/iron/dark,
-/area/station/science/robotics/lab)
+/area/station/hallway/primary/central/fore)
 "obd" = (
 /obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{
 	dir = 10
@@ -40691,18 +40703,6 @@
 /obj/machinery/atmospherics/pipe/layer_manifold/visible,
 /turf/open/floor/plating,
 /area/station/engineering/atmos/space_catwalk)
-"oGo" = (
-/obj/structure/table/glass,
-/obj/item/stock_parts/power_store/cell/high{
-	pixel_x = 11;
-	pixel_y = 6
-	},
-/obj/item/folder/blue{
-	pixel_x = -3;
-	pixel_y = 2
-	},
-/turf/open/floor/carpet/executive,
-/area/station/command/meeting_room)
 "oGJ" = (
 /obj/effect/turf_decal/trimline/neutral/line{
 	dir = 1
@@ -40763,24 +40763,6 @@
 	dir = 1
 	},
 /area/station/security/execution/transfer)
-"oHJ" = (
-/obj/structure/table/greyscale,
-/obj/item/pen{
-	pixel_x = 13;
-	pixel_y = 4
-	},
-/obj/machinery/light/small/directional/south,
-/obj/item/flatpack{
-	board = /obj/item/circuitboard/machine/flatpacker;
-	pixel_x = -6;
-	pixel_y = 5
-	},
-/obj/item/multitool{
-	pixel_x = 7;
-	pixel_y = -2
-	},
-/turf/open/floor/iron/grimy,
-/area/station/engineering/main)
 "oHO" = (
 /obj/structure/chair/plastic{
 	dir = 1
@@ -42635,9 +42617,12 @@
 /area/station/service/kitchen)
 "pot" = (
 /obj/structure/table/wood,
+<<<<<<< HEAD
 /obj/item/cigarette/cigar/premium{
 	pixel_y = 5
 	},
+=======
+>>>>>>> e29081ffacf ([MIRROR] Birdshot Service Fixes (#3333))
 /turf/open/floor/stone,
 /area/station/service/abandoned_gambling_den)
 "pox" = (
@@ -42980,6 +42965,26 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /turf/open/floor/iron/white/small,
 /area/station/service/janitor)
+"psL" = (
+/obj/effect/turf_decal/bot,
+/obj/machinery/light/cold/dim/directional/east,
+/obj/machinery/newscaster/directional/east,
+/obj/structure/cable,
+/obj/structure/table/reinforced,
+/obj/item/paper_bin{
+	pixel_x = 5;
+	pixel_y = 19
+	},
+/obj/item/pen{
+	pixel_x = 5;
+	pixel_y = 20
+	},
+/obj/machinery/cell_charger{
+	pixel_x = 2;
+	pixel_y = 1
+	},
+/turf/open/floor/iron/smooth,
+/area/station/engineering/break_room)
 "psP" = (
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -43303,6 +43308,7 @@
 "pxO" = (
 /obj/structure/disposalpipe/segment{
 	dir = 9
+<<<<<<< HEAD
 	},
 /obj/machinery/duct,
 /turf/open/floor/iron/freezer,
@@ -43311,10 +43317,12 @@
 /obj/structure/table,
 /obj/machinery/cell_charger{
 	pixel_y = 5
+=======
+>>>>>>> e29081ffacf ([MIRROR] Birdshot Service Fixes (#3333))
 	},
-/obj/item/stock_parts/power_store/cell/high,
-/turf/open/floor/engine,
-/area/station/science/xenobiology)
+/obj/machinery/duct,
+/turf/open/floor/iron/freezer,
+/area/station/service/kitchen/coldroom)
 "pxZ" = (
 /obj/structure/rack,
 /obj/effect/spawner/random/maintenance,
@@ -45224,6 +45232,17 @@
 /obj/structure/mirror/directional/north,
 /turf/open/floor/iron/white/small,
 /area/station/maintenance/port/aft)
+"qaH" = (
+/obj/structure/cable,
+/obj/effect/turf_decal/siding/dark_red/corner{
+	dir = 1
+	},
+/obj/structure/rack,
+/obj/effect/spawner/random/armory/riot_helmet,
+/obj/effect/spawner/random/armory/bulletproof_helmet,
+/obj/effect/spawner/random/armory/dragnet,
+/turf/open/floor/iron/dark/small,
+/area/station/ai_monitored/security/armory)
 "qaV" = (
 /obj/structure/disposalpipe/segment{
 	dir = 10
@@ -45818,6 +45837,13 @@
 	},
 /turf/open/floor/plating,
 /area/station/tcommsat/server)
+"qiO" = (
+/obj/structure/table,
+/obj/machinery/cell_charger{
+	pixel_y = 5
+	},
+/turf/open/floor/engine,
+/area/station/science/xenobiology)
 "qjh" = (
 /obj/machinery/light_switch/directional/west,
 /turf/open/floor/iron/white,
@@ -48488,6 +48514,14 @@
 	},
 /turf/open/floor/iron/smooth,
 /area/station/engineering/atmos)
+<<<<<<< HEAD
+=======
+"qYq" = (
+/obj/structure/table/glass,
+/obj/machinery/cell_charger,
+/turf/open/floor/iron/white,
+/area/station/science/auxlab/firing_range)
+>>>>>>> e29081ffacf ([MIRROR] Birdshot Service Fixes (#3333))
 "qYu" = (
 /obj/structure/cable,
 /obj/structure/disposalpipe/segment{
@@ -48832,10 +48866,13 @@
 	pixel_y = -3;
 	pixel_x = -2
 	},
+<<<<<<< HEAD
 /obj/item/cigarette{
 	pixel_x = 6;
 	pixel_y = 4
 	},
+=======
+>>>>>>> e29081ffacf ([MIRROR] Birdshot Service Fixes (#3333))
 /obj/item/clothing/mask/gas{
 	pixel_y = 5
 	},
@@ -49138,7 +49175,10 @@
 	dir = 10
 	},
 /obj/structure/table,
+<<<<<<< HEAD
 /obj/item/cigarette,
+=======
+>>>>>>> e29081ffacf ([MIRROR] Birdshot Service Fixes (#3333))
 /obj/item/toy/toy_dagger,
 /obj/item/clothing/head/collectable/paper,
 /obj/item/toy/figure/roboticist{
@@ -51086,6 +51126,27 @@
 /obj/structure/sign/poster/official/random/directional/north,
 /turf/open/floor/plating,
 /area/station/maintenance/department/engine)
+<<<<<<< HEAD
+=======
+"rLu" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/closet/crate,
+/obj/item/reagent_containers/cup/glass/bottle/vodka,
+/obj/item/food/grown/citrus/orange,
+/obj/item/food/grown/citrus/orange{
+	pixel_x = 4;
+	pixel_y = 2
+	},
+/obj/item/food/grown/grapes/green{
+	pixel_y = -4;
+	pixel_x = -6
+	},
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
+	dir = 8
+	},
+/turf/open/floor/iron/small,
+/area/station/maintenance/department/engine/atmos)
+>>>>>>> e29081ffacf ([MIRROR] Birdshot Service Fixes (#3333))
 "rLw" = (
 /obj/structure/cable,
 /obj/structure/disposalpipe/segment{
@@ -54154,6 +54215,20 @@
 /obj/machinery/camera/autoname/directional/south,
 /turf/open/floor/iron/cafeteria,
 /area/station/security/prison/mess)
+<<<<<<< HEAD
+=======
+"sFD" = (
+/obj/effect/turf_decal/tile/purple/opposingcorners,
+/obj/effect/turf_decal/siding/green{
+	dir = 9
+	},
+/obj/structure/table,
+/obj/machinery/cell_charger,
+/obj/machinery/power/apc/auto_name/directional/west,
+/obj/structure/cable,
+/turf/open/floor/iron/cafeteria,
+/area/station/science/circuits)
+>>>>>>> e29081ffacf ([MIRROR] Birdshot Service Fixes (#3333))
 "sFH" = (
 /obj/structure/disposalpipe/segment{
 	dir = 4
@@ -54570,11 +54645,17 @@
 	},
 /turf/open/floor/iron,
 /area/station/hallway/secondary/exit/departure_lounge)
-"sNr" = (
+"sNv" = (
 /obj/structure/cable,
-/obj/effect/turf_decal/siding/dark_red/corner{
+/obj/structure/disposalpipe/segment,
+/obj/machinery/door/airlock/maintenance{
+	name = "Maintenance"
+	},
+/obj/effect/mapping_helpers/airlock/access/any/service/maintenance,
+/obj/effect/mapping_helpers/airlock/unres{
 	dir = 1
 	},
+<<<<<<< HEAD
 /obj/structure/rack,
 /obj/effect/spawner/random/armory/riot_helmet,
 /obj/effect/spawner/random/armory/bulletproof_helmet,
@@ -54591,6 +54672,8 @@
 /obj/effect/mapping_helpers/airlock/unres{
 	dir = 1
 	},
+=======
+>>>>>>> e29081ffacf ([MIRROR] Birdshot Service Fixes (#3333))
 /turf/open/floor/plating,
 /area/station/maintenance/port/greater)
 "sNz" = (
@@ -55611,11 +55694,13 @@
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
 /turf/open/floor/iron/white,
 /area/station/medical/treatment_center)
-"tcA" = (
-/obj/structure/filingcabinet/chestdrawer,
-/obj/item/stock_parts/power_store/cell/emproof{
-	pixel_y = 9
+"tcB" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/door/airlock/hydroponics/glass{
+	name = "Service Breakroom"
 	},
+<<<<<<< HEAD
 /turf/open/floor/iron/grimy,
 /area/station/engineering/main)
 "tcB" = (
@@ -55624,6 +55709,8 @@
 /obj/machinery/door/airlock/hydroponics/glass{
 	name = "Service Breakroom"
 	},
+=======
+>>>>>>> e29081ffacf ([MIRROR] Birdshot Service Fixes (#3333))
 /obj/effect/mapping_helpers/airlock/access/any/service/general,
 /obj/machinery/duct,
 /turf/open/floor/iron/textured_half{
@@ -56856,6 +56943,19 @@
 	},
 /turf/open/floor/tram,
 /area/station/maintenance/department/medical/central)
+"twR" = (
+/obj/structure/table/glass,
+/obj/machinery/cell_charger,
+/obj/machinery/status_display/evac/directional/north,
+/obj/structure/sign/directions/supply/directional/west,
+/obj/structure/sign/directions/engineering/directional/west{
+	pixel_y = 8
+	},
+/obj/structure/sign/directions/command/directional/west{
+	pixel_y = -8
+	},
+/turf/open/floor/iron/white,
+/area/station/hallway/primary/starboard)
 "twZ" = (
 /obj/structure/chair/sofa/bench/right,
 /obj/machinery/newscaster/directional/north,
@@ -57670,7 +57770,10 @@
 	pixel_x = -2;
 	pixel_y = -3
 	},
+<<<<<<< HEAD
 /obj/item/cigarette/cigar,
+=======
+>>>>>>> e29081ffacf ([MIRROR] Birdshot Service Fixes (#3333))
 /obj/effect/mapping_helpers/broken_floor,
 /obj/machinery/light_switch/directional/south,
 /turf/open/floor/iron/smooth,
@@ -62962,6 +63065,18 @@
 /obj/structure/alien/weeds,
 /turf/open/floor/plating,
 /area/station/maintenance/starboard/greater)
+"vjx" = (
+/obj/structure/table,
+/obj/machinery/cell_charger{
+	pixel_y = 18
+	},
+/obj/item/clothing/suit/hazardvest,
+/obj/effect/turf_decal/siding/thinplating_new/terracotta{
+	dir = 4
+	},
+/obj/machinery/firealarm/directional/west,
+/turf/open/floor/iron,
+/area/station/command/teleporter)
 "vjI" = (
 /obj/machinery/door/airlock{
 	name = "Bathrooms"
@@ -63896,6 +64011,21 @@
 	},
 /turf/open/floor/iron,
 /area/station/cargo/sorting)
+<<<<<<< HEAD
+=======
+"vuK" = (
+/obj/structure/cable,
+/obj/structure/table/reinforced,
+/obj/item/stack/cable_coil{
+	pixel_x = -3;
+	pixel_y = 3
+	},
+/obj/item/electronics/airlock{
+	pixel_y = 13
+	},
+/turf/open/floor/iron,
+/area/station/engineering/storage/tech)
+>>>>>>> e29081ffacf ([MIRROR] Birdshot Service Fixes (#3333))
 "vuL" = (
 /obj/structure/disposalpipe/segment{
 	dir = 5
@@ -66686,6 +66816,18 @@
 /obj/structure/flora/bush/sunny/style_random,
 /turf/open/floor/grass,
 /area/station/service/chapel)
+<<<<<<< HEAD
+=======
+"wjY" = (
+/obj/structure/window/spawner/directional/east,
+/obj/structure/table/wood,
+/obj/machinery/cell_charger{
+	pixel_y = 5
+	},
+/obj/structure/sign/poster/official/random/directional/north,
+/turf/open/floor/wood/tile,
+/area/station/command/corporate_showroom)
+>>>>>>> e29081ffacf ([MIRROR] Birdshot Service Fixes (#3333))
 "wjZ" = (
 /obj/structure/cable,
 /obj/effect/spawner/structure/window/reinforced,
@@ -66740,6 +66882,17 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /turf/open/floor/iron/chapel,
 /area/station/maintenance/starboard/greater)
+<<<<<<< HEAD
+=======
+"wld" = (
+/obj/effect/turf_decal/tile/yellow/opposingcorners,
+/obj/structure/table/reinforced/titaniumglass,
+/obj/item/rcl/pre_loaded,
+/obj/machinery/light/small/directional/south,
+/obj/structure/secure_safe/directional/east,
+/turf/open/floor/iron,
+/area/station/command/heads_quarters/ce)
+>>>>>>> e29081ffacf ([MIRROR] Birdshot Service Fixes (#3333))
 "wlf" = (
 /obj/effect/landmark/start/hangover,
 /turf/open/floor/glass,
@@ -88401,7 +88554,7 @@ mVt
 dIt
 huN
 jBr
-sNr
+qaH
 syk
 vYD
 lox
@@ -89601,7 +89754,7 @@ ojz
 sLu
 urE
 ess
-mFH
+jCY
 vfG
 oSw
 jyl
@@ -89612,7 +89765,7 @@ obW
 grF
 ecn
 kmH
-bHp
+rLu
 cPe
 obW
 blb
@@ -90375,7 +90528,7 @@ euP
 all
 eWf
 eIx
-oHJ
+kWg
 bNq
 wxG
 uIX
@@ -90614,7 +90767,7 @@ ufR
 xYG
 xYG
 rDV
-mOx
+cGb
 dwC
 iAk
 sql
@@ -90628,11 +90781,11 @@ sHO
 drI
 cRq
 rbl
-tcA
+jcx
 uKO
 vfG
-lGJ
-mAK
+fnm
+gUo
 bNq
 hOX
 fEU
@@ -92198,7 +92351,7 @@ eEq
 sRg
 gQG
 hbw
-aGI
+hgb
 hmQ
 pGE
 jug
@@ -92286,7 +92439,7 @@ xAR
 trp
 etx
 fwS
-iLZ
+ePg
 trp
 jRx
 xul
@@ -92944,7 +93097,7 @@ paX
 rdH
 gpI
 ceP
-mcj
+wld
 gpI
 qCT
 rWH
@@ -93193,7 +93346,7 @@ cED
 nQE
 rLj
 gNt
-iIK
+lkQ
 gKL
 fMA
 gFF
@@ -95246,7 +95399,7 @@ gwl
 pPm
 jKU
 qbP
-iGM
+psL
 nck
 tau
 gKL
@@ -95537,7 +95690,7 @@ sUy
 muW
 mOk
 iap
-oGo
+gSQ
 iDk
 sUy
 jaK
@@ -97082,7 +97235,11 @@ xMk
 xsh
 hcc
 xGJ
+<<<<<<< HEAD
 bBN
+=======
+wjY
+>>>>>>> e29081ffacf ([MIRROR] Birdshot Service Fixes (#3333))
 jwi
 qtd
 hOg
@@ -98890,7 +99047,7 @@ myT
 iMg
 iYj
 sDp
-gZy
+vjx
 kke
 kgz
 oGJ
@@ -104791,7 +104948,7 @@ gKg
 xbl
 uhI
 yhW
-clV
+hAQ
 gcz
 hyv
 fyH
@@ -109476,9 +109633,9 @@ aZL
 ciR
 mwu
 yeP
-enq
+aXg
 ivY
-nLM
+vuK
 ssz
 ssz
 kHo
@@ -112024,7 +112181,7 @@ vDX
 vDX
 xww
 vDX
-eDr
+twR
 xdc
 xtL
 xQW
@@ -118461,7 +118618,7 @@ wHg
 mbZ
 xia
 jYr
-oaY
+jbc
 lZB
 ivz
 jYr
@@ -119244,7 +119401,7 @@ pXQ
 kwA
 xaR
 sYa
-pxW
+qiO
 xlP
 gpy
 xlP
@@ -121527,7 +121684,7 @@ oyQ
 pVa
 qjh
 qzL
-kbI
+qYq
 xok
 vhC
 sHV
@@ -122844,7 +123001,7 @@ ifa
 ifa
 ifa
 ifa
-kmP
+sFD
 vLi
 tQr
 ifa