[MIRROR] [MDB Ignore] Combines Cargobus consoles with Dept. Order Con…

…soles, freeing all departments of 1 whole tile of space (#1665) * [MDB Ignore] Combines Cargobus consoles with Dept. Order Consoles, freeing all departments of 1 whole tile of space * Map reset * Map reset * Removes the deleted consoles from our maps * Blueshift, voidraptor fixes * Update Blueshift.dmm --------- Co-authored-by: MrMelbert <[email protected]> Co-authored-by: Mal <[email protected]>
Fluffy-Frontier · Mar 28, 2024 · b8cc01e · b8cc01e
1 parent 7817c37
commit b8cc01e
Show file tree

Hide file tree

Showing 21 changed files with 1,103 additions and 1,409 deletions.
diff --git a/_maps/map_files/Birdshot/birdshot.dmm b/_maps/map_files/Birdshot/birdshot.dmm
@@ -2392,16 +2392,6 @@
 /obj/machinery/light/small/directional/west,
 /turf/open/floor/grass,
 /area/station/service/chapel)
-"aWC" = (
-/obj/machinery/computer/department_orders/engineering{
-	dir = 8
-	},
-/obj/effect/turf_decal/stripes/line{
-	dir = 8
-	},
-/obj/machinery/light/small/directional/east,
-/turf/open/floor/plating,
-/area/station/engineering/break_room)
 "aXI" = (
 /turf/closed/wall/r_wall,
 /area/station/science/lobby)
@@ -5426,11 +5416,6 @@
 /obj/effect/mapping_helpers/airlock/access/any/service/maintenance,
 /turf/open/floor/plating,
 /area/station/maintenance/central/greater)
-"ceK" = (
-/obj/effect/turf_decal/tile/neutral/fourcorners,
-/obj/structure/bed/medical/emergency,
-/turf/open/floor/iron/dark,
-/area/station/medical/medbay/central)
 "ceZ" = (
 /obj/structure/cable,
 /turf/open/floor/plating,
@@ -12932,15 +12917,6 @@
 /obj/machinery/firealarm/directional/east,
 /turf/open/floor/circuit/red,
 /area/station/ai_monitored/turret_protected/ai)
-"eNV" = (
-/obj/machinery/modular_computer/preset/cargochat/engineering{
-	dir = 8
-	},
-/obj/effect/turf_decal/stripes/line{
-	dir = 8
-	},
-/turf/open/floor/plating,
-/area/station/engineering/break_room)
 "eOo" = (
 /obj/machinery/atmospherics/pipe/smart/simple/supply/visible{
 	dir = 9
@@ -16583,15 +16559,6 @@
 /obj/effect/spawner/random/structure/girder,
 /turf/open/floor/plating,
 /area/station/ai_monitored/turret_protected/aisat/maint)
-"gcf" = (
-/obj/effect/turf_decal/tile/neutral/fourcorners,
-/obj/machinery/computer/department_orders/medical{
-	dir = 1
-	},
-/obj/item/radio/intercom/directional/south,
-/obj/machinery/camera/autoname/directional/south,
-/turf/open/floor/iron/dark,
-/area/station/medical/medbay/central)
 "gcm" = (
 /obj/effect/spawner/random/structure/crate,
 /turf/open/floor/plating/rust,
@@ -21100,6 +21067,7 @@
 	},
 /turf/open/floor/iron,
 /area/station/hallway/primary/fore)
+<<<<<<< HEAD
 "hBv" = (
 /obj/structure/disposalpipe/segment{
 	dir = 4
@@ -21119,6 +21087,8 @@
 	},
 /turf/open/floor/iron/textured_large,
 /area/station/command/heads_quarters/hop)
