diff --git a/_maps/map_files/Birdshot/birdshot.dmm b/_maps/map_files/Birdshot/birdshot.dmm index 7b7fd7a2eb3..722f286da3d 100644 --- 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,6 +39289,7 @@ /obj/machinery/light/small/directional/south, /turf/open/floor/iron/dark, /area/station/cargo/office) +<<<<<<< HEAD "nZg" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -39344,6 +39297,8 @@ /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 diff --git a/_maps/map_files/Deltastation/DeltaStation2.dmm b/_maps/map_files/Deltastation/DeltaStation2.dmm index 56237c8fea2..3deb0cdef2e 100644 --- a/_maps/map_files/Deltastation/DeltaStation2.dmm +++ b/_maps/map_files/Deltastation/DeltaStation2.dmm @@ -2543,6 +2543,14 @@ /obj/structure/grille/broken, /turf/open/space, /area/space/nearstation) +"aFp" = ( +/obj/structure/sign/warning/secure_area/directional/south, +/obj/effect/turf_decal/trimline/purple/filled/line{ + dir = 10 + }, +/obj/item/kirbyplants/organic/plant10, +/turf/open/floor/iron/white, +/area/station/science/research) "aFv" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -3738,6 +3746,15 @@ }, /turf/open/space/basic, /area/space/nearstation) +"aUZ" = ( +/obj/machinery/airalarm/directional/north, +/obj/structure/table, +/obj/machinery/fax{ + fax_name = "Service Hallway"; + name = "Service Fax Machine" + }, +/turf/open/floor/iron/checker, +/area/station/hallway/secondary/service) "aVo" = ( /obj/machinery/computer/security/hos{ dir = 1 @@ -17174,6 +17191,17 @@ }, /turf/open/floor/iron, /area/station/command/heads_quarters/qm) +"ekF" = ( +/obj/structure/sign/poster/official/random/directional/south, +/obj/machinery/light/directional/south, +/obj/structure/window/reinforced/spawner/directional/west, +/obj/structure/disposalpipe/trunk{ + dir = 4 + }, +/obj/machinery/disposal/bin, +/obj/effect/turf_decal/bot, +/turf/open/floor/iron, +/area/station/engineering/storage_shared) "ekM" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/cobweb/cobweb2, @@ -18252,6 +18280,15 @@ }, /turf/open/floor/iron/white, /area/station/medical/treatment_center) +"eyl" = ( +/obj/machinery/firealarm/directional/east, +/obj/effect/turf_decal/trimline/purple/filled/corner{ + dir = 8 + }, +/obj/machinery/airalarm/directional/south, +/obj/machinery/photocopier, +/turf/open/floor/iron/white, +/area/station/science/research) "eyr" = ( /obj/item/kirbyplants/random, /obj/machinery/power/apc/auto_name/directional/north, @@ -18993,6 +19030,7 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/station/service/abandoned_gambling_den/gaming) +<<<<<<< HEAD "eIu" = ( /obj/structure/table/reinforced, /obj/machinery/door/firedoor, @@ -19013,6 +19051,8 @@ /obj/item/folder/blue, /turf/open/floor/iron, /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)) "eIy" = ( /obj/structure/disposalpipe/segment{ dir = 5 @@ -20775,6 +20815,13 @@ }, /turf/open/floor/wood/large, /area/station/service/theater) +"fes" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron, +/area/station/security/office) "fez" = ( /obj/effect/landmark/start/hangover, /obj/effect/turf_decal/siding/wood/corner, @@ -22799,6 +22846,7 @@ /obj/structure/cable, /turf/open/floor/plating, /area/station/service/abandoned_gambling_den) +<<<<<<< HEAD "fEX" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -22809,6 +22857,20 @@ /obj/machinery/status_display/evac/directional/north, /turf/open/floor/iron/dark, /area/station/hallway/secondary/service) +======= +"fEV" = ( +/obj/structure/sign/poster/official/moth_epi/directional/west, +/obj/effect/turf_decal/bot, +/obj/structure/disposalpipe/trunk{ + dir = 1 + }, +/obj/machinery/disposal/bin, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/medical/storage) +>>>>>>> 95c538c3a57 ([MIRROR] [MDB Ignore] Combines Cargobus consoles with Dept. Order Consoles, freeing all departments of 1 whole tile of space (#1665)) "fFb" = ( /obj/structure/table, /obj/effect/spawner/random/entertainment/drugs{ @@ -24114,6 +24176,13 @@ }, /turf/open/floor/iron, /area/station/engineering/atmos) +"fWB" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/obj/item/radio/intercom/directional/north, +/turf/open/floor/iron/dark, +/area/station/hallway/secondary/service) "fWH" = ( /obj/effect/turf_decal/trimline/blue/filled/corner, /turf/open/floor/iron/white, @@ -24592,6 +24661,14 @@ }, /turf/open/floor/iron, /area/station/service/hydroponics) +"gch" = ( +/obj/structure/table, +/obj/item/clipboard, +/obj/item/stack/package_wrap, +/obj/item/hand_labeler, +/obj/effect/turf_decal/bot, +/turf/open/floor/iron/checker, +/area/station/hallway/secondary/service) "gci" = ( /obj/machinery/door/firedoor, /obj/machinery/door/poddoor/shutters/window/preopen{ @@ -26303,6 +26380,12 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/grimy, /area/station/command/heads_quarters/hop) +"guZ" = ( +/obj/machinery/light/small/directional/west, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/machinery/photobooth/security, +/turf/open/floor/iron/dark, +/area/station/security/execution/transfer) "gvf" = ( /obj/structure/window/reinforced/spawner/directional/north, /obj/structure/lattice, @@ -30842,6 +30925,16 @@ /obj/effect/mapping_helpers/airlock/access/all/service/kitchen, /turf/open/floor/iron/freezer, /area/station/service/kitchen/coldroom) +"hFQ" = ( +/obj/structure/disposalpipe/segment, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 8 + }, +/obj/structure/window/reinforced/spawner/directional/north, +/obj/item/kirbyplants/random, +/obj/effect/turf_decal/bot, +/turf/open/floor/iron, +/area/station/medical/storage) "hFS" = ( /obj/structure/cable, /obj/effect/turf_decal/stripes/line{ @@ -32099,6 +32192,28 @@ /obj/effect/turf_decal/bot, /turf/open/floor/iron, /area/station/engineering/atmos/hfr_room) +"hWA" = ( +/obj/structure/table/reinforced, +/obj/machinery/door/firedoor, +/obj/machinery/door/poddoor/preopen{ + id = "hopblast"; + name = "HoP Blast Door" + }, +/obj/machinery/door/window/brigdoor/left/directional/east{ + name = "Access Desk"; + req_access = list("hop") + }, +/obj/machinery/door/window/right/directional/west{ + name = "Access Queue" + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/structure/desk_bell{ + pixel_x = 7 + }, +/turf/open/floor/iron, +/area/station/command/heads_quarters/hop) "hWF" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -41376,6 +41491,15 @@ /obj/effect/landmark/start/hangover, /turf/open/floor/iron, /area/station/hallway/primary/fore) +"kix" = ( +/obj/effect/turf_decal/bot, +/obj/structure/extinguisher_cabinet/directional/south, +/obj/machinery/light/small/directional/south, +/obj/machinery/modular_computer/preset/cargochat/service{ + dir = 1 + }, +/turf/open/floor/iron/checker, +/area/station/hallway/secondary/service) "kiz" = ( /obj/structure/sign/poster/random/directional/east, /obj/structure/table, @@ -41957,6 +42081,16 @@ /obj/effect/landmark/event_spawn, /turf/open/floor/iron/grimy, /area/station/tcommsat/computer) +"kqI" = ( +/obj/structure/plaque/static_plaque/golden{ + pixel_y = -32 + }, +/obj/structure/reagent_dispensers/water_cooler, +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/security/office) "kqJ" = ( /obj/effect/turf_decal/tile/brown/anticorner/contrasted{ dir = 1 @@ -43560,6 +43694,13 @@ }, /turf/open/floor/iron/dark, /area/station/engineering/transit_tube) +"kNB" = ( +/obj/structure/table/wood, +/obj/item/papercutter, +/obj/item/paper/fluff/ids_for_dummies, +/obj/item/radio/intercom/directional/east, +/turf/open/floor/wood, +/area/station/command/heads_quarters/hop) "kNC" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -44664,6 +44805,15 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/maintenance/department/eva/abandoned) +"lcl" = ( +/obj/machinery/light_switch/directional/north, +/obj/structure/cable, +/obj/effect/turf_decal/loading_area{ + dir = 8 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron/textured, +/area/station/medical/storage) "lcm" = ( /turf/open/floor/wood, /area/station/security/detectives_office/private_investigators_office) @@ -48476,6 +48626,42 @@ /obj/machinery/light/directional/south, /turf/open/floor/iron, /area/station/hallway/secondary/entry) +"lZC" = ( +/obj/structure/table/wood, +/obj/machinery/computer/records/medical/laptop, +/obj/machinery/light_switch/directional/west{ + pixel_x = -38; + pixel_y = 8 + }, +/obj/machinery/button/flasher{ + id = "hopflash"; + pixel_x = -38; + pixel_y = -7; + req_access = list("kitchen") + }, +/obj/machinery/button/ticket_machine{ + pixel_y = 22; + pixel_x = -6 + }, +/obj/machinery/button/door/directional/west{ + id = "hopblast"; + name = "Lockdown Blast Doors"; + pixel_y = 6; + req_access = list("hop") + }, +/obj/machinery/button/door/directional/west{ + id = "hopline"; + name = "Queue Shutters Control"; + pixel_y = -6; + req_access = list("hop") + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/machinery/button/photobooth{ + pixel_y = 22; + pixel_x = 6 + }, +/turf/open/floor/iron/dark, +/area/station/command/heads_quarters/hop) "lZF" = ( /obj/machinery/power/shieldwallgen/xenobiologyaccess, /obj/structure/cable, @@ -49291,6 +49477,7 @@ "mlE" = ( /turf/closed/wall/r_wall, /area/station/ai_monitored/command/storage/eva) +<<<<<<< HEAD "mlM" = ( /obj/structure/table/wood, /obj/machinery/computer/records/medical/laptop, @@ -49325,6 +49512,8 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /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)) "mlW" = ( /obj/structure/sign/nanotrasen{ pixel_y = 32 @@ -49738,6 +49927,16 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/fore) +"msL" = ( +/obj/machinery/newscaster/directional/east, +/obj/machinery/airalarm/directional/south, +/obj/structure/tank_holder/extinguisher, +/obj/machinery/camera/directional/south{ + c_tag = "Library - Art Gallery"; + name = "library camera" + }, +/turf/open/floor/wood/tile, +/area/station/service/library/artgallery) "msR" = ( /obj/effect/turf_decal/tile/red/opposingcorners{ dir = 1 @@ -49827,6 +50026,23 @@ /obj/effect/turf_decal/tile/yellow/fourcorners, /turf/open/floor/iron, /area/station/engineering/storage) +"mtD" = ( +/obj/machinery/requests_console/directional/north{ + department = "Medbay"; + name = "Medbay Requests Console" + }, +/obj/effect/mapping_helpers/requests_console/assistance, +/obj/structure/cable, +/obj/effect/turf_decal/bot, +/obj/machinery/camera/directional/north{ + c_tag = "Medbay - Storage"; + name = "medbay camera"; + network = list("ss13","medbay") + }, +/obj/machinery/modular_computer/preset/cargochat/medical, +/obj/effect/turf_decal/trimline/brown/filled/end, +/turf/open/floor/iron, +/area/station/medical/storage) "mtO" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/effect/turf_decal/tile/yellow{ @@ -51797,6 +52013,18 @@ }, /turf/open/floor/iron, /area/station/service/abandoned_gambling_den/gaming) +"mRl" = ( +/obj/effect/turf_decal/trimline/brown/filled/line{ + dir = 4 + }, +/obj/structure/table, +/obj/machinery/fax{ + fax_name = "Research Division"; + name = "Research Division Fax Machine"; + pixel_x = 1 + }, +/turf/open/floor/iron, +/area/station/science/research) "mRs" = ( /obj/structure/cable, /obj/effect/landmark/start/depsec/science, @@ -54575,6 +54803,20 @@ /obj/effect/turf_decal/tile/blue, /turf/open/floor/iron, /area/station/service/hydroponics) +"nFf" = ( +/obj/structure/disposalpipe/segment{ + dir = 10 + }, +/obj/effect/turf_decal/delivery, +/obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ + dir = 1 + }, +/obj/machinery/door/window/left/directional/east{ + name = "Medical Delivery"; + req_access = list("medical") + }, +/turf/open/floor/iron/textured, +/area/station/medical/storage) "nFr" = ( /obj/structure/cable, /obj/effect/turf_decal/stripes/line{ @@ -58782,6 +59024,21 @@ }, /turf/open/floor/wood, /area/station/service/electronic_marketing_den) +"oLD" = ( +/obj/machinery/camera/directional/north{ + c_tag = "Science - Central Access"; + dir = 9; + name = "science camera"; + network = list("ss13","rd") + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/item/radio/intercom/directional/north, +/obj/effect/turf_decal/trimline/purple/filled/corner{ + dir = 4 + }, +/turf/open/floor/iron/white, +/area/station/science/research) "oLL" = ( /obj/structure/cable, /obj/effect/turf_decal/delivery, @@ -59209,6 +59466,20 @@ /obj/machinery/light/small/dim/directional/north, /turf/open/floor/plating, /area/station/maintenance/port/aft) +"oRf" = ( +/obj/machinery/light/directional/south, +/obj/machinery/camera/directional/south{ + c_tag = "Security - Office Aft" + }, +/obj/machinery/computer/security/telescreen/entertainment/directional/south, +/obj/machinery/modular_computer/preset/cargochat/security{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/brown/filled/line{ + dir = 9 + }, +/turf/open/floor/iron/dark, +/area/station/security/office) "oRh" = ( /obj/machinery/status_display/evac/directional/east, /obj/structure/chair{ @@ -59833,12 +60104,15 @@ }, /turf/open/floor/wood, /area/station/security/detectives_office/private_investigators_office) +<<<<<<< HEAD "paD" = ( /obj/structure/table/wood, /obj/item/papercutter, /obj/item/paper/fluff/ids_for_dummies, /turf/open/floor/wood, /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)) "paQ" = ( /obj/effect/turf_decal/trimline/purple/filled/line, /turf/open/floor/iron/white, @@ -61120,6 +61394,16 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/station/security/detectives_office/private_investigators_office) +"pqo" = ( +/obj/machinery/flasher/directional/east{ + id = "hopflash"; + pixel_x = 0; + pixel_y = 26 + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/machinery/photobooth, +/turf/open/floor/iron/dark, +/area/station/hallway/primary/central/fore) "pqp" = ( /obj/structure/sign/warning/secure_area/directional/north, /obj/structure/table, @@ -63382,6 +63666,15 @@ }, /turf/open/floor/iron/white, /area/station/medical/chemistry) +"pQo" = ( +/obj/machinery/modular_computer/preset/cargochat/engineering{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/brown/filled/end{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/engineering/storage_shared) "pQx" = ( /obj/structure/lattice, /obj/structure/window/reinforced/spawner/directional/north, @@ -63947,6 +64240,18 @@ }, /turf/open/floor/iron, /area/station/cargo/storage) +"pWB" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/obj/machinery/firealarm/directional/north, +/obj/machinery/camera/directional/north{ + c_tag = "Service - Service Hall"; + dir = 9; + name = "service camera" + }, +/turf/open/floor/iron/dark, +/area/station/hallway/secondary/service) "pWG" = ( /obj/structure/table/wood, /obj/item/radio/intercom/directional/west, @@ -65590,6 +65895,13 @@ }, /turf/open/floor/iron, /area/station/hallway/secondary/entry) +"qsv" = ( +/obj/effect/turf_decal/bot, +/obj/structure/table, +/obj/item/paper_bin, +/obj/item/pen, +/turf/open/floor/iron/checker, +/area/station/hallway/secondary/service) "qsw" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/table/wood, @@ -66037,6 +66349,7 @@ }, /turf/open/floor/iron, /area/station/engineering/main) +<<<<<<< HEAD "qyK" = ( /obj/structure/table/reinforced, /obj/item/paper_bin, @@ -66045,6 +66358,8 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /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)) "qyX" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -67099,6 +67414,7 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/station/security/courtroom) +<<<<<<< HEAD "qLa" = ( /obj/structure/table, /obj/item/paper_bin{ @@ -67120,6 +67436,8 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /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)) "qLg" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -67668,6 +67986,12 @@ /obj/effect/landmark/event_spawn, /turf/open/floor/iron/grimy, /area/station/service/library) +"qSC" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/station/hallway/secondary/service) "qSG" = ( /obj/machinery/portable_atmospherics/canister/anesthetic_mix, /obj/machinery/light/small/blacklight/directional/north, @@ -68942,6 +69266,12 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/station/security/detectives_office) +"rky" = ( +/obj/effect/turf_decal/bot, +/obj/machinery/holopad, +/obj/effect/landmark/start/hangover, +/turf/open/floor/iron/checker, +/area/station/hallway/secondary/service) "rkC" = ( /obj/structure/chair/office{ dir = 8 @@ -72508,6 +72838,20 @@ }, /turf/open/floor/iron, /area/station/maintenance/port/fore) +"scp" = ( +/obj/machinery/light/directional/west, +/obj/effect/turf_decal/trimline/brown/filled/line{ + dir = 4 + }, +/obj/effect/turf_decal/bot/left, +/obj/structure/sign/nanotrasen{ + pixel_x = -32 + }, +/obj/machinery/modular_computer/preset/cargochat/science{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/science/research) "scs" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 1 @@ -75645,6 +75989,11 @@ "sRd" = ( /turf/closed/wall/r_wall, /area/station/security/evidence) +"sRs" = ( +/obj/item/radio/intercom/directional/north, +/obj/machinery/photocopier, +/turf/open/floor/iron/checker, +/area/station/hallway/secondary/service) "sRt" = ( /obj/structure/rack, /obj/effect/spawner/random/maintenance, @@ -78658,6 +79007,12 @@ /obj/structure/sign/poster/official/random/directional/west, /turf/open/floor/wood, /area/station/maintenance/port/fore) +"tFu" = ( +/obj/structure/cable, +/obj/machinery/firealarm/directional/east, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron, +/area/station/engineering/storage_shared) "tFG" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 1 @@ -80252,6 +80607,14 @@ }, /turf/open/floor/iron, /area/station/hallway/secondary/command) +"tYN" = ( +/obj/machinery/airalarm/directional/west, +/obj/effect/turf_decal/trimline/brown/filled/line{ + dir = 4 + }, +/obj/machinery/recharge_station, +/turf/open/floor/iron, +/area/station/science/research) "tYP" = ( /obj/structure/chair/office/light, /obj/structure/cable, @@ -80417,6 +80780,12 @@ }, /turf/open/floor/iron, /area/station/medical/abandoned) +"ubJ" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/turf/open/floor/iron/dark, +/area/station/hallway/secondary/service) "ubK" = ( /obj/machinery/computer/operating, /obj/effect/turf_decal/tile/neutral/fourcorners, @@ -83382,6 +83751,15 @@ /obj/effect/turf_decal/bot, /turf/open/floor/iron, /area/station/cargo/miningoffice) +"uMT" = ( +/obj/machinery/disposal/bin, +/obj/effect/decal/cleanable/dirt, +/obj/structure/disposalpipe/trunk{ + dir = 1 + }, +/obj/effect/turf_decal/bot, +/turf/open/floor/iron/checker, +/area/station/hallway/secondary/service) "uMV" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -85258,6 +85636,11 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/wood/large, /area/station/service/barber) +"vlS" = ( +/obj/structure/cable, +/mob/living/basic/slime, +/turf/open/floor/circuit/green, +/area/station/science/xenobiology) "vlY" = ( /obj/machinery/door/firedoor, /obj/effect/turf_decal/stripes/line{ @@ -87010,6 +87393,9 @@ }, /turf/open/floor/iron, /area/station/engineering/atmos) +"vHq" = ( +/turf/open/floor/iron, +/area/station/security/office) "vHu" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -88226,20 +88612,6 @@ /obj/effect/turf_decal/bot, /turf/open/floor/iron, /area/station/cargo/storage) -"vZV" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/turf_decal/trimline/purple/filled/corner{ - dir = 1 - }, -/obj/structure/table, -/obj/machinery/fax{ - fax_name = "Research Division"; - name = "Research Division Fax Machine"; - pixel_x = 1 - }, -/turf/open/floor/iron/white, -/area/station/science/research) "vZX" = ( /obj/machinery/status_display/ai/directional/north, /obj/effect/turf_decal/tile/yellow/opposingcorners, @@ -90988,6 +91360,13 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/science/auxlab/firing_range) +"wGm" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/item/kirbyplants/random, +/turf/open/floor/iron, +/area/station/engineering/storage_shared) "wGs" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 4 @@ -92930,6 +93309,16 @@ /obj/effect/turf_decal/trimline/neutral/warning, /turf/open/floor/iron/dark/textured_half, /area/station/medical/morgue) +"xiu" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/status_display/evac/directional/north, +/obj/structure/disposalpipe/segment{ + dir = 10 + }, +/turf/open/floor/iron/dark, +/area/station/hallway/secondary/service) "xiB" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -93141,6 +93530,13 @@ /obj/effect/landmark/start/hangover, /turf/open/floor/iron/dark, /area/station/hallway/primary/central/fore) +"xlf" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 1 + }, +/obj/effect/landmark/event_spawn, +/turf/open/floor/iron/dark, +/area/station/hallway/secondary/service) "xls" = ( /obj/structure/table/reinforced, /obj/item/storage/toolbox/mechanical, @@ -93575,6 +93971,17 @@ }, /turf/open/floor/iron/dark, /area/station/command/bridge) +<<<<<<< HEAD +======= +"xrS" = ( +/obj/structure/sign/warning/secure_area/directional/south, +/obj/effect/turf_decal/trimline/purple/filled/line{ + dir = 6 + }, +/obj/item/kirbyplants/organic/plant10, +/turf/open/floor/iron/white, +/area/station/science/research) +>>>>>>> 95c538c3a57 ([MIRROR] [MDB Ignore] Combines Cargobus consoles with Dept. Order Consoles, freeing all departments of 1 whole tile of space (#1665)) "xsb" = ( /obj/item/kirbyplants/random, /obj/effect/turf_decal/stripes/line{ @@ -95853,6 +96260,13 @@ /obj/machinery/duct, /turf/open/floor/plating, /area/station/maintenance/port/fore) +"xUs" = ( +/obj/effect/turf_decal/tile/red{ + dir = 8 + }, +/obj/item/kirbyplants/random, +/turf/open/floor/iron, +/area/station/security/office) "xUv" = ( /obj/machinery/firealarm/directional/west, /obj/structure/cable, @@ -118581,7 +118995,11 @@ pWL jjm rUl rTW +<<<<<<< HEAD lvX +======= +vlS +>>>>>>> 95c538c3a57 ([MIRROR] [MDB Ignore] Combines Cargobus consoles with Dept. Order Consoles, freeing all departments of 1 whole tile of space (#1665)) rTW oVW oUe @@ -120123,7 +120541,11 @@ kSA jjm nkj rTW +<<<<<<< HEAD lvX +======= +vlS +>>>>>>> 95c538c3a57 ([MIRROR] [MDB Ignore] Combines Cargobus consoles with Dept. Order Consoles, freeing all departments of 1 whole tile of space (#1665)) rTW oVW fmi @@ -120586,7 +121008,11 @@ fXF jgZ mrd rDL +<<<<<<< HEAD iDS +======= +pQo +>>>>>>> 95c538c3a57 ([MIRROR] [MDB Ignore] Combines Cargobus consoles with Dept. Order Consoles, freeing all departments of 1 whole tile of space (#1665)) uCa wkj bqP @@ -120843,7 +121269,11 @@ fXF suH ikV gIk +<<<<<<< HEAD fVA +======= +ekF +>>>>>>> 95c538c3a57 ([MIRROR] [MDB Ignore] Combines Cargobus consoles with Dept. Order Consoles, freeing all departments of 1 whole tile of space (#1665)) leE bfq iFn @@ -120884,7 +121314,11 @@ uKY gcr mQO rTW +<<<<<<< HEAD lvX +======= +vlS +>>>>>>> 95c538c3a57 ([MIRROR] [MDB Ignore] Combines Cargobus consoles with Dept. Order Consoles, freeing all departments of 1 whole tile of space (#1665)) rTW iWX csO @@ -121100,7 +121534,11 @@ nmi xvf oQJ xJJ +<<<<<<< HEAD pbV +======= +wGm +>>>>>>> 95c538c3a57 ([MIRROR] [MDB Ignore] Combines Cargobus consoles with Dept. Order Consoles, freeing all departments of 1 whole tile of space (#1665)) uCa aTz ygM @@ -121613,7 +122051,11 @@ wiZ fXF xkz hwe +<<<<<<< HEAD jwA +======= +tFu +>>>>>>> 95c538c3a57 ([MIRROR] [MDB Ignore] Combines Cargobus consoles with Dept. Order Consoles, freeing all departments of 1 whole tile of space (#1665)) vpV uCa gQk @@ -126799,7 +127241,11 @@ nIa hSf ffb cMn +<<<<<<< HEAD bUz +======= +xrS +>>>>>>> 95c538c3a57 ([MIRROR] [MDB Ignore] Combines Cargobus consoles with Dept. Order Consoles, freeing all departments of 1 whole tile of space (#1665)) sIX sIX cLR @@ -128341,15 +128787,25 @@ txc pZM ffb dqP +<<<<<<< HEAD nlp +======= +aFp +>>>>>>> 95c538c3a57 ([MIRROR] [MDB Ignore] Combines Cargobus consoles with Dept. Order Consoles, freeing all departments of 1 whole tile of space (#1665)) sIX sIX xbJ sIX sIX +<<<<<<< HEAD skv dCI stp +======= +mRl +scp +tYN +>>>>>>> 95c538c3a57 ([MIRROR] [MDB Ignore] Combines Cargobus consoles with Dept. Order Consoles, freeing all departments of 1 whole tile of space (#1665)) dNN qMB wtS @@ -129369,13 +129825,17 @@ bGn igg tFM cTj -dyx +ikZ oRh oHq wNV +<<<<<<< HEAD tuM +======= +eyl +>>>>>>> 95c538c3a57 ([MIRROR] [MDB Ignore] Combines Cargobus consoles with Dept. Order Consoles, freeing all departments of 1 whole tile of space (#1665)) dNN -vZV +uMV sEF sVi xWf @@ -129632,7 +130092,11 @@ dNN dNN dNN dNN +<<<<<<< HEAD yhO +======= +oLD +>>>>>>> 95c538c3a57 ([MIRROR] [MDB Ignore] Combines Cargobus consoles with Dept. Order Consoles, freeing all departments of 1 whole tile of space (#1665)) dCx aJT fDF @@ -132163,7 +132627,7 @@ fxs lAg kPM pRS -qLa +pqo nLS xld uqZ @@ -132421,7 +132885,7 @@ rgW vze pRS pRS -eIu +hWA iaL pRS iaL @@ -132677,7 +133141,7 @@ sEm dEA nxd pRS -mlM +lZC eGs ykB jpe @@ -133147,7 +133611,11 @@ sid sBG sLz vRB +<<<<<<< HEAD rIx +======= +gch +>>>>>>> 95c538c3a57 ([MIRROR] [MDB Ignore] Combines Cargobus consoles with Dept. Order Consoles, freeing all departments of 1 whole tile of space (#1665)) xMe kVP bSp @@ -133403,8 +133871,13 @@ cnL kfa pPI kVP +<<<<<<< HEAD fEX fTZ +======= +xiu +uMT +>>>>>>> 95c538c3a57 ([MIRROR] [MDB Ignore] Combines Cargobus consoles with Dept. Order Consoles, freeing all departments of 1 whole tile of space (#1665)) jVP kVP pET @@ -133660,8 +134133,13 @@ vdZ qPp pXt kVP +<<<<<<< HEAD ovQ joU +======= +fWB +rky +>>>>>>> 95c538c3a57 ([MIRROR] [MDB Ignore] Combines Cargobus consoles with Dept. Order Consoles, freeing all departments of 1 whole tile of space (#1665)) iXO kVP pgN @@ -133917,8 +134395,13 @@ vBt tyK kVP kVP +<<<<<<< HEAD dZw uVd +======= +pWB +qsv +>>>>>>> 95c538c3a57 ([MIRROR] [MDB Ignore] Combines Cargobus consoles with Dept. Order Consoles, freeing all departments of 1 whole tile of space (#1665)) gMB kVP kVP @@ -133962,7 +134445,7 @@ wmp rgW mGw pRS -paD +kNB lAv nAz jce @@ -134174,11 +134657,19 @@ kVP kVP kVP dUH +<<<<<<< HEAD sRB eWN iff rpH biZ +======= +ubJ +xlf +giz +kVr +kix +>>>>>>> 95c538c3a57 ([MIRROR] [MDB Ignore] Combines Cargobus consoles with Dept. Order Consoles, freeing all departments of 1 whole tile of space (#1665)) kVP sGS qOT @@ -135202,8 +135693,13 @@ xSf mqV kVP giz +<<<<<<< HEAD nOn mKa +======= +giz +qSC +>>>>>>> 95c538c3a57 ([MIRROR] [MDB Ignore] Combines Cargobus consoles with Dept. Order Consoles, freeing all departments of 1 whole tile of space (#1665)) lJJ maV ptC @@ -135460,7 +135956,11 @@ kVP kVP vat kVP +<<<<<<< HEAD gIE +======= +sRs +>>>>>>> 95c538c3a57 ([MIRROR] [MDB Ignore] Combines Cargobus consoles with Dept. Order Consoles, freeing all departments of 1 whole tile of space (#1665)) hUh kVP cAV @@ -135717,7 +136217,11 @@ pOD tWU sSH kVP +<<<<<<< HEAD kzV +======= +aUZ +>>>>>>> 95c538c3a57 ([MIRROR] [MDB Ignore] Combines Cargobus consoles with Dept. Order Consoles, freeing all departments of 1 whole tile of space (#1665)) qPX kVP aVE @@ -136579,9 +137083,15 @@ umA veM veM ako +<<<<<<< HEAD piu evr qBn +======= +nFf +hFQ +fEV +>>>>>>> 95c538c3a57 ([MIRROR] [MDB Ignore] Combines Cargobus consoles with Dept. Order Consoles, freeing all departments of 1 whole tile of space (#1665)) uQF ibh cYk @@ -136836,8 +137346,13 @@ oCo fiU jRJ ako +<<<<<<< HEAD dqj bGM +======= +lcl +dNc +>>>>>>> 95c538c3a57 ([MIRROR] [MDB Ignore] Combines Cargobus consoles with Dept. Order Consoles, freeing all departments of 1 whole tile of space (#1665)) dNc dNc jhs @@ -137093,7 +137608,11 @@ euF oCo sJG ako +<<<<<<< HEAD kbc +======= +mtD +>>>>>>> 95c538c3a57 ([MIRROR] [MDB Ignore] Combines Cargobus consoles with Dept. Order Consoles, freeing all departments of 1 whole tile of space (#1665)) rjO oOI oOI @@ -144540,7 +145059,11 @@ lsJ ffP gBi tqy +<<<<<<< HEAD hYh +======= +msL +>>>>>>> 95c538c3a57 ([MIRROR] [MDB Ignore] Combines Cargobus consoles with Dept. Order Consoles, freeing all departments of 1 whole tile of space (#1665)) qMf oci bqS @@ -149109,7 +149632,11 @@ nzR gKp gDP rTG +<<<<<<< HEAD nsG +======= +xUs +>>>>>>> 95c538c3a57 ([MIRROR] [MDB Ignore] Combines Cargobus consoles with Dept. Order Consoles, freeing all departments of 1 whole tile of space (#1665)) ozu dql pWH @@ -149623,8 +150150,13 @@ ieg eIl ieg ieg +<<<<<<< HEAD tXW anY +======= +fes +vHq +>>>>>>> 95c538c3a57 ([MIRROR] [MDB Ignore] Combines Cargobus consoles with Dept. Order Consoles, freeing all departments of 1 whole tile of space (#1665)) dql eBE gIV @@ -149869,7 +150401,7 @@ ouc qWZ iCo krO -qyK +guZ lET gBA xtf @@ -149880,8 +150412,13 @@ qlN bdx lpI iIb +<<<<<<< HEAD sYN wWH +======= +tXW +kqI +>>>>>>> 95c538c3a57 ([MIRROR] [MDB Ignore] Combines Cargobus consoles with Dept. Order Consoles, freeing all departments of 1 whole tile of space (#1665)) vgK wdC lTt @@ -150138,7 +150675,11 @@ sKp tXJ bkN gCV +<<<<<<< HEAD uBY +======= +oRf +>>>>>>> 95c538c3a57 ([MIRROR] [MDB Ignore] Combines Cargobus consoles with Dept. Order Consoles, freeing all departments of 1 whole tile of space (#1665)) vgK ljX tLx diff --git a/_maps/map_files/IceBoxStation/IceBoxStation.dmm b/_maps/map_files/IceBoxStation/IceBoxStation.dmm index d460b278a11..eb2e75ff8e7 100644 --- a/_maps/map_files/IceBoxStation/IceBoxStation.dmm +++ b/_maps/map_files/IceBoxStation/IceBoxStation.dmm @@ -3533,10 +3533,6 @@ /obj/effect/spawner/structure/window/hollow/reinforced/end, /turf/open/floor/plating, /area/mine/eva/lower) -"bfB" = ( -/obj/machinery/firealarm/directional/east, -/turf/open/floor/iron/dark/textured, -/area/station/security/office) "bfL" = ( /obj/effect/turf_decal/stripes/line{ dir = 5 @@ -8065,17 +8061,6 @@ }, /turf/open/floor/iron/dark, /area/station/medical/morgue) -"csZ" = ( -/obj/effect/turf_decal/siding/wideplating_new/light{ - dir = 6 - }, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/effect/landmark/start/prisoner, -/obj/machinery/duct, -/turf/open/floor/iron/showroomfloor, -/area/station/security/prison/work) "ctk" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -8254,6 +8239,18 @@ /obj/structure/closet/emcloset, /turf/open/floor/plating, /area/station/maintenance/starboard/fore) +"cvG" = ( +/obj/effect/turf_decal/siding/wideplating_new/light, +/obj/item/trash/bee, +/obj/machinery/light/directional/west, +/obj/structure/cable, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 4 + }, +/obj/structure/sign/poster/official/moth_piping/directional/west, +/obj/machinery/duct, +/turf/open/floor/iron/showroomfloor, +/area/station/security/prison/work) "cvN" = ( /obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ dir = 4 @@ -9840,15 +9837,6 @@ }, /turf/open/misc/asteroid/snow/icemoon, /area/icemoon/surface/outdoors/nospawn) -"cSy" = ( -/obj/effect/turf_decal/trimline/blue/filled/line{ - dir = 8 - }, -/obj/structure/disposalpipe/junction{ - dir = 1 - }, -/turf/open/floor/iron/white, -/area/station/medical/medbay/aft) "cSE" = ( /obj/effect/turf_decal/stripes/line, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -15549,13 +15537,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/plating, /area/station/maintenance/port/fore) -"eHU" = ( -/obj/structure/disposalpipe/segment, -/obj/effect/turf_decal/trimline/blue/filled/line{ - dir = 4 - }, -/turf/open/floor/iron/white, -/area/station/medical/medbay/aft) "eHW" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -17013,19 +16994,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/plating, /area/station/maintenance/port/aft) -"fhY" = ( -/obj/structure/window/reinforced/spawner/directional/west, -/obj/machinery/computer/security/telescreen/entertainment/directional/north, -/obj/effect/turf_decal/siding/yellow/corner{ - dir = 4 - }, -/obj/structure/table, -/obj/machinery/fax{ - fax_name = "Engineering Lobby"; - name = "Engineering Lobby Fax Machine" - }, -/turf/open/floor/iron, -/area/station/engineering/lobby) "fij" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -20618,13 +20586,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold/yellow/visible, /turf/open/floor/iron, /area/station/engineering/atmos) -"gnA" = ( -/obj/effect/turf_decal/tile/blue/half/contrasted{ - dir = 8 - }, -/obj/machinery/light/small/directional/west, -/turf/open/floor/iron, -/area/station/command/heads_quarters/hop) "gnL" = ( /obj/structure/closet/bombcloset/security, /turf/open/floor/iron/smooth, @@ -23145,16 +23106,6 @@ }, /turf/open/floor/iron/white, /area/station/science/xenobiology) -"hdT" = ( -/obj/effect/turf_decal/trimline/blue/filled/line{ - dir = 1 - }, -/obj/structure/disposalpipe/segment{ - dir = 10 - }, -/obj/machinery/status_display/evac/directional/north, -/turf/open/floor/iron/white, -/area/station/medical/medbay/aft) "hdV" = ( /obj/structure/table, /obj/item/reagent_containers/condiment/saltshaker{ @@ -25915,13 +25866,6 @@ }, /turf/open/floor/plating/snowed/icemoon, /area/icemoon/underground/explored) -"hYW" = ( -/obj/machinery/door/firedoor, -/obj/effect/turf_decal/tile/red{ - dir = 4 - }, -/turf/open/floor/iron, -/area/station/hallway/primary/central) "hZe" = ( /obj/effect/turf_decal/trimline/yellow/warning{ dir = 1 @@ -25978,14 +25922,6 @@ /obj/effect/turf_decal/delivery, /turf/open/floor/iron, /area/station/cargo/storage) -"iaS" = ( -/obj/machinery/modular_computer/preset/id, -/obj/item/paper/fluff/ids_for_dummies, -/obj/effect/turf_decal/tile/blue/half/contrasted{ - dir = 8 - }, -/turf/open/floor/iron, -/area/station/command/heads_quarters/hop) "iaT" = ( /obj/effect/spawner/random/trash/mess, /turf/open/floor/plating, @@ -28428,12 +28364,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/dark/textured, /area/station/security/interrogation) -"iML" = ( -/obj/effect/turf_decal/trimline/blue/filled/line{ - dir = 8 - }, -/turf/open/floor/iron/white, -/area/station/medical/medbay/aft) "iMT" = ( /turf/open/floor/iron, /area/station/commons/storage/primary) @@ -29703,14 +29633,6 @@ /obj/effect/landmark/blobstart, /turf/open/floor/plating, /area/station/maintenance/starboard/fore) -"jih" = ( -/obj/structure/disposalpipe/segment, -/obj/effect/turf_decal/trimline/blue/filled/line{ - dir = 4 - }, -/obj/structure/tank_holder/extinguisher, -/turf/open/floor/iron/white, -/area/station/medical/medbay/aft) "jjk" = ( /obj/structure/lattice/catwalk, /obj/structure/railing{ @@ -33409,16 +33331,6 @@ }, /turf/open/floor/plating, /area/station/maintenance/department/crew_quarters/bar) -"kna" = ( -/obj/machinery/modular_computer/preset/cargochat/engineering, -/obj/effect/turf_decal/tile/brown/fourcorners, -/turf/open/floor/iron/dark, -/area/station/engineering/lobby) -"knc" = ( -/obj/machinery/computer/department_orders/engineering, -/obj/effect/turf_decal/tile/brown/fourcorners, -/turf/open/floor/iron/dark, -/area/station/engineering/lobby) "knd" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/plating, @@ -34032,13 +33944,6 @@ /obj/machinery/light/small/directional/east, /turf/open/floor/plating, /area/station/engineering/lobby) -"kvI" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ - dir = 1 - }, -/obj/item/kirbyplants/random, -/turf/open/floor/iron/dark/textured, -/area/station/security/office) "kvR" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -36044,15 +35949,6 @@ "kZu" = ( /turf/closed/wall, /area/mine/production) -"kZz" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/machinery/computer/department_orders/service{ - dir = 1 - }, -/turf/open/floor/plating, -/area/station/hallway/secondary/service) "kZC" = ( /obj/machinery/holopad, /obj/effect/turf_decal/bot_white, @@ -37547,18 +37443,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/dark, /area/station/medical/treatment_center) -"lyo" = ( -/obj/machinery/requests_console/directional/north{ - department = "Security"; - name = "Security Requests Console" - }, -/obj/effect/mapping_helpers/requests_console/information, -/obj/effect/mapping_helpers/requests_console/assistance, -/obj/effect/turf_decal/tile/red/anticorner, -/turf/open/floor/iron/dark/textured_corner{ - dir = 1 - }, -/area/station/security/office) "lyq" = ( /obj/machinery/portable_atmospherics/canister/nitrogen, /obj/effect/turf_decal/bot, @@ -37572,16 +37456,6 @@ /obj/machinery/airalarm/directional/south, /turf/open/floor/stone, /area/mine/eva/lower) -"lyw" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/landmark/event_spawn, -/turf/open/floor/iron/white, -/area/station/medical/medbay/aft) "lyG" = ( /turf/open/floor/glass/reinforced, /area/station/ai_monitored/security/armory/upper) @@ -41499,15 +41373,6 @@ }, /turf/open/floor/plating/icemoon, /area/station/science/ordnance/bomb) -"mMX" = ( -/obj/machinery/airalarm/directional/north, -/obj/structure/table, -/obj/machinery/fax{ - fax_name = "Security Office"; - name = "Security Office Fax Machine" - }, -/turf/open/floor/iron/dark/textured, -/area/station/security/office) "mNj" = ( /obj/machinery/computer/security{ dir = 4 @@ -41867,15 +41732,6 @@ /obj/effect/landmark/generic_maintenance_landmark, /turf/open/floor/plating, /area/station/maintenance/starboard/aft) -"mUM" = ( -/obj/item/radio/intercom/directional/north, -/obj/effect/turf_decal/tile/red/anticorner{ - dir = 8 - }, -/turf/open/floor/iron/dark/textured_corner{ - dir = 4 - }, -/area/station/security/office) "mUR" = ( /obj/machinery/firealarm/directional/north{ pixel_x = -26 @@ -43469,19 +43325,6 @@ "npD" = ( /turf/closed/wall/r_wall, /area/station/maintenance/aft/greater) -"npE" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/effect/turf_decal/trimline/blue/filled/warning{ - dir = 8 - }, -/obj/structure/disposalpipe/segment, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/cable, -/turf/open/floor/iron/white, -/area/station/medical/medbay/aft) "npH" = ( /obj/effect/decal/cleanable/dirt, /obj/item/reagent_containers/cup/bucket, @@ -43613,19 +43456,6 @@ /obj/effect/mapping_helpers/mail_sorting/service/theater, /turf/open/floor/wood/parquet, /area/station/commons/lounge) -"nry" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/effect/turf_decal/trimline/blue/filled/corner{ - dir = 8 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/disposalpipe/segment, -/turf/open/floor/iron/white, -/area/station/medical/medbay/aft) "nrA" = ( /obj/machinery/atmospherics/pipe/smart/simple/yellow/visible{ dir = 4 @@ -45606,18 +45436,6 @@ }, /turf/open/floor/iron/dark/textured_edge, /area/station/security/prison) -"nUV" = ( -/obj/effect/turf_decal/siding/wideplating_new/light, -/obj/item/trash/bee, -/obj/machinery/light/directional/west, -/obj/structure/cable, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ - dir = 4 - }, -/obj/structure/sign/poster/official/moth_piping/directional/west, -/obj/machinery/duct, -/turf/open/floor/iron/showroomfloor, -/area/station/security/prison/work) "nVc" = ( /obj/structure/cable, /obj/effect/turf_decal/trimline/yellow/filled/corner{ @@ -47484,10 +47302,6 @@ /obj/machinery/airalarm/directional/west, /turf/open/floor/iron/dark, /area/station/ai_monitored/turret_protected/ai) -"ozn" = ( -/obj/machinery/photocopier, -/turf/open/floor/iron/dark, -/area/station/engineering/lobby) "ozo" = ( /obj/effect/landmark/carpspawn, /turf/open/misc/asteroid/snow/icemoon, @@ -49226,16 +49040,6 @@ /obj/structure/cable, /turf/open/floor/iron/dark/textured_edge, /area/station/security/prison) -"oZW" = ( -/obj/machinery/newscaster/directional/south, -/obj/machinery/computer/department_orders/science{ - dir = 1 - }, -/obj/effect/turf_decal/tile/brown/opposingcorners{ - dir = 1 - }, -/turf/open/floor/iron, -/area/station/science/lab) "pac" = ( /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 8 @@ -49955,14 +49759,6 @@ /obj/structure/closet/crate/freezer/blood, /turf/open/floor/iron/white, /area/station/medical/cryo) -"pko" = ( -/obj/structure/disposalpipe/segment, -/obj/effect/turf_decal/trimline/blue/filled/line{ - dir = 4 - }, -/obj/structure/extinguisher_cabinet/directional/east, -/turf/open/floor/iron/white, -/area/station/medical/medbay/aft) "pkN" = ( /obj/structure/railing, /obj/effect/mapping_helpers/burnt_floor, @@ -52322,14 +52118,6 @@ }, /turf/open/floor/iron, /area/station/science/robotics/lab) -"pVX" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, -/obj/machinery/photocopier, -/obj/effect/turf_decal/tile/red/half/contrasted{ - dir = 8 - }, -/turf/open/floor/iron/dark/textured, -/area/station/security/office) "pWb" = ( /obj/effect/decal/cleanable/dirt, /obj/item/rack_parts, @@ -56619,19 +56407,6 @@ "rkL" = ( /turf/open/floor/carpet/blue, /area/station/medical/psychology) -"rkM" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/cable, -/obj/structure/disposalpipe/segment, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/turf_decal/trimline/blue/filled/warning{ - dir = 4 - }, -/turf/open/floor/iron/white, -/area/station/medical/medbay/aft) "rkN" = ( /turf/closed/wall, /area/station/engineering/atmos/hfr_room) @@ -56964,20 +56739,6 @@ }, /turf/open/floor/iron/dark, /area/station/security/checkpoint/customs/auxiliary) -"rqq" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/disposalpipe/segment, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/turf_decal/box/white{ - color = "#52B4E9" - }, -/obj/machinery/holopad, -/turf/open/floor/iron/white, -/area/station/medical/medbay/aft) "rqD" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 8 @@ -59024,36 +58785,6 @@ }, /turf/open/floor/iron/dark/smooth_large, /area/station/security/processing) -"rYk" = ( -/obj/structure/chair/office{ - dir = 8 - }, -/obj/machinery/button/flasher{ - id = "hopflash"; - pixel_x = 8; - pixel_y = -32 - }, -/obj/machinery/button/door/directional/south{ - id = "hopqueue"; - name = "Queue Shutters Control"; - pixel_x = -8; - req_access = list("hop") - }, -/obj/machinery/button/door/directional/south{ - id = "hop"; - name = "Privacy Shutters Control"; - pixel_x = 8; - req_access = list("hop") - }, -/obj/machinery/button/ticket_machine{ - pixel_x = -8; - pixel_y = -32 - }, -/obj/effect/turf_decal/tile/blue/anticorner/contrasted{ - dir = 8 - }, -/turf/open/floor/iron, -/area/station/command/heads_quarters/hop) "rYq" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -61420,14 +61151,6 @@ /obj/effect/turf_decal/tile/yellow/full, /turf/open/floor/iron/large, /area/station/medical/pharmacy) -"sHd" = ( -/obj/effect/turf_decal/trimline/blue/filled/line{ - dir = 5 - }, -/obj/structure/disposalpipe/trunk, -/obj/machinery/disposal/bin/tagger, -/turf/open/floor/iron/white, -/area/station/medical/medbay/aft) "sHh" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/carpet, @@ -62453,6 +62176,17 @@ }, /turf/open/floor/engine, /area/station/engineering/atmos/hfr_room) +"sZp" = ( +/obj/effect/turf_decal/siding/wideplating_new/light{ + dir = 6 + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/landmark/start/prisoner, +/obj/machinery/duct, +/turf/open/floor/iron/showroomfloor, +/area/station/security/prison/work) "sZD" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -67471,15 +67205,6 @@ }, /turf/open/floor/iron/dark, /area/station/hallway/primary/central) -"uIt" = ( -/obj/structure/cable, -/obj/effect/turf_decal/trimline/blue/filled/line{ - dir = 1 - }, -/obj/machinery/power/apc/auto_name/directional/north, -/obj/item/kirbyplants/random, -/turf/open/floor/iron/white, -/area/station/medical/medbay/aft) "uIx" = ( /obj/machinery/meter, /obj/machinery/atmospherics/pipe/smart/manifold4w/purple/visible, @@ -67680,16 +67405,6 @@ }, /turf/open/floor/wood/parquet, /area/station/commons/lounge) -"uLV" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/filingcabinet, -/obj/effect/turf_decal/tile/red/half/contrasted{ - dir = 4 - }, -/turf/open/floor/iron/dark/textured, -/area/station/security/office) "uLX" = ( /obj/machinery/door/airlock{ name = "Port Emergency Storage" @@ -68370,15 +68085,6 @@ }, /turf/open/floor/iron/white/smooth_large, /area/station/medical/chemistry) -"uXW" = ( -/obj/machinery/modular_computer/preset/cargochat/security{ - dir = 4 - }, -/obj/machinery/power/apc/auto_name/directional/north, -/obj/structure/cable, -/obj/machinery/light/directional/west, -/turf/open/floor/iron/dark/textured, -/area/station/security/office) "uYc" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -69572,16 +69278,6 @@ /obj/item/kirbyplants/random, /turf/open/floor/iron, /area/station/security/courtroom) -"vry" = ( -/obj/machinery/requests_console/directional/south{ - department = "Head of Personnel's Desk"; - name = "Head of Personnel's Requests Console" - }, -/obj/effect/mapping_helpers/requests_console/announcement, -/obj/effect/mapping_helpers/requests_console/information, -/obj/effect/mapping_helpers/requests_console/assistance, -/turf/open/floor/iron, -/area/station/command/heads_quarters/hop) "vrC" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -70421,16 +70117,6 @@ }, /turf/open/floor/iron, /area/mine/laborcamp) -"vDS" = ( -/obj/machinery/computer/department_orders/security{ - dir = 4 - }, -/obj/structure/cable, -/obj/effect/turf_decal/tile/red/half/contrasted{ - dir = 4 - }, -/turf/open/floor/iron/dark/textured, -/area/station/security/office) "vEi" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/public/glass{ @@ -72625,15 +72311,6 @@ /obj/structure/sign/poster/official/safety_eye_protection/directional/south, /turf/open/floor/iron/white, /area/station/medical/chemistry) -"woF" = ( -/obj/machinery/modular_computer/preset/cargochat/medical{ - dir = 1 - }, -/obj/effect/turf_decal/trimline/brown/filled/end{ - dir = 8 - }, -/turf/open/floor/iron/large, -/area/station/medical/medbay/aft) "woH" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -75516,29 +75193,6 @@ /obj/effect/landmark/event_spawn, /turf/open/floor/glass/reinforced, /area/station/ai_monitored/security/armory/upper) -"xge" = ( -/obj/machinery/button/door/directional/north{ - id = "permainner"; - name = "Inner Bolt Control"; - normaldoorcontrol = 1; - pixel_x = -6; - req_access = list("brig"); - specialfunctions = 4 - }, -/obj/machinery/button/door/directional/north{ - id = "permaouter"; - name = "Outer Bolt Control"; - normaldoorcontrol = 1; - pixel_x = 6; - req_access = list("brig"); - specialfunctions = 4 - }, -/obj/item/paper/crumpled{ - default_raw_text = "Remember! Corporate spent a lot of money to create this state of the art fashion show. If we EVER even so much as HEAR a rumor that a news crew or corporate rep is coming by, this place needs to be in TIP TOP condition. It's all of our asses (and our pensions) if it's not."; - name = "Crumpled Memo" - }, -/turf/open/floor/iron/smooth, -/area/station/security/execution/transfer) "xgg" = ( /obj/structure/rack, /obj/item/clothing/suit/hooded/wintercoat/eva{ @@ -76111,16 +75765,6 @@ /obj/machinery/duct, /turf/open/floor/plating, /area/station/maintenance/department/crew_quarters/bar) -"xpt" = ( -/obj/structure/window/reinforced/spawner/directional/east, -/obj/effect/turf_decal/trimline/brown/filled/end{ - dir = 4 - }, -/obj/machinery/computer/department_orders/medical{ - dir = 1 - }, -/turf/open/floor/iron/large, -/area/station/medical/medbay/aft) "xpw" = ( /obj/machinery/power/apc/auto_name/directional/south, /obj/structure/cable, @@ -167551,7 +167195,7 @@ iDt iDt oqL unm -nUV +cvG ldz fvK cIc @@ -167808,7 +167452,7 @@ iDt iDt oqL bFU -csZ +sZp axX auJ oVy @@ -169937,10 +169581,10 @@ thA thA thA thA -xMq psb scw psb +iDt thA thA xMq @@ -170194,10 +169838,10 @@ thA thA thA iDt -iDt scw iDt scw +iDt thA thA thA @@ -170451,10 +170095,10 @@ thA thA iDt iDt -iDt psb scw psb +iDt thA thA thA @@ -235216,7 +234860,6 @@ qrJ uLC xzh dnq -dnq qcu bDR hYW @@ -235474,9 +235117,9 @@ nqU rcE rcE rcE -rcE hVc jII +jII dnq ylU dnq @@ -235731,7 +235374,6 @@ ydT iIA fSC iIA -iIA cvg jII okb @@ -235988,8 +235630,8 @@ cpm cpm cpm egY -egY wwn +jfc cpm pzb cRF @@ -249625,9 +249267,6 @@ mJj laD npE xLK -iML -iML -iML nHX hRA ist diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm index 2192d36a613..5585d4473c2 100644 --- a/_maps/map_files/MetaStation/MetaStation.dmm +++ b/_maps/map_files/MetaStation/MetaStation.dmm @@ -559,6 +559,7 @@ /obj/structure/window/reinforced/spawner/directional/south, /turf/open/floor/circuit, /area/station/ai_monitored/turret_protected/ai_upload) +<<<<<<< HEAD "akT" = ( /obj/structure/table, /obj/item/storage/box/bodybags{ @@ -577,6 +578,8 @@ /obj/machinery/light/directional/south, /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)) "akZ" = ( /obj/machinery/atmospherics/pipe/smart/simple/dark/visible{ dir = 4 @@ -1388,13 +1391,6 @@ /obj/effect/landmark/event_spawn, /turf/open/floor/plating, /area/station/engineering/supermatter/room) -"aBJ" = ( -/obj/effect/turf_decal/delivery, -/obj/effect/turf_decal/siding, -/obj/structure/disposalpipe/trunk, -/obj/machinery/disposal/bin/tagger, -/turf/open/floor/iron, -/area/station/science/lab) "aBL" = ( /obj/effect/spawner/structure/window, /obj/structure/cable, @@ -3214,19 +3210,6 @@ /obj/effect/turf_decal/tile/red/half/contrasted, /turf/open/floor/iron, /area/station/hallway/secondary/exit/departure_lounge) -"bgn" = ( -/obj/structure/table, -/obj/machinery/cell_charger, -/obj/machinery/requests_console/directional/east{ - department = "Research Lab"; - name = "Research Requests Console" - }, -/obj/effect/mapping_helpers/requests_console/announcement, -/obj/effect/mapping_helpers/requests_console/ore_update, -/obj/effect/mapping_helpers/requests_console/information, -/obj/effect/mapping_helpers/requests_console/assistance, -/turf/open/floor/iron, -/area/station/science/lab) "bgs" = ( /obj/machinery/door/firedoor, /obj/structure/cable, @@ -4109,6 +4092,7 @@ /obj/structure/closet/bombcloset, /turf/open/floor/plating, /area/station/maintenance/aft/lesser) +<<<<<<< HEAD "buw" = ( /obj/structure/table, /obj/item/clothing/gloves/color/orange, @@ -4119,6 +4103,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)) "buE" = ( /obj/machinery/power/apc/auto_name/directional/south, /obj/structure/window/spawner/directional/west, @@ -6216,15 +6202,6 @@ /obj/item/toy/basketball, /turf/open/floor/iron, /area/station/security/prison) -"cnu" = ( -/obj/effect/turf_decal/trimline/brown/filled/line{ - dir = 5 - }, -/obj/effect/turf_decal/trimline/purple/filled/warning{ - dir = 5 - }, -/turf/open/floor/iron, -/area/station/science/explab) "cnA" = ( /obj/machinery/status_display/evac/directional/north, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -7074,18 +7051,6 @@ /obj/structure/railing, /turf/open/floor/iron, /area/station/cargo/miningoffice) -"cCx" = ( -/obj/machinery/modular_computer/preset/cargochat/science{ - dir = 4 - }, -/obj/effect/turf_decal/trimline/brown/filled/line{ - dir = 1 - }, -/obj/effect/turf_decal/trimline/purple/filled/warning{ - dir = 1 - }, -/turf/open/floor/iron, -/area/station/science/explab) "cCM" = ( /obj/structure/lattice/catwalk, /obj/item/reagent_containers/cup/glass/bottle/rum{ @@ -8279,26 +8244,6 @@ /obj/machinery/atmospherics/pipe/smart/simple/yellow/visible, /turf/open/floor/iron, /area/station/engineering/atmos) -"dbd" = ( -/obj/structure/table, -/obj/item/stack/sheet/glass, -/obj/item/stack/sheet/glass, -/obj/item/stack/sheet/glass, -/obj/item/stack/sheet/glass, -/obj/machinery/button/door/directional/east{ - id = "rdrnd"; - name = "Primary Research Shutters Control"; - pixel_y = 6; - req_access = list("science") - }, -/obj/machinery/button/door/directional/east{ - id = "rndlab2"; - name = "Secondary Research Shutters Control"; - pixel_y = -6; - req_access = list("science") - }, -/turf/open/floor/iron, -/area/station/science/lab) "dbh" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -9293,15 +9238,6 @@ dir = 1 }, /area/station/engineering/atmos/pumproom) -"dub" = ( -/obj/machinery/modular_computer/preset/cargochat/medical{ - dir = 1 - }, -/obj/effect/turf_decal/trimline/brown/filled/line{ - dir = 1 - }, -/turf/open/floor/iron/dark, -/area/station/medical/medbay/central) "duk" = ( /obj/machinery/light/small/dim/directional/west, /turf/open/floor/iron, @@ -15794,15 +15730,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/security/brig) -"fNE" = ( -/obj/structure/table, -/obj/machinery/cell_charger, -/obj/item/stock_parts/cell/high, -/obj/item/radio/intercom/directional/north, -/obj/machinery/firealarm/directional/west, -/obj/machinery/light/small/directional/north, -/turf/open/floor/iron/white, -/area/station/science/explab) "fNI" = ( /obj/structure/sign/poster/contraband/random/directional/east, /turf/open/floor/wood, @@ -19062,16 +18989,6 @@ /obj/structure/window/reinforced/spawner/directional/north, /turf/open/space, /area/space/nearstation) -"gZQ" = ( -/obj/effect/turf_decal/trimline/blue/filled/corner, -/obj/effect/turf_decal/trimline/brown/filled/line{ - dir = 4 - }, -/obj/effect/turf_decal/trimline/purple/filled/warning{ - dir = 4 - }, -/turf/open/floor/iron, -/area/station/science/explab) "gZV" = ( /obj/structure/cable, /obj/effect/turf_decal/siding/wood{ @@ -22607,14 +22524,6 @@ /obj/structure/extinguisher_cabinet/directional/west, /turf/open/floor/iron, /area/station/cargo/warehouse) -"ims" = ( -/obj/machinery/vending/wardrobe/medi_wardrobe, -/obj/effect/turf_decal/bot_white, -/obj/effect/turf_decal/siding/white{ - dir = 4 - }, -/turf/open/floor/iron/dark, -/area/station/medical/storage) "imt" = ( /obj/effect/turf_decal/trimline/neutral/warning{ dir = 9 @@ -23774,16 +23683,6 @@ /obj/effect/turf_decal/box, /turf/open/floor/iron/dark/smooth_large, /area/station/cargo/bitrunning/den) -"iGT" = ( -/obj/structure/table, -/obj/item/paper_bin, -/obj/item/pen, -/obj/machinery/camera/directional/north{ - c_tag = "Science Research Office"; - network = list("ss13","rd") - }, -/turf/open/floor/iron, -/area/station/science/lab) "iHc" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -23903,6 +23802,7 @@ /obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/open/floor/plating, /area/station/maintenance/solars/port/fore) +<<<<<<< HEAD "iJx" = ( /obj/structure/cable, /obj/structure/table, @@ -23931,6 +23831,8 @@ /obj/effect/turf_decal/tile/red/anticorner/contrasted, /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)) "iJC" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -26308,18 +26210,6 @@ /obj/machinery/shower/directional/north, /turf/open/floor/iron, /area/station/science/xenobiology) -"jwg" = ( -/obj/effect/turf_decal/trimline/brown/filled/line{ - dir = 8 - }, -/obj/effect/turf_decal/trimline/red/filled/warning{ - dir = 8 - }, -/obj/machinery/computer/department_orders/security{ - dir = 8 - }, -/turf/open/floor/iron, -/area/station/security/brig) "jwj" = ( /obj/machinery/atmospherics/pipe/smart/simple/dark/visible, /obj/effect/turf_decal/siding/purple{ @@ -29367,11 +29257,6 @@ /obj/item/kirbyplants/random, /turf/open/floor/iron/dark, /area/station/medical/morgue) -"kyt" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/table, -/turf/open/floor/iron, -/area/station/maintenance/starboard/greater) "kyQ" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -30247,6 +30132,7 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/central) +<<<<<<< HEAD "kQz" = ( /obj/structure/table, /obj/item/storage/box/prisoner{ @@ -30258,6 +30144,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)) "kQP" = ( /turf/closed/wall, /area/station/command/heads_quarters/qm) @@ -31065,16 +30953,6 @@ }, /turf/open/floor/iron, /area/station/engineering/break_room) -"lfd" = ( -/obj/effect/turf_decal/trimline/brown/filled/line{ - dir = 4 - }, -/obj/effect/turf_decal/trimline/yellow/filled/warning{ - dir = 4 - }, -/obj/machinery/computer/department_orders/engineering, -/turf/open/floor/iron, -/area/station/engineering/break_room) "lfk" = ( /obj/effect/turf_decal/trimline/yellow/filled/end{ dir = 8 @@ -31854,24 +31732,6 @@ /obj/structure/cable, /turf/open/floor/iron/dark, /area/station/commons/fitness/recreation) -"luB" = ( -/obj/machinery/computer/department_orders/medical{ - dir = 1 - }, -/obj/machinery/light/small/directional/south, -/obj/effect/turf_decal/trimline/brown/filled/line{ - dir = 1 - }, -/turf/open/floor/iron/dark, -/area/station/medical/medbay/central) -"luE" = ( -/obj/structure/rack, -/obj/item/integrated_circuit/loaded/hello_world, -/obj/item/storage/toolbox/electrical, -/obj/item/integrated_circuit/loaded/speech_relay, -/obj/machinery/airalarm/directional/north, -/turf/open/floor/iron/white, -/area/station/science/explab) "luF" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/disposalpipe/segment{ @@ -34314,22 +34174,6 @@ /obj/item/reagent_containers/cup/beaker/large, /turf/open/floor/iron/cafeteria, /area/station/service/kitchen) -"msW" = ( -/obj/machinery/light/directional/north, -/obj/structure/sign/warning/secure_area/directional/north, -/obj/structure/table/glass, -/obj/effect/turf_decal/stripes/corner{ - dir = 4 - }, -/obj/item/book/manual/wiki/engineering_construction{ - pixel_y = 3 - }, -/obj/item/folder/yellow, -/obj/effect/turf_decal/tile/yellow/half/contrasted{ - dir = 1 - }, -/turf/open/floor/iron, -/area/station/engineering/break_room) "mta" = ( /obj/machinery/camera/directional/north{ c_tag = "Starboard Primary Hallway - tech_storage" @@ -35551,27 +35395,6 @@ }, /turf/open/floor/iron, /area/station/commons/dorms) -"mME" = ( -/obj/structure/table, -/obj/item/folder/white{ - pixel_x = 3; - pixel_y = 4 - }, -/obj/item/reagent_containers/cup/beaker/large{ - pixel_x = -4; - pixel_y = 7 - }, -/obj/item/reagent_containers/cup/beaker{ - pixel_x = 7 - }, -/obj/item/reagent_containers/dropper{ - pixel_x = -3; - pixel_y = -6 - }, -/obj/machinery/airalarm/directional/north, -/obj/machinery/light/small/directional/north, -/turf/open/floor/iron, -/area/station/science/lab) "mMK" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -38098,16 +37921,6 @@ /obj/effect/mapping_helpers/broken_floor, /turf/open/floor/plating, /area/station/maintenance/solars/starboard/fore) -"nEf" = ( -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ - dir = 4 - }, -/obj/machinery/computer/order_console/cook{ - dir = 4 - }, -/turf/open/floor/iron, -/area/station/maintenance/starboard/greater) "nEB" = ( /obj/structure/sign/poster/random/directional/east, /obj/machinery/requests_console/directional/south{ @@ -39504,21 +39317,6 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/station/engineering/main) -"ofm" = ( -/obj/structure/table, -/obj/structure/cable, -/obj/item/disk/tech_disk{ - pixel_x = -6 - }, -/obj/item/disk/tech_disk{ - pixel_x = 6 - }, -/obj/item/disk/tech_disk{ - pixel_y = 6 - }, -/obj/machinery/power/apc/auto_name/directional/east, -/turf/open/floor/iron, -/area/station/science/lab) "ofQ" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/plating, @@ -44733,6 +44531,7 @@ }, /turf/open/floor/plating, /area/station/maintenance/central) +<<<<<<< HEAD "qaN" = ( /obj/structure/table/wood, /obj/machinery/button/ticket_machine{ @@ -44765,6 +44564,8 @@ }, /turf/open/floor/wood, /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)) "qaP" = ( /obj/effect/turf_decal/plaque{ icon_state = "L3" @@ -48097,11 +47898,6 @@ dir = 1 }, /area/station/commons/fitness) -"rjy" = ( -/obj/effect/turf_decal/trimline/blue/filled/line, -/obj/machinery/recharge_station, -/turf/open/floor/iron/white, -/area/station/medical/storage) "rjz" = ( /obj/machinery/power/shieldwallgen, /obj/structure/extinguisher_cabinet/directional/west, @@ -48347,12 +48143,6 @@ /obj/effect/spawner/random/trash/caution_sign, /turf/open/floor/plating, /area/station/maintenance/starboard/fore) -"rop" = ( -/obj/machinery/computer/department_orders/science{ - dir = 4 - }, -/turf/open/floor/iron, -/area/station/science/explab) "roF" = ( /obj/structure/cable, /obj/machinery/power/apc/auto_name/directional/south, @@ -49422,13 +49212,6 @@ /obj/machinery/light/small/directional/west, /turf/open/floor/wood, /area/station/service/theater) -"rHE" = ( -/obj/structure/table, -/obj/item/clipboard, -/obj/item/toy/figure/scientist, -/obj/machinery/firealarm/directional/east, -/turf/open/floor/iron, -/area/station/science/lab) "rHZ" = ( /obj/machinery/atmospherics/pipe/bridge_pipe/cyan/visible, /obj/machinery/atmospherics/components/binary/valve/digital{ @@ -53276,15 +53059,6 @@ /obj/machinery/light/small/directional/north, /turf/open/floor/wood/large, /area/station/service/theater) -"sZi" = ( -/obj/effect/decal/cleanable/dirt, -/obj/machinery/modular_computer/preset/cargochat/service{ - dir = 8 - }, -/obj/structure/sign/poster/random/directional/east, -/obj/machinery/light/cold/directional/east, -/turf/open/floor/iron, -/area/station/maintenance/starboard/greater) "sZo" = ( /obj/machinery/light/directional/north, /obj/structure/reagent_dispensers/watertank/high, @@ -53662,13 +53436,6 @@ }, /turf/open/floor/iron/white, /area/station/science/xenobiology) -"tgn" = ( -/obj/machinery/vending/medical, -/obj/machinery/light/cold/directional/south, -/obj/machinery/newscaster/directional/south, -/obj/effect/turf_decal/bot_white, -/turf/open/floor/iron/dark, -/area/station/medical/storage) "tgo" = ( /obj/effect/turf_decal/tile/neutral{ dir = 4 @@ -54972,13 +54739,6 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/security/prison) -"tHk" = ( -/obj/effect/decal/cleanable/dirt, -/obj/machinery/computer/department_orders/service{ - dir = 8 - }, -/turf/open/floor/iron, -/area/station/maintenance/starboard/greater) "tHE" = ( /obj/structure/disposalpipe/segment{ dir = 6 @@ -55060,6 +54820,7 @@ }, /turf/open/floor/iron/white, /area/station/medical/virology) +<<<<<<< HEAD "tIv" = ( /obj/structure/table/reinforced, /obj/machinery/door/window/brigdoor/right/directional/north{ @@ -55077,6 +54838,8 @@ /obj/structure/cable, /turf/open/floor/iron, /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)) "tIx" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/disposalpipe/segment{ @@ -57417,6 +57180,7 @@ }, /turf/open/floor/iron, /area/station/engineering/break_room) +<<<<<<< HEAD "uwC" = ( /obj/structure/table, /obj/item/paper_bin{ @@ -57434,6 +57198,8 @@ }, /turf/open/floor/iron, /area/station/hallway/secondary/command) +======= +>>>>>>> 95c538c3a57 ([MIRROR] [MDB Ignore] Combines Cargobus consoles with Dept. Order Consoles, freeing all departments of 1 whole tile of space (#1665)) "uwK" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 8 @@ -64016,18 +63782,6 @@ /obj/structure/extinguisher_cabinet/directional/west, /turf/open/floor/iron, /area/station/engineering/atmos) -"wIr" = ( -/obj/effect/turf_decal/trimline/brown/filled/line{ - dir = 10 - }, -/obj/effect/turf_decal/trimline/red/filled/warning{ - dir = 10 - }, -/obj/machinery/modular_computer/preset/cargochat/security{ - dir = 8 - }, -/turf/open/floor/iron, -/area/station/security/brig) "wIB" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/closed/wall/r_wall, @@ -67848,18 +67602,6 @@ /obj/item/pipe_dispenser, /turf/open/floor/iron, /area/station/engineering/main) -"yaH" = ( -/obj/structure/chair/office{ - dir = 8 - }, -/obj/effect/turf_decal/trimline/brown/filled/line{ - dir = 4 - }, -/obj/effect/turf_decal/trimline/purple/filled/warning{ - dir = 4 - }, -/turf/open/floor/iron, -/area/station/science/explab) "yaO" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, diff --git a/_maps/map_files/NSVBlueshift/Blueshift.dmm b/_maps/map_files/NSVBlueshift/Blueshift.dmm index 619c91b073a..457e83ed87e 100644 --- a/_maps/map_files/NSVBlueshift/Blueshift.dmm +++ b/_maps/map_files/NSVBlueshift/Blueshift.dmm @@ -3026,7 +3026,7 @@ /turf/open/floor/iron/dark, /area/station/science/genetics) "aFb" = ( -/obj/machinery/modular_computer/preset/cargochat, +/obj/structure/reagent_dispensers/water_cooler, /turf/open/floor/iron/dark, /area/station/tcommsat/computer) "aFf" = ( @@ -4727,9 +4727,6 @@ /obj/effect/turf_decal/trimline/purple/filled/warning{ dir = 9 }, -/obj/machinery/computer/department_orders/science{ - dir = 1 - }, /turf/open/floor/iron, /area/station/science/lab) "aXj" = ( @@ -13798,6 +13795,9 @@ dir = 1 }, /obj/item/radio/intercom/directional/west, +/obj/machinery/modular_computer/preset/cargochat/security{ + dir = 4 + }, /turf/open/floor/iron/dark/side{ dir = 8 }, @@ -36362,7 +36362,6 @@ /obj/effect/turf_decal/bot, /obj/effect/turf_decal/loading_area, /obj/structure/disposalpipe/segment, -/obj/machinery/computer/department_orders/security, /turf/open/floor/iron/dark/corner{ dir = 4 }, @@ -50134,9 +50133,6 @@ /area/station/security/brig) "jDW" = ( /obj/structure/window/spawner/directional/south, -/obj/machinery/computer/department_orders/service{ - dir = 1 - }, /turf/open/floor/iron/dark/side, /area/station/hallway/secondary/service) "jEg" = ( @@ -65894,9 +65890,6 @@ /turf/open/floor/iron/dark, /area/station/science/cytology) "mER" = ( -/obj/machinery/computer/department_orders/engineering{ - dir = 8 - }, /obj/machinery/light/directional/east, /turf/open/floor/iron/dark, /area/station/engineering/break_room) @@ -117911,7 +117904,6 @@ /obj/effect/turf_decal/trimline/blue/filled/warning{ dir = 6 }, -/obj/machinery/computer/department_orders/medical, /obj/machinery/digital_clock/directional/north, /turf/open/floor/iron, /area/station/medical/break_room) diff --git a/_maps/map_files/NorthStar/north_star.dmm b/_maps/map_files/NorthStar/north_star.dmm index 9af6d5baf06..947ace1f5c4 100644 --- a/_maps/map_files/NorthStar/north_star.dmm +++ b/_maps/map_files/NorthStar/north_star.dmm @@ -554,13 +554,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/catwalk_floor, /area/station/maintenance/floor1/port/fore) -"agJ" = ( -/obj/machinery/modular_computer/preset/cargochat/science, -/obj/effect/turf_decal/tile/brown/opposingcorners, -/obj/effect/turf_decal/tile/brown/opposingcorners, -/obj/effect/turf_decal/stripes/white/line, -/turf/open/floor/iron/dark, -/area/station/science/circuits) "agK" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -2413,14 +2406,6 @@ }, /turf/open/floor/iron/dark, /area/station/science/lab) -"aFI" = ( -/obj/machinery/computer/department_orders/medical{ - dir = 1 - }, -/obj/effect/turf_decal/tile/blue/fourcorners, -/obj/machinery/light/cold/directional/south, -/turf/open/floor/iron/white/textured, -/area/station/medical/break_room) "aFJ" = ( /obj/machinery/button/door/directional/north{ id = "sm_bolt"; @@ -2442,13 +2427,6 @@ }, /turf/open/floor/pod, /area/station/maintenance/floor4/port/fore) -"aGj" = ( -/obj/effect/turf_decal/tile/brown/opposingcorners, -/obj/effect/turf_decal/tile/brown/opposingcorners, -/obj/effect/turf_decal/stripes/white/line, -/obj/machinery/bci_implanter, -/turf/open/floor/iron/dark, -/area/station/science/circuits) "aGm" = ( /obj/structure/chair/comfy/black{ dir = 4 @@ -2494,13 +2472,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/station/maintenance/floor2/port/aft) -"aGG" = ( -/obj/structure/table/reinforced, -/obj/item/paper_bin, -/turf/open/floor/iron/half{ - dir = 1 - }, -/area/station/engineering/lobby) "aGH" = ( /turf/open/floor/plating, /area/station/maintenance/floor3/starboard/fore) @@ -8709,15 +8680,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/white, /area/station/medical/storage) -"cgv" = ( -/obj/structure/disposalpipe/trunk{ - dir = 1 - }, -/obj/machinery/disposal/bin/tagger, -/turf/open/floor/iron/dark/side{ - dir = 10 - }, -/area/station/security/office) "cgw" = ( /obj/effect/decal/cleanable/oil, /obj/effect/decal/cleanable/dirt, @@ -13010,13 +12972,6 @@ "dmU" = ( /turf/open/floor/iron/dark/side, /area/station/hallway/secondary/entry) -"dmZ" = ( -/obj/machinery/modular_computer/preset/cargochat/medical{ - dir = 1 - }, -/obj/effect/turf_decal/tile/blue/fourcorners, -/turf/open/floor/iron/white/textured, -/area/station/medical/break_room) "dnx" = ( /obj/structure/girder, /turf/open/floor/plating, @@ -14965,12 +14920,6 @@ /obj/structure/frame/machine, /turf/open/floor/engine, /area/station/maintenance/floor1/port/aft) -"dNU" = ( -/obj/structure/table, -/obj/item/paper_bin, -/obj/item/pen, -/turf/open/floor/iron/dark, -/area/station/hallway/floor4/fore) "dOa" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -16960,14 +16909,6 @@ /obj/structure/cable/layer3, /turf/open/floor/iron/dark, /area/station/ai_monitored/turret_protected/aisat) -"enP" = ( -/obj/machinery/module_duplicator, -/obj/effect/turf_decal/tile/purple/opposingcorners, -/obj/effect/turf_decal/siding/brown{ - dir = 1 - }, -/turf/open/floor/iron/white, -/area/station/science/circuits) "enX" = ( /obj/effect/turf_decal/weather/dirt{ dir = 5 @@ -24372,13 +24313,6 @@ /obj/machinery/door/firedoor, /turf/open/floor/iron/smooth_large, /area/station/maintenance/floor2/starboard/aft) -"gqN" = ( -/obj/effect/turf_decal/bot, -/obj/machinery/power/apc/auto_name/directional/east, -/obj/structure/cable, -/obj/structure/reagent_dispensers/watertank, -/turf/open/floor/iron/dark, -/area/station/hallway/secondary/service) "gqO" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -29851,20 +29785,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/textured_large, /area/station/cargo/storage) -"hLW" = ( -/obj/effect/turf_decal/tile/red{ - dir = 4 - }, -/obj/effect/turf_decal/tile/red{ - dir = 8 - }, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/duct, -/obj/structure/disposalpipe/segment, -/turf/open/floor/iron/dark, -/area/station/security/office) "hLX" = ( /turf/open/floor/iron/white/small, /area/station/medical/chemistry) @@ -31288,13 +31208,6 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron/dark, /area/station/security/checkpoint/second) -"ifZ" = ( -/obj/structure/rack, -/obj/effect/turf_decal/tile/brown/opposingcorners, -/obj/effect/turf_decal/tile/brown/opposingcorners, -/obj/effect/turf_decal/stripes/white/line, -/turf/open/floor/iron/dark, -/area/station/science/circuits) "igd" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable, @@ -36955,19 +36868,6 @@ /obj/machinery/portable_atmospherics/canister/carbon_dioxide, /turf/open/floor/engine/co2, /area/station/engineering/atmos) -"jEw" = ( -/obj/machinery/computer/department_orders/engineering{ - department_delivery_areas = list(/area/station/engineering/lobby) - }, -/obj/effect/turf_decal/tile/brown{ - dir = 4 - }, -/obj/effect/turf_decal/tile/yellow{ - dir = 1 - }, -/obj/effect/turf_decal/siding/thinplating_new, -/turf/open/floor/iron/dark/textured, -/area/station/engineering/lobby) "jEO" = ( /obj/effect/spawner/random/structure/crate, /obj/effect/decal/cleanable/dirt, @@ -41357,11 +41257,6 @@ }, /turf/open/floor/iron/white, /area/station/science/lobby) -"kJp" = ( -/obj/structure/table, -/obj/effect/turf_decal/tile/purple/opposingcorners, -/turf/open/floor/iron/white, -/area/station/science/circuits) "kJq" = ( /turf/open/floor/iron/kitchen, /area/station/service/kitchen/abandoned) @@ -43553,21 +43448,6 @@ /obj/effect/spawner/random/maintenance/two, /turf/open/floor/pod/light, /area/station/maintenance/floor4/starboard/aft) -"lku" = ( -/obj/effect/turf_decal/trimline/brown/filled/line{ - dir = 10 - }, -/obj/machinery/computer/department_orders/security{ - dir = 8 - }, -/obj/item/radio/intercom/directional/east, -/obj/machinery/button/door/directional/south{ - id = "secmechbay"; - name = "Security Mech Garage Door Controls"; - req_access = list("security") - }, -/turf/open/floor/iron, -/area/station/security/office) "lkA" = ( /obj/effect/turf_decal/trimline/red/filled/line, /obj/structure/disposalpipe/segment{ @@ -50786,13 +50666,6 @@ }, /turf/open/floor/plating, /area/station/medical/abandoned) -"naW" = ( -/obj/machinery/computer/department_orders/service{ - dir = 8 - }, -/obj/effect/turf_decal/bot, -/turf/open/floor/iron/dark, -/area/station/hallway/secondary/service) "nba" = ( /obj/effect/turf_decal/trimline/green/filled/line{ dir = 10 @@ -57766,11 +57639,6 @@ /obj/machinery/light/dim/directional/west, /turf/open/floor/wood/large, /area/station/security/prison/safe) -"oPv" = ( -/obj/machinery/component_printer, -/obj/effect/turf_decal/tile/purple/opposingcorners, -/turf/open/floor/iron/white, -/area/station/science/circuits) "oPA" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/effect/turf_decal/tile/blue/fourcorners, @@ -68438,11 +68306,6 @@ dir = 8 }, /area/station/hallway/floor1/aft) -"rDw" = ( -/turf/open/floor/iron/dark/side{ - dir = 4 - }, -/area/station/security/office) "rDD" = ( /obj/structure/transit_tube/curved/flipped{ dir = 8 @@ -74278,16 +74141,6 @@ /obj/effect/landmark/start/botanist, /turf/open/floor/iron, /area/station/service/hydroponics) -"tfk" = ( -/obj/machinery/computer/department_orders/science{ - department_delivery_areas = list(/area/station/science/lobby,/area/station/science/robotics/lab) - }, -/obj/effect/turf_decal/tile/brown/opposingcorners, -/obj/effect/turf_decal/tile/brown/opposingcorners, -/obj/effect/turf_decal/stripes/white/line, -/obj/machinery/light/cold/no_nightlight/directional/north, -/turf/open/floor/iron/dark, -/area/station/science/circuits) "tfo" = ( /obj/effect/turf_decal/trimline/white/line{ dir = 8 @@ -74721,15 +74574,6 @@ }, /turf/open/floor/circuit, /area/station/science/xenobiology) -"tlX" = ( -/obj/machinery/modular_computer/preset/civilian{ - dir = 8 - }, -/obj/effect/turf_decal/siding/wood{ - dir = 4 - }, -/turf/open/floor/iron/dark/smooth_large, -/area/station/science/lobby) "tlZ" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 8 @@ -78093,18 +77937,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/station/medical/abandoned) -"ufI" = ( -/obj/machinery/firealarm/directional/south, -/obj/machinery/camera/directional/south{ - c_tag = "Security - Office Aft" - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/cable, -/obj/effect/turf_decal/tile/red/fourcorners, -/obj/item/kirbyplants/organic/plant10, -/turf/open/floor/iron/dark, -/area/station/security/office) "ufL" = ( /obj/structure/railing/corner{ dir = 1 @@ -78873,21 +78705,6 @@ /obj/machinery/vending/wallmed/directional/west, /turf/open/floor/iron/white, /area/station/hallway/floor2/fore) -"uqF" = ( -/obj/structure/table, -/obj/machinery/button/ticket_machine{ - pixel_x = -32 - }, -/obj/item/stamp/head/hop{ - pixel_x = 8; - pixel_y = 5 - }, -/obj/item/flashlight/lamp{ - pixel_x = -4; - pixel_y = 3 - }, -/turf/open/floor/iron/dark, -/area/station/command/heads_quarters/hop) "uqT" = ( /obj/effect/turf_decal/trimline/green/filled/line{ dir = 6 @@ -83220,13 +83037,6 @@ }, /turf/open/floor/iron/dark, /area/station/science/ordnance/testlab) -"vuC" = ( -/obj/machinery/light/directional/south, -/obj/machinery/computer/order_console/cook{ - dir = 4 - }, -/turf/open/floor/iron, -/area/station/hallway/secondary/service) "vuD" = ( /obj/effect/turf_decal/trimline/white/filled/line, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -83262,16 +83072,6 @@ }, /turf/open/floor/catwalk_floor, /area/station/maintenance/floor3/port/fore) -"vuQ" = ( -/obj/effect/turf_decal/trimline/brown/filled/line{ - dir = 9 - }, -/obj/machinery/modular_computer/preset/cargochat/security{ - dir = 8 - }, -/obj/machinery/light/directional/east, -/turf/open/floor/iron, -/area/station/security/office) "vuU" = ( /obj/structure/cable, /obj/structure/disposalpipe/segment{ @@ -83764,13 +83564,6 @@ /obj/effect/decal/cleanable/wrapping, /turf/open/floor/pod/light, /area/station/maintenance/floor4/starboard/fore) -"vAP" = ( -/obj/machinery/modular_computer/preset/cargochat/service{ - dir = 8 - }, -/obj/machinery/airalarm/directional/east, -/turf/open/floor/iron, -/area/station/hallway/secondary/service) "vAS" = ( /obj/effect/mapping_helpers/airlock/access/any/supply/mining, /obj/machinery/door/airlock/multi_tile/public/glass{ @@ -87312,12 +87105,6 @@ "wuL" = ( /turf/closed/wall, /area/station/commons/dorms/apartment2) -"wuM" = ( -/obj/structure/table, -/obj/effect/turf_decal/tile/purple/opposingcorners, -/obj/item/radio/intercom/directional/south, -/turf/open/floor/iron/white, -/area/station/science/circuits) "wuZ" = ( /obj/structure/rack, /obj/effect/decal/cleanable/dirt, @@ -319736,7 +319523,7 @@ aQS vko mBg dPf -rDw +mBg pse oQu odH diff --git a/_maps/map_files/VoidRaptor/VoidRaptor.dmm b/_maps/map_files/VoidRaptor/VoidRaptor.dmm index 6e23381a6af..e6bd520019e 100644 --- a/_maps/map_files/VoidRaptor/VoidRaptor.dmm +++ b/_maps/map_files/VoidRaptor/VoidRaptor.dmm @@ -33131,7 +33131,6 @@ dir = 4 }, /obj/effect/turf_decal/trimline/brown/filled/mid_joiner, -/obj/machinery/computer/department_orders/service, /obj/effect/turf_decal/bot, /turf/open/floor/iron/smooth_large, /area/station/hallway/secondary/service) @@ -34720,7 +34719,6 @@ /area/station/science/xenobiology) "jSl" = ( /obj/effect/turf_decal/bot, -/obj/machinery/computer/department_orders/science, /obj/effect/turf_decal/trimline/brown/filled/mid_joiner, /obj/effect/turf_decal/trimline/brown/filled/line{ dir = 10 @@ -36909,9 +36907,6 @@ /turf/open/floor/iron/smooth, /area/station/cargo/lobby) "kyH" = ( -/obj/machinery/computer/department_orders/medical{ - dir = 4 - }, /obj/effect/turf_decal/trimline/brown/filled/line{ dir = 6 }, @@ -48178,9 +48173,6 @@ /obj/effect/turf_decal/trimline/brown/filled/line{ dir = 9 }, -/obj/machinery/computer/department_orders/security{ - dir = 1 - }, /obj/machinery/firealarm/directional/south, /obj/effect/turf_decal/trimline/brown/filled/mid_joiner{ dir = 8 @@ -49589,9 +49581,6 @@ /turf/closed/wall, /area/station/medical/medbay/central) "nUc" = ( -/obj/machinery/computer/department_orders/engineering{ - dir = 1 - }, /obj/effect/turf_decal/trimline/brown/filled/mid_joiner{ dir = 1 }, @@ -49770,9 +49759,6 @@ /obj/effect/turf_decal/trimline/brown/filled/line{ dir = 8 }, -/obj/machinery/modular_computer/preset/cargochat/cargo{ - dir = 4 - }, /obj/effect/turf_decal/bot, /turf/open/floor/iron/smooth_edge{ dir = 4 diff --git a/_maps/map_files/tramstation/tramstation.dmm b/_maps/map_files/tramstation/tramstation.dmm index 03f46d2d840..07b57d865b0 100644 --- a/_maps/map_files/tramstation/tramstation.dmm +++ b/_maps/map_files/tramstation/tramstation.dmm @@ -597,6 +597,7 @@ dir = 1 }, /area/station/escapepodbay) +<<<<<<< HEAD "aci" = ( /obj/structure/railing{ dir = 4 @@ -606,6 +607,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)) "acj" = ( /turf/open/floor/iron/stairs/medium{ dir = 1 @@ -31354,6 +31357,16 @@ /obj/effect/mapping_helpers/airlock/locked, /turf/open/floor/catwalk_floor, /area/station/maintenance/tram/mid) +"kfH" = ( +/obj/structure/railing{ + dir = 4 + }, +/obj/effect/turf_decal/trimline/red/filled/line{ + dir = 4 + }, +/obj/machinery/photobooth/security, +/turf/open/floor/iron, +/area/station/security/execution/transfer) "kfO" = ( /turf/open/floor/plating, /area/station/cargo/drone_bay) @@ -86741,7 +86754,7 @@ jWs jvE eLB abU -aci +kfH acv acH sXc @@ -183172,7 +183185,11 @@ vTb rbn crj wWT +<<<<<<< HEAD fDB +======= +bCx +>>>>>>> 95c538c3a57 ([MIRROR] [MDB Ignore] Combines Cargobus consoles with Dept. Order Consoles, freeing all departments of 1 whole tile of space (#1665)) uvB rBb tbK diff --git a/code/game/objects/items/circuitboards/computer_circuitboards.dm b/code/game/objects/items/circuitboards/computer_circuitboards.dm index 2eca8339590..e0e5c31c99f 100644 --- a/code/game/objects/items/circuitboards/computer_circuitboards.dm +++ b/code/game/objects/items/circuitboards/computer_circuitboards.dm @@ -594,28 +594,3 @@ /obj/item/circuitboard/computer/exodrone_console name = "Exploration Drone Control Console" build_path = /obj/machinery/computer/exodrone_control_console - -/obj/item/circuitboard/computer/service_orders - name = "Service Order" - greyscale_colors = CIRCUIT_COLOR_SUPPLY - build_path = /obj/machinery/computer/department_orders/service - -/obj/item/circuitboard/computer/engineering_orders - name = "Engineering Order" - greyscale_colors = CIRCUIT_COLOR_SUPPLY - build_path = /obj/machinery/computer/department_orders/engineering - -/obj/item/circuitboard/computer/science_orders - name = "Science Order" - greyscale_colors = CIRCUIT_COLOR_SUPPLY - build_path = /obj/machinery/computer/department_orders/science - -/obj/item/circuitboard/computer/security_orders - name = "Security Order" - greyscale_colors = CIRCUIT_COLOR_SUPPLY - build_path = /obj/machinery/computer/department_orders/security - -/obj/item/circuitboard/computer/medical_orders - name = "Medical Order" - greyscale_colors = CIRCUIT_COLOR_SUPPLY - build_path = /obj/machinery/computer/department_orders/medical diff --git a/code/modules/cargo/department_order.dm b/code/modules/cargo/department_order.dm deleted file mode 100644 index c8eb6e99ac2..00000000000 --- a/code/modules/cargo/department_order.dm +++ /dev/null @@ -1,277 +0,0 @@ - -///cooldown for each department, assoc type 2 cooldown. global, so rebuilding the console doesn't refresh the cd -GLOBAL_LIST_INIT(department_order_cooldowns, list( - /obj/machinery/computer/department_orders/service = 0, - /obj/machinery/computer/department_orders/engineering = 0, - /obj/machinery/computer/department_orders/science = 0, - /obj/machinery/computer/department_orders/security = 0, - /obj/machinery/computer/department_orders/medical = 0, -)) - -/obj/machinery/computer/department_orders - name = "department order console" - desc = "Used to order supplies for a department. Crates ordered this way will be locked until they reach their destination." - icon_screen = "supply" - light_color = COLOR_BRIGHT_ORANGE - ///reference to the order we've made UNTIL it gets sent on the supply shuttle. this is so heads can cancel it - var/datum/supply_order/department_order - ///access required to override an order - this should be a head of staff for the department - var/override_access - ///where this computer expects deliveries to need to go, passed onto orders. it will see if the FIRST one exists, then try a fallback. if no fallbacks it throws an error - var/list/department_delivery_areas = list() - ///which groups this computer can order from - var/list/dep_groups = list() - /// If this departmental order console currently is on cooldown. - var/on_cooldown = FALSE - - /// Our radio object we use to talk to our department. - var/obj/item/radio/radio - /// The radio key typepath that will be instantiated and inserted into our radio. - var/obj/item/encryptionkey/radio_key_typepath - /// The radio channel we will speak into by default. - var/radio_channel - -/obj/machinery/computer/department_orders/Initialize(mapload, obj/item/circuitboard/board) - . = ..() - // All maps should have ONLY ONE of each order console roundstart - REGISTER_REQUIRED_MAP_ITEM(1, 1) - - if (radio_channel && radio_key_typepath) - radio = new(src) - radio.keyslot = new radio_key_typepath - radio.subspace_transmission = TRUE - radio.canhear_range = 0 - radio.recalculateChannels() - - if(mapload) //check for mapping errors - for(var/delivery_area_type in department_delivery_areas) - if(GLOB.areas_by_type[delivery_area_type]) - return - //every area fallback didn't exist on this map so throw a mapping error and set some generic area that uuuh please exist okay - log_mapping("[src] has no valid areas to deliver to on this map, add some more fallback areas to its \"department_delivery_areas\" var.") - department_delivery_areas = list(/area/station/hallway/primary/central) //if this doesn't exist like honestly fuck your map man - -/obj/machinery/computer/department_orders/Destroy() - QDEL_NULL(radio) - - return ..() - -/obj/machinery/computer/department_orders/ui_interact(mob/user, datum/tgui/ui) - . = ..() - ui = SStgui.try_update_ui(user, src, ui) - if(!ui) - ui = new(user, src, "DepartmentOrders") - ui.open() - -/obj/machinery/computer/department_orders/ui_data(mob/user) - var/list/data = list() - var/cooldown = GLOB.department_order_cooldowns[type] - world.time - if(cooldown < 0) - data["time_left"] = 0 - else - data["time_left"] = DisplayTimeText(cooldown, 1) - data["can_override"] = department_order ? TRUE : FALSE - return data - -/obj/machinery/computer/department_orders/ui_static_data(mob/user) - var/list/data = list() - var/list/supply_data = list() //each item in this needs to be a Category - for(var/pack_key in SSshuttle.supply_packs) - var/datum/supply_pack/pack = SSshuttle.supply_packs[pack_key] - //skip groups we do not offer - if(!(pack.group in dep_groups)) - continue - //find which group this belongs to, make the group if it doesn't exist - var/list/target_group - for(var/list/possible_group in supply_data) - if(possible_group["name"] == pack.group) - target_group = possible_group - break - if(!target_group) - target_group = list( - "name" = pack.group, - "packs" = list(), - ) - supply_data += list(target_group) - //skip packs we should not show, even if we should show the group - if((pack.hidden && !(obj_flags & EMAGGED)) || (pack.special && !pack.special_enabled) || pack.drop_pod_only || pack.goody) - continue - //finally the pack data itself - target_group["packs"] += list(list( - "name" = pack.name, - "cost" = pack.get_cost(), - "id" = pack.id, - "desc" = pack.desc || pack.name, // If there is a description, use it. Otherwise use the pack's name. - )) - data["supplies"] = supply_data - return data - -/obj/machinery/computer/department_orders/ui_act(action, list/params) - . = ..() - - if(!isliving(usr)) - return - var/mob/living/orderer = usr - - var/obj/item/card/id/id_card = orderer.get_idcard(hand_first = TRUE) - - //needs to come BEFORE preventing actions! - if(action == "override_order") - if(!(override_access in id_card.GetAccess())) - balloon_alert(usr, "requires head of staff access!") - playsound(src, 'sound/machines/buzz-sigh.ogg', 30, TRUE) - return - - if(department_order && (department_order in SSshuttle.shopping_list)) - GLOB.department_order_cooldowns[type] = 0 - SSshuttle.shopping_list -= department_order - department_order = null - UnregisterSignal(SSshuttle, COMSIG_SUPPLY_SHUTTLE_BUY) - return TRUE - - if(GLOB.department_order_cooldowns[type] > world.time) - return - - if(!check_access(id_card)) - balloon_alert(usr, "access denied!") - playsound(src, 'sound/machines/buzz-sigh.ogg', 30, TRUE) - return - - . = TRUE - var/id = params["id"] - id = text2path(id) || id - var/datum/supply_pack/pack = SSshuttle.supply_packs[id] - if(!pack) - say("Something went wrong!") - CRASH("requested supply pack id \"[id]\" not found!") - if((pack.hidden && !(obj_flags & EMAGGED)) || (pack.special && !pack.special_enabled) || pack.drop_pod_only || pack.goody) - return - var/name = "*None Provided*" - var/rank = "*None Provided*" - var/ckey = usr.ckey - if(ishuman(usr)) - var/mob/living/carbon/human/human_orderer = usr - name = human_orderer.get_authentification_name() - rank = human_orderer.get_assignment(hand_first = TRUE) - else if(HAS_SILICON_ACCESS(usr)) - name = usr.real_name - rank = "Silicon" - //already have a signal to finalize the order - var/already_signalled = department_order ? TRUE : FALSE - var/chosen_delivery_area - for(var/delivery_area_type in department_delivery_areas) - if(GLOB.areas_by_type[delivery_area_type]) - chosen_delivery_area = delivery_area_type - break - - if(SSshuttle.supply.get_order_count(pack) == OVER_ORDER_LIMIT) - playsound(src, 'sound/machines/buzz-sigh.ogg', 50, FALSE) - say("ERROR: No more then [CARGO_MAX_ORDER] of any pack may be ordered at once") - return - - department_order = new( - pack = pack, - orderer = name, - orderer_rank = rank, - orderer_ckey = ckey, - reason = "", - paying_account = null, - department_destination = chosen_delivery_area, - coupon = null, - manifest_can_fail = FALSE, - ) - SSshuttle.shopping_list += department_order - if(!already_signalled) - RegisterSignal(SSshuttle, COMSIG_SUPPLY_SHUTTLE_BUY, PROC_REF(finalize_department_order)) - say("Order processed. Cargo will deliver the crate when it comes in on their shuttle. NOTICE: Heads of staff may override the order.") - calculate_cooldown(pack.cost) - -///signal when the supply shuttle begins to spawn orders. we forget the current order preventing it from being overridden (since it's already past the point of no return on undoing the order) -/obj/machinery/computer/department_orders/proc/finalize_department_order(datum/subsystem) - SIGNAL_HANDLER - if(department_order && (department_order in SSshuttle.shopping_list)) - department_order = null - UnregisterSignal(subsystem, COMSIG_SUPPLY_SHUTTLE_BUY) - -/obj/machinery/computer/department_orders/proc/calculate_cooldown(credits) - //minimum almost the lowest value of a crate - var/min = CARGO_CRATE_VALUE * 1.6 - //maximum fairly expensive crate at 3000 - var/max = CARGO_CRATE_VALUE * 15 - credits = clamp(credits, min, max) - var/time_y = (credits - min)/(max - min) + 1 //convert to between 1 and 2 - time_y = 10 MINUTES * time_y - GLOB.department_order_cooldowns[type] = world.time + time_y - -/obj/machinery/computer/department_orders/process() - . = ..() - if (!.) - return FALSE - - if (GLOB.department_order_cooldowns[type] > world.time) - on_cooldown = TRUE - else if (on_cooldown) - radio?.talk_into(src, "Order cooldown has expired! A new order may now be placed!", radio_channel) - playsound(src, 'sound/machines/ping.ogg', 30, TRUE) - on_cooldown = FALSE - - return TRUE - -/obj/machinery/computer/department_orders/service - name = "service order console" - circuit = /obj/item/circuitboard/computer/service_orders - department_delivery_areas = list(/area/station/hallway/secondary/service, /area/station/service/bar/atrium) - override_access = ACCESS_HOP - req_one_access = list(ACCESS_SERVICE) - dep_groups = list("Service", "Food & Hydroponics", "Livestock", "Costumes & Toys") - radio_key_typepath = /obj/item/encryptionkey/headset_service - radio_channel = RADIO_CHANNEL_SERVICE - -/obj/machinery/computer/department_orders/engineering - name = "engineering order console" - circuit = /obj/item/circuitboard/computer/engineering_orders - department_delivery_areas = list(/area/station/engineering/main) - override_access = ACCESS_CE - req_one_access = REGION_ACCESS_ENGINEERING - dep_groups = list("Engineering", "Engine Construction", "Canisters & Materials") - radio_key_typepath = /obj/item/encryptionkey/headset_eng - radio_channel = RADIO_CHANNEL_ENGINEERING - -/obj/machinery/computer/department_orders/science - name = "science order console" - circuit = /obj/item/circuitboard/computer/science_orders - department_delivery_areas = list(/area/station/science/research) - override_access = ACCESS_RD - req_one_access = REGION_ACCESS_RESEARCH - dep_groups = list("Science", "Livestock", "Canisters & Materials") - radio_key_typepath = /obj/item/encryptionkey/headset_sci - radio_channel = RADIO_CHANNEL_SCIENCE - -/obj/machinery/computer/department_orders/security - name = "security order console" - circuit = /obj/item/circuitboard/computer/security_orders - department_delivery_areas = list( - /area/station/security/office, - /area/station/security/brig, - /area/station/security/brig/upper, - ) - override_access = ACCESS_HOS - req_one_access = REGION_ACCESS_SECURITY - dep_groups = list("Security", "Armory") - radio_key_typepath = /obj/item/encryptionkey/headset_sec - radio_channel = RADIO_CHANNEL_SECURITY - -/obj/machinery/computer/department_orders/medical - name = "medical order console" - circuit = /obj/item/circuitboard/computer/medical_orders - department_delivery_areas = list( - /area/station/medical/medbay/central, - /area/station/medical/medbay, - /area/station/medical/treatment_center, - /area/station/medical/storage, - ) - override_access = ACCESS_CMO - req_one_access = REGION_ACCESS_MEDBAY - dep_groups = list("Medical") - radio_key_typepath = /obj/item/encryptionkey/headset_med - radio_channel = RADIO_CHANNEL_MEDICAL diff --git a/code/modules/jobs/departments/departments.dm b/code/modules/jobs/departments/departments.dm index 9f2776bad0e..ce21920eced 100644 --- a/code/modules/jobs/departments/departments.dm +++ b/code/modules/jobs/departments/departments.dm @@ -18,7 +18,24 @@ var/list/department_jobs = list() /// For separatists, what independent name prefix does their nation get named? var/list/nation_prefixes = list() - + /// List of /area types that are considered part of this department's "delivery" area. + /// Acts as a priority system, where first items are picked first. + var/list/department_delivery_areas = list() + /// List of categories in the cargo console that are associated with this department. + var/list/associated_cargo_groups = list() + /// The single access associated with the head of staff of this department. + var/head_of_staff_access + /// A list of generic access flags people in this department generally have. + var/list/department_access = list() + +/datum/job_department/New() + . = ..() + for(var/delivery_area_type in department_delivery_areas) + if(GLOB.areas_by_type[delivery_area_type]) + return + //every area fallback didn't exist on this map so throw a mapping error and set some generic area that uuuh please exist okay + log_mapping("[type] has no valid areas to deliver to on this map, add some more fallback areas to its \"department_delivery_areas\" var.") + department_delivery_areas = list(/area/station/hallway/primary/central) //if this doesn't exist like honestly fuck your map man /// Handles adding jobs to the department and setting up the job bitflags. /datum/job_department/proc/add_job(datum/job/job) @@ -76,6 +93,14 @@ label_class = "security" ui_color = "#d46a78" nation_prefixes = list("Securi", "Beepski", "Shitcuri", "Red", "Stunba", "Flashbango", "Flasha", "Stanfordi") + department_delivery_areas = list( + /area/station/security/office, + /area/station/security/brig, + /area/station/security/brig/upper, + ) + associated_cargo_groups = list("Security", "Armory") + head_of_staff_access = ACCESS_HOS + department_access = REGION_ACCESS_SECURITY /datum/job_department/engineering department_name = DEPARTMENT_ENGINEERING @@ -86,7 +111,10 @@ label_class = "engineering" ui_color = "#dfb567" nation_prefixes = list("Atomo", "Engino", "Power", "Teleco") - + department_delivery_areas = list(/area/station/engineering/main) + associated_cargo_groups = list("Engineering", "Engine Construction", "Canisters & Materials") + head_of_staff_access = ACCESS_CE + department_access = REGION_ACCESS_ENGINEERING /datum/job_department/medical department_name = DEPARTMENT_MEDICAL @@ -97,7 +125,15 @@ label_class = "medical" ui_color = "#65b2bd" nation_prefixes = list("Mede", "Healtha", "Recova", "Chemi", "Viro", "Psych") - + department_delivery_areas = list( + /area/station/medical/medbay/central, + /area/station/medical/medbay, + /area/station/medical/treatment_center, + /area/station/medical/storage, + ) + associated_cargo_groups = list("Medical") + head_of_staff_access = ACCESS_CMO + department_access = REGION_ACCESS_MEDBAY /datum/job_department/science department_name = DEPARTMENT_SCIENCE @@ -108,6 +144,10 @@ label_class = "science" ui_color = "#c973c9" nation_prefixes = list("Sci", "Griffa", "Geneti", "Explosi", "Mecha", "Xeno", "Nani", "Cyto") + department_delivery_areas = list(/area/station/science/research) + associated_cargo_groups = list("Science", "Livestock", "Canisters & Materials") + head_of_staff_access = ACCESS_RD + department_access = REGION_ACCESS_RESEARCH /datum/job_department/cargo @@ -119,7 +159,8 @@ label_class = "supply" ui_color = "#cf9c6c" nation_prefixes = list("Cargo", "Guna", "Suppli", "Mule", "Crate", "Ore", "Mini", "Shaf") - + head_of_staff_access = ACCESS_QM + department_access = REGION_ACCESS_SUPPLY /datum/job_department/service department_name = DEPARTMENT_SERVICE @@ -130,7 +171,10 @@ label_class = "service" ui_color = "#7cc46a" nation_prefixes = list("Honka", "Boozo", "Fatu", "Danka", "Mimi", "Libra", "Jani", "Religi") - + department_delivery_areas = list(/area/station/hallway/secondary/service, /area/station/service/bar/atrium) + associated_cargo_groups = list("Service", "Food & Hydroponics", "Livestock", "Costumes & Toys") + head_of_staff_access = ACCESS_HOP + department_access = list(ACCESS_SERVICE) /datum/job_department/silicon department_name = DEPARTMENT_SILICON diff --git a/code/modules/modular_computers/computers/machinery/console_presets.dm b/code/modules/modular_computers/computers/machinery/console_presets.dm index 00af9975e24..18f394d6ee0 100644 --- a/code/modules/modular_computers/computers/machinery/console_presets.dm +++ b/code/modules/modular_computers/computers/machinery/console_presets.dm @@ -80,42 +80,69 @@ // ===== CARGO CHAT CONSOLES ===== /obj/machinery/modular_computer/preset/cargochat - name = "cargo chatroom console" - desc = "A stationary computer. This one comes preloaded with a chatroom for your cargo requests." + name = "cargo interfacing console" + desc = "A stationary computer that comes pre-loaded with software to interface with the cargo department." starting_programs = list( /datum/computer_file/program/chatclient, ) - - ///Used in Initialize to set the chat client name. - var/console_department + /// What department type is assigned to this console? + var/datum/job_department/department_type /obj/machinery/modular_computer/preset/cargochat/Initialize(mapload) + add_starting_software() . = ..() + setup_starting_software() + REGISTER_REQUIRED_MAP_ITEM(1, 1) + if(department_type) + name = "[lowertext(initial(department_type.department_name))] [name]" + cpu.name = name + +/obj/machinery/modular_computer/preset/cargochat/proc/add_starting_software() + starting_programs += /datum/computer_file/program/department_order + +/obj/machinery/modular_computer/preset/cargochat/proc/setup_starting_software() + if(!department_type) + return + var/datum/computer_file/program/chatclient/chatprogram = cpu.find_file_by_name("ntnrc_client") - chatprogram.username = "[lowertext(console_department)]_department" - cpu.active_program = chatprogram + chatprogram.username = "[lowertext(initial(department_type.department_name))]_department" + cpu.idle_threads += chatprogram + + var/datum/computer_file/program/department_order/orderprogram = cpu.find_file_by_name("dept_order") + orderprogram.set_linked_department(department_type) + cpu.active_program = orderprogram + update_appearance(UPDATE_ICON) /obj/machinery/modular_computer/preset/cargochat/service - console_department = "Service" + department_type = /datum/job_department/service /obj/machinery/modular_computer/preset/cargochat/engineering - console_department = "Engineering" + department_type = /datum/job_department/engineering /obj/machinery/modular_computer/preset/cargochat/science - console_department = "Science" + department_type = /datum/job_department/science /obj/machinery/modular_computer/preset/cargochat/security - console_department = "Security" + department_type = /datum/job_department/security /obj/machinery/modular_computer/preset/cargochat/medical - console_department = "Medical" - + department_type = /datum/job_department/medical -//ONE PER MAP PLEASE, IT MAKES A CARGOBUS FOR EACH ONE OF THESE /obj/machinery/modular_computer/preset/cargochat/cargo - console_department = "Cargo" - name = "department chatroom console" - desc = "A stationary computer. This one comes preloaded with a chatroom for incoming cargo requests. You may moderate it from this computer." + department_type = /datum/job_department/cargo + name = "departmental interfacing console" + desc = "A stationary computer that comes pre-loaded with software to interface with incoming departmental cargo requests." + +/obj/machinery/modular_computer/preset/cargochat/cargo/add_starting_software() + starting_programs += /datum/computer_file/program/bounty_board + starting_programs += /datum/computer_file/program/budgetorders + starting_programs += /datum/computer_file/program/shipping + +/obj/machinery/modular_computer/preset/cargochat/cargo/setup_starting_software() + var/datum/computer_file/program/chatclient/chatprogram = cpu.find_file_by_name("ntnrc_client") + cpu.active_program = chatprogram + update_appearance(UPDATE_ICON) + // Rest of the chat program setup is done in LateInit /obj/machinery/modular_computer/preset/cargochat/cargo/LateInitialize() . = ..() diff --git a/code/modules/modular_computers/file_system/programs/budgetordering.dm b/code/modules/modular_computers/file_system/programs/budgetordering.dm index b7d337d5c34..af890f0740d 100644 --- a/code/modules/modular_computers/file_system/programs/budgetordering.dm +++ b/code/modules/modular_computers/file_system/programs/budgetordering.dm @@ -8,6 +8,7 @@ can_run_on_flags = PROGRAM_LAPTOP | PROGRAM_PDA size = 10 tgui_id = "NtosCargo" + program_icon = FA_ICON_CART_FLATBED ///Are you actually placing orders with it? var/requestonly = TRUE ///Can the tablet see or buy illegal stuff? diff --git a/code/modules/modular_computers/file_system/programs/chatroom/ntnrc_client.dm b/code/modules/modular_computers/file_system/programs/chatroom/ntnrc_client.dm index b3566591e12..66182437869 100644 --- a/code/modules/modular_computers/file_system/programs/chatroom/ntnrc_client.dm +++ b/code/modules/modular_computers/file_system/programs/chatroom/ntnrc_client.dm @@ -8,13 +8,13 @@ filename = "ntnrc_client" filedesc = "Chat Client" downloader_category = PROGRAM_CATEGORY_DEVICE - program_open_overlay = "command" - extended_desc = "This program allows communication over NTNRC network" + program_open_overlay = "text" + extended_desc = "This program allows communication over NTNRC network." size = 8 ui_header = "ntnrc_idle.gif" program_flags = PROGRAM_ON_NTNET_STORE | PROGRAM_REQUIRES_NTNET tgui_id = "NtosNetChat" - program_icon = "comment-alt" + program_icon = FA_ICON_COMMENT_ALT alert_able = TRUE ///The user's screen name. diff --git a/code/modules/modular_computers/file_system/programs/dept_order.dm b/code/modules/modular_computers/file_system/programs/dept_order.dm new file mode 100644 index 00000000000..2229628d392 --- /dev/null +++ b/code/modules/modular_computers/file_system/programs/dept_order.dm @@ -0,0 +1,274 @@ +/datum/computer_file/program/department_order + filename = "dept_order" + filedesc = "Departmental Orders" + can_run_on_flags = PROGRAM_CONSOLE + downloader_category = PROGRAM_CATEGORY_SUPPLY + program_open_overlay = "request" + extended_desc = "Allows for departments to order supplied from Cargo for free, with a cooldown between orders." + size = 10 + tgui_id = "NtosDeptOrder" + program_icon = FA_ICON_CART_FLATBED + alert_able = TRUE + + // Filled via set_linked_department. Also serves as "who can cancel the order". + download_access = list(ACCESS_COMMAND) + // Anyone can open, not everyone can use. + run_access = list() + /// Filled via set_linked_department. Serves as "who can place orders". + VAR_PRIVATE/list/use_access = list() + + /// The department we are linked to, typepath. + VAR_PRIVATE/datum/job_department/linked_department + /// Stores the time when we can next place an order for each department. + VAR_PRIVATE/static/list/department_cooldowns = list( + /datum/job_department/engineering = 0, + /datum/job_department/medical = 0, + /datum/job_department/science = 0, + /datum/job_department/security = 0, + /datum/job_department/service = 0, + ) + /// Reference to the order we've made UNTIL it gets sent on the supply shuttle. this is so heads can cancel it + VAR_PRIVATE/datum/supply_order/department_order + /// Our radio object we use to talk to our department. + VAR_PRIVATE/obj/item/radio/radio + /// The radio channel we will speak into by default. + VAR_PRIVATE/radio_channel + /// Maps what department gets what encryption key + /// I could've put this on the job department datum but it felt unnecessary + VAR_PRIVATE/static/list/dept_to_radio = list( + /datum/job_department/engineering = /obj/item/encryptionkey/headset_eng, + /datum/job_department/medical = /obj/item/encryptionkey/headset_med, + /datum/job_department/science = /obj/item/encryptionkey/headset_sci, + /datum/job_department/security = /obj/item/encryptionkey/headset_sec, + /datum/job_department/service = /obj/item/encryptionkey/headset_service, + ) + +/// Sets the passed department type as the active department for this computer file. +/datum/computer_file/program/department_order/proc/set_linked_department(datum/job_department/department) + linked_department = department + var/datum/job_department/linked_department_real = SSjob.get_department_type(linked_department) + // Heads of staff can download + download_access |= linked_department_real.head_of_staff_access + // Heads of staff + anyone in the dept can run it + use_access |= linked_department_real.head_of_staff_access + use_access |= linked_department_real.department_access + // Also set up the radio + if(dept_to_radio[linked_department]) + if(!isnull(radio)) + QDEL_NULL(radio) + var/picked_key = dept_to_radio[linked_department] || /obj/item/encryptionkey/headset_cargo + radio = new(computer) + radio.keyslot = new picked_key() + radio.subspace_transmission = TRUE + radio.canhear_range = 0 + radio.recalculateChannels() + radio_channel = radio.keyslot.channels[1] + computer.update_static_data_for_all_viewers() + +/datum/computer_file/program/department_order/Destroy() + QDEL_NULL(radio) + return ..() + +/datum/computer_file/program/department_order/ui_interact(mob/user, datum/tgui/ui) + check_cooldown() + +/datum/computer_file/program/department_order/ui_data(mob/user) + var/list/data = list() + data["no_link"] = !linked_department + data["id_inside"] = !!computer.computer_id_slot + data["time_left"] = department_cooldowns[linked_department] ? DisplayTimeText(max(department_cooldowns[linked_department] - world.time, 0), 1) : null + data["can_override"] = !!department_order + return data + +/datum/computer_file/program/department_order/ui_static_data(mob/user) + var/datum/job_department/linked_department_real = SSjob.get_department_type(linked_department) + if(isnull(linked_department_real)) + return list("supplies" = list()) + + var/list/data = list() + + var/list/supply_data = list() + for(var/group in linked_department_real.associated_cargo_groups) + supply_data[group] = list() + + for(var/pack_key in SSshuttle.supply_packs) + var/datum/supply_pack/pack = SSshuttle.supply_packs[pack_key] + if(!islist(supply_data[pack.group]) || !can_see_pack(pack)) + continue + + UNTYPED_LIST_ADD(supply_data[pack.group], list( + "name" = pack.name, + "cost" = pack.get_cost(), + "id" = pack.id, + "desc" = pack.desc || pack.name, // If there is a description, use it. Otherwise use the pack's name. + )) + + var/list/supply_data_flattened = list() + for(var/group in supply_data) + UNTYPED_LIST_ADD(supply_data_flattened, list( + "name" = group, + "packs" = supply_data[group], + )) + + data["supplies"] = supply_data_flattened + return data + +/// Checks if we can "see" the passed supply pack +/datum/computer_file/program/department_order/proc/can_see_pack(datum/supply_pack/to_check) + PROTECTED_PROC(TRUE) + if(to_check.hidden && !(computer.obj_flags & EMAGGED)) + return FALSE + if(to_check.special && !to_check.special_enabled) + return FALSE + if(to_check.drop_pod_only) + return FALSE + if(to_check.goody) + return FALSE + return TRUE + +/// Looks through all possible departments and finds one this ID card "corresponds" to. +/datum/computer_file/program/department_order/proc/find_department_to_link(obj/item/card/id/id_card) + PROTECTED_PROC(TRUE) + if(id_card.type != /obj/item/card/id/advanced/silver) + // I don't want to introduce weird "access order" behavior with Captain's ID / Chameleon ids / etc, so only silver IDs work + return null + var/list/access_to_depts = list() + for(var/datum/job_department/department as anything in department_cooldowns) + access_to_depts[initial(department.head_of_staff_access)] = department + for(var/access_key in id_card.GetAccess()) + if(access_to_depts[access_key]) + return access_to_depts[access_key] + return null + +/datum/computer_file/program/department_order/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) + . = ..() + if(.) + return . + + var/mob/living/orderer = ui.user + if(!istype(orderer)) + return . + + if(action == "link") + if(!isnull(linked_department)) + return TRUE + + var/new_dept_type = find_department_to_link(computer.computer_id_slot) + if(isnull(new_dept_type)) + computer.physical.balloon_alert(orderer, "no department found!") + playsound(computer, 'sound/machines/buzz-sigh.ogg', 30, TRUE) + else + computer.physical.balloon_alert(orderer, "linked") + playsound(computer, 'sound/machines/ping.ogg', 30, TRUE) + set_linked_department(new_dept_type) + return TRUE + + if(isnull(linked_department)) + return TRUE + + var/obj/item/card/id/id_card = computer.computer_id_slot || orderer.get_idcard(hand_first = TRUE) + var/list/id_card_access = id_card?.GetAccess() || list() + + if(length(use_access & id_card_access) <= 0) + computer.physical.balloon_alert(orderer, "access denied!") + playsound(computer, 'sound/machines/buzz-sigh.ogg', 30, TRUE) + return TRUE + + if(action == "override_order") + if(isnull(department_order) || !(department_order in SSshuttle.shopping_list)) + return TRUE + if(length(download_access & id_card_access) <= 0) + computer.physical.balloon_alert(orderer, "requires head of staff access!") + playsound(computer, 'sound/machines/buzz-sigh.ogg', 30, TRUE) + return TRUE + + department_cooldowns[linked_department] = 0 + SSshuttle.shopping_list -= department_order + department_order = null + UnregisterSignal(SSshuttle, COMSIG_SUPPLY_SHUTTLE_BUY) + return TRUE + + if(department_cooldowns[linked_department] > world.time) + return TRUE + + submit_order(orderer, params["id"]) + return TRUE + +/datum/computer_file/program/department_order/proc/submit_order(mob/living/orderer, id) + id = text2path(id) || id + + var/datum/job_department/linked_department_real = SSjob.get_department_type(linked_department) + var/datum/supply_pack/pack = SSshuttle.supply_packs[id] + if(isnull(pack)) + computer.physical.say("Something went wrong!") + CRASH("requested supply pack id \"[id]\" not found!") + if(!can_see_pack(pack) || !(pack.group in linked_department_real.associated_cargo_groups)) + return + var/name = "*None Provided*" + var/rank = "*None Provided*" + var/ckey = orderer.ckey + if(ishuman(orderer)) + var/mob/living/carbon/human/human_orderer = orderer + name = human_orderer.get_authentification_name() + rank = human_orderer.get_assignment(hand_first = TRUE) + else if(HAS_SILICON_ACCESS(orderer)) + name = orderer.real_name + rank = "Silicon" + var/already_signalled = !!department_order + var/chosen_delivery_area + for(var/delivery_area_type in linked_department_real.department_delivery_areas) + if(GLOB.areas_by_type[delivery_area_type]) + chosen_delivery_area = delivery_area_type + break + + if(SSshuttle.supply.get_order_count(pack) == OVER_ORDER_LIMIT) + playsound(computer, 'sound/machines/buzz-sigh.ogg', 50, FALSE) + computer.physical.say("ERROR: No more then [CARGO_MAX_ORDER] of any pack may be ordered at once!") + return + + department_order = new( + pack = pack, + orderer = name, + orderer_rank = rank, + orderer_ckey = ckey, + reason = "Departmental Order", + paying_account = null, + department_destination = chosen_delivery_area, + coupon = null, + manifest_can_fail = FALSE, + ) + SSshuttle.shopping_list += department_order + if(!already_signalled) + RegisterSignal(SSshuttle, COMSIG_SUPPLY_SHUTTLE_BUY, PROC_REF(finalize_department_order)) + computer.physical.say("Order processed. Cargo will deliver the crate when it comes in on their shuttle. NOTICE: Heads of staff may override the order.") + calculate_cooldown(pack.cost) + +///signal when the supply shuttle begins to spawn orders. we forget the current order preventing it from being overridden (since it's already past the point of no return on undoing the order) +/datum/computer_file/program/department_order/proc/finalize_department_order(datum/subsystem) + SIGNAL_HANDLER + if(!isnull(department_order) && (department_order in SSshuttle.shopping_list)) + department_order = null + UnregisterSignal(subsystem, COMSIG_SUPPLY_SHUTTLE_BUY) + +/datum/computer_file/program/department_order/proc/calculate_cooldown(credits) + //minimum almost the lowest value of a crate + var/min = CARGO_CRATE_VALUE * 1.6 + //maximum fairly expensive crate at 3000 + var/max = CARGO_CRATE_VALUE * 15 + credits = clamp(credits, min, max) + var/time_y = (credits - min)/(max - min) + 1 //convert to between 1 and 2 + time_y = 10 MINUTES * time_y + department_cooldowns[linked_department] = world.time + time_y + +/datum/computer_file/program/department_order/process_tick(seconds_per_tick) + if(!check_cooldown() || alert_silenced || !alert_able) + return + radio?.talk_into(computer, "Order cooldown has expired! A new order may now be placed!", radio_channel) + computer.alert_call(src, "Order cooldown expired!", 'sound/machines/ping.ogg') + +/// Checks if the cooldown is up and resets it if so. +/datum/computer_file/program/department_order/proc/check_cooldown() + if(department_cooldowns[linked_department] > 0 && department_cooldowns[linked_department] <= world.time) + department_cooldowns[linked_department] = 0 + return TRUE + return FALSE diff --git a/code/modules/modular_computers/file_system/programs/messenger/messenger_program.dm b/code/modules/modular_computers/file_system/programs/messenger/messenger_program.dm index 87fbbd1ab75..1a74eba32c8 100644 --- a/code/modules/modular_computers/file_system/programs/messenger/messenger_program.dm +++ b/code/modules/modular_computers/file_system/programs/messenger/messenger_program.dm @@ -9,7 +9,7 @@ filename = "nt_messenger" filedesc = "Direct Messenger" downloader_category = PROGRAM_CATEGORY_DEVICE - program_open_overlay = "command" + program_open_overlay = "text" extended_desc = "This program allows old-school communication with other modular devices." size = 0 undeletable = TRUE // It comes by default in tablets, can't be downloaded, takes no space and should obviously not be able to be deleted. diff --git a/code/modules/unit_tests/required_map_items.dm b/code/modules/unit_tests/required_map_items.dm index 73499c83b6d..145f5fd34ce 100644 --- a/code/modules/unit_tests/required_map_items.dm +++ b/code/modules/unit_tests/required_map_items.dm @@ -14,7 +14,7 @@ /// More detailed information about each item (mainly, how much of each should exist) is set on a per item basis /datum/unit_test/required_map_items/proc/setup_expected_types() expected_types += subtypesof(/obj/item/stamp/head) - expected_types += subtypesof(/obj/machinery/computer/department_orders) + expected_types += subtypesof(/obj/machinery/modular_computer/preset/cargochat) expected_types += /mob/living/basic/parrot/poly expected_types += /mob/living/basic/pet/dog/corgi/ian diff --git a/icons/obj/machines/computer.dmi b/icons/obj/machines/computer.dmi index aae3a83a455..f8fb31c9ba0 100644 Binary files a/icons/obj/machines/computer.dmi and b/icons/obj/machines/computer.dmi differ diff --git a/icons/obj/machines/modular_console.dmi b/icons/obj/machines/modular_console.dmi index 7b370a76785..6a8348e1b8e 100644 Binary files a/icons/obj/machines/modular_console.dmi and b/icons/obj/machines/modular_console.dmi differ diff --git a/tgstation.dme b/tgstation.dme index e51831db3af..365a1f9e8c1 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -3628,7 +3628,6 @@ #include "code\modules\cargo\bounty.dm" #include "code\modules\cargo\centcom_podlauncher.dm" #include "code\modules\cargo\coupon.dm" -#include "code\modules\cargo\department_order.dm" #include "code\modules\cargo\exports.dm" #include "code\modules\cargo\expressconsole.dm" #include "code\modules\cargo\gondolapod.dm" @@ -5218,6 +5217,7 @@ #include "code\modules\modular_computers\file_system\programs\cargoship.dm" #include "code\modules\modular_computers\file_system\programs\coupon.dm" #include "code\modules\modular_computers\file_system\programs\crewmanifest.dm" +#include "code\modules\modular_computers\file_system\programs\dept_order.dm" #include "code\modules\modular_computers\file_system\programs\emojipedia.dm" #include "code\modules\modular_computers\file_system\programs\file_browser.dm" #include "code\modules\modular_computers\file_system\programs\frontier.dm" diff --git a/tgui/packages/tgui/interfaces/DepartmentOrders.tsx b/tgui/packages/tgui/interfaces/NtosDeptOrder.tsx similarity index 63% rename from tgui/packages/tgui/interfaces/DepartmentOrders.tsx rename to tgui/packages/tgui/interfaces/NtosDeptOrder.tsx index 5fb8853cdb8..46f52887a44 100644 --- a/tgui/packages/tgui/interfaces/DepartmentOrders.tsx +++ b/tgui/packages/tgui/interfaces/NtosDeptOrder.tsx @@ -3,6 +3,7 @@ import { useState } from 'react'; import { useBackend } from '../backend'; import { + Blink, Box, Button, Dimmer, @@ -13,17 +14,18 @@ import { Tabs, Tooltip, } from '../components'; -import { Window } from '../layouts'; +import { NtosWindow } from '../layouts'; // 15x crate value const COST_UPPER_BOUND = 3000; +type typePath = string; + type Pack = { name: string; - cost: number; - id: string; desc: string; - goody: string; + cost: number; + id: typePath; }; type Category = { @@ -33,8 +35,10 @@ type Category = { type Info = { can_override: BooleanLike; - time_left: number; + time_left: string | null; supplies: Category[]; + no_link: BooleanLike; + id_inside: BooleanLike; }; const CooldownEstimate = (props) => { @@ -54,45 +58,60 @@ const CooldownEstimate = (props) => { ); }; -export const DepartmentOrders = (props) => { +export const DepartmentOrderContent = (props) => { const { data } = useBackend(); - const { time_left } = data; + const { no_link, time_left } = data; + if (!data) { + return null; + } + + if (no_link) { + return ; + } + if (time_left) { + return ; + } + return ( - - - {(!!time_left && ) || ( - - - - - - As employees of Nanotrasen, the selection of orders here are - completely free of charge, only incurring a cooldown on the - service. Cheaper items will make you wait for less time - before Nanotrasen allows another purchase, to encourage - tasteful spending. - - - - - - - - - )} - - + + + + + + As employees of Nanotrasen, the selection of orders here are + completely free of charge, only incurring a cooldown on the + service. Cheaper items will make you wait for less time before + Nanotrasen allows another purchase, to encourage tasteful + spending. + + + + + + + + + ); +}; + +export const NtosDeptOrder = () => { + return ( + + + + + ); }; -const CooldownDimmer = (props) => { +const CooldownDimmer = () => { const { act, data } = useBackend(); const { can_override, time_left } = data; return ( - + Ready for another order in {time_left}... @@ -119,7 +138,31 @@ const CooldownDimmer = (props) => { ); }; -const DepartmentCatalog = (props) => { +const NoLinkDimmer = () => { + const { act, data } = useBackend(); + const { id_inside } = data; + return ( + + + + + + + + + Unlinked! + + + + + + + ); +}; + +const DepartmentCatalog = () => { const { act, data } = useBackend(); const { supplies } = data; const [tabCategory, setTabCategory] = useState(supplies[0]);