From dcf9cf3407456423654f2d442b1bba7563402538 Mon Sep 17 00:00:00 2001 From: Mikhail Dzianishchyts Date: Tue, 3 Sep 2024 12:59:17 +0300 Subject: [PATCH 1/3] Revert "Apply Request Console directions UpdatePath (#1465)" This reverts commit 684c3a2f41117e339602f334e49a19cf0c72b3dc. --- _maps/map_files220/generic/Lavaland.dmm | 34 +- _maps/map_files220/stations/boxstation.dmm | 330 ++++++++++++++++--- _maps/map_files220/stations/deltastation.dmm | 211 ++++++++++-- _maps/map_files220/stations/metastation.dmm | 314 +++++++++++++++--- 4 files changed, 760 insertions(+), 129 deletions(-) diff --git a/_maps/map_files220/generic/Lavaland.dmm b/_maps/map_files220/generic/Lavaland.dmm index 4e3835ea9bd3..10b36a3257af 100644 --- a/_maps/map_files220/generic/Lavaland.dmm +++ b/_maps/map_files220/generic/Lavaland.dmm @@ -449,7 +449,10 @@ "bl" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/arrows, -/obj/machinery/requests_console/directional/south, +/obj/machinery/requests_console{ + department = "Labor Camp"; + pixel_y = -32 + }, /turf/simulated/floor/plasteel{ icon_state = "brown" }, @@ -539,7 +542,13 @@ /area/mine/outpost/engineering) "bv" = ( /obj/machinery/newscaster/directional/north, -/obj/machinery/requests_console/directional/east, +/obj/machinery/requests_console{ + announcementConsole = 1; + department = "Quartermaster's Desk"; + departmentType = 5; + name = "Quartermaster Requests Console"; + pixel_x = 30 + }, /obj/structure/closet/secure_closet/quartermaster/lavaland, /turf/simulated/floor/carpet, /area/mine/outpost/quartermaster) @@ -1700,7 +1709,12 @@ "dM" = ( /obj/effect/spawner/random_spawners/cobweb_left_rare, /obj/effect/decal/cleanable/glass, -/obj/machinery/requests_console/directional/west, +/obj/machinery/requests_console{ + department = "Mining Outpost"; + departmentType = 2; + name = "Mining Outpost Requests Console"; + pixel_x = -30 + }, /turf/simulated/floor/plating, /area/mine/outpost/maintenance/east) "dN" = ( @@ -6204,7 +6218,12 @@ dir = 1 }, /obj/machinery/light/directional/south, -/obj/machinery/requests_console/directional/south, +/obj/machinery/requests_console{ + department = "Mining Outpost"; + departmentType = 2; + name = "Mining Outpost Requests Console"; + pixel_y = -30 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "darkyellowcorners" @@ -7924,7 +7943,12 @@ /obj/effect/turf_decal/stripes/corner{ dir = 8 }, -/obj/machinery/requests_console/directional/east, +/obj/machinery/requests_console{ + department = "Mining Outpost"; + departmentType = 2; + name = "Mining Outpost Requests Console"; + pixel_x = 30 + }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "dark" diff --git a/_maps/map_files220/stations/boxstation.dmm b/_maps/map_files220/stations/boxstation.dmm index cd76b568dcc4..fb7a79a06a32 100644 --- a/_maps/map_files220/stations/boxstation.dmm +++ b/_maps/map_files220/stations/boxstation.dmm @@ -2578,7 +2578,13 @@ }, /area/station/security/permabrig) "amt" = ( -/obj/machinery/requests_console/directional/east, +/obj/machinery/requests_console{ + announcementConsole = 1; + department = "Head of Security's Desk"; + departmentType = 5; + name = "Head of Security Requests Console"; + pixel_x = 30 + }, /obj/machinery/computer/brigcells{ dir = 8 }, @@ -3287,7 +3293,12 @@ pixel_y = 22 }, /obj/machinery/light/directional/north, -/obj/machinery/requests_console/directional/west, +/obj/machinery/requests_console{ + department = "Security"; + departmentType = 5; + name = "Security Requests Console"; + pixel_x = -30 + }, /turf/simulated/floor/plasteel, /area/station/security/main) "aoM" = ( @@ -3428,7 +3439,12 @@ pixel_y = 7 }, /obj/item/pen, -/obj/machinery/requests_console/directional/south, +/obj/machinery/requests_console{ + department = "Warden"; + departmentType = 7; + name = "Warden's Requests Console"; + pixel_y = -32 + }, /obj/item/radio/intercom/department/security{ pixel_x = -22; dir = 4 @@ -5018,7 +5034,12 @@ c_tag = "Brig Prisoner Processing West"; dir = 4 }, -/obj/machinery/requests_console/directional/west, +/obj/machinery/requests_console{ + department = "Security"; + departmentType = 5; + name = "Security Requests Console"; + pixel_x = -30 + }, /turf/simulated/floor/plasteel, /area/station/security/processing) "auU" = ( @@ -5617,7 +5638,11 @@ /turf/space, /area/space/nearstation) "axp" = ( -/obj/machinery/requests_console/directional/west, +/obj/machinery/requests_console{ + department = "Internal Affairs Office"; + name = "Internal Affairs Requests Console"; + pixel_x = -30 + }, /obj/machinery/papershredder, /turf/simulated/floor/wood/fancy/cherry, /area/station/legal/lawoffice) @@ -12885,7 +12910,12 @@ }, /area/station/engineering/ai_transit_tube) "aWh" = ( -/obj/machinery/requests_console/directional/north, +/obj/machinery/requests_console{ + department = "Security"; + departmentType = 5; + name = "Security Requests Console"; + pixel_y = 30 + }, /obj/machinery/computer/secure_data, /turf/simulated/floor/plasteel{ dir = 1; @@ -12911,7 +12941,11 @@ /area/station/public/storage/tools) "aWm" = ( /obj/structure/table, -/obj/machinery/requests_console/directional/north, +/obj/machinery/requests_console{ + department = "Tool Storage"; + name = "Tool Storage Requests Console"; + pixel_y = 30 + }, /obj/item/assembly/igniter{ pixel_x = -8 }, @@ -15535,7 +15569,11 @@ }, /area/station/hallway/primary/central/north) "bex" = ( -/obj/machinery/requests_console/directional/south, +/obj/machinery/requests_console{ + department = "Arrival Shuttle"; + name = "Arrival Shuttle Requests Console"; + pixel_y = -30 + }, /turf/simulated/floor/mineral/titanium/blue, /area/shuttle/arrival/station) "bey" = ( @@ -19430,7 +19468,13 @@ /area/station/turret_protected/aisat/interior) "bvV" = ( /obj/item/kirbyplants, -/obj/machinery/requests_console/directional/north, +/obj/machinery/requests_console{ + announcementConsole = 1; + department = "Bridge"; + departmentType = 5; + name = "Bridge Requests Console"; + pixel_y = 30 + }, /obj/effect/turf_decal/siding/wood/oak{ dir = 9 }, @@ -19851,7 +19895,13 @@ c_tag = "Bridge Central"; dir = 1 }, -/obj/machinery/requests_console/directional/south, +/obj/machinery/requests_console{ + announcementConsole = 1; + department = "Bridge"; + departmentType = 5; + name = "Bridge Requests Console"; + pixel_y = -30 + }, /turf/simulated/floor/plasteel{ icon_state = "blue" }, @@ -19942,7 +19992,12 @@ /turf/simulated/floor/wood/oak, /area/station/service/library) "bxX" = ( -/obj/machinery/requests_console/directional/east, +/obj/machinery/requests_console{ + department = "Science"; + departmentType = 2; + name = "Science Requests Console"; + pixel_x = 30 + }, /obj/structure/table, /obj/item/folder/white, /obj/item/pen, @@ -20221,7 +20276,12 @@ /area/station/supply/office) "bzH" = ( /obj/structure/table, -/obj/machinery/requests_console/directional/north, +/obj/machinery/requests_console{ + department = "Cargo Bay"; + departmentType = 2; + name = "Cargo Requests Console"; + pixel_y = 30 + }, /obj/item/stack/tape_roll, /obj/item/destTagger{ pixel_x = 4; @@ -21792,7 +21852,12 @@ }, /area/station/science/robotics) "bGF" = ( -/obj/machinery/requests_console/directional/north, +/obj/machinery/requests_console{ + department = "Robotics"; + departmentType = 2; + name = "Robotics Requests Console"; + pixel_y = 30 + }, /obj/structure/rack, /obj/item/book/manual/wiki/sop_science{ pixel_x = -3; @@ -21936,7 +22001,12 @@ /obj/structure/chair/comfy/teal{ dir = 8 }, -/obj/machinery/requests_console/directional/east, +/obj/machinery/requests_console{ + department = "Medbay"; + departmentType = 1; + name = "Medbay Requests Console"; + pixel_x = 32 + }, /turf/simulated/floor/plasteel{ icon_state = "cafeteria" }, @@ -22256,7 +22326,12 @@ }, /area/station/supply/storage) "bIU" = ( -/obj/machinery/requests_console/directional/north, +/obj/machinery/requests_console{ + department = "Cargo Bay"; + departmentType = 2; + name = "Cargo Requests Console"; + pixel_y = 30 + }, /obj/effect/turf_decal/delivery/hollow, /obj/machinery/navbeacon{ codes_txt = "delivery"; @@ -22466,7 +22541,13 @@ c_tag = "Medbay Chemistry"; dir = 4 }, -/obj/machinery/requests_console/directional/west, +/obj/machinery/requests_console{ + department = "Medbay"; + departmentType = 1; + name = "Chemistry Requests Console"; + pixel_x = -30; + dir = 8 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "whiteyellow" @@ -23820,7 +23901,13 @@ "bPP" = ( /obj/machinery/computer/security/mining, /obj/machinery/firealarm/directional/north, -/obj/machinery/requests_console/directional/west, +/obj/machinery/requests_console{ + department = "Quartermaster's Desk"; + departmentType = 5; + name = "Quartermaster Requests Console"; + announcementConsole = 1; + pixel_x = -30 + }, /turf/simulated/floor/carpet, /area/station/supply/qm) "bPR" = ( @@ -24637,7 +24724,12 @@ /area/station/hallway/primary/central/sw) "bTA" = ( /obj/structure/table, -/obj/machinery/requests_console/directional/west, +/obj/machinery/requests_console{ + department = "Cargo Bay"; + departmentType = 2; + name = "Cargo Requests Console"; + pixel_x = -30 + }, /obj/machinery/camera{ c_tag = "Cargo Office"; dir = 4 @@ -27426,7 +27518,13 @@ /area/station/command/office/rd) "ceP" = ( /obj/structure/closet/secure_closet/ntrep, -/obj/machinery/requests_console/directional/east, +/obj/machinery/requests_console{ + announcementConsole = 1; + department = "NT Representative"; + departmentType = 5; + name = "NT Representative Requests Console"; + pixel_x = 30 + }, /turf/simulated/floor/wood/oak, /area/station/command/office/ntrep) "ceT" = ( @@ -27503,7 +27601,13 @@ /area/station/engineering/control) "cfp" = ( /obj/structure/closet/secure_closet/blueshield, -/obj/machinery/requests_console/directional/west, +/obj/machinery/requests_console{ + announcementConsole = 1; + department = "Blueshield"; + departmentType = 5; + name = "Blueshield Requests Console"; + pixel_x = -30 + }, /turf/simulated/floor/wood/oak, /area/station/command/office/blueshield) "cfw" = ( @@ -27755,7 +27859,12 @@ /area/station/medical/psych) "cgE" = ( /obj/machinery/economy/vending/plasmaresearch, -/obj/machinery/requests_console/directional/south, +/obj/machinery/requests_console{ + department = "Science"; + departmentType = 2; + name = "Science Requests Console"; + pixel_y = -30 + }, /turf/simulated/floor/plasteel{ dir = 10; icon_state = "whitepurple" @@ -29638,7 +29747,12 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 }, -/obj/machinery/requests_console/directional/west, +/obj/machinery/requests_console{ + department = "Morgue"; + departmentType = 5; + name = "Morgue Requests Console"; + pixel_x = -32 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "darkblue" @@ -33771,7 +33885,12 @@ }, /area/station/science/explab) "cEn" = ( -/obj/machinery/requests_console/directional/east, +/obj/machinery/requests_console{ + department = "Science"; + departmentType = 2; + name = "Science Requests Console"; + pixel_x = 30 + }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "whitepurple" @@ -37546,7 +37665,12 @@ /turf/simulated/floor/plasteel, /area/station/engineering/atmos) "cSf" = ( -/obj/machinery/requests_console/directional/north, +/obj/machinery/requests_console{ + department = "Science"; + departmentType = 2; + name = "Science Requests Console"; + pixel_y = 30 + }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "whitepurple" @@ -39914,7 +40038,11 @@ }, /area/station/engineering/hallway) "daf" = ( -/obj/machinery/requests_console/directional/west, +/obj/machinery/requests_console{ + department = "EVA"; + name = "EVA Requests Console"; + pixel_x = -32 + }, /obj/effect/turf_decal/delivery/white/hollow, /obj/structure/closet/secure_closet/exile, /turf/simulated/floor/plasteel{ @@ -42402,7 +42530,12 @@ network = list("Singularity","engine"); pixel_y = 30 }, -/obj/machinery/requests_console/directional/west, +/obj/machinery/requests_console{ + department = "Engineering"; + departmentType = 3; + name = "Engineering Requests Console"; + pixel_x = -30 + }, /obj/machinery/camera{ c_tag = "Engineering Reception"; network = list("SS13","Engineering") @@ -43364,7 +43497,13 @@ /area/station/engineering/control) "dmU" = ( /obj/machinery/photocopier, -/obj/machinery/requests_console/directional/east, +/obj/machinery/requests_console{ + announcementConsole = 1; + department = "Chief Engineer's Desk"; + departmentType = 7; + name = "Chief Engineer Requests Console"; + pixel_x = 32 + }, /turf/simulated/floor/plasteel{ dir = 6; icon_state = "darkyellow" @@ -43521,8 +43660,12 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 }, -/obj/machinery/requests_console/directional/east{ - pixel_y = -30 +/obj/machinery/requests_console{ + department = "AI"; + departmentType = 5; + name = "AI Requests Console"; + pixel_x = 32; + pixel_y = -32 }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -48846,7 +48989,13 @@ /area/station/science/rnd) "eLL" = ( /obj/machinery/photocopier, -/obj/machinery/requests_console/directional/east, +/obj/machinery/requests_console{ + announcementConsole = 1; + department = "Chief Medical Officer's Desk"; + departmentType = 5; + name = "Chief Medical Officer Requests Console"; + pixel_x = 32 + }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "darkblue" @@ -50695,7 +50844,12 @@ /turf/simulated/floor/plating, /area/station/maintenance/apmaint) "fwA" = ( -/obj/machinery/requests_console/directional/south, +/obj/machinery/requests_console{ + department = "Detective"; + departmentType = 5; + name = "Detective Requests Console"; + pixel_y = -30 + }, /obj/effect/turf_decal/siding/wood/oak{ dir = 1 }, @@ -50966,7 +51120,12 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/requests_console/directional/north, +/obj/machinery/requests_console{ + department = "Science"; + departmentType = 2; + name = "Science Requests Console"; + pixel_y = 30 + }, /turf/simulated/floor/plasteel{ dir = 5; icon_state = "whitepurple" @@ -55465,7 +55624,12 @@ /area/station/hallway/primary/starboard/east) "gZX" = ( /obj/machinery/light/directional/east, -/obj/machinery/requests_console/directional/east, +/obj/machinery/requests_console{ + department = "Medbay"; + departmentType = 1; + name = "Medbay Requests Console"; + pixel_x = 32 + }, /obj/structure/filingcabinet/chestdrawer, /obj/item/folder/white, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -57126,7 +57290,11 @@ /turf/simulated/floor/plating, /area/station/maintenance/fore) "hDJ" = ( -/obj/machinery/requests_console/directional/south, +/obj/machinery/requests_console{ + department = "Locker Room"; + name = "Locker Room Requests Console"; + pixel_y = -32 + }, /turf/simulated/floor/plasteel, /area/station/public/locker) "hDN" = ( @@ -59506,7 +59674,12 @@ /turf/simulated/floor/carpet/green, /area/station/command/bridge) "izr" = ( -/obj/machinery/requests_console/directional/north, +/obj/machinery/requests_console{ + department = "Bar"; + departmentType = 2; + name = "Bar Requests Console"; + pixel_y = 30 + }, /obj/structure/chair/comfy/black, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -60797,7 +60970,12 @@ /turf/simulated/floor/grass, /area/station/security/permabrig) "iZR" = ( -/obj/machinery/requests_console/directional/south, +/obj/machinery/requests_console{ + department = "Security"; + departmentType = 5; + name = "Security Requests Console"; + pixel_y = -30 + }, /turf/simulated/floor/plasteel{ icon_state = "darkredcorners" }, @@ -64890,7 +65068,11 @@ /turf/space, /area/space/nearstation) "kBr" = ( -/obj/machinery/requests_console/directional/east, +/obj/machinery/requests_console{ + department = "Tech Storage"; + name = "Tech Storage Requests Console"; + pixel_x = 32 + }, /turf/simulated/floor/plating, /area/station/engineering/tech_storage) "kBF" = ( @@ -73018,7 +73200,12 @@ "nrD" = ( /obj/structure/closet/secure_closet/explorer, /obj/effect/decal/cleanable/dirt, -/obj/machinery/requests_console/directional/west, +/obj/machinery/requests_console{ + department = "Expedition"; + departmentType = 2; + pixel_x = -30; + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "brown" @@ -75936,7 +76123,12 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/machinery/requests_console/directional/north, +/obj/machinery/requests_console{ + department = "Hydroponics"; + departmentType = 2; + name = "Hydroponics Requests Console"; + pixel_y = 30 + }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -77149,7 +77341,12 @@ /turf/simulated/floor/carpet/red, /area/station/public/arcade) "oPu" = ( -/obj/machinery/requests_console/directional/north, +/obj/machinery/requests_console{ + department = "Kitchen"; + departmentType = 2; + name = "Kitchen Requests Console"; + pixel_y = 30 + }, /turf/simulated/floor/plasteel{ icon_state = "cafeteria" }, @@ -90819,7 +91016,14 @@ /obj/machinery/computer/robotics{ dir = 4 }, -/obj/machinery/requests_console/directional/north, +/obj/machinery/requests_console{ + announcementConsole = 1; + department = "Research Director's Desk"; + departmentType = 7; + name = "Research Director Requests Console"; + pixel_x = -2; + pixel_y = 30 + }, /obj/machinery/button/windowtint/west{ desc = "A remote control switch for polarized windows. For culling the sight of the equipment-starved masses."; id = "rdrobosurgery"; @@ -91233,7 +91437,13 @@ /area/station/security/main) "tOn" = ( /obj/machinery/suit_storage_unit/captain/secure, -/obj/machinery/requests_console/directional/west, +/obj/machinery/requests_console{ + announcementConsole = 1; + department = "Captain's Desk"; + departmentType = 5; + name = "Captain Requests Console"; + pixel_x = -30 + }, /turf/simulated/floor/carpet/royalblue, /area/station/command/office/captain) "tOo" = ( @@ -94199,7 +94409,12 @@ /obj/structure/sign/poster/official/help_others{ pixel_y = -30 }, -/obj/machinery/requests_console/directional/west, +/obj/machinery/requests_console{ + department = "Medbay"; + departmentType = 1; + name = "Genetics Requests Console"; + pixel_x = -30 + }, /obj/structure/disposalpipe/trunk{ dir = 1 }, @@ -99897,7 +100112,12 @@ /turf/simulated/floor/plating, /area/station/security/prisonlockers) "wQa" = ( -/obj/machinery/requests_console/directional/west, +/obj/machinery/requests_console{ + department = "Cargo Bay"; + departmentType = 2; + name = "Cargo Requests Console"; + pixel_x = -30 + }, /obj/effect/landmark/start/shaft_miner, /turf/simulated/floor/plasteel{ dir = 8; @@ -100161,7 +100381,13 @@ }, /area/station/security/permabrig) "wVJ" = ( -/obj/machinery/requests_console/directional/south, +/obj/machinery/requests_console{ + announcementConsole = 1; + department = "Head of Personnel's Desk"; + departmentType = 5; + name = "Head of Personnel Requests Console"; + pixel_y = -30 + }, /obj/machinery/camera/autoname{ dir = 1 }, @@ -100542,7 +100768,12 @@ /area/station/public/dorms) "xdo" = ( /obj/structure/table, -/obj/machinery/requests_console/directional/east, +/obj/machinery/requests_console{ + department = "Engineering"; + departmentType = 3; + name = "Engineering Requests Console"; + pixel_x = 30 + }, /obj/item/stack/sheet/glass{ amount = 50 }, @@ -100728,7 +100959,12 @@ /obj/structure/disposalpipe/trunk{ dir = 8 }, -/obj/machinery/requests_console/directional/east, +/obj/machinery/requests_console{ + department = "Janitorial"; + departmentType = 1; + name = "Janitor Requests Console"; + pixel_x = 32 + }, /turf/simulated/floor/plasteel, /area/station/service/janitor) "xfi" = ( diff --git a/_maps/map_files220/stations/deltastation.dmm b/_maps/map_files220/stations/deltastation.dmm index daf4e44fdaa0..7c2736b08b89 100644 --- a/_maps/map_files220/stations/deltastation.dmm +++ b/_maps/map_files220/stations/deltastation.dmm @@ -9912,7 +9912,12 @@ }, /area/station/supply/office) "aQl" = ( -/obj/machinery/requests_console/directional/north, +/obj/machinery/requests_console{ + department = "Cargo Bay"; + departmentType = 2; + name = "Cargo Requests Console"; + pixel_y = 30 + }, /obj/machinery/photocopier, /turf/simulated/floor/plasteel{ dir = 1; @@ -16474,7 +16479,12 @@ "bsq" = ( /obj/machinery/disposal, /obj/structure/disposalpipe/trunk, -/obj/machinery/requests_console/directional/north, +/obj/machinery/requests_console{ + department = "Bar"; + departmentType = 2; + name = "Bar Requests Console"; + pixel_y = 30 + }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -16999,7 +17009,12 @@ /area/station/command/vault) "bvh" = ( /obj/structure/filingcabinet/chestdrawer, -/obj/machinery/requests_console/directional/east, +/obj/machinery/requests_console{ + department = "Warden"; + departmentType = 7; + name = "Warden's Requests Console"; + pixel_x = 32 + }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "darkred" @@ -18553,7 +18568,11 @@ /obj/structure/disposalpipe/trunk{ dir = 4 }, -/obj/machinery/requests_console/directional/north, +/obj/machinery/requests_console{ + department = "Primary Tool Storage"; + name = "Primary Tool Storage Console"; + pixel_y = 30 + }, /obj/effect/turf_decal/delivery/hollow, /turf/simulated/floor/plasteel, /area/station/public/storage/tools) @@ -18847,8 +18866,12 @@ pixel_x = 28; pixel_y = 5 }, -/obj/machinery/requests_console/directional/east{ - pixel_y = 30 +/obj/machinery/requests_console{ + department = "AI"; + departmentType = 5; + name = "AI Requests Console"; + pixel_x = 32; + pixel_y = 32 }, /obj/item/radio/intercom/custom{ pixel_y = 5; @@ -20374,7 +20397,13 @@ dir = 8 }, /obj/item/storage/fancy/donut_box, -/obj/machinery/requests_console/directional/south, +/obj/machinery/requests_console{ + announcementConsole = 1; + department = "Bridge"; + departmentType = 5; + name = "Bridge Requests Console"; + pixel_y = -30 + }, /turf/simulated/floor/carpet, /area/station/command/bridge) "bHr" = ( @@ -22445,7 +22474,13 @@ /obj/machinery/computer/atmos_alert{ dir = 4 }, -/obj/machinery/requests_console/directional/west, +/obj/machinery/requests_console{ + announcementConsole = 1; + department = "Chief Engineer's Desk"; + departmentType = 7; + name = "Chief Engineer Requests Console"; + pixel_x = -32 + }, /turf/simulated/floor/plasteel/dark, /area/station/command/office/ce) "bOa" = ( @@ -24011,7 +24046,13 @@ /obj/machinery/computer/card{ dir = 4 }, -/obj/machinery/requests_console/directional/west, +/obj/machinery/requests_console{ + announcementConsole = 1; + department = "Captain's Desk"; + departmentType = 5; + name = "Captain Requests Console"; + pixel_x = -30 + }, /turf/simulated/floor/carpet/black, /area/station/command/office/captain) "bSP" = ( @@ -24658,7 +24699,13 @@ /obj/structure/table/wood, /obj/item/paper_bin/nanotrasen, /obj/item/stamp/hop, -/obj/machinery/requests_console/directional/north, +/obj/machinery/requests_console{ + announcementConsole = 1; + department = "Head of Personnel's Desk"; + departmentType = 5; + name = "Head of Personnel Requests Console"; + pixel_y = 30 + }, /obj/effect/turf_decal/siding/wood/oak{ dir = 9 }, @@ -26057,7 +26104,13 @@ /obj/machinery/photocopier/faxmachine/longrange{ department = "NT Representative's Office" }, -/obj/machinery/requests_console/directional/north, +/obj/machinery/requests_console{ + announcementConsole = 1; + department = "NT Representative"; + departmentType = 5; + name = "NT Representative Requests Console"; + pixel_y = 30 + }, /turf/simulated/floor/carpet/royalblack, /area/station/command/office/ntrep) "cae" = ( @@ -26111,7 +26164,13 @@ /area/station/maintenance/aft) "cal" = ( /obj/structure/closet/secure_closet/blueshield, -/obj/machinery/requests_console/directional/north, +/obj/machinery/requests_console{ + announcementConsole = 1; + department = "Blueshield"; + departmentType = 5; + name = "Blueshield Requests Console"; + pixel_y = 30 + }, /obj/effect/turf_decal/siding/wood/oak/end{ dir = 1 }, @@ -32865,7 +32924,11 @@ c_tag = "EVA Storage"; dir = 8 }, -/obj/machinery/requests_console/directional/east, +/obj/machinery/requests_console{ + department = "EVA"; + name = "EVA Requests Console"; + pixel_x = 32 + }, /obj/machinery/light/directional/east, /turf/simulated/floor/plasteel/dark, /area/station/ai_monitored/storage/eva) @@ -42726,7 +42789,12 @@ pixel_x = -4; pixel_y = 2 }, -/obj/machinery/requests_console/directional/south, +/obj/machinery/requests_console{ + department = "Medbay"; + departmentType = 1; + name = "Chemistry Requests Console"; + pixel_y = -30 + }, /turf/simulated/floor/plasteel{ icon_state = "whiteyellow" }, @@ -44162,7 +44230,12 @@ pixel_x = -1; pixel_y = -2 }, -/obj/machinery/requests_console/directional/south, +/obj/machinery/requests_console{ + department = "Science"; + departmentType = 2; + name = "Science Requests Console"; + pixel_y = -30 + }, /obj/effect/turf_decal/stripes/corner{ dir = 8 }, @@ -46940,7 +47013,11 @@ "dQi" = ( /obj/structure/table/wood, /obj/item/paper_bin, -/obj/machinery/requests_console/directional/east, +/obj/machinery/requests_console{ + department = "Chapel Office"; + pixel_x = 30; + dir = 8 + }, /obj/machinery/button/windowtint/south{ range = 20; id = "CHAP" @@ -53634,7 +53711,12 @@ /obj/machinery/camera{ c_tag = "Kitchen South" }, -/obj/machinery/requests_console/directional/north, +/obj/machinery/requests_console{ + department = "Kitchen"; + departmentType = 2; + name = "Kitchen Requests Console"; + pixel_y = 30 + }, /turf/simulated/floor/plasteel/white, /area/station/service/kitchen) "fou" = ( @@ -55340,7 +55422,12 @@ pixel_y = 6 }, /obj/item/storage/firstaid/regular, -/obj/machinery/requests_console/directional/west, +/obj/machinery/requests_console{ + department = "Expedition"; + departmentType = 2; + pixel_x = -30; + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 9; icon_state = "darkbrown" @@ -64747,7 +64834,12 @@ /area/station/maintenance/fsmaint) "iHy" = ( /obj/machinery/disposal, -/obj/machinery/requests_console/directional/south, +/obj/machinery/requests_console{ + department = "Medbay"; + departmentType = 1; + name = "Genetics Requests Console"; + pixel_y = -30 + }, /obj/structure/disposalpipe/trunk{ dir = 1 }, @@ -74115,7 +74207,13 @@ /turf/simulated/floor/plasteel/dark, /area/station/security/evidence) "lvU" = ( -/obj/machinery/requests_console/directional/east, +/obj/machinery/requests_console{ + announcementConsole = 1; + department = "Chief Medical Officer's Desk"; + departmentType = 5; + name = "Chief Medical Officer Requests Console"; + pixel_x = 30 + }, /obj/machinery/light_switch/south, /obj/machinery/computer/card/minor/cmo{ dir = 8 @@ -77044,7 +77142,12 @@ /area/station/science/toxins/mixing) "mqn" = ( /obj/machinery/firealarm/directional/east, -/obj/machinery/requests_console/directional/south, +/obj/machinery/requests_console{ + department = "Engineering"; + departmentType = 3; + name = "Engineering Requests Console"; + pixel_y = -30 + }, /obj/effect/turf_decal/delivery, /obj/structure/closet/wardrobe/engineering_yellow, /turf/simulated/floor/plasteel, @@ -86042,7 +86145,13 @@ department = "Research Director's Office"; pixel_y = 4 }, -/obj/machinery/requests_console/directional/south, +/obj/machinery/requests_console{ + announcementConsole = 1; + department = "Research Director's Desk"; + departmentType = 7; + name = "Research Director Requests Console"; + pixel_y = -32 + }, /obj/effect/turf_decal/delivery/hollow, /turf/simulated/floor/plasteel{ dir = 6; @@ -89731,7 +89840,12 @@ "pYO" = ( /obj/effect/turf_decal/delivery, /obj/machinery/chem_dispenser, -/obj/machinery/requests_console/directional/north, +/obj/machinery/requests_console{ + department = "Hydroponics"; + departmentType = 2; + name = "Hydroponics Requests Console"; + pixel_y = 30 + }, /obj/machinery/light/directional/north, /turf/simulated/floor/plasteel/dark, /area/station/service/hydroponics) @@ -97961,7 +98075,13 @@ "swm" = ( /obj/machinery/computer/card/minor/qm, /obj/effect/turf_decal/delivery/hollow, -/obj/machinery/requests_console/directional/north, +/obj/machinery/requests_console{ + department = "Quartermaster's Desk"; + departmentType = 5; + name = "Quartermaster Requests Console"; + pixel_y = 30; + announcementConsole = 1 + }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "brown" @@ -99721,7 +99841,12 @@ }, /area/station/supply/office) "sVQ" = ( -/obj/machinery/requests_console/directional/north, +/obj/machinery/requests_console{ + department = "Virology"; + departmentType = 3; + name = "Virology Requests Console"; + pixel_y = 30 + }, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -105834,7 +105959,12 @@ }, /area/station/medical/storage) "uOK" = ( -/obj/machinery/requests_console/directional/north, +/obj/machinery/requests_console{ + department = "Morgue"; + departmentType = 5; + name = "Morgue Requests Console"; + pixel_y = 30 + }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "darkblue" @@ -106558,7 +106688,12 @@ /obj/item/paper_bin, /obj/item/pen, /obj/machinery/status_display/directional/south, -/obj/machinery/requests_console/directional/east, +/obj/machinery/requests_console{ + department = "Atmospherics"; + departmentType = 3; + name = "Atmospherics Requests Console"; + pixel_x = 30 + }, /turf/simulated/floor/plasteel{ dir = 6; icon_state = "caution" @@ -116052,7 +116187,12 @@ pixel_y = 6 }, /obj/structure/reagent_dispensers/peppertank/east, -/obj/machinery/requests_console/directional/north, +/obj/machinery/requests_console{ + department = "Security"; + departmentType = 5; + name = "Security Requests Console"; + pixel_y = 30 + }, /obj/machinery/camera{ c_tag = "Departure Lounge Security Checkpoint West" }, @@ -116249,7 +116389,12 @@ /obj/structure/table/reinforced, /obj/machinery/defibrillator_mount/loaded, /obj/machinery/light/directional/south, -/obj/machinery/requests_console/directional/south, +/obj/machinery/requests_console{ + department = "Medbay"; + departmentType = 1; + name = "Medbay Requests Console"; + pixel_y = -30 + }, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -117191,7 +117336,13 @@ /area/station/medical/virology) "yif" = ( /obj/machinery/photocopier, -/obj/machinery/requests_console/directional/east, +/obj/machinery/requests_console{ + announcementConsole = 1; + department = "Head of Security's Desk"; + departmentType = 5; + name = "Head of Security Requests Console"; + pixel_x = 30 + }, /obj/machinery/light/directional/east, /turf/simulated/floor/carpet/red, /area/station/command/office/hos) diff --git a/_maps/map_files220/stations/metastation.dmm b/_maps/map_files220/stations/metastation.dmm index 55e9cf848e6f..3d9a1cd6e916 100644 --- a/_maps/map_files220/stations/metastation.dmm +++ b/_maps/map_files220/stations/metastation.dmm @@ -509,7 +509,12 @@ /turf/simulated/floor/carpet, /area/station/legal/magistrate) "afw" = ( -/obj/machinery/requests_console/directional/north, +/obj/machinery/requests_console{ + name = "Detective Requests Console"; + pixel_y = 30; + department = "Detective"; + departmentType = 5 + }, /turf/simulated/floor/carpet, /area/station/security/detective) "afy" = ( @@ -1401,9 +1406,11 @@ /area/station/maintenance/fore) "alZ" = ( /obj/structure/closet/secure_closet/security, -/obj/machinery/requests_console/directional/east{ +/obj/machinery/requests_console{ department = "Security"; - departmentType = 5 + departmentType = 5; + name = "Security Requests Console"; + pixel_x = 30 }, /turf/simulated/floor/plasteel{ dir = 10; @@ -6369,7 +6376,10 @@ /turf/simulated/floor/plasteel, /area/station/supply/miningdock) "aHs" = ( -/obj/machinery/requests_console/directional/south, +/obj/machinery/requests_console{ + department = "Mining"; + pixel_y = -30 + }, /turf/simulated/floor/plasteel, /area/station/supply/miningdock) "aHu" = ( @@ -7389,7 +7399,12 @@ d2 = 8; icon_state = "2-8" }, -/obj/machinery/requests_console/directional/north, +/obj/machinery/requests_console{ + department = "Science"; + departmentType = 2; + name = "Science Requests Console"; + pixel_y = 30 + }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -8888,7 +8903,13 @@ /area/station/engineering/engine/supermatter) "aPw" = ( /obj/structure/table, -/obj/machinery/requests_console/directional/north, +/obj/machinery/requests_console{ + department = "Quartermaster's Desk"; + departmentType = 5; + name = "Quartermaster Requests Console"; + pixel_y = 30; + announcementConsole = 1 + }, /obj/machinery/photocopier/faxmachine/longrange{ pixel_y = 4; department = "Quartermaster's Office" @@ -14094,7 +14115,13 @@ /area/station/aisat) "bfd" = ( /obj/machinery/computer/atmos_alert, -/obj/machinery/requests_console/directional/north, +/obj/machinery/requests_console{ + announcementConsole = 1; + department = "Chief Engineer's Desk"; + departmentType = 7; + name = "Chief Engineer Requests Console"; + pixel_y = 30 + }, /turf/simulated/floor/plasteel{ icon_state = "darkneutralfull" }, @@ -15349,7 +15376,12 @@ c_tag = "Customs Checkpoint" }, /obj/machinery/computer/card, -/obj/machinery/requests_console/directional/north, +/obj/machinery/requests_console{ + department = "Security"; + departmentType = 5; + name = "Security Requests Console"; + pixel_y = 30 + }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "red" @@ -16081,7 +16113,10 @@ /obj/item/t_scanner, /obj/effect/decal/cleanable/dirt, /obj/structure/sign/poster/official/random/east, -/obj/machinery/requests_console/directional/south, +/obj/machinery/requests_console{ + department = "Tool Storage"; + pixel_y = -30 + }, /turf/simulated/floor/plasteel, /area/station/public/storage/tools) "bkB" = ( @@ -17581,7 +17616,12 @@ "boN" = ( /obj/item/restraints/legcuffs/beartrap, /obj/item/restraints/legcuffs/beartrap, -/obj/machinery/requests_console/directional/west, +/obj/machinery/requests_console{ + department = "Janitorial"; + departmentType = 1; + name = "Janitor Requests Console"; + pixel_x = -30 + }, /obj/machinery/camera{ c_tag = "Custodial Closet"; dir = 4 @@ -17995,7 +18035,11 @@ "bpO" = ( /obj/structure/table, /obj/item/stack/wrapping_paper, -/obj/machinery/requests_console/directional/south, +/obj/machinery/requests_console{ + department = "Cargo Bay"; + departmentType = 2; + pixel_y = -30 + }, /obj/item/stack/packageWrap{ pixel_x = 2; pixel_y = -3 @@ -18411,7 +18455,12 @@ pixel_y = 3 }, /obj/item/pen/multi, -/obj/machinery/requests_console/directional/west, +/obj/machinery/requests_console{ + department = "AI"; + departmentType = 5; + name = "AI Requests Console"; + pixel_x = -30 + }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -18530,7 +18579,10 @@ /turf/simulated/floor/mineral/titanium/blue, /area/shuttle/arrival/station) "brt" = ( -/obj/machinery/requests_console/directional/south, +/obj/machinery/requests_console{ + department = "Arrival shuttle"; + pixel_y = -30 + }, /obj/machinery/light/directional/south, /turf/simulated/floor/mineral/titanium/blue, /area/shuttle/arrival/station) @@ -19648,7 +19700,13 @@ /turf/simulated/floor/plasteel, /area/station/hallway/secondary/entry) "buE" = ( -/obj/machinery/requests_console/directional/east, +/obj/machinery/requests_console{ + announcementConsole = 1; + department = "Bridge"; + departmentType = 5; + name = "Bridge Requests Console"; + pixel_x = 30 + }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 }, @@ -21164,7 +21222,13 @@ /area/station/command/bridge) "byu" = ( /obj/machinery/pdapainter, -/obj/machinery/requests_console/directional/north, +/obj/machinery/requests_console{ + announcementConsole = 1; + department = "Head of Personnel's Desk"; + departmentType = 5; + name = "Head of Personnel Requests Console"; + pixel_y = 30 + }, /turf/simulated/floor/wood, /area/station/command/office/hop) "byv" = ( @@ -21273,7 +21337,13 @@ /obj/machinery/computer/card{ dir = 8 }, -/obj/machinery/requests_console/directional/east, +/obj/machinery/requests_console{ + announcementConsole = 1; + department = "Captain's Desk"; + departmentType = 5; + name = "Captain Requests Console"; + pixel_x = 30 + }, /turf/simulated/floor/wood, /area/station/command/office/captain) "byK" = ( @@ -24272,7 +24342,13 @@ }, /area/station/telecomms/computer) "bJm" = ( -/obj/machinery/requests_console/directional/south, +/obj/machinery/requests_console{ + announcementConsole = 1; + department = "Telecoms Admin"; + departmentType = 5; + name = "Telecoms Request Console"; + pixel_y = -30 + }, /obj/machinery/firealarm/directional/east, /obj/item/paper_bin{ pixel_x = -1; @@ -25508,7 +25584,12 @@ /obj/structure/closet/secure_closet/explorer, /obj/item/gun/energy/laser/awaymission_aeg/rnd, /obj/item/radio/off, -/obj/machinery/requests_console/directional/south, +/obj/machinery/requests_console{ + department = "Expedition"; + departmentType = 2; + dir = 1; + pixel_y = -30 + }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "darkbrown" @@ -26741,7 +26822,10 @@ /turf/simulated/floor/plasteel, /area/station/command/teleporter) "bSi" = ( -/obj/machinery/requests_console/directional/east, +/obj/machinery/requests_console{ + department = "EVA"; + pixel_x = 30 + }, /turf/simulated/floor/plasteel, /area/station/ai_monitored/storage/eva) "bSj" = ( @@ -28036,7 +28120,13 @@ "bWC" = ( /obj/structure/table/wood, /obj/item/paper/blueshield, -/obj/machinery/requests_console/directional/west, +/obj/machinery/requests_console{ + announcementConsole = 1; + department = "Blueshield"; + departmentType = 5; + name = "Blueshield Requests Console"; + pixel_x = -30 + }, /obj/item/paper_bin, /obj/item/pen/blue, /obj/machinery/light/small/directional/west, @@ -28362,7 +28452,13 @@ /obj/item/folder, /obj/item/pen/multi/fountain, /obj/item/stamp/rep, -/obj/machinery/requests_console/directional/west, +/obj/machinery/requests_console{ + announcementConsole = 1; + department = "NT Representative"; + departmentType = 5; + name = "NT Representative Requests Console"; + pixel_x = -30 + }, /turf/simulated/floor/carpet/royalblack, /area/station/command/office/ntrep) "bXy" = ( @@ -29814,7 +29910,12 @@ pixel_y = -2 }, /obj/structure/table/reinforced, -/obj/machinery/requests_console/directional/north, +/obj/machinery/requests_console{ + department = "Medbay"; + departmentType = 1; + name = "Medbay Requests Console"; + pixel_y = 30 + }, /turf/simulated/floor/plasteel{ icon_state = "whitebluefull" }, @@ -30071,7 +30172,12 @@ /area/station/service/hydroponics) "cdi" = ( /obj/structure/table/reinforced, -/obj/machinery/requests_console/directional/north, +/obj/machinery/requests_console{ + department = "Robotics"; + departmentType = 2; + name = "Robotics Requests Console"; + pixel_y = 30 + }, /obj/item/stack/sheet/plasteel{ amount = 10 }, @@ -30450,7 +30556,12 @@ /area/station/maintenance/fsmaint) "cen" = ( /obj/structure/table/glass, -/obj/machinery/requests_console/directional/west, +/obj/machinery/requests_console{ + department = "Hydroponics"; + departmentType = 2; + name = "Hydroponics Requests Console"; + pixel_x = -32 + }, /obj/item/stack/packageWrap, /obj/item/stack/packageWrap, /obj/item/stack/packageWrap, @@ -35408,7 +35519,13 @@ /turf/simulated/floor/plating, /area/station/maintenance/starboard2) "cwH" = ( -/obj/machinery/requests_console/directional/east, +/obj/machinery/requests_console{ + announcementConsole = 1; + department = "Research Director's Desk"; + departmentType = 7; + name = "Research Director Requests Console"; + pixel_x = 30 + }, /obj/machinery/computer/aifixer{ dir = 8 }, @@ -36261,7 +36378,13 @@ dir = 8 }, /obj/machinery/light/directional/north, -/obj/machinery/requests_console/directional/north, +/obj/machinery/requests_console{ + announcementConsole = 1; + department = "Head of Security's Desk"; + departmentType = 5; + name = "Head of Security Requests Console"; + pixel_y = 30 + }, /turf/simulated/floor/wood, /area/station/command/office/hos) "czA" = ( @@ -39754,7 +39877,12 @@ /obj/effect/turf_decal/stripes/line{ dir = 6 }, -/obj/machinery/requests_console/directional/west, +/obj/machinery/requests_console{ + department = "Robotics"; + departmentType = 2; + name = "Robotics Requests Console"; + pixel_x = -30 + }, /obj/structure/disposalpipe/segment/corner{ dir = 4 }, @@ -43472,7 +43600,12 @@ /obj/effect/turf_decal/stripes/line{ dir = 5 }, -/obj/machinery/requests_console/directional/north, +/obj/machinery/requests_console{ + department = "Science"; + departmentType = 2; + name = "Science Requests Console"; + pixel_y = 30 + }, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -43536,9 +43669,11 @@ }, /obj/item/restraints/handcuffs, /obj/item/radio/off, -/obj/machinery/requests_console/directional/east{ +/obj/machinery/requests_console{ department = "Security"; - departmentType = 5 + departmentType = 5; + name = "Security Requests Console"; + pixel_x = 30 }, /turf/simulated/floor/plasteel{ dir = 4; @@ -43736,7 +43871,12 @@ /obj/structure/disposalpipe/segment/corner{ dir = 4 }, -/obj/machinery/requests_console/directional/north, +/obj/machinery/requests_console{ + department = "Chapel"; + departmentType = 2; + name = "Chapel Requests Console"; + pixel_y = 30 + }, /obj/machinery/atmospherics/unary/vent_pump/on, /turf/simulated/floor/plasteel{ icon_state = "grimy" @@ -46219,7 +46359,12 @@ pixel_x = 4; pixel_y = 4 }, -/obj/machinery/requests_console/directional/west, +/obj/machinery/requests_console{ + department = "Engineering"; + departmentType = 3; + name = "Engineering Requests Console"; + pixel_x = -30 + }, /turf/simulated/floor/plasteel{ dir = 10; icon_state = "yellow" @@ -53928,7 +54073,11 @@ /turf/simulated/floor/plating, /area/station/engineering/controlroom) "hHW" = ( -/obj/machinery/requests_console/directional/east, +/obj/machinery/requests_console{ + department = "Internal Affairs Office"; + name = "Internal Affairs Requests Console"; + pixel_x = 30 + }, /turf/simulated/floor/plasteel{ icon_state = "cult" }, @@ -54594,7 +54743,12 @@ /obj/machinery/camera{ c_tag = "Science - Research Fore" }, -/obj/machinery/requests_console/directional/north, +/obj/machinery/requests_console{ + department = "Science"; + departmentType = 2; + name = "Science Requests Console"; + pixel_y = 32 + }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "whitepurple" @@ -57212,7 +57366,12 @@ /obj/item/reagent_containers/drinks/shaker{ pixel_x = -6 }, -/obj/machinery/requests_console/directional/south, +/obj/machinery/requests_console{ + department = "Bar"; + departmentType = 2; + name = "Bar Requests Console"; + pixel_y = -30 + }, /obj/machinery/reagentgrinder{ pixel_x = 6; pixel_y = 6 @@ -59781,7 +59940,13 @@ /obj/machinery/computer/card/minor/cmo{ dir = 4 }, -/obj/machinery/requests_console/directional/west, +/obj/machinery/requests_console{ + announcementConsole = 1; + department = "Chief Medical Officer's Desk"; + departmentType = 5; + name = "Chief Medical Officer Requests Console"; + pixel_x = -30 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "whiteblue" @@ -61295,7 +61460,12 @@ /area/station/maintenance/aft) "lfd" = ( /obj/structure/table/glass, -/obj/machinery/requests_console/directional/west, +/obj/machinery/requests_console{ + department = "Medbay"; + departmentType = 1; + name = "Chemistry Requests Console"; + pixel_x = -30 + }, /obj/machinery/reagentgrinder, /obj/machinery/camera{ c_tag = "Chemistry"; @@ -62399,7 +62569,12 @@ name = "emergency shower" }, /obj/machinery/atmospherics/pipe/simple/visible/purple, -/obj/machinery/requests_console/directional/east, +/obj/machinery/requests_console{ + department = "Atmospherics"; + departmentType = 3; + name = "Atmospherics Requests Console"; + pixel_x = 30 + }, /turf/simulated/floor/plasteel, /area/station/engineering/atmos) "lDD" = ( @@ -64525,7 +64700,12 @@ /area/station/maintenance/starboard) "mAA" = ( /obj/structure/closet/bombcloset, -/obj/machinery/requests_console/directional/west, +/obj/machinery/requests_console{ + department = "Science"; + departmentType = 2; + name = "Science Requests Console"; + pixel_x = -30 + }, /obj/effect/turf_decal/stripes/line{ dir = 4 }, @@ -71198,7 +71378,12 @@ }, /area/station/security/storage) "pNo" = ( -/obj/machinery/requests_console/directional/south, +/obj/machinery/requests_console{ + department = "Cargo Bay"; + departmentType = 2; + name = "Cargo Requests Console"; + pixel_y = -30 + }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "brown" @@ -71735,7 +71920,12 @@ /obj/item/storage/box/bodybags, /obj/item/clothing/mask/surgical, /obj/item/clothing/gloves/color/latex, -/obj/machinery/requests_console/directional/west, +/obj/machinery/requests_console{ + department = "Morgue"; + departmentType = 5; + name = "Morgue Requests Console"; + pixel_x = -30 + }, /obj/machinery/light/small/directional/south, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -72306,7 +72496,12 @@ pixel_y = 4 }, /obj/item/storage/box, -/obj/machinery/requests_console/directional/west, +/obj/machinery/requests_console{ + department = "Atmospherics"; + departmentType = 3; + name = "Atmospherics Requests Console"; + pixel_x = -30 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "caution" @@ -73532,7 +73727,12 @@ pixel_x = 4; pixel_y = -3 }, -/obj/machinery/requests_console/directional/south, +/obj/machinery/requests_console{ + department = "Virology"; + departmentType = 3; + name = "Virology Requests Console"; + pixel_y = -30 + }, /obj/item/stack/sheet/mineral/plasma, /obj/item/stack/sheet/mineral/plasma, /obj/item/stack/sheet/mineral/plasma, @@ -75447,7 +75647,12 @@ }, /area/station/engineering/atmos/control) "rJh" = ( -/obj/machinery/requests_console/directional/north, +/obj/machinery/requests_console{ + department = "Warden"; + departmentType = 7; + name = "Warden's Requests Console"; + pixel_y = 30 + }, /obj/structure/cable/yellow{ d1 = 4; d2 = 8; @@ -78780,7 +78985,12 @@ }, /obj/machinery/light/directional/south, /obj/effect/turf_decal/stripes/line, -/obj/machinery/requests_console/directional/south, +/obj/machinery/requests_console{ + department = "Engineering"; + departmentType = 3; + name = "Engineering Requests Console"; + pixel_y = -30 + }, /turf/simulated/floor/plasteel, /area/station/engineering/control) "tmM" = ( @@ -79797,7 +80007,12 @@ "tRb" = ( /obj/structure/table, /obj/machinery/kitchen_machine/microwave, -/obj/machinery/requests_console/directional/west, +/obj/machinery/requests_console{ + department = "Kitchen"; + departmentType = 2; + name = "Kitchen Requests Console"; + pixel_x = -30 + }, /obj/machinery/light/directional/west, /obj/effect/turf_decal/tile/bar{ dir = 1 @@ -88441,7 +88656,12 @@ /obj/structure/table, /obj/item/paper_bin, /obj/item/pen, -/obj/machinery/requests_console/directional/west, +/obj/machinery/requests_console{ + department = "Science"; + departmentType = 2; + name = "Science Requests Console"; + pixel_x = -30 + }, /obj/effect/turf_decal/delivery/hollow, /obj/effect/turf_decal/stripes/white/line{ dir = 1 From 0c80481414e90f6e489e687eba058b8e8a95e7a3 Mon Sep 17 00:00:00 2001 From: Mikhail Dzianishchyts Date: Tue, 3 Sep 2024 13:06:03 +0300 Subject: [PATCH 2/3] Fix requests consoles in chemistry --- _maps/map_files220/stations/boxstation.dmm | 2 +- _maps/map_files220/stations/deltastation.dmm | 2 +- _maps/map_files220/stations/metastation.dmm | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/_maps/map_files220/stations/boxstation.dmm b/_maps/map_files220/stations/boxstation.dmm index fb7a79a06a32..8bffa39ca287 100644 --- a/_maps/map_files220/stations/boxstation.dmm +++ b/_maps/map_files220/stations/boxstation.dmm @@ -22542,7 +22542,7 @@ dir = 4 }, /obj/machinery/requests_console{ - department = "Medbay"; + department = "Chemistry"; departmentType = 1; name = "Chemistry Requests Console"; pixel_x = -30; diff --git a/_maps/map_files220/stations/deltastation.dmm b/_maps/map_files220/stations/deltastation.dmm index 7c2736b08b89..96851d60a84b 100644 --- a/_maps/map_files220/stations/deltastation.dmm +++ b/_maps/map_files220/stations/deltastation.dmm @@ -42790,7 +42790,7 @@ pixel_y = 2 }, /obj/machinery/requests_console{ - department = "Medbay"; + department = "Chemistry"; departmentType = 1; name = "Chemistry Requests Console"; pixel_y = -30 diff --git a/_maps/map_files220/stations/metastation.dmm b/_maps/map_files220/stations/metastation.dmm index 3d9a1cd6e916..1d4424fc6463 100644 --- a/_maps/map_files220/stations/metastation.dmm +++ b/_maps/map_files220/stations/metastation.dmm @@ -61461,7 +61461,7 @@ "lfd" = ( /obj/structure/table/glass, /obj/machinery/requests_console{ - department = "Medbay"; + department = "Chemistry"; departmentType = 1; name = "Chemistry Requests Console"; pixel_x = -30 From 861837cae22894bc2968a987075850b535a3a06a Mon Sep 17 00:00:00 2001 From: Mikhail Dzianishchyts Date: Tue, 3 Sep 2024 13:08:04 +0300 Subject: [PATCH 3/3] Get rotated --- _maps/map_files220/stations/metastation.dmm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/_maps/map_files220/stations/metastation.dmm b/_maps/map_files220/stations/metastation.dmm index 1d4424fc6463..1987926fa4aa 100644 --- a/_maps/map_files220/stations/metastation.dmm +++ b/_maps/map_files220/stations/metastation.dmm @@ -61464,7 +61464,8 @@ department = "Chemistry"; departmentType = 1; name = "Chemistry Requests Console"; - pixel_x = -30 + pixel_x = -30; + dir = 8 }, /obj/machinery/reagentgrinder, /obj/machinery/camera{