+=======
+>>>>>>> 95c538c3a57 ([MIRROR] [MDB Ignore] Combines Cargobus consoles with Dept. Order Consoles, freeing all departments of 1 whole tile of space (#1665))
 "hBA" = (
 /obj/structure/cable,
 /obj/effect/spawner/structure/window,
@@ -22367,6 +22337,7 @@
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/iron/dark,
 /area/station/medical/medbay/aft)
+<<<<<<< HEAD
 "ibq" = (
 /obj/structure/table/wood,
 /obj/structure/desk_bell{
@@ -22384,6 +22355,8 @@
 /obj/machinery/light/small/directional/west,
 /turf/open/floor/iron/textured_large,
 /area/station/hallway/primary/central/fore)
+=======
+>>>>>>> 95c538c3a57 ([MIRROR] [MDB Ignore] Combines Cargobus consoles with Dept. Order Consoles, freeing all departments of 1 whole tile of space (#1665))
 "ibv" = (
 /obj/item/kirbyplants/random,
 /turf/open/floor/iron,
@@ -25231,19 +25204,6 @@
 /obj/structure/alien/weeds,
 /turf/open/floor/plating,
 /area/station/maintenance/starboard/greater)
-"jco" = (
-/obj/effect/turf_decal/stripes/corner{
-	dir = 8
-	},
-/obj/machinery/rnd/production/circuit_imprinter,
-/obj/machinery/camera{
-	c_tag = "Engineering - Foyer - Starboard";
-	dir = 9
-	},
-/obj/effect/decal/cleanable/cobweb/cobweb2,
-/obj/machinery/airalarm/directional/east,
-/turf/open/floor/plating,
-/area/station/engineering/break_room)
 "jct" = (
 /obj/structure/cable,
 /obj/machinery/door/airlock/external{
@@ -26255,6 +26215,7 @@
 /obj/machinery/light/cold/directional/north,
 /turf/open/floor/iron/white/small,
 /area/station/medical/storage)
+<<<<<<< HEAD
 "jxV" = (
 /obj/effect/turf_decal/tile/blue,
 /obj/machinery/modular_computer/preset/id,
@@ -26283,6 +26244,8 @@
 	},
 /turf/open/floor/iron/dark/textured_corner,
 /area/station/command/heads_quarters/hop)
+=======
+>>>>>>> 95c538c3a57 ([MIRROR] [MDB Ignore] Combines Cargobus consoles with Dept. Order Consoles, freeing all departments of 1 whole tile of space (#1665))
 "jxZ" = (
 /obj/effect/turf_decal/siding/blue{
 	dir = 6
@@ -26483,17 +26446,6 @@
 	},
 /turf/open/floor/iron/dark/small,
 /area/station/ai_monitored/security/armory)
-"jBx" = (
-/obj/structure/disposalpipe/segment{
-	dir = 4
-	},
-/obj/effect/turf_decal/siding/white{
-	dir = 8
-	},
-/obj/structure/tank_holder/extinguisher,
-/obj/machinery/camera/autoname/directional/north,
-/turf/open/floor/iron/dark,
-/area/station/medical/medbay/central)
 "jBD" = (
 /obj/structure/table/wood,
 /obj/effect/mapping_helpers/broken_floor,
@@ -39337,13 +39289,16 @@
 /obj/machinery/light/small/directional/south,
 /turf/open/floor/iron/dark,
 /area/station/cargo/office)
+<<<<<<< HEAD
 "nZg" = (
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/iron/half,
 /area/station/hallway/primary/central/fore)
+=======
+>>>>>>> 95c538c3a57 ([MIRROR] [MDB Ignore] Combines Cargobus consoles with Dept. Order Consoles, freeing all departments of 1 whole tile of space (#1665))
 "nZh" = (
 /obj/structure/table,
 /obj/item/stock_parts/scanning_module{
@@ -51919,12 +51874,6 @@
 /obj/machinery/light_switch/directional/north,
 /turf/open/floor/iron/dark,
 /area/station/science/genetics)
-"sbt" = (
-/obj/structure/table,
-/obj/effect/turf_decal/bot,
-/obj/machinery/light/small/directional/north,
-/turf/open/floor/iron/kitchen/small,
-/area/station/hallway/secondary/service)
 "sbx" = (
 /obj/structure/chair/sofa/bench/right{
 	dir = 8
@@ -53410,14 +53359,6 @@
 /obj/structure/flora/bush/flowers_yw/style_random,
 /turf/open/misc/sandy_dirt,
 /area/station/medical/medbay/lobby)
-"syE" = (
-/obj/effect/turf_decal/tile/neutral/fourcorners,
-/obj/structure/window/spawner/directional/west,
-/obj/machinery/vending/medical,
-/obj/machinery/camera/directional/south,
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/iron/dark,
-/area/station/medical/medbay/central)
 "syG" = (
 /obj/effect/spawner/xmastree,
 /turf/open/floor/grass,
@@ -53669,15 +53610,6 @@
 	},
 /turf/open/floor/iron/dark,
 /area/station/science/ordnance/testlab)
-"sDD" = (
-/obj/structure/disposalpipe/segment,
-/obj/effect/mapping_helpers/broken_floor,
-/obj/machinery/modular_computer/preset/cargochat/service{
-	dir = 4
-	},
-/obj/effect/turf_decal/delivery,
-/turf/open/floor/iron/kitchen/small,
-/area/station/hallway/secondary/service)
 "sDT" = (
 /obj/machinery/firealarm/directional/north,
 /obj/structure/cable,
@@ -56100,13 +56032,6 @@
 "tuZ" = (
 /turf/closed/wall,
 /area/station/security/brig/entrance)
-"tvg" = (
-/obj/effect/turf_decal/tile/neutral/fourcorners,
-/obj/machinery/modular_computer/preset/cargochat/medical{
-	dir = 1
-	},
-/turf/open/floor/iron/dark,
-/area/station/medical/medbay/central)
 "tvM" = (
 /obj/structure/flora/bush/fullgrass/style_random,
 /obj/structure/flora/bush/flowers_br/style_random,
@@ -61466,12 +61391,6 @@
 /obj/effect/spawner/structure/window/reinforced/tinted,
 /turf/open/floor/plating,
 /area/station/science/server)
-"viC" = (
-/obj/machinery/computer/department_orders/science{
-	dir = 1
-	},
-/turf/open/floor/iron/white,
-/area/station/science/research)
 "viK" = (
 /obj/structure/disposalpipe/segment,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -64974,13 +64893,6 @@
 	},
 /turf/open/floor/iron/cafeteria,
 /area/station/service/cafeteria)
-"wkl" = (
-/obj/effect/mapping_helpers/broken_floor,
-/obj/machinery/computer/department_orders/service,
-/obj/effect/turf_decal/delivery,
-/obj/structure/sign/poster/official/random/directional/north,
-/turf/open/floor/iron/kitchen/small,
-/area/station/hallway/secondary/service)
 "wkm" = (
 /obj/effect/turf_decal/tile/blue,
 /obj/effect/decal/cleanable/dirt,
@@ -65640,6 +65552,7 @@
 "wuM" = (
 /turf/closed/wall,
 /area/station/command/heads_quarters/qm)
+<<<<<<< HEAD
 "wvg" = (
 /obj/structure/cable,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -65658,6 +65571,8 @@
 	},
 /turf/open/floor/iron,
 /area/station/security/execution/transfer)
+=======
+>>>>>>> 95c538c3a57 ([MIRROR] [MDB Ignore] Combines Cargobus consoles with Dept. Order Consoles, freeing all departments of 1 whole tile of space (#1665))
 "wvn" = (
 /obj/structure/cable,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -70891,18 +70806,6 @@
 "xQJ" = (
 /turf/closed/wall,
 /area/station/service/abandoned_gambling_den/gaming)
-"xQK" = (
-/obj/effect/turf_decal/tile/dark_red{
-	dir = 1
-	},
-/obj/effect/turf_decal/siding/wideplating/dark/corner{
-	dir = 8
-	},
-/obj/machinery/computer/department_orders/security{
-	dir = 1
-	},
-/turf/open/floor/iron,
-/area/station/security/brig/entrance)
 "xQN" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
@@ -115581,7 +115484,7 @@ wPK
 xfc
 vRh
 xUV
-viC
+rpk
 uMU
 eAn
 bZN