From 7f219de67fc946862ba134e1f4ebe88e7c676902 Mon Sep 17 00:00:00 2001 From: warriorstar-orion Date: Mon, 1 Jul 2024 04:55:30 -0400 Subject: [PATCH] refactor: move req console config to areas (#26051) * refactor: move req console config to areas * improve dmdoc * just set this to what the area has --- _maps/map_files/stations/boxstation.dmm | 204 ++++-------------- _maps/map_files/stations/cerestation.dmm | 114 +--------- _maps/map_files/stations/deltastation.dmm | 118 ++-------- _maps/map_files/stations/metastation.dmm | 107 +-------- code/__DEFINES/machines.dm | 8 + code/game/area/ai_monitored.dm | 1 + code/game/area/areas.dm | 8 + code/game/area/ss13_areas/ai_areas.dm | 2 + code/game/area/ss13_areas/command_areas.dm | 29 +++ .../game/area/ss13_areas/engineering_areas.dm | 11 + code/game/area/ss13_areas/legal_areas.dm | 6 +- code/game/area/ss13_areas/medical_areas.dm | 11 + code/game/area/ss13_areas/public_areas.dm | 4 + code/game/area/ss13_areas/science_areas.dm | 17 +- code/game/area/ss13_areas/security_areas.dm | 14 ++ code/game/area/ss13_areas/service_areas.dm | 9 + code/game/area/ss13_areas/supply_areas.dm | 12 ++ code/game/machinery/requests_console.dm | 25 ++- 18 files changed, 206 insertions(+), 494 deletions(-) diff --git a/_maps/map_files/stations/boxstation.dmm b/_maps/map_files/stations/boxstation.dmm index eef6fea641c..d560ad2d9f2 100644 --- a/_maps/map_files/stations/boxstation.dmm +++ b/_maps/map_files/stations/boxstation.dmm @@ -673,8 +673,6 @@ dir = 8 }, /obj/machinery/requests_console{ - department = "Security"; - departmentType = 5; pixel_y = 30 }, /obj/machinery/economy/vending/secdrobe, @@ -3119,9 +3117,6 @@ /area/station/security/permabrig) "amt" = ( /obj/machinery/requests_console{ - announcementConsole = 1; - department = "Head of Security's Desk"; - departmentType = 5; pixel_x = 30 }, /obj/machinery/computer/brigcells{ @@ -4184,8 +4179,6 @@ pixel_x = -28 }, /obj/machinery/requests_console{ - department = "Warden"; - departmentType = 7; pixel_y = -30 }, /obj/item/radio/intercom/department/security{ @@ -6769,7 +6762,6 @@ "axp" = ( /obj/structure/bookcase/sop, /obj/machinery/requests_console{ - department = "Internal Affairs Office"; pixel_x = -30 }, /obj/machinery/light{ @@ -9588,9 +9580,7 @@ pixel_y = -28 }, /obj/machinery/requests_console{ - department = "Magistrate"; - pixel_x = 30; - departmentType = 5 + pixel_x = 30 }, /turf/simulated/floor/plasteel{ icon_state = "cult" @@ -9923,7 +9913,6 @@ "aGu" = ( /obj/item/kirbyplants, /obj/machinery/requests_console{ - department = "Courtroom"; pixel_x = 30 }, /turf/simulated/floor/wood, @@ -10283,7 +10272,6 @@ icon_state = "1-2" }, /obj/machinery/requests_console{ - department = "Courtroom"; pixel_x = 30 }, /turf/simulated/floor/plasteel{ @@ -14999,8 +14987,6 @@ /area/station/maintenance/fsmaint) "aWh" = ( /obj/machinery/requests_console{ - department = "Security"; - departmentType = 5; pixel_y = 30 }, /obj/machinery/computer/secure_data, @@ -15046,7 +15032,6 @@ c_tag = "Primary Tool Storage" }, /obj/machinery/requests_console{ - department = "Tool Storage"; pixel_y = 30 }, /obj/item/assembly/igniter{ @@ -15842,8 +15827,6 @@ c_tag = "Medbay Paramedic" }, /obj/machinery/requests_console{ - department = "Paramedic"; - departmentType = 1; pixel_y = 30 }, /turf/simulated/floor/plasteel, @@ -17857,7 +17840,6 @@ /area/station/hallway/primary/central/north) "bex" = ( /obj/machinery/requests_console{ - department = "Arrival Shuttle"; pixel_y = -30 }, /turf/simulated/floor/mineral/titanium/blue, @@ -18116,8 +18098,6 @@ /area/station/public/dorms) "bfk" = ( /obj/machinery/requests_console{ - department = "Bar"; - departmentType = 2; pixel_y = 30 }, /obj/structure/table/reinforced, @@ -22712,9 +22692,7 @@ /area/station/service/bar) "brI" = ( /obj/machinery/requests_console{ - department = "Chapel"; - pixel_x = -30; - departmentType = 2 + pixel_x = -30 }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -23714,8 +23692,6 @@ /obj/structure/table, /obj/machinery/reagentgrinder, /obj/machinery/requests_console{ - department = "Kitchen"; - departmentType = 2; pixel_x = 30 }, /turf/simulated/floor/plasteel{ @@ -23894,10 +23870,8 @@ "bvr" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/requests_console{ - department = "Expedition"; - departmentType = 2; - pixel_x = -30; - dir = 4 + dir = 4; + pixel_x = -30 }, /turf/simulated/floor/plasteel{ dir = 8; @@ -24524,8 +24498,6 @@ /area/station/service/library) "bxX" = ( /obj/machinery/requests_console{ - department = "Science"; - departmentType = 2; pixel_x = 30 }, /obj/structure/table, @@ -24896,8 +24868,6 @@ "bzH" = ( /obj/structure/table, /obj/machinery/requests_console{ - department = "Cargo Bay"; - departmentType = 2; pixel_y = 30 }, /obj/item/stack/tape_roll, @@ -26615,8 +26585,6 @@ /area/station/science/robotics) "bGF" = ( /obj/machinery/requests_console{ - department = "Robotics"; - departmentType = 2; pixel_y = 30 }, /obj/structure/rack{ @@ -27266,8 +27234,6 @@ /area/station/supply/storage) "bIU" = ( /obj/machinery/requests_console{ - department = "Cargo Bay"; - departmentType = 2; pixel_y = 30 }, /obj/effect/turf_decal/delivery/hollow, @@ -27592,8 +27558,6 @@ /area/station/medical/reception) "bJZ" = ( /obj/machinery/requests_console{ - department = "Medbay"; - departmentType = 1; pixel_x = -30 }, /obj/structure/table, @@ -29124,17 +29088,6 @@ }, /turf/simulated/floor/plasteel, /area/station/supply/storage) -"bPP" = ( -/obj/machinery/computer/security/mining, -/obj/machinery/firealarm/directional/north, -/obj/machinery/requests_console{ - announcementConsole = 1; - department = "Quartermaster's Desk"; - departmentType = 5; - pixel_x = -30 - }, -/turf/simulated/floor/carpet, -/area/station/supply/qm) "bPS" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -30144,8 +30097,6 @@ "bTA" = ( /obj/structure/table, /obj/machinery/requests_console{ - department = "Cargo Bay"; - departmentType = 2; pixel_x = -30 }, /obj/machinery/camera{ @@ -30180,8 +30131,6 @@ dir = 4 }, /obj/machinery/requests_console{ - department = "Chemistry"; - departmentType = 1; pixel_x = -30 }, /turf/simulated/floor/plasteel{ @@ -32526,9 +32475,6 @@ dir = 8 }, /obj/machinery/requests_console{ - announcementConsole = 1; - department = "Chief Medical Officer's Desk"; - departmentType = 5; pixel_x = 30 }, /turf/simulated/floor/plasteel{ @@ -33574,8 +33520,6 @@ "cgE" = ( /obj/machinery/economy/vending/plasmaresearch, /obj/machinery/requests_console{ - department = "Science"; - departmentType = 2; pixel_y = -30 }, /turf/simulated/floor/plasteel{ @@ -34561,8 +34505,6 @@ dir = 1 }, /obj/machinery/requests_console{ - department = "Virology"; - departmentType = 3; pixel_y = 30 }, /obj/machinery/newscaster{ @@ -34871,10 +34813,6 @@ /area/station/hallway/primary/aft/north) "clR" = ( /obj/machinery/requests_console{ - announcementConsole = 1; - department = "Blueshield"; - departmentType = 5; - name = "Blueshield Requests Console"; pixel_x = -32 }, /turf/simulated/floor/wood, @@ -39104,7 +39042,6 @@ /area/station/engineering/tech_storage) "cAK" = ( /obj/machinery/requests_console{ - department = "Tech Storage"; pixel_y = -32 }, /turf/simulated/floor/plating, @@ -41022,8 +40959,6 @@ dir = 4 }, /obj/machinery/requests_console{ - department = "Science"; - departmentType = 2; pixel_y = -30 }, /turf/simulated/floor/plasteel{ @@ -41907,8 +41842,6 @@ icon_state = "1-2" }, /obj/machinery/requests_console{ - department = "Atmospherics"; - departmentType = 3; pixel_x = 30 }, /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ @@ -43553,8 +43486,6 @@ "cQO" = ( /obj/structure/table, /obj/machinery/requests_console{ - department = "Engineering"; - departmentType = 3; pixel_x = 30 }, /obj/item/stack/sheet/glass{ @@ -44008,8 +43939,6 @@ /area/station/engineering/atmos) "cSf" = ( /obj/machinery/requests_console{ - department = "Xenobiology"; - departmentType = 2; pixel_y = 30 }, /turf/simulated/floor/plasteel{ @@ -44681,8 +44610,6 @@ /area/station/public/mrchangs) "cUj" = ( /obj/machinery/requests_console{ - department = "Engineering"; - departmentType = 3; pixel_y = 30 }, /obj/structure/table, @@ -45228,8 +45155,6 @@ "cWp" = ( /obj/structure/table, /obj/machinery/requests_console{ - department = "Atmospherics"; - departmentType = 3; pixel_y = -30 }, /obj/item/stack/sheet/glass{ @@ -46242,7 +46167,6 @@ /obj/structure/table/reinforced, /obj/item/book/manual/evaguide, /obj/machinery/requests_console{ - department = "EVA"; pixel_x = -32 }, /obj/effect/turf_decal/delivery/white/hollow, @@ -48294,7 +48218,6 @@ /area/space/nearstation) "dig" = ( /obj/machinery/requests_console{ - department = "Locker Room"; pixel_x = -32 }, /turf/simulated/floor/plasteel, @@ -50104,8 +50027,6 @@ /area/station/public/locker) "dnH" = ( /obj/machinery/requests_console{ - department = "Hydroponics"; - departmentType = 2; pixel_y = 30 }, /obj/machinery/plantgenes, @@ -51055,10 +50976,8 @@ pixel_y = -28 }, /obj/machinery/requests_console{ - department = "AI"; - departmentType = 5; - pixel_x = 32; - pixel_y = -32 + pixel_y = -32; + pixel_x = 32 }, /obj/effect/landmark/start/ai, /obj/machinery/newscaster/security_unit{ @@ -52866,7 +52785,7 @@ inlet_injector_autolink_id = "o2_in"; name = "Oxygen Supply Control"; outlet_vent_autolink_id = "o2_out"; - autolink_sensors = list("o2_sensor"="Tank") + autolink_sensors = list("o2_sensor" = "Tank") }, /turf/simulated/floor/plasteel{ icon_state = "blue" @@ -54456,9 +54375,7 @@ }, /obj/item/storage/briefcase, /obj/machinery/requests_console{ - department = "Psychiatrist"; - pixel_x = -30; - departmentType = 2 + pixel_x = -30 }, /turf/simulated/floor/wood, /area/station/medical/psych) @@ -54701,7 +54618,7 @@ inlet_injector_autolink_id = "n2_in"; name = "Nitrogen Supply Control"; outlet_vent_autolink_id = "n2_out"; - autolink_sensors = list("n2_sensor"="Tank") + autolink_sensors = list("n2_sensor" = "Tank") }, /obj/machinery/atmospherics/pipe/simple/visible/yellow, /turf/simulated/floor/plasteel{ @@ -55180,6 +55097,16 @@ icon_state = "darkgreen" }, /area/station/medical/medbay3) +"feD" = ( +/obj/machinery/light{ + dir = 4 + }, +/obj/machinery/firealarm/directional/east, +/turf/simulated/floor/plasteel{ + dir = 4; + icon_state = "brown" + }, +/area/station/supply/expedition) "feN" = ( /turf/simulated/floor/plasteel, /area/station/hallway/secondary/entry/north) @@ -55988,7 +55915,7 @@ /obj/machinery/computer/general_air_control{ dir = 4; name = "Tank Monitor"; - autolink_sensors = list("n2_sensor"="Nitrogen","o2_sensor"="Oxygen","co2_sensor"="Carbon Dioxide","tox_sensor"="Toxins","n2o_sensor"="Nitrous Oxide","waste_sensor"="Gas Mix Tank") + autolink_sensors = list("n2_sensor" = "Nitrogen", "o2_sensor" = "Oxygen", "co2_sensor" = "Carbon Dioxide", "tox_sensor" = "Toxins", "n2o_sensor" = "Nitrous Oxide", "waste_sensor" = "Gas Mix Tank") }, /turf/simulated/floor/plasteel, /area/station/engineering/atmos/control) @@ -59239,9 +59166,6 @@ "gXD" = ( /obj/item/kirbyplants, /obj/machinery/requests_console{ - announcementConsole = 1; - department = "Bridge"; - departmentType = 5; pixel_y = 30 }, /turf/simulated/floor/wood, @@ -61534,8 +61458,6 @@ dir = 8 }, /obj/machinery/requests_console{ - department = "Library"; - departmentType = 2; pixel_x = 30 }, /turf/simulated/floor/wood, @@ -66419,8 +66341,6 @@ /area/station/security/permabrig) "kFd" = ( /obj/machinery/requests_console{ - department = "Chapel"; - departmentType = 2; pixel_y = -30 }, /turf/simulated/floor/plasteel{ @@ -66556,7 +66476,7 @@ inlet_injector_autolink_id = "co2_in"; name = "Carbon Dioxide Supply Control"; outlet_vent_autolink_id = "co2_out"; - autolink_sensors = list("co2_sensor"="Tank") + autolink_sensors = list("co2_sensor" = "Tank") }, /turf/simulated/floor/plasteel{ dir = 4; @@ -68218,9 +68138,7 @@ /obj/item/camera_film, /obj/item/camera/detective, /obj/machinery/requests_console{ - pixel_y = -30; - department = "Detective"; - departmentType = 5 + pixel_y = -30 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 @@ -69460,7 +69378,7 @@ dir = 1; level = 3; name = "Distribution and Waste Monitor"; - autolink_sensors = list("mair_in_meter"="Mixed Air In","air_sensor"="Mixed Air Supply Tank","mair_out_meter"="Mixed Air Out","dloop_atm_meter"="Distribution Loop","wloop_atm_meter"="Waste Loop") + autolink_sensors = list("mair_in_meter" = "Mixed Air In", "air_sensor" = "Mixed Air Supply Tank", "mair_out_meter" = "Mixed Air Out", "dloop_atm_meter" = "Distribution Loop", "wloop_atm_meter" = "Waste Loop") }, /turf/simulated/floor/plasteel, /area/station/engineering/controlroom) @@ -69876,9 +69794,6 @@ /area/station/maintenance/asmaint) "mlz" = ( /obj/machinery/requests_console{ - announcementConsole = 1; - department = "Chief Engineer's Desk"; - departmentType = 7; pixel_y = 32 }, /obj/machinery/light{ @@ -70319,8 +70234,6 @@ pixel_y = 2 }, /obj/machinery/requests_console{ - department = "Morgue"; - departmentType = 5; pixel_x = -30 }, /turf/simulated/floor/plasteel{ @@ -71064,7 +70977,6 @@ /obj/structure/table, /obj/item/storage/firstaid/regular, /obj/machinery/requests_console{ - department = "Crew Quarters"; pixel_y = 30 }, /turf/simulated/floor/plasteel{ @@ -73704,9 +73616,6 @@ dir = 4 }, /obj/machinery/requests_console{ - announcementConsole = 1; - department = "Bridge"; - departmentType = 5; pixel_y = -30 }, /obj/structure/cable{ @@ -75095,7 +75004,7 @@ inlet_injector_autolink_id = "tox_in"; name = "Toxin Supply Control"; outlet_vent_autolink_id = "tox_out"; - autolink_sensors = list("tox_sensor"="Tank") + autolink_sensors = list("tox_sensor" = "Tank") }, /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -75455,7 +75364,7 @@ dir = 8; level = 3; name = "Distribution and Waste Monitor"; - autolink_sensors = list("mair_in_meter"="Mixed Air In","air_sensor"="Mixed Air Supply Tank","mair_out_meter"="Mixed Air Out","dloop_atm_meter"="Distribution Loop","wloop_atm_meter"="Waste Loop") + autolink_sensors = list("mair_in_meter" = "Mixed Air In", "air_sensor" = "Mixed Air Supply Tank", "mair_out_meter" = "Mixed Air Out", "dloop_atm_meter" = "Distribution Loop", "wloop_atm_meter" = "Waste Loop") }, /turf/simulated/floor/plasteel, /area/station/engineering/atmos/control) @@ -77497,6 +77406,14 @@ /obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/fpmaint) +"pZw" = ( +/obj/machinery/computer/security/mining, +/obj/machinery/requests_console{ + pixel_x = -30 + }, +/obj/machinery/firealarm/directional/north, +/turf/simulated/floor/carpet, +/area/station/supply/qm) "pZK" = ( /obj/machinery/light{ dir = 8 @@ -78148,7 +78065,7 @@ }, /obj/machinery/computer/general_air_control{ name = "Bomb Mix Monitor"; - autolink_sensors = list("burn_sensor"="Burn Mix") + autolink_sensors = list("burn_sensor" = "Burn Mix") }, /obj/machinery/door_control{ id = "ToxinsVenting"; @@ -79218,8 +79135,6 @@ /area/station/medical/storage) "qId" = ( /obj/machinery/requests_console{ - department = "Science"; - departmentType = 2; pixel_x = 30 }, /obj/structure/disposalpipe/segment, @@ -79859,11 +79774,6 @@ /area/station/maintenance/fore) "qZX" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/requests_console{ - department = "Expedition"; - departmentType = 2; - pixel_x = 30 - }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "darkbluecorners" @@ -79919,7 +79829,7 @@ }, /obj/machinery/computer/general_air_control{ name = "Tank Monitor"; - autolink_sensors = list("n2_sensor"="Nitrogen","o2_sensor"="Oxygen","co2_sensor"="Carbon Dioxide","tox_sensor"="Toxins","n2o_sensor"="Nitrous Oxide","waste_sensor"="Gas Mix Tank") + autolink_sensors = list("n2_sensor" = "Nitrogen", "o2_sensor" = "Oxygen", "co2_sensor" = "Carbon Dioxide", "tox_sensor" = "Toxins", "n2o_sensor" = "Nitrous Oxide", "waste_sensor" = "Gas Mix Tank") }, /obj/machinery/light{ dir = 4 @@ -81087,7 +80997,7 @@ name = "Mixed Air Supply Control"; outlet_vent_autolink_id = "air_out"; outlet_setting = 2000; - autolink_sensors = list("air_sensor"="Tank") + autolink_sensors = list("air_sensor" = "Tank") }, /turf/simulated/floor/plasteel{ icon_state = "arrival" @@ -83157,22 +83067,6 @@ }, /turf/simulated/floor/plasteel, /area/station/command/bridge) -"sJe" = ( -/obj/machinery/light{ - dir = 4 - }, -/obj/machinery/firealarm/directional/east, -/obj/machinery/requests_console{ - announcementConsole = 1; - department = "NT Representative"; - departmentType = 5; - pixel_y = 30 - }, -/turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "brown" - }, -/area/station/supply/expedition) "sJu" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock{ @@ -84925,9 +84819,6 @@ /area/station/maintenance/apmaint2) "tFe" = ( /obj/machinery/requests_console{ - announcementConsole = 1; - department = "Head of Personnel's Desk"; - departmentType = 5; pixel_y = -30 }, /obj/machinery/camera/autoname{ @@ -84948,9 +84839,6 @@ dir = 4 }, /obj/machinery/requests_console{ - announcementConsole = 1; - department = "Research Director's Desk"; - departmentType = 7; pixel_x = -2; pixel_y = 30 }, @@ -86978,7 +86866,7 @@ inlet_injector_autolink_id = "waste_in"; name = "Gas Mix Tank Control"; outlet_vent_autolink_id = "waste_out"; - autolink_sensors = list("waste_sensor"="Tank") + autolink_sensors = list("waste_sensor" = "Tank") }, /turf/simulated/floor/plasteel{ dir = 4; @@ -87236,8 +87124,6 @@ pixel_y = -30 }, /obj/machinery/requests_console{ - department = "Genetics"; - departmentType = 1; pixel_x = -30 }, /turf/simulated/floor/plasteel{ @@ -91233,8 +91119,6 @@ /area/station/maintenance/apmaint) "wQa" = ( /obj/machinery/requests_console{ - department = "Mining"; - departmentType = 2; pixel_x = -30 }, /obj/effect/landmark/start/shaft_miner, @@ -91582,8 +91466,6 @@ "xbn" = ( /obj/vehicle/janicart, /obj/machinery/requests_console{ - department = "Janitorial"; - departmentType = 1; pixel_y = -29 }, /obj/effect/turf_decal/delivery/green/hollow, @@ -92307,9 +92189,6 @@ dir = 1 }, /obj/machinery/requests_console{ - announcementConsole = 1; - department = "NT Representative"; - departmentType = 5; pixel_y = -30; dir = 1 }, @@ -92470,9 +92349,6 @@ "xwJ" = ( /obj/machinery/suit_storage_unit/captain/secure, /obj/machinery/requests_console{ - announcementConsole = 1; - department = "Captain's Desk"; - departmentType = 5; pixel_x = 30 }, /turf/simulated/floor/carpet/royalblue, @@ -92574,7 +92450,7 @@ inlet_injector_autolink_id = "n2o_in"; name = "Nitrous Oxide Supply Control"; outlet_vent_autolink_id = "n2o_out"; - autolink_sensors = list("n2o_sensor"="Tank") + autolink_sensors = list("n2o_sensor" = "Tank") }, /turf/simulated/floor/plasteel{ dir = 4; @@ -115134,7 +115010,7 @@ rBg bSm prX bYM -bPP +pZw bXf bYr nBz @@ -118742,7 +118618,7 @@ wrU wrU wrU coH -sJe +feD cFM wrU xQB diff --git a/_maps/map_files/stations/cerestation.dmm b/_maps/map_files/stations/cerestation.dmm index 0e5293c8909..b4074a8105d 100644 --- a/_maps/map_files/stations/cerestation.dmm +++ b/_maps/map_files/stations/cerestation.dmm @@ -1282,8 +1282,6 @@ /area/shuttle/pod_4) "aiO" = ( /obj/machinery/requests_console{ - department = "AI"; - departmentType = 5; pixel_y = -28 }, /obj/machinery/turretid/lethal{ @@ -3874,9 +3872,6 @@ dir = 1 }, /obj/machinery/requests_console{ - announcementConsole = 1; - department = "Head of Security's Desk"; - departmentType = 5; pixel_y = -30 }, /obj/machinery/computer/secure_data{ @@ -3933,10 +3928,6 @@ /area/station/command/office/captain) "ayv" = ( /obj/machinery/requests_console{ - announcementConsole = 1; - department = "Captain's Desk"; - departmentType = 5; - name = "Captain RC"; pixel_y = 30 }, /obj/machinery/computer/communications, @@ -5144,10 +5135,6 @@ /area/station/command/bridge) "aHm" = ( /obj/machinery/requests_console{ - announcementConsole = 1; - department = "Bridge"; - departmentType = 5; - name = "Bridge RC"; pixel_y = 30 }, /turf/simulated/floor/carpet/black, @@ -8809,9 +8796,6 @@ /area/station/hallway/primary/starboard/north) "bcR" = ( /obj/machinery/requests_console{ - department = "Cargo Bay"; - departmentType = 2; - name = "Cargo RC"; pixel_x = -30 }, /turf/simulated/floor/plasteel{ @@ -9768,7 +9752,6 @@ name = "south bump" }, /obj/machinery/requests_console{ - department = "EVA"; pixel_x = -32 }, /turf/simulated/floor/plasteel{ @@ -10378,10 +10361,6 @@ dir = 4 }, /obj/machinery/requests_console{ - announcementConsole = 1; - department = "Chief Engineer's Desk"; - departmentType = 3; - name = "Chief Engineer RC"; pixel_x = -32 }, /turf/simulated/floor/plasteel, @@ -10436,10 +10415,6 @@ dir = 4 }, /obj/machinery/requests_console{ - announcementConsole = 1; - department = "Chief Medical Officer's Desk"; - departmentType = 5; - name = "Chief Medical Officer RC"; pixel_x = -30 }, /turf/simulated/floor/plasteel{ @@ -11398,10 +11373,6 @@ /area/station/command/office/hop) "bqF" = ( /obj/machinery/requests_console{ - announcementConsole = 1; - department = "Head of Personnel's Desk"; - departmentType = 5; - name = "Head of Personnel RC"; pixel_y = 30 }, /obj/machinery/disposal, @@ -15934,7 +15905,6 @@ network = list("SS13","CMO") }, /obj/machinery/requests_console{ - department = "Virology"; pixel_x = -32 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -23628,9 +23598,6 @@ /area/station/supply/office) "cAn" = ( /obj/machinery/requests_console{ - department = "Cargo Bay"; - departmentType = 2; - name = "Cargo RC"; pixel_y = 30 }, /turf/simulated/floor/plasteel{ @@ -24024,7 +23991,6 @@ dir = 8 }, /obj/machinery/requests_console{ - department = "Crew Quarters"; pixel_y = 30 }, /turf/simulated/floor/plasteel{ @@ -24262,10 +24228,7 @@ /area/space) "cEm" = ( /obj/machinery/requests_console{ - department = "Quartermaster's Desk"; - departmentType = 5; - pixel_x = 30; - announcementConsole = 1 + pixel_x = 30 }, /obj/machinery/photocopier, /turf/simulated/floor/plasteel{ @@ -24347,8 +24310,6 @@ pixel_y = -28 }, /obj/machinery/requests_console{ - department = "Warden"; - departmentType = 7; pixel_x = -30 }, /turf/simulated/floor/plasteel{ @@ -27396,7 +27357,6 @@ /obj/item/stamp/magistrate, /obj/item/pen/multi/gold, /obj/machinery/requests_console{ - department = "Magistrate"; pixel_x = 30 }, /turf/simulated/floor/carpet, @@ -28594,7 +28554,6 @@ dir = 4 }, /obj/machinery/requests_console{ - department = "Tool Storage"; pixel_y = 30 }, /turf/simulated/floor/plasteel{ @@ -29009,8 +28968,6 @@ }, /obj/structure/table/wood, /obj/machinery/requests_console{ - department = "Bar"; - departmentType = 2; pixel_x = -30 }, /turf/simulated/floor/wood, @@ -30170,9 +30127,7 @@ /area/station/science/hallway) "dkb" = ( /obj/machinery/requests_console{ - pixel_y = -30; - department = "Detective"; - departmentType = 5 + pixel_y = -30 }, /obj/structure/cable/orange{ d1 = 4; @@ -33575,7 +33530,6 @@ /obj/item/t_scanner, /obj/item/multitool, /obj/machinery/requests_console{ - department = "Tech Storage"; pixel_x = -30 }, /turf/simulated/floor/plating, @@ -37730,9 +37684,6 @@ /area/station/maintenance/disposal/external/north) "eZB" = ( /obj/machinery/requests_console{ - department = "Atmospherics"; - departmentType = 4; - name = "Atmos RC"; pixel_x = 30 }, /obj/structure/closet/secure_closet/atmos_personal, @@ -42670,8 +42621,6 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/requests_console{ - department = "Janitorial"; - departmentType = 1; pixel_x = 30 }, /turf/simulated/floor/plasteel, @@ -46203,10 +46152,7 @@ "hUK" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/requests_console{ - department = "Mining"; - departmentType = 5; - pixel_x = 30; - announcementConsole = 1 + pixel_x = 30 }, /turf/simulated/floor/plasteel, /area/station/supply/miningdock) @@ -52334,7 +52280,6 @@ "jMh" = ( /obj/item/kirbyplants, /obj/machinery/requests_console{ - department = "Psychiatrist"; pixel_x = -30 }, /turf/simulated/floor/carpet, @@ -53460,7 +53405,6 @@ /area/station/maintenance/starboard) "kgy" = ( /obj/machinery/requests_console{ - department = "Library"; pixel_x = -30 }, /turf/simulated/floor/wood, @@ -54527,9 +54471,6 @@ /area/station/maintenance/asmaint) "kwS" = ( /obj/machinery/requests_console{ - announcementConsole = 1; - department = "NT Representative"; - departmentType = 5; pixel_x = 30 }, /turf/simulated/floor/wood, @@ -59755,10 +59696,6 @@ /area/station/command/office/rd) "lZX" = ( /obj/machinery/requests_console{ - announcementConsole = 1; - department = "Blueshield"; - departmentType = 5; - name = "Blueshield Requests Console"; pixel_x = 30 }, /obj/structure/closet/cabinet, @@ -59766,9 +59703,6 @@ /obj/item/reagent_containers/drinks/drinkingglass, /obj/item/reagent_containers/drinks/bottle/whiskey, /obj/machinery/requests_console{ - announcementConsole = 1; - department = "Blueshield"; - departmentType = 5; pixel_x = 30 }, /turf/simulated/floor/wood, @@ -61930,7 +61864,6 @@ "mNv" = ( /obj/structure/closet/wardrobe/black, /obj/machinery/requests_console{ - department = "Arrival Shuttle"; pixel_y = -30 }, /turf/simulated/floor/mineral/titanium/blue, @@ -63033,8 +62966,6 @@ /obj/structure/table/glass, /obj/item/storage/box/syringes, /obj/machinery/requests_console{ - department = "Medbay"; - departmentType = 1; pixel_y = 30 }, /turf/simulated/floor/plasteel{ @@ -67330,8 +67261,6 @@ "ozW" = ( /obj/structure/closet/secure_closet/freezer/kitchen, /obj/machinery/requests_console{ - department = "Kitchen"; - departmentType = 2; pixel_y = -30 }, /turf/simulated/floor/plasteel{ @@ -67436,8 +67365,6 @@ /obj/item/stack/sheet/metal/fifty, /obj/item/stack/sheet/metal/fifty, /obj/machinery/requests_console{ - department = "Engineering"; - departmentType = 3; pixel_x = 30 }, /turf/simulated/floor/plasteel{ @@ -69871,9 +69798,6 @@ /area/station/science/misc_lab) "pqq" = ( /obj/machinery/requests_console{ - announcementConsole = 1; - department = "Xenobiology"; - departmentType = 5; pixel_x = -30 }, /turf/simulated/floor/plasteel{ @@ -76858,8 +76782,6 @@ /area/station/service/kitchen) "rCC" = ( /obj/machinery/requests_console{ - department = "Morgue"; - departmentType = 5; pixel_x = -30 }, /turf/simulated/floor/plasteel{ @@ -77552,8 +77474,6 @@ /area/station/hallway/primary/starboard/north) "rOy" = ( /obj/machinery/requests_console{ - department = "Chapel"; - departmentType = 2; pixel_y = 30 }, /turf/simulated/floor/carpet/black, @@ -80118,8 +80038,6 @@ /area/station/public/quantum/science) "sDY" = ( /obj/machinery/requests_console{ - department = "Hydroponics"; - departmentType = 2; pixel_y = 30 }, /obj/machinery/hydroponics/constructable, @@ -80668,9 +80586,6 @@ dir = 1 }, /obj/machinery/requests_console{ - department = "Robotics"; - departmentType = 2; - name = "Robotics RC"; pixel_y = 30 }, /turf/simulated/floor/plasteel/white, @@ -82843,8 +82758,6 @@ /area/station/hallway/primary/fore/east) "tyF" = ( /obj/machinery/requests_console{ - department = "Science"; - departmentType = 2; pixel_x = -30 }, /obj/machinery/r_n_d/circuit_imprinter, @@ -85981,10 +85894,6 @@ /area/station/hallway/primary/central/west) "uzI" = ( /obj/machinery/requests_console{ - announcementConsole = 1; - department = "Research Director's Desk"; - departmentType = 5; - name = "Research Director RC"; pixel_x = -30 }, /obj/machinery/computer/security{ @@ -86567,8 +86476,6 @@ /area/station/public/locker) "uJE" = ( /obj/machinery/requests_console{ - department = "Courtroom"; - departmentType = 2; pixel_x = 30 }, /turf/simulated/floor/carpet, @@ -87562,8 +87469,6 @@ /obj/item/storage/box/monkeycubes/wolpincubes, /obj/item/storage/box/monkeycubes/nian_worme_cubes, /obj/machinery/requests_console{ - department = "Genetics"; - departmentType = 1; pixel_x = -30 }, /turf/simulated/floor/plasteel{ @@ -88563,7 +88468,6 @@ /obj/item/stamp/law, /obj/item/pen/multi, /obj/machinery/requests_console{ - department = "Internal Affairs Office"; pixel_x = -30 }, /obj/item/taperecorder, @@ -92748,8 +92652,6 @@ icon_state = "1-2" }, /obj/machinery/requests_console{ - department = "Security"; - departmentType = 5; pixel_x = 30 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -92941,7 +92843,6 @@ /area/station/maintenance/gambling_den) "wyn" = ( /obj/machinery/requests_console{ - department = "Paramedic"; pixel_x = 30 }, /turf/simulated/floor/plasteel{ @@ -95474,9 +95375,8 @@ "xnp" = ( /obj/effect/landmark/start/explorer, /obj/machinery/requests_console{ - department = "Expedition"; - pixel_x = -30; - dir = 4 + dir = 4; + pixel_x = -30 }, /turf/simulated/floor/plasteel{ dir = 8; @@ -97352,9 +97252,6 @@ /area/station/legal/magistrate) "xSE" = ( /obj/machinery/requests_console{ - department = "Chemistry"; - departmentType = 2; - name = "Chemistry RC"; pixel_x = -30 }, /mob/living/simple_animal/bot/cleanbot{ @@ -97715,7 +97612,6 @@ /area/station/hallway/primary/central/north) "xYV" = ( /obj/machinery/requests_console{ - department = "Locker Room"; pixel_y = -30 }, /turf/simulated/floor/plasteel, diff --git a/_maps/map_files/stations/deltastation.dmm b/_maps/map_files/stations/deltastation.dmm index 27d07cd3e14..fc21356c971 100644 --- a/_maps/map_files/stations/deltastation.dmm +++ b/_maps/map_files/stations/deltastation.dmm @@ -399,7 +399,6 @@ "aeF" = ( /obj/structure/filingcabinet/chestdrawer, /obj/machinery/requests_console{ - department = "Psychiatrist"; pixel_x = -30 }, /turf/simulated/floor/wood, @@ -6307,8 +6306,6 @@ }, /obj/structure/closet/l3closet/janitor, /obj/machinery/requests_console{ - department = "Janitorial"; - departmentType = 1; pixel_y = 29 }, /obj/effect/turf_decal/delivery/hollow, @@ -9108,8 +9105,6 @@ /obj/item/reagent_containers/drinks/shaker, /obj/item/reagent_containers/glass/rag, /obj/machinery/requests_console{ - department = "Bar"; - departmentType = 2; pixel_y = 30 }, /turf/simulated/floor/plasteel/dark, @@ -14468,8 +14463,6 @@ c_tag = "Cargo Office" }, /obj/machinery/requests_console{ - department = "Cargo Bay"; - departmentType = 2; pixel_y = 30 }, /obj/item/storage/firstaid/regular, @@ -14624,9 +14617,6 @@ dir = 8 }, /obj/machinery/requests_console{ - announcementConsole = 1; - department = "Quartermaster's Desk"; - departmentType = 5; pixel_x = 30 }, /turf/simulated/floor/plasteel{ @@ -18030,8 +18020,6 @@ /obj/machinery/disposal, /obj/structure/disposalpipe/trunk, /obj/machinery/requests_console{ - department = "Kitchen"; - departmentType = 2; pixel_x = 30 }, /obj/effect/turf_decal/delivery, @@ -20434,9 +20422,6 @@ dir = 1 }, /obj/machinery/requests_console{ - announcementConsole = 1; - department = "Head of Security's Desk"; - departmentType = 5; pixel_y = 30 }, /turf/simulated/floor/plasteel{ @@ -24395,6 +24380,15 @@ }, /turf/simulated/floor/plating, /area/station/maintenance/starboard) +"buG" = ( +/obj/structure/closet/secure_closet/engineering_personal, +/obj/machinery/requests_console{ + pixel_y = -30 + }, +/obj/effect/turf_decal/delivery, +/obj/machinery/firealarm/directional/east, +/turf/simulated/floor/plasteel, +/area/station/engineering/control) "buI" = ( /obj/machinery/atmospherics/pipe/simple/visible/yellow{ dir = 4 @@ -24918,8 +24912,6 @@ /obj/item/watertank, /obj/item/grenade/chem_grenade/antiweed, /obj/machinery/requests_console{ - department = "Hydroponics"; - departmentType = 2; pixel_x = 30 }, /obj/effect/turf_decal/delivery/hollow, @@ -26965,8 +26957,6 @@ pixel_y = -32 }, /obj/machinery/requests_console{ - department = "Atmospherics"; - departmentType = 3; pixel_x = 30 }, /turf/simulated/floor/plasteel{ @@ -27080,8 +27070,6 @@ dir = 4 }, /obj/machinery/requests_console{ - department = "Tool Storage"; - name = "Primary Tool Storage Console"; pixel_y = 30 }, /obj/effect/turf_decal/delivery/hollow, @@ -27656,10 +27644,8 @@ pixel_y = 5 }, /obj/machinery/requests_console{ - department = "AI"; - departmentType = 5; - pixel_x = 32; - pixel_y = 32 + pixel_y = 32; + pixel_x = 32 }, /obj/item/radio/intercom/custom{ pixel_y = 25 @@ -30109,7 +30095,6 @@ /obj/item/stack/sheet/glass, /obj/item/stack/sheet/glass, /obj/machinery/requests_console{ - department = "Tech Storage"; pixel_x = 30 }, /turf/simulated/floor/plasteel/dark, @@ -31103,8 +31088,6 @@ dir = 8 }, /obj/machinery/requests_console{ - department = "Detective"; - departmentType = 5; pixel_x = 30 }, /turf/simulated/floor/carpet, @@ -31437,9 +31420,6 @@ dir = 4 }, /obj/machinery/requests_console{ - announcementConsole = 1; - department = "Chief Engineer's Desk"; - departmentType = 7; pixel_x = -32 }, /turf/simulated/floor/plasteel/dark, @@ -33958,9 +33938,6 @@ dir = 4 }, /obj/machinery/requests_console{ - announcementConsole = 1; - department = "Captain's Desk"; - departmentType = 5; pixel_x = -30 }, /turf/simulated/floor/carpet/black, @@ -34813,9 +34790,6 @@ /obj/item/paper_bin/nanotrasen, /obj/item/stamp/hop, /obj/machinery/requests_console{ - announcementConsole = 1; - department = "Head of Personnel's Desk"; - departmentType = 5; pixel_y = 30 }, /turf/simulated/floor/wood, @@ -36611,9 +36585,6 @@ department = "NT Representative's Office" }, /obj/machinery/requests_console{ - announcementConsole = 1; - department = "NT Representative"; - departmentType = 5; pixel_y = 30 }, /turf/simulated/floor/carpet/royalblack, @@ -36653,9 +36624,6 @@ "cal" = ( /obj/structure/closet/secure_closet/blueshield, /obj/machinery/requests_console{ - announcementConsole = 1; - department = "Blueshield"; - departmentType = 5; pixel_y = 30 }, /turf/simulated/floor/wood, @@ -38994,7 +38962,6 @@ "cgk" = ( /obj/item/kirbyplants, /obj/machinery/requests_console{ - department = "Magistrate"; pixel_y = -30 }, /turf/simulated/floor/plasteel{ @@ -39468,7 +39435,6 @@ "chP" = ( /obj/structure/filingcabinet/security, /obj/machinery/requests_console{ - department = "Internal Affairs Office"; pixel_x = 30 }, /turf/simulated/floor/wood, @@ -41263,17 +41229,6 @@ /obj/effect/turf_decal/delivery, /turf/simulated/floor/plasteel, /area/station/engineering/control) -"cmN" = ( -/obj/structure/closet/secure_closet/engineering_personal, -/obj/machinery/firealarm/directional/east, -/obj/machinery/requests_console{ - department = "Engineering"; - departmentType = 3; - pixel_y = -30 - }, -/obj/effect/turf_decal/delivery, -/turf/simulated/floor/plasteel, -/area/station/engineering/control) "cmO" = ( /obj/structure/table/reinforced, /obj/item/clipboard, @@ -41998,7 +41953,6 @@ pixel_y = 4 }, /obj/machinery/requests_console{ - department = "Courtroom"; pixel_x = 30 }, /turf/simulated/floor/plasteel/dark, @@ -42386,7 +42340,6 @@ /obj/item/storage/bag/books, /obj/item/taperecorder, /obj/machinery/requests_console{ - department = "Library"; pixel_x = 30 }, /turf/simulated/floor/plasteel/grimy, @@ -46194,9 +46147,8 @@ "czW" = ( /obj/effect/spawner/random_spawners/dirt_often, /obj/machinery/requests_console{ - department = "Expedition"; - dir = 4; - pixel_x = -30 + pixel_x = -30; + dir = 4 }, /turf/simulated/floor/plasteel{ dir = 8; @@ -46620,7 +46572,6 @@ dir = 8 }, /obj/machinery/requests_console{ - department = "EVA"; pixel_x = 32 }, /turf/simulated/floor/plasteel/dark, @@ -50753,7 +50704,6 @@ icon_state = "2-8" }, /obj/machinery/requests_console{ - department = "Paramedic"; pixel_x = 30 }, /turf/simulated/floor/plasteel{ @@ -53482,7 +53432,6 @@ "cYh" = ( /obj/structure/closet/wardrobe/yellow, /obj/machinery/requests_console{ - department = "Locker Room"; pixel_x = 30 }, /turf/simulated/floor/plasteel{ @@ -53815,8 +53764,6 @@ }, /obj/machinery/reagentgrinder, /obj/machinery/requests_console{ - department = "Xenobiology"; - departmentType = 2; pixel_x = 30 }, /obj/effect/turf_decal/delivery, @@ -54906,8 +54853,6 @@ network = list("Research","SS13") }, /obj/machinery/requests_console{ - department = "Science"; - departmentType = 2; pixel_x = 30 }, /turf/simulated/floor/plasteel{ @@ -56940,8 +56885,6 @@ name = "Chemistry Cleaner" }, /obj/machinery/requests_console{ - department = "Chemistry"; - departmentType = 1; pixel_x = -30 }, /turf/simulated/floor/plasteel{ @@ -57712,9 +57655,6 @@ /obj/item/clipboard, /obj/item/toy/figure/crew/rd, /obj/machinery/requests_console{ - announcementConsole = 1; - department = "Research Director's Desk"; - departmentType = 7; pixel_x = -30; pixel_y = -2 }, @@ -58544,8 +58484,6 @@ amount = 50 }, /obj/machinery/requests_console{ - department = "Robotics"; - departmentType = 2; pixel_y = 30 }, /obj/effect/turf_decal/delivery/hollow, @@ -64624,8 +64562,6 @@ "dYd" = ( /obj/machinery/dna_scannernew, /obj/machinery/requests_console{ - department = "Genetics"; - departmentType = 1; pixel_y = 30 }, /turf/simulated/floor/plasteel{ @@ -68933,8 +68869,6 @@ pixel_y = -2 }, /obj/machinery/requests_console{ - department = "Science"; - departmentType = 2; pixel_y = -30 }, /turf/simulated/floor/plasteel{ @@ -73287,9 +73221,6 @@ /area/station/medical/medbay) "iWN" = ( /obj/machinery/requests_console{ - announcementConsole = 1; - department = "Chief Medical Officer's Desk"; - departmentType = 5; pixel_x = 30 }, /turf/simulated/floor/plasteel{ @@ -77602,8 +77533,6 @@ /area/station/security/main) "lFG" = ( /obj/machinery/requests_console{ - department = "Medbay"; - departmentType = 1; pixel_x = 30 }, /obj/structure/table, @@ -80516,7 +80445,6 @@ "nnV" = ( /obj/effect/turf_decal/delivery, /obj/machinery/requests_console{ - department = "Mining"; pixel_y = -30 }, /turf/simulated/floor/plasteel, @@ -81321,8 +81249,6 @@ }, /obj/item/pen/multi, /obj/machinery/requests_console{ - department = "Morgue"; - departmentType = 5; pixel_y = -30 }, /turf/simulated/floor/plasteel{ @@ -81450,9 +81376,6 @@ /area/station/command/office/cmo) "nRs" = ( /obj/machinery/requests_console{ - announcementConsole = 1; - department = "Bridge"; - departmentType = 5; dir = 1; pixel_y = -30 }, @@ -81728,8 +81651,6 @@ /area/station/medical/virology) "oar" = ( /obj/machinery/requests_console{ - department = "Security"; - departmentType = 5; pixel_y = -30 }, /turf/simulated/floor/plasteel{ @@ -88587,7 +88508,6 @@ dir = 4 }, /obj/machinery/requests_console{ - department = "Crew Quarters"; pixel_x = -30 }, /turf/simulated/floor/plasteel{ @@ -91878,9 +91798,8 @@ /obj/item/paper_bin, /obj/item/pen, /obj/machinery/requests_console{ - department = "Chapel Office"; - pixel_x = 30; - dir = 8 + dir = 8; + pixel_x = 30 }, /obj/machinery/button/windowtint{ pixel_y = -27; @@ -91904,8 +91823,6 @@ "tNO" = ( /obj/machinery/computer/crew, /obj/machinery/requests_console{ - department = "Warden"; - departmentType = 7; pixel_y = 30 }, /turf/simulated/floor/plasteel{ @@ -98414,8 +98331,6 @@ pixel_x = -30 }, /obj/machinery/requests_console{ - department = "Virology"; - departmentType = 3; pixel_y = -30 }, /turf/simulated/floor/plasteel{ @@ -98887,7 +98802,6 @@ "xPh" = ( /obj/item/kirbyplants, /obj/machinery/requests_console{ - department = "Arrival Shuttle"; pixel_x = 30 }, /turf/simulated/floor/mineral/titanium/blue, @@ -126879,7 +126793,7 @@ ceT pkx iUa cjO -cmN +buG nNM czH coo diff --git a/_maps/map_files/stations/metastation.dmm b/_maps/map_files/stations/metastation.dmm index 25dde91bd94..8476ef47ab8 100644 --- a/_maps/map_files/stations/metastation.dmm +++ b/_maps/map_files/stations/metastation.dmm @@ -441,9 +441,7 @@ /area/station/legal/magistrate) "afw" = ( /obj/machinery/requests_console{ - pixel_y = 30; - department = "Detective"; - departmentType = 5 + pixel_y = 30 }, /turf/simulated/floor/carpet, /area/station/security/detective) @@ -1327,8 +1325,6 @@ "alZ" = ( /obj/structure/closet/secure_closet/security, /obj/machinery/requests_console{ - department = "Security"; - departmentType = 5; pixel_x = 30 }, /turf/simulated/floor/plasteel{ @@ -5753,7 +5749,6 @@ /obj/structure/chair/comfy/brown, /obj/effect/landmark/start/magistrate, /obj/machinery/requests_console{ - department = "Magistrate"; pixel_y = 30 }, /turf/simulated/floor/carpet, @@ -6221,7 +6216,6 @@ /area/station/supply/miningdock) "aHs" = ( /obj/machinery/requests_console{ - department = "Mining"; pixel_y = -30 }, /turf/simulated/floor/plasteel, @@ -7284,8 +7278,6 @@ }, /obj/item/storage/box/pillbottles, /obj/machinery/requests_console{ - department = "Science"; - departmentType = 2; pixel_y = 30 }, /turf/simulated/floor/plasteel{ @@ -8826,9 +8818,6 @@ department = "Quartermaster's Office" }, /obj/machinery/requests_console{ - announcementConsole = 1; - department = "Quartermaster's Desk"; - departmentType = 5; pixel_y = 30 }, /turf/simulated/floor/plasteel{ @@ -12200,7 +12189,6 @@ /area/station/hallway/secondary/bridge) "bad" = ( /obj/machinery/requests_console{ - department = "Crew Quarters"; pixel_x = 30 }, /turf/simulated/floor/plasteel{ @@ -13367,7 +13355,6 @@ pixel_y = -6 }, /obj/machinery/requests_console{ - department = "Tech Storage"; pixel_y = 30 }, /turf/simulated/floor/plasteel{ @@ -14146,9 +14133,6 @@ "bfd" = ( /obj/machinery/computer/atmos_alert, /obj/machinery/requests_console{ - announcementConsole = 1; - department = "Chief Engineer's Desk"; - departmentType = 7; pixel_y = 30 }, /turf/simulated/floor/plasteel{ @@ -15448,8 +15432,6 @@ }, /obj/machinery/computer/card, /obj/machinery/requests_console{ - department = "Security"; - departmentType = 5; pixel_y = 30 }, /turf/simulated/floor/plasteel{ @@ -16245,7 +16227,6 @@ pixel_x = 32 }, /obj/machinery/requests_console{ - department = "Tool Storage"; pixel_y = -30 }, /turf/simulated/floor/plasteel, @@ -17812,8 +17793,6 @@ /obj/item/restraints/legcuffs/beartrap, /obj/item/restraints/legcuffs/beartrap, /obj/machinery/requests_console{ - department = "Janitorial"; - departmentType = 1; pixel_x = -30 }, /obj/machinery/camera{ @@ -18192,8 +18171,6 @@ /obj/structure/table, /obj/item/stack/wrapping_paper, /obj/machinery/requests_console{ - department = "Cargo Bay"; - departmentType = 2; pixel_y = -30 }, /obj/item/stack/packageWrap{ @@ -18592,8 +18569,6 @@ }, /obj/item/pen/multi, /obj/machinery/requests_console{ - department = "AI"; - departmentType = 5; pixel_x = -30 }, /turf/simulated/floor/plasteel{ @@ -18726,7 +18701,6 @@ /area/shuttle/arrival/station) "brt" = ( /obj/machinery/requests_console{ - department = "Arrival Shuttle"; pixel_y = -30 }, /obj/machinery/light, @@ -19917,9 +19891,6 @@ /area/station/hallway/secondary/entry/east) "buE" = ( /obj/machinery/requests_console{ - announcementConsole = 1; - department = "Bridge"; - departmentType = 5; pixel_x = 30 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -21436,9 +21407,6 @@ "byu" = ( /obj/machinery/pdapainter, /obj/machinery/requests_console{ - announcementConsole = 1; - department = "Head of Personnel's Desk"; - departmentType = 5; pixel_y = 30 }, /turf/simulated/floor/wood, @@ -21551,9 +21519,6 @@ dir = 8 }, /obj/machinery/requests_console{ - announcementConsole = 1; - department = "Captain's Desk"; - departmentType = 5; pixel_x = 30 }, /turf/simulated/floor/wood, @@ -24000,7 +23965,6 @@ /obj/structure/chair/comfy/black, /obj/effect/landmark/start/assistant, /obj/machinery/requests_console{ - department = "Library"; pixel_y = 30 }, /turf/simulated/floor/wood, @@ -26433,8 +26397,6 @@ /obj/structure/table, /obj/machinery/kitchen_machine/microwave, /obj/machinery/requests_console{ - department = "Kitchen"; - departmentType = 2; pixel_x = -30 }, /turf/simulated/floor/plasteel{ @@ -26903,7 +26865,6 @@ /area/station/command/teleporter) "bSi" = ( /obj/machinery/requests_console{ - department = "EVA"; pixel_x = 30 }, /turf/simulated/floor/plasteel, @@ -28151,9 +28112,6 @@ /obj/structure/table/wood, /obj/item/paper/blueshield, /obj/machinery/requests_console{ - announcementConsole = 1; - department = "Blueshield"; - departmentType = 5; pixel_x = -30 }, /obj/item/paper_bin, @@ -28421,9 +28379,6 @@ /obj/item/pen/multi/fountain, /obj/item/stamp/rep, /obj/machinery/requests_console{ - announcementConsole = 1; - department = "NT Representative"; - departmentType = 5; pixel_x = -30 }, /turf/simulated/floor/carpet/royalblack, @@ -28768,9 +28723,8 @@ /area/station/command/office/ntrep) "bYp" = ( /obj/machinery/requests_console{ - department = "Expedition"; - pixel_x = 30; - dir = 8 + dir = 8; + pixel_x = 30 }, /turf/simulated/floor/plasteel{ dir = 4; @@ -29744,8 +29698,6 @@ }, /obj/structure/table/reinforced, /obj/machinery/requests_console{ - department = "Medbay"; - departmentType = 1; pixel_y = 30 }, /obj/machinery/light{ @@ -29973,8 +29925,6 @@ /area/station/hallway/primary/central/se) "ccZ" = ( /obj/machinery/requests_console{ - department = "Hydroponics"; - departmentType = 2; pixel_x = -32 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -30006,8 +29956,6 @@ "cdi" = ( /obj/structure/table/reinforced, /obj/machinery/requests_console{ - department = "Robotics"; - departmentType = 2; pixel_y = 30 }, /obj/item/stack/sheet/plasteel{ @@ -35019,9 +34967,6 @@ /area/station/maintenance/starboard2) "cwH" = ( /obj/machinery/requests_console{ - announcementConsole = 1; - department = "Research Director's Desk"; - departmentType = 7; pixel_x = 30 }, /obj/machinery/computer/aifixer{ @@ -35735,9 +35680,6 @@ dir = 1 }, /obj/machinery/requests_console{ - announcementConsole = 1; - department = "Head of Security's Desk"; - departmentType = 5; pixel_y = 30 }, /turf/simulated/floor/wood, @@ -38571,8 +38513,6 @@ }, /obj/effect/landmark/start/geneticist, /obj/machinery/requests_console{ - department = "Genetics"; - departmentType = 1; pixel_y = -30 }, /turf/simulated/floor/plasteel{ @@ -42768,8 +42708,6 @@ dir = 5 }, /obj/machinery/requests_console{ - department = "Xenobiology"; - departmentType = 2; pixel_y = 30 }, /turf/simulated/floor/plasteel{ @@ -43020,8 +42958,6 @@ dir = 4 }, /obj/machinery/requests_console{ - department = "Chapel"; - departmentType = 2; pixel_y = 30 }, /obj/machinery/atmospherics/unary/vent_pump/on, @@ -45808,8 +45744,6 @@ pixel_y = 4 }, /obj/machinery/requests_console{ - department = "Engineering"; - departmentType = 3; pixel_x = -30 }, /turf/simulated/floor/plasteel{ @@ -46641,8 +46575,6 @@ pixel_y = 8 }, /obj/machinery/requests_console{ - department = "Science"; - departmentType = 2; pixel_y = 30 }, /turf/simulated/floor/plasteel{ @@ -54374,7 +54306,6 @@ /area/station/medical/storage) "hHW" = ( /obj/machinery/requests_console{ - department = "Internal Affairs Office"; pixel_x = 30 }, /turf/simulated/floor/plasteel{ @@ -55190,8 +55121,6 @@ c_tag = "Science - Research Fore" }, /obj/machinery/requests_console{ - department = "Science"; - departmentType = 2; pixel_y = 32 }, /turf/simulated/floor/plasteel{ @@ -59164,8 +59093,6 @@ dir = 6 }, /obj/machinery/requests_console{ - department = "Robotics"; - departmentType = 2; pixel_x = -30 }, /obj/structure/disposalpipe/segment{ @@ -61069,9 +60996,6 @@ dir = 4 }, /obj/machinery/requests_console{ - announcementConsole = 1; - department = "Chief Medical Officer's Desk"; - departmentType = 5; pixel_x = -30 }, /turf/simulated/floor/plasteel{ @@ -61741,7 +61665,6 @@ dir = 6 }, /obj/machinery/requests_console{ - department = "Paramedic"; pixel_y = 30 }, /turf/simulated/floor/plasteel{ @@ -61853,8 +61776,6 @@ "kQx" = ( /obj/item/kirbyplants/plant11, /obj/machinery/requests_console{ - department = "Courtroom"; - departmentType = 1; pixel_x = -30 }, /turf/simulated/floor/wood, @@ -62536,8 +62457,6 @@ "lfd" = ( /obj/structure/table/glass, /obj/machinery/requests_console{ - department = "Chemistry"; - departmentType = 1; pixel_x = -30 }, /obj/machinery/reagentgrinder, @@ -62974,7 +62893,6 @@ /area/station/engineering/control) "llW" = ( /obj/machinery/requests_console{ - department = "Locker Room"; pixel_x = -30 }, /turf/simulated/floor/plasteel{ @@ -63758,8 +63676,6 @@ }, /obj/machinery/atmospherics/pipe/simple/visible/purple, /obj/machinery/requests_console{ - department = "Atmospherics"; - departmentType = 3; pixel_x = 30 }, /obj/structure/disposalpipe/segment, @@ -65563,7 +65479,6 @@ dir = 8 }, /obj/machinery/requests_console{ - department = "Psychiatrist"; pixel_x = 30 }, /turf/simulated/floor/carpet, @@ -68104,8 +68019,6 @@ /area/station/security/brig) "nos" = ( /obj/machinery/requests_console{ - department = "Bar"; - departmentType = 2; pixel_y = -30 }, /turf/simulated/floor/plasteel{ @@ -73717,8 +73630,6 @@ /area/station/hallway/secondary/entry/east) "pNo" = ( /obj/machinery/requests_console{ - department = "Cargo Bay"; - departmentType = 2; pixel_y = -30 }, /turf/simulated/floor/plasteel{ @@ -74263,8 +74174,6 @@ /obj/item/clothing/mask/surgical, /obj/item/clothing/gloves/color/latex, /obj/machinery/requests_console{ - department = "Morgue"; - departmentType = 5; pixel_x = -30 }, /obj/machinery/light/small, @@ -74810,8 +74719,6 @@ }, /obj/item/storage/box, /obj/machinery/requests_console{ - department = "Atmospherics"; - departmentType = 3; pixel_x = -30 }, /turf/simulated/floor/plasteel{ @@ -76237,8 +76144,6 @@ pixel_y = -3 }, /obj/machinery/requests_console{ - department = "Virology"; - departmentType = 3; pixel_y = -30 }, /obj/item/stack/sheet/mineral/plasma, @@ -78418,8 +78323,6 @@ "rJh" = ( /obj/structure/rack, /obj/machinery/requests_console{ - department = "Warden"; - departmentType = 7; pixel_y = 30 }, /obj/structure/cable{ @@ -81055,8 +80958,6 @@ "sOH" = ( /obj/structure/closet/bombcloset, /obj/machinery/requests_console{ - department = "Science"; - departmentType = 2; pixel_x = 30 }, /obj/effect/turf_decal/stripes/line{ @@ -82210,8 +82111,6 @@ /obj/machinery/light, /obj/effect/turf_decal/stripes/line, /obj/machinery/requests_console{ - department = "Engineering"; - departmentType = 3; pixel_y = -30 }, /turf/simulated/floor/plasteel, diff --git a/code/__DEFINES/machines.dm b/code/__DEFINES/machines.dm index 8df2fa3ab50..60638b439f8 100644 --- a/code/__DEFINES/machines.dm +++ b/code/__DEFINES/machines.dm @@ -100,3 +100,11 @@ #define CIRCULATOR_SIDE_LEFT WEST #define CIRCULATOR_SIDE_RIGHT EAST + +// Request Console configuration bitmask. +/// [/obj/machinery/requests_console] can request assistance. +#define RC_ASSIST (1<<0) +/// [/obj/machinery/requests_console] can request supplies. +#define RC_SUPPLY (1<<1) +/// [/obj/machinery/requests_console] can relay anonymous information. +#define RC_INFO (1<<2) diff --git a/code/game/area/ai_monitored.dm b/code/game/area/ai_monitored.dm index 93516308bd0..c09499af43c 100644 --- a/code/game/area/ai_monitored.dm +++ b/code/game/area/ai_monitored.dm @@ -33,3 +33,4 @@ name = "EVA Storage" icon_state = "eva" ambientsounds = HIGHSEC_SOUNDS + request_console_name = "EVA" diff --git a/code/game/area/areas.dm b/code/game/area/areas.dm index 66ed38dd37a..c42ad887141 100644 --- a/code/game/area/areas.dm +++ b/code/game/area/areas.dm @@ -91,6 +91,14 @@ /// Turrets use this list to see if individual power/lethal settings are allowed. Contains the /obj/machinery/turretid for this area var/list/turret_controls = list() + /// The flags applied to request consoles spawned in this area. + /// See [RC_ASSIST], [RC_SUPPLY], [RC_INFO]. + var/request_console_flags = 0 + /// The name for any spawned request consoles. Defaults to the area name. + var/request_console_name + /// Whether request consoles in this area can send announcements. + var/request_console_announces = FALSE + /* Lighting Vars */ diff --git a/code/game/area/ss13_areas/ai_areas.dm b/code/game/area/ss13_areas/ai_areas.dm index dc745d0a409..ae6f92353f1 100644 --- a/code/game/area/ss13_areas/ai_areas.dm +++ b/code/game/area/ss13_areas/ai_areas.dm @@ -11,6 +11,8 @@ name = "\improper AI Chamber" icon_state = "ai_chamber" ambientsounds = list('sound/ambience/ambitech.ogg', 'sound/ambience/ambitech2.ogg', 'sound/ambience/ambiatmos.ogg', 'sound/ambience/ambiatmos2.ogg') + request_console_flags = RC_ASSIST | RC_INFO + request_console_name = "AI" /area/station/turret_protected/aisat name = "\improper AI Satellite" diff --git a/code/game/area/ss13_areas/command_areas.dm b/code/game/area/ss13_areas/command_areas.dm index ab9865943fc..0fb8b633319 100644 --- a/code/game/area/ss13_areas/command_areas.dm +++ b/code/game/area/ss13_areas/command_areas.dm @@ -6,16 +6,24 @@ icon_state = "bridge" ambientsounds = list('sound/ambience/signal.ogg') sound_environment = SOUND_AREA_STANDARD_STATION + request_console_flags = RC_ASSIST | RC_INFO + request_console_announces = TRUE /area/station/command/meeting_room name = "\improper Heads of Staff Meeting Room" icon_state = "meeting" sound_environment = SOUND_AREA_MEDIUM_SOFTFLOOR + request_console_flags = RC_ASSIST | RC_INFO + request_console_name = "Bridge" + request_console_announces = TRUE /area/station/command/office/captain name = "\improper Captain's Office" icon_state = "captainoffice" sound_environment = SOUND_AREA_WOODFLOOR + request_console_flags = RC_ASSIST | RC_INFO + request_console_name = "Captain's Desk" + request_console_announces = TRUE /area/station/command/office/captain/bedroom name = "\improper Captain's Bedroom" @@ -24,30 +32,51 @@ /area/station/command/office/hop name = "\improper Head of Personnel's Quarters" icon_state = "hop" + request_console_flags = RC_ASSIST | RC_INFO + request_console_name = "Head of Personnel's Desk" + request_console_announces = TRUE /area/station/command/office/rd name = "\improper Research Director's Quarters" icon_state = "rd" + request_console_flags = RC_ASSIST | RC_SUPPLY | RC_INFO + request_console_name = "Research Director's Desk" + request_console_announces = TRUE /area/station/command/office/ce name = "\improper Chief Engineer's Quarters" icon_state = "ce" + request_console_flags = RC_ASSIST | RC_SUPPLY | RC_INFO + request_console_name = "Chief Engineer's Desk" + request_console_announces = TRUE /area/station/command/office/hos name = "\improper Head of Security's Quarters" icon_state = "hos" + request_console_flags = RC_ASSIST | RC_INFO + request_console_name = "Head of Security's Desk" + request_console_announces = TRUE /area/station/command/office/cmo name = "\improper Chief Medical Officer's Quarters" icon_state = "CMO" + request_console_flags = RC_ASSIST | RC_INFO + request_console_name = "Chief Medical Officer's Desk" + request_console_announces = TRUE /area/station/command/office/ntrep name = "\improper Nanotrasen Representative's Office" icon_state = "ntrep" + request_console_flags = RC_ASSIST | RC_INFO + request_console_name = "NT Representative" + request_console_announces = TRUE /area/station/command/office/blueshield name = "\improper Blueshield's Office" icon_state = "blueshield" + request_console_flags = RC_ASSIST | RC_INFO + request_console_name = "Blueshield" + request_console_announces = TRUE /area/station/command/teleporter name = "\improper Teleporter" diff --git a/code/game/area/ss13_areas/engineering_areas.dm b/code/game/area/ss13_areas/engineering_areas.dm index dc3fe13d7ce..d42c827b215 100644 --- a/code/game/area/ss13_areas/engineering_areas.dm +++ b/code/game/area/ss13_areas/engineering_areas.dm @@ -2,10 +2,13 @@ /area/station/engineering/atmos name = "Atmospherics" icon_state = "atmos" + request_console_flags = RC_ASSIST | RC_SUPPLY /area/station/engineering/atmos/control name = "Atmospherics Control Room" icon_state = "atmosctrl" + request_console_flags = RC_ASSIST | RC_SUPPLY + request_console_name = "Atmospherics" /area/station/engineering/atmos/distribution name = "Atmospherics Distribution Loop" @@ -24,11 +27,14 @@ /area/station/engineering/control name = "Engineering" icon_state = "engine_control" + request_console_flags = RC_ASSIST | RC_SUPPLY /area/station/engineering/break_room name = "\improper Engineering Foyer" icon_state = "engibreak" sound_environment = SOUND_AREA_SMALL_ENCLOSED + request_console_flags = RC_ASSIST | RC_SUPPLY + request_console_name = "Engineering" /area/station/engineering/break_room/secondary name = "\improper Secondary Engineering Foyer" @@ -37,10 +43,14 @@ name = "Engineering Equipment Storage" icon_state = "engilocker" sound_environment = SOUND_AREA_SMALL_ENCLOSED + request_console_flags = RC_ASSIST | RC_SUPPLY + request_console_name = "Engineering" /area/station/engineering/hardsuitstorage name = "\improper Engineering Hardsuit Storage" icon_state = "engi" + request_console_flags = RC_ASSIST | RC_SUPPLY + request_console_name = "Engineering" /area/station/engineering/controlroom name = "\improper Engineering Control Room" @@ -101,3 +111,4 @@ /area/station/engineering/tech_storage name = "Technical Storage" icon_state = "techstorage" + request_console_name = "Tech Storage" diff --git a/code/game/area/ss13_areas/legal_areas.dm b/code/game/area/ss13_areas/legal_areas.dm index c366e054fbc..551d542a39c 100644 --- a/code/game/area/ss13_areas/legal_areas.dm +++ b/code/game/area/ss13_areas/legal_areas.dm @@ -2,18 +2,22 @@ /area/station/legal/courtroom name = "\improper Courtroom" icon_state = "courtroom" + request_console_flags = RC_ASSIST | RC_SUPPLY /area/station/legal/courtroom/gallery name = "\improper Courtroom Gallery" icon_state = "courtroom" + request_console_name = "Courtroom" /area/station/legal/lawoffice name = "\improper Law Office" icon_state = "law" sound_environment = SOUND_AREA_SMALL_SOFTFLOOR + request_console_name = "Internal Affairs Office" /area/station/legal/magistrate name = "\improper Magistrate's Office" icon_state = "magistrate" sound_environment = SOUND_AREA_SMALL_SOFTFLOOR - + request_console_flags = RC_ASSIST | RC_INFO + request_console_name = "Magistrate" diff --git a/code/game/area/ss13_areas/medical_areas.dm b/code/game/area/ss13_areas/medical_areas.dm index f0d7f8c3cf1..38efae8f9f2 100644 --- a/code/game/area/ss13_areas/medical_areas.dm +++ b/code/game/area/ss13_areas/medical_areas.dm @@ -8,6 +8,7 @@ /area/station/medical/medbay name = "\improper Medbay" icon_state = "medbay" + request_console_flags = RC_ASSIST //Medbay is a large area, these additional areas help level out APC load. /area/station/medical/medbay2 @@ -21,14 +22,20 @@ /area/station/medical/storage name = "Medical Storage" icon_state = "medbaystorage" + request_console_flags = RC_ASSIST + request_console_name = "Medbay" /area/station/medical/reception name = "\improper Medbay Reception" icon_state = "medbaylobby" + request_console_flags = RC_ASSIST + request_console_name = "Medbay" /area/station/medical/psych name = "\improper Psych Room" icon_state = "medbaypsych" + request_console_flags = RC_SUPPLY + request_console_name = "Psychiatrist" /area/station/medical/break_room name = "\improper Medbay Break Room" @@ -60,6 +67,7 @@ /area/station/medical/virology name = "Virology" icon_state = "virology" + request_console_flags = RC_ASSIST | RC_SUPPLY /area/station/medical/virology/lab name = "\improper Virology Laboratory" @@ -71,10 +79,12 @@ ambientsounds = SPOOKY_SOUNDS is_haunted = TRUE sound_environment = SOUND_AREA_SMALL_ENCLOSED + request_console_flags = RC_ASSIST | RC_INFO /area/station/medical/chemistry name = "Chemistry" icon_state = "chem" + request_console_flags = RC_ASSIST | RC_SUPPLY /area/station/medical/surgery name = "\improper Surgery" @@ -111,3 +121,4 @@ /area/station/medical/paramedic name = "Paramedic" icon_state = "paramedic" + request_console_flags = RC_ASSIST diff --git a/code/game/area/ss13_areas/public_areas.dm b/code/game/area/ss13_areas/public_areas.dm index 0a06add2481..846853aac72 100644 --- a/code/game/area/ss13_areas/public_areas.dm +++ b/code/game/area/ss13_areas/public_areas.dm @@ -149,6 +149,7 @@ name = "\improper Dormitories" icon_state = "dorms" sound_environment = SOUND_AREA_STANDARD_STATION + request_console_name = "Crew Quarters" /area/station/public/sleep name = "\improper Primary Cryogenic Dormitories" @@ -162,6 +163,7 @@ /area/station/public/locker name = "\improper Locker Room" icon_state = "locker" + request_console_name = "Crew Quarters" /area/station/public/toilet name = "\improper Dormitory Toilets" @@ -177,6 +179,7 @@ /area/station/public/fitness name = "\improper Fitness Room" icon_state = "fitness" + request_console_name = "Crew Quarters" /area/station/public/arcade name = "\improper Arcade" @@ -205,6 +208,7 @@ /area/station/public/storage/tools name = "Primary Tool Storage" icon_state = "primarystorage" + request_console_name = "Tool Storage" /area/station/public/storage/art name = "Art Supply Storage" diff --git a/code/game/area/ss13_areas/science_areas.dm b/code/game/area/ss13_areas/science_areas.dm index 7702c345640..a06c38c270f 100644 --- a/code/game/area/ss13_areas/science_areas.dm +++ b/code/game/area/ss13_areas/science_areas.dm @@ -3,6 +3,8 @@ /area/station/science/robotics name = "\improper Robotics Lab" icon_state = "robo" + request_console_flags = RC_SUPPLY + request_console_name = "Robotics" /area/station/science/robotics/chargebay name = "\improper Mech Bay" @@ -17,6 +19,8 @@ /area/station/science/explab name = "\improper E.X.P.E.R.I-MENTOR Lab" icon_state = "scilab" + request_console_flags = RC_SUPPLY + request_console_name = "Science" /area/station/science/explab/chamber name = "\improper E.X.P.E.R.I-MENTOR Chamber" @@ -37,7 +41,8 @@ /area/station/science/genetics name = "\improper Genetics Lab" icon_state = "genetics" - + request_console_flags = RC_ASSIST + request_console_name = "Genetics" /area/station/science sound_environment = SOUND_AREA_STANDARD_STATION @@ -45,6 +50,8 @@ /area/station/science/rnd name = "Research and Development" icon_state = "rnd" + request_console_flags = RC_SUPPLY + request_console_name = "Science" /area/station/science/hallway name = "\improper Research Lab" @@ -54,6 +61,8 @@ name = "\improper Xenobiology Lab" icon_state = "xenobio" xenobiology_compatible = TRUE + request_console_flags = RC_ASSIST | RC_INFO + request_console_name = "Xenobiology" /area/station/science/storage name = "\improper Science Toxins Storage" @@ -67,14 +76,20 @@ /area/station/science/toxins/mixing name = "\improper Toxins Mixing Room" icon_state = "toxmix" + request_console_flags = RC_SUPPLY + request_console_name = "Science" /area/station/science/toxins/launch name = "\improper Toxins Launch Room" icon_state = "toxlaunch" + request_console_flags = RC_SUPPLY + request_console_name = "Science" /area/station/science/misc_lab name = "\improper Research Testing Lab" icon_state = "scichem" + request_console_flags = RC_SUPPLY + request_console_name = "Science" /area/station/science/test_chamber name = "\improper Research Testing Chamber" diff --git a/code/game/area/ss13_areas/security_areas.dm b/code/game/area/ss13_areas/security_areas.dm index fc465472ee6..51c6f84d4c4 100644 --- a/code/game/area/ss13_areas/security_areas.dm +++ b/code/game/area/ss13_areas/security_areas.dm @@ -6,6 +6,8 @@ /area/station/security/main name = "\improper Security Office" icon_state = "securityoffice" + request_console_flags = RC_ASSIST | RC_INFO + request_console_name = "Security" /area/station/security/lobby name = "\improper Security Lobby" @@ -14,6 +16,8 @@ /area/station/security/brig name = "\improper Brig" icon_state = "brig" + request_console_flags = RC_ASSIST | RC_INFO + request_console_name = "Security" /area/station/security/brig/prison_break() for(var/obj/structure/closet/secure_closet/brig/temp_closet in src) @@ -69,6 +73,8 @@ /area/station/security/storage name = "Security Equipment Storage" icon_state = "securityequipmentstorage" + request_console_flags = RC_ASSIST | RC_INFO + request_console_name = "Security" /area/station/security/evidence name = "\improper Evidence Room" @@ -88,6 +94,8 @@ name = "\improper Warden's Office" icon_state = "Warden" sound_environment = SOUND_AREA_SMALL_SOFTFLOOR + request_console_flags = RC_ASSIST | RC_SUPPLY | RC_INFO + request_console_name = "Warden" /area/station/security/armory name = "\improper Armory" @@ -96,11 +104,15 @@ /area/station/security/armory/secure name = "\improper Secure Armory" icon_state = "secarmory" + request_console_flags = RC_ASSIST | RC_SUPPLY | RC_INFO + request_console_name = "Warden" /area/station/security/detective name = "\improper Detective's Office" icon_state = "detective" ambientsounds = list('sound/ambience/ambidet1.ogg', 'sound/ambience/ambidet2.ogg') + request_console_flags = RC_ASSIST | RC_INFO + request_console_name = "Detective" /area/station/security/range name = "\improper Firing Range" @@ -119,6 +131,8 @@ /area/station/security/checkpoint/secondary name = "\improper Security Checkpoint" icon_state = "checkpoint1" + request_console_flags = RC_ASSIST | RC_INFO + request_console_name = "Security" // Solitary /area/station/security/permasolitary diff --git a/code/game/area/ss13_areas/service_areas.dm b/code/game/area/ss13_areas/service_areas.dm index db6956a205c..53db5504c9b 100644 --- a/code/game/area/ss13_areas/service_areas.dm +++ b/code/game/area/ss13_areas/service_areas.dm @@ -6,11 +6,13 @@ /area/station/service/kitchen name = "\improper Kitchen" icon_state = "kitchen" + request_console_flags = RC_SUPPLY /area/station/service/bar name = "\improper Bar" icon_state = "bar" sound_environment = SOUND_AREA_WOODFLOOR + request_console_flags = RC_SUPPLY /area/station/service/theatre name = "\improper Theatre" @@ -22,6 +24,7 @@ name = "\improper Library" icon_state = "library" sound_environment = SOUND_AREA_LARGE_SOFTFLOOR + request_console_flags = RC_SUPPLY /area/station/service/chapel name = "\improper Chapel" @@ -30,10 +33,13 @@ is_haunted = TRUE sound_environment = SOUND_AREA_LARGE_ENCLOSED valid_territory = FALSE + request_console_flags = RC_SUPPLY /area/station/service/chapel/office name = "\improper Chapel Office" icon_state = "chapeloffice" + request_console_flags = RC_SUPPLY + request_console_name = "Chapel" /area/station/service/clown name = "\improper Clown's Office" @@ -54,8 +60,11 @@ name = "\improper Custodial Closet" icon_state = "janitor" sound_environment = SOUND_AREA_SMALL_ENCLOSED + request_console_flags = RC_ASSIST + request_console_name = "Janitorial" /area/station/service/hydroponics name = "Hydroponics" icon_state = "hydro" sound_environment = SOUND_AREA_STANDARD_STATION + request_console_flags = RC_SUPPLY diff --git a/code/game/area/ss13_areas/supply_areas.dm b/code/game/area/ss13_areas/supply_areas.dm index c198c44b31c..2a12264ce6a 100644 --- a/code/game/area/ss13_areas/supply_areas.dm +++ b/code/game/area/ss13_areas/supply_areas.dm @@ -12,26 +12,38 @@ name = "\improper Delivery Office" icon_state = "cargobay" sound_environment = SOUND_AREA_STANDARD_STATION + request_console_flags = RC_SUPPLY + request_console_name = "Cargo Bay" /area/station/supply/office name = "\improper Cargo Office" icon_state = "cargooffice" + request_console_flags = RC_SUPPLY + request_console_name = "Cargo Bay" /area/station/supply/storage name = "\improper Cargo Bay" icon_state = "cargobay" sound_environment = SOUND_AREA_LARGE_ENCLOSED + request_console_flags = RC_SUPPLY /area/station/supply/qm name = "\improper Quartermaster's Office" icon_state = "qm" + request_console_flags = RC_ASSIST | RC_INFO + request_console_name = "Quartermaster's Desk" + request_console_announces = TRUE /area/station/supply/miningdock name = "\improper Mining Dock" icon_state = "mining" + request_console_flags = RC_ASSIST | RC_INFO + request_console_name = "Mining" /area/station/supply/expedition name = "\improper Expedition Room" icon_state = "expedition" ambientsounds = list('sound/ambience/ambiexp.ogg') sound_environment = SOUND_AREA_SMALL_ENCLOSED + request_console_flags = RC_ASSIST | RC_INFO + request_console_name = "Expedition" diff --git a/code/game/machinery/requests_console.dm b/code/game/machinery/requests_console.dm index 6c308e4e62b..314cf83f7cf 100644 --- a/code/game/machinery/requests_console.dm +++ b/code/game/machinery/requests_console.dm @@ -1,12 +1,6 @@ /******************** Requests Console ********************/ /** Originally written by errorage, updated by: Carn, needs more work though. I just added some security fixes */ -//Request Console Department Types. -//For one console to be under multiple categories, you need to add the numbers with each other. For example, value of 6 will allow you to request supplies and relay info to that specific console. -#define RC_ASSIST (1<<0) //Request Assistance -#define RC_SUPPLY (1<<1) //Request Supplies -#define RC_INFO (1<<2) //Relay Info - //Request Console Screens #define RCS_MAINMENU 0 // Main menu #define RCS_RQSUPPLY 1 // Request supplies @@ -43,15 +37,16 @@ GLOBAL_LIST_EMPTY(allRequestConsoles) icon_state = "req_comp_off" max_integrity = 300 armor = list(MELEE = 70, BULLET = 30, LASER = 30, ENERGY = 30, BOMB = 0, RAD = 0, FIRE = 90, ACID = 90) - var/department = "Unknown" //The list of all departments on the station (Determined from this variable on each unit) Set this to the same thing if you want several consoles in one department + /// The name of the containing department. Set this to the same thing if you want several consoles in one department. + var/department + /// Bitflag. Zero is reply-only. See [RC_ASSIST], [RC_SUPPLY], [RC_INFO]. + var/departmentType var/list/message_log = list() //List of all messages - var/departmentType = 0 //Bitflag. Zero is reply-only. Map currently uses raw numbers instead of defines. var/newmessagepriority = RQ_NONEW_MESSAGES var/screen = RCS_MAINMENU var/silent = FALSE // set to TRUE for it not to beep all the time + /// Whether this console can be used to send department announcements var/announcementConsole = FALSE - // FALSE = This console cannot be used to send department announcements - // TRUE = This console can send department announcementsf /// Will be set to TRUE when you authenticate yourself for announcements var/announceAuth = FALSE /// Will be set to TRUE when you authenticate yourself for requesting a secondary goal @@ -102,6 +97,13 @@ GLOBAL_LIST_EMPTY(allRequestConsoles) Radio.follow_target = src . = ..() + var/area/containing_area = get_area(src) + if(isnull(department)) + department = containing_area.request_console_name || containing_area.name + if(isnull(departmentType)) + departmentType = containing_area.request_console_flags + announcementConsole = containing_area.request_console_announces + announcer.config.default_title = "[department] announcement" name = "[department] Requests Console" @@ -434,9 +436,6 @@ GLOBAL_LIST_EMPTY(allRequestConsoles) return TRUE -#undef RC_ASSIST -#undef RC_SUPPLY -#undef RC_INFO #undef RCS_MAINMENU #undef RCS_RQSUPPLY #undef RCS_RQASSIST