diff --git a/_maps/map_files/generic/Lavaland.dmm b/_maps/map_files/generic/Lavaland.dmm index 680a9b55dec..ebbcc6a197e 100644 --- a/_maps/map_files/generic/Lavaland.dmm +++ b/_maps/map_files/generic/Lavaland.dmm @@ -307,12 +307,7 @@ dir = 1 }, /obj/machinery/light, -/obj/machinery/requests_console{ - department = "Mining Outpost"; - departmentType = 2; - name = "Mining Outpost Requests Console"; - pixel_y = -30 - }, +/obj/machinery/requests_console/directional/south, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "darkyellowcorners" @@ -366,13 +361,7 @@ name = "north bump"; pixel_y = 28 }, -/obj/machinery/requests_console{ - announcementConsole = 1; - department = "Quartermaster's Desk"; - departmentType = 5; - name = "Quartermaster Requests Console"; - pixel_x = 30 - }, +/obj/machinery/requests_console/directional/east, /obj/structure/closet/secure_closet/quartermaster/lavaland, /turf/simulated/floor/carpet, /area/mine/outpost/quartermaster) @@ -639,12 +628,7 @@ /obj/effect/turf_decal/stripes/corner{ dir = 8 }, -/obj/machinery/requests_console{ - department = "Mining Outpost"; - departmentType = 2; - name = "Mining Outpost Requests Console"; - pixel_x = 30 - }, +/obj/machinery/requests_console/directional/east, /obj/item/radio/intercom{ name = "north bump"; pixel_y = 28 @@ -1390,12 +1374,7 @@ "dM" = ( /obj/effect/spawner/random_spawners/cobweb_left_rare, /obj/effect/decal/cleanable/glass, -/obj/machinery/requests_console{ - department = "Mining Outpost"; - departmentType = 2; - name = "Mining Outpost Requests Console"; - pixel_x = -30 - }, +/obj/machinery/requests_console/directional/west, /turf/simulated/floor/plating, /area/mine/outpost/maintenance/east) "dN" = ( @@ -8880,10 +8859,7 @@ }, /area/mine/outpost/cafeteria) "PJ" = ( -/obj/machinery/requests_console{ - department = "Labor Camp"; - pixel_y = 32 - }, +/obj/machinery/requests_console/directional/north, /obj/effect/turf_decal/arrows/red{ dir = 1 }, diff --git a/_maps/map_files/stations/boxstation.dmm b/_maps/map_files/stations/boxstation.dmm index 19781232e20..49e3eb2fe00 100644 --- a/_maps/map_files/stations/boxstation.dmm +++ b/_maps/map_files/stations/boxstation.dmm @@ -672,9 +672,7 @@ /obj/structure/window/reinforced{ dir = 8 }, -/obj/machinery/requests_console{ - pixel_y = 30 - }, +/obj/machinery/requests_console/directional/north, /obj/machinery/economy/vending/secdrobe, /turf/simulated/floor/plasteel{ dir = 9; @@ -3116,9 +3114,7 @@ }, /area/station/security/permabrig) "amt" = ( -/obj/machinery/requests_console{ - pixel_x = 30 - }, +/obj/machinery/requests_console/directional/east, /obj/machinery/computer/brigcells{ dir = 8 }, @@ -4176,9 +4172,7 @@ name = "west bump"; pixel_x = -28 }, -/obj/machinery/requests_console{ - pixel_y = -30 - }, +/obj/machinery/requests_console/directional/south, /obj/item/radio/intercom/department/security{ pixel_x = -28; pixel_y = -10 @@ -6759,9 +6753,7 @@ /area/space/nearstation) "axp" = ( /obj/structure/bookcase/sop, -/obj/machinery/requests_console{ - pixel_x = -30 - }, +/obj/machinery/requests_console/directional/west, /obj/machinery/light{ dir = 8 }, @@ -9577,9 +9569,7 @@ name = "south bump"; pixel_y = -28 }, -/obj/machinery/requests_console{ - pixel_x = 30 - }, +/obj/machinery/requests_console/directional/east, /turf/simulated/floor/plasteel{ icon_state = "cult" }, @@ -9910,9 +9900,7 @@ /area/station/legal/courtroom) "aGu" = ( /obj/item/kirbyplants, -/obj/machinery/requests_console{ - pixel_x = 30 - }, +/obj/machinery/requests_console/directional/east, /turf/simulated/floor/wood, /area/station/legal/courtroom) "aGw" = ( @@ -10269,9 +10257,7 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/requests_console{ - pixel_x = 30 - }, +/obj/machinery/requests_console/directional/east, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -14984,9 +14970,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/fsmaint) "aWh" = ( -/obj/machinery/requests_console{ - pixel_y = 30 - }, +/obj/machinery/requests_console/directional/north, /obj/machinery/computer/secure_data, /turf/simulated/floor/plasteel{ dir = 1; @@ -15029,9 +15013,7 @@ /obj/machinery/camera{ c_tag = "Primary Tool Storage" }, -/obj/machinery/requests_console{ - pixel_y = 30 - }, +/obj/machinery/requests_console/directional/north, /obj/item/assembly/igniter{ pixel_x = -8; pixel_y = -4 @@ -15824,9 +15806,7 @@ /obj/machinery/camera{ c_tag = "Medbay Paramedic" }, -/obj/machinery/requests_console{ - pixel_y = 30 - }, +/obj/machinery/requests_console/directional/north, /turf/simulated/floor/plasteel, /area/station/medical/paramedic) "aYx" = ( @@ -17837,9 +17817,7 @@ }, /area/station/hallway/primary/central/north) "bex" = ( -/obj/machinery/requests_console{ - pixel_y = -30 - }, +/obj/machinery/requests_console/directional/south, /turf/simulated/floor/mineral/titanium/blue, /area/shuttle/arrival/station) "bey" = ( @@ -18095,9 +18073,7 @@ }, /area/station/public/dorms) "bfk" = ( -/obj/machinery/requests_console{ - pixel_y = 30 - }, +/obj/machinery/requests_console/directional/north, /obj/structure/table/reinforced, /obj/machinery/chem_dispenser/beer{ pixel_y = 8 @@ -22689,9 +22665,7 @@ /turf/simulated/floor/wood, /area/station/service/bar) "brI" = ( -/obj/machinery/requests_console{ - pixel_x = -30 - }, +/obj/machinery/requests_console/directional/west, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -23689,9 +23663,7 @@ "buK" = ( /obj/structure/table, /obj/machinery/reagentgrinder, -/obj/machinery/requests_console{ - pixel_x = 30 - }, +/obj/machinery/requests_console/directional/east, /turf/simulated/floor/plasteel{ icon_state = "cafeteria" }, @@ -23867,10 +23839,7 @@ /area/station/public/locker) "bvr" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/requests_console{ - dir = 4; - pixel_x = -30 - }, +/obj/machinery/requests_console/directional/west, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "brown" @@ -24495,9 +24464,7 @@ /turf/simulated/floor/wood, /area/station/service/library) "bxX" = ( -/obj/machinery/requests_console{ - pixel_x = 30 - }, +/obj/machinery/requests_console/directional/east, /obj/structure/table, /obj/item/folder/white, /obj/item/pen, @@ -24865,9 +24832,7 @@ /area/station/supply/sorting) "bzH" = ( /obj/structure/table, -/obj/machinery/requests_console{ - pixel_y = 30 - }, +/obj/machinery/requests_console/directional/north, /obj/item/stack/tape_roll, /obj/item/destTagger{ pixel_x = 4; @@ -26580,9 +26545,7 @@ }, /area/station/science/robotics) "bGF" = ( -/obj/machinery/requests_console{ - pixel_y = 30 - }, +/obj/machinery/requests_console/directional/north, /obj/structure/rack{ dir = 8; layer = 2.9 @@ -27229,9 +27192,7 @@ }, /area/station/supply/storage) "bIU" = ( -/obj/machinery/requests_console{ - pixel_y = 30 - }, +/obj/machinery/requests_console/directional/north, /obj/effect/turf_decal/delivery/hollow, /obj/machinery/navbeacon{ codes_txt = "delivery"; @@ -27553,9 +27514,7 @@ }, /area/station/medical/reception) "bJZ" = ( -/obj/machinery/requests_console{ - pixel_x = -30 - }, +/obj/machinery/requests_console/directional/west, /obj/structure/table, /obj/item/reagent_containers/drinks/cans/dr_gibb, /obj/item/storage/box/patch_packs, @@ -30100,9 +30059,7 @@ /area/station/hallway/primary/central/sw) "bTA" = ( /obj/structure/table, -/obj/machinery/requests_console{ - pixel_x = -30 - }, +/obj/machinery/requests_console/directional/west, /obj/machinery/camera{ c_tag = "Cargo Office"; dir = 4 @@ -30134,9 +30091,7 @@ c_tag = "Medbay Chemistry"; dir = 4 }, -/obj/machinery/requests_console{ - pixel_x = -30 - }, +/obj/machinery/requests_console/directional/west, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "whiteyellow" @@ -32478,9 +32433,7 @@ /obj/machinery/computer/crew{ dir = 8 }, -/obj/machinery/requests_console{ - pixel_x = 30 - }, +/obj/machinery/requests_console/directional/east, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "darkblue" @@ -33523,9 +33476,7 @@ /area/station/medical/psych) "cgE" = ( /obj/machinery/economy/vending/plasmaresearch, -/obj/machinery/requests_console{ - pixel_y = -30 - }, +/obj/machinery/requests_console/directional/south, /turf/simulated/floor/plasteel{ dir = 10; icon_state = "whitepurple" @@ -34508,9 +34459,7 @@ /obj/machinery/light{ dir = 1 }, -/obj/machinery/requests_console{ - pixel_y = 30 - }, +/obj/machinery/requests_console/directional/north, /obj/machinery/newscaster{ dir = 4; name = "west bump"; @@ -34816,9 +34765,7 @@ }, /area/station/hallway/primary/aft/north) "clR" = ( -/obj/machinery/requests_console{ - pixel_x = -32 - }, +/obj/machinery/requests_console/directional/west, /turf/simulated/floor/wood, /area/station/command/office/blueshield) "clT" = ( @@ -39045,9 +38992,7 @@ /turf/simulated/floor/plating, /area/station/engineering/tech_storage) "cAK" = ( -/obj/machinery/requests_console{ - pixel_y = -32 - }, +/obj/machinery/requests_console/directional/south, /turf/simulated/floor/plating, /area/station/engineering/tech_storage) "cAL" = ( @@ -40962,9 +40907,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/requests_console{ - pixel_y = -30 - }, +/obj/machinery/requests_console/directional/south, /turf/simulated/floor/plasteel{ icon_state = "whitepurple" }, @@ -41846,9 +41789,7 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/requests_console{ - pixel_x = 30 - }, +/obj/machinery/requests_console/directional/east, /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ dir = 10 }, @@ -43490,9 +43431,7 @@ /area/station/engineering/equipmentstorage) "cQO" = ( /obj/structure/table, -/obj/machinery/requests_console{ - pixel_x = 30 - }, +/obj/machinery/requests_console/directional/east, /obj/item/stack/sheet/glass{ amount = 50 }, @@ -43943,9 +43882,7 @@ /turf/simulated/floor/plasteel, /area/station/engineering/atmos) "cSf" = ( -/obj/machinery/requests_console{ - pixel_y = 30 - }, +/obj/machinery/requests_console/directional/north, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "whitepurple" @@ -44614,9 +44551,7 @@ /turf/simulated/floor/carpet, /area/station/public/mrchangs) "cUj" = ( -/obj/machinery/requests_console{ - pixel_y = 30 - }, +/obj/machinery/requests_console/directional/north, /obj/structure/table, /obj/item/book/manual/wiki/engineering_guide, /obj/item/book/manual/engineering_particle_accelerator{ @@ -45159,9 +45094,7 @@ /area/station/service/bar) "cWp" = ( /obj/structure/table, -/obj/machinery/requests_console{ - pixel_y = -30 - }, +/obj/machinery/requests_console/directional/south, /obj/item/stack/sheet/glass{ amount = 50 }, @@ -46171,9 +46104,7 @@ "daf" = ( /obj/structure/table/reinforced, /obj/item/book/manual/evaguide, -/obj/machinery/requests_console{ - pixel_x = -32 - }, +/obj/machinery/requests_console/directional/west, /obj/effect/turf_decal/delivery/white/hollow, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -48222,9 +48153,7 @@ /turf/space, /area/space/nearstation) "dig" = ( -/obj/machinery/requests_console{ - pixel_x = -32 - }, +/obj/machinery/requests_console/directional/west, /turf/simulated/floor/plasteel, /area/station/public/locker) "dii" = ( @@ -50031,9 +49960,7 @@ /turf/simulated/floor/plasteel, /area/station/public/locker) "dnH" = ( -/obj/machinery/requests_console{ - pixel_y = 30 - }, +/obj/machinery/requests_console/directional/north, /obj/machinery/plantgenes, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -50980,16 +50907,15 @@ name = "south bump"; pixel_y = -28 }, -/obj/machinery/requests_console{ - pixel_y = -32; - pixel_x = 32 - }, /obj/effect/landmark/start/ai, /obj/machinery/newscaster/security_unit{ dir = 4; name = "west bump"; pixel_x = -28 }, +/obj/machinery/requests_console/directional/south{ + pixel_x = 30 + }, /turf/simulated/floor/bluegrid, /area/station/turret_protected/ai) "drV" = ( @@ -54385,9 +54311,7 @@ pixel_x = -5 }, /obj/item/storage/briefcase, -/obj/machinery/requests_console{ - pixel_x = -30 - }, +/obj/machinery/requests_console/directional/west, /turf/simulated/floor/wood, /area/station/medical/psych) "eNV" = ( @@ -59176,9 +59100,7 @@ /area/station/security/permabrig) "gXD" = ( /obj/item/kirbyplants, -/obj/machinery/requests_console{ - pixel_y = 30 - }, +/obj/machinery/requests_console/directional/north, /turf/simulated/floor/wood, /area/station/command/meeting_room) "gYq" = ( @@ -61469,9 +61391,7 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 }, -/obj/machinery/requests_console{ - pixel_x = 30 - }, +/obj/machinery/requests_console/directional/east, /turf/simulated/floor/wood, /area/station/service/library) "iim" = ( @@ -66361,9 +66281,7 @@ }, /area/station/security/permabrig) "kFd" = ( -/obj/machinery/requests_console{ - pixel_y = -30 - }, +/obj/machinery/requests_console/directional/south, /turf/simulated/floor/plasteel{ icon_state = "grimy" }, @@ -68162,9 +68080,7 @@ /obj/item/camera_film, /obj/item/camera_film, /obj/item/camera/detective, -/obj/machinery/requests_console{ - pixel_y = -30 - }, +/obj/machinery/requests_console/directional/south, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 }, @@ -69818,9 +69734,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/asmaint) "mlz" = ( -/obj/machinery/requests_console{ - pixel_y = 32 - }, +/obj/machinery/requests_console/directional/north, /obj/machinery/light{ dir = 1 }, @@ -70258,9 +70172,7 @@ pixel_x = 2; pixel_y = 2 }, -/obj/machinery/requests_console{ - pixel_x = -30 - }, +/obj/machinery/requests_console/directional/west, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -71001,9 +70913,7 @@ "mQt" = ( /obj/structure/table, /obj/item/storage/firstaid/regular, -/obj/machinery/requests_console{ - pixel_y = 30 - }, +/obj/machinery/requests_console/directional/north, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "bluered" @@ -73639,9 +73549,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/machinery/requests_console{ - pixel_y = -30 - }, +/obj/machinery/requests_console/directional/south, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -77430,9 +77338,7 @@ /area/station/maintenance/fpmaint) "pZw" = ( /obj/machinery/computer/security/mining, -/obj/machinery/requests_console{ - pixel_x = -30 - }, +/obj/machinery/requests_console/directional/west, /obj/machinery/firealarm/directional/north, /turf/simulated/floor/carpet, /area/station/supply/qm) @@ -79154,9 +79060,7 @@ }, /area/station/medical/storage) "qId" = ( -/obj/machinery/requests_console{ - pixel_x = 30 - }, +/obj/machinery/requests_console/directional/east, /obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ dir = 4; @@ -84852,9 +84756,7 @@ /turf/simulated/floor/plasteel, /area/station/maintenance/apmaint2) "tFe" = ( -/obj/machinery/requests_console{ - pixel_y = -30 - }, +/obj/machinery/requests_console/directional/south, /obj/machinery/camera/autoname{ dir = 10 }, @@ -84872,10 +84774,7 @@ /obj/machinery/computer/robotics{ dir = 4 }, -/obj/machinery/requests_console{ - pixel_x = -2; - pixel_y = 30 - }, +/obj/machinery/requests_console/directional/north, /obj/machinery/button/windowtint{ desc = "A remote control switch for polarized windows. For culling the sight of the equipment-starved masses."; id = "rdrobosurgery"; @@ -87164,9 +87063,7 @@ /obj/structure/sign/poster/official/help_others{ pixel_y = -30 }, -/obj/machinery/requests_console{ - pixel_x = -30 - }, +/obj/machinery/requests_console/directional/west, /turf/simulated/floor/plasteel{ dir = 10; icon_state = "darkpurple" @@ -91158,9 +91055,7 @@ /turf/simulated/floor/plasteel, /area/station/maintenance/apmaint) "wQa" = ( -/obj/machinery/requests_console{ - pixel_x = -30 - }, +/obj/machinery/requests_console/directional/west, /obj/effect/landmark/start/shaft_miner, /turf/simulated/floor/plasteel{ dir = 8; @@ -91505,9 +91400,7 @@ /area/station/hallway/primary/aft/south) "xbn" = ( /obj/vehicle/janicart, -/obj/machinery/requests_console{ - pixel_y = -29 - }, +/obj/machinery/requests_console/directional/south, /obj/effect/turf_decal/delivery/green/hollow, /turf/simulated/floor/plasteel, /area/station/service/janitor) @@ -92228,10 +92121,7 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 }, -/obj/machinery/requests_console{ - pixel_y = -30; - dir = 1 - }, +/obj/machinery/requests_console/directional/south, /turf/simulated/floor/wood, /area/station/command/office/ntrep) "xtZ" = ( @@ -92388,9 +92278,7 @@ /area/station/maintenance/apmaint2) "xwJ" = ( /obj/machinery/suit_storage_unit/captain/secure, -/obj/machinery/requests_console{ - pixel_x = 30 - }, +/obj/machinery/requests_console/directional/east, /turf/simulated/floor/carpet/royalblue, /area/station/command/office/captain) "xwU" = ( diff --git a/_maps/map_files/stations/cerestation.dmm b/_maps/map_files/stations/cerestation.dmm index aec12ea281f..945e7d77213 100644 --- a/_maps/map_files/stations/cerestation.dmm +++ b/_maps/map_files/stations/cerestation.dmm @@ -1281,9 +1281,7 @@ /turf/simulated/floor/mineral/titanium/blue, /area/shuttle/pod_4) "aiO" = ( -/obj/machinery/requests_console{ - pixel_y = -28 - }, +/obj/machinery/requests_console/directional/south, /obj/machinery/turretid/lethal{ check_synth = 1; name = "AI Chamber Turret Control"; @@ -3872,9 +3870,7 @@ c_tag = "Brig Head of Security's Office"; dir = 1 }, -/obj/machinery/requests_console{ - pixel_y = -30 - }, +/obj/machinery/requests_console/directional/south, /obj/machinery/computer/secure_data{ dir = 1 }, @@ -3928,9 +3924,7 @@ /turf/simulated/floor/wood, /area/station/command/office/captain) "ayv" = ( -/obj/machinery/requests_console{ - pixel_y = 30 - }, +/obj/machinery/requests_console/directional/north, /obj/machinery/computer/communications, /turf/simulated/floor/wood, /area/station/command/office/captain) @@ -5135,9 +5129,7 @@ /turf/simulated/floor/carpet/black, /area/station/command/bridge) "aHm" = ( -/obj/machinery/requests_console{ - pixel_y = 30 - }, +/obj/machinery/requests_console/directional/north, /turf/simulated/floor/carpet/black, /area/station/command/bridge) "aHn" = ( @@ -8771,9 +8763,7 @@ }, /area/station/hallway/primary/starboard/north) "bcR" = ( -/obj/machinery/requests_console{ - pixel_x = -30 - }, +/obj/machinery/requests_console/directional/west, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "darkbrown" @@ -9727,9 +9717,7 @@ pixel_y = -24; name = "south bump" }, -/obj/machinery/requests_console{ - pixel_x = -32 - }, +/obj/machinery/requests_console/directional/west, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -10336,9 +10324,7 @@ /obj/machinery/computer/station_alert{ dir = 4 }, -/obj/machinery/requests_console{ - pixel_x = -32 - }, +/obj/machinery/requests_console/directional/west, /turf/simulated/floor/plasteel, /area/station/command/office/ce) "blt" = ( @@ -10390,9 +10376,7 @@ /obj/machinery/computer/card/minor/cmo{ dir = 4 }, -/obj/machinery/requests_console{ - pixel_x = -30 - }, +/obj/machinery/requests_console/directional/west, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "darkblue" @@ -11348,9 +11332,7 @@ /turf/simulated/floor/carpet/blue, /area/station/command/office/hop) "bqF" = ( -/obj/machinery/requests_console{ - pixel_y = 30 - }, +/obj/machinery/requests_console/directional/north, /obj/machinery/disposal, /obj/structure/disposalpipe/trunk, /turf/simulated/floor/wood, @@ -15880,9 +15862,7 @@ dir = 5; network = list("SS13","CMO") }, -/obj/machinery/requests_console{ - pixel_x = -32 - }, +/obj/machinery/requests_console/directional/west, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ icon_state = "white" @@ -23598,9 +23578,7 @@ }, /area/station/supply/office) "cAn" = ( -/obj/machinery/requests_console{ - pixel_y = 30 - }, +/obj/machinery/requests_console/directional/north, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "darkbrown" @@ -23991,9 +23969,7 @@ /obj/structure/disposalpipe/trunk{ dir = 8 }, -/obj/machinery/requests_console{ - pixel_y = 30 - }, +/obj/machinery/requests_console/directional/north, /turf/simulated/floor/plasteel{ icon_state = "neutralfull" }, @@ -24234,9 +24210,7 @@ /turf/space, /area/space) "cEm" = ( -/obj/machinery/requests_console{ - pixel_x = 30 - }, +/obj/machinery/requests_console/directional/east, /obj/machinery/photocopier, /turf/simulated/floor/plasteel{ dir = 4; @@ -24309,9 +24283,7 @@ /obj/machinery/computer/guestpass{ pixel_y = -28 }, -/obj/machinery/requests_console{ - pixel_x = -30 - }, +/obj/machinery/requests_console/directional/west, /turf/simulated/floor/plasteel{ dir = 10; icon_state = "darkred" @@ -27353,9 +27325,7 @@ /obj/item/paper_bin/nanotrasen, /obj/item/stamp/magistrate, /obj/item/pen/multi/gold, -/obj/machinery/requests_console{ - pixel_x = 30 - }, +/obj/machinery/requests_console/directional/east, /turf/simulated/floor/carpet, /area/station/legal/magistrate) "cSQ" = ( @@ -28538,9 +28508,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/requests_console{ - pixel_y = 30 - }, +/obj/machinery/requests_console/directional/north, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutral" @@ -28952,9 +28920,7 @@ dir = 4 }, /obj/structure/table/wood, -/obj/machinery/requests_console{ - pixel_x = -30 - }, +/obj/machinery/requests_console/directional/west, /turf/simulated/floor/wood, /area/station/service/bar) "ddc" = ( @@ -30111,9 +30077,7 @@ }, /area/station/science/hallway) "dkb" = ( -/obj/machinery/requests_console{ - pixel_y = -30 - }, +/obj/machinery/requests_console/directional/south, /obj/structure/cable/orange{ d1 = 4; d2 = 8; @@ -33487,9 +33451,7 @@ /obj/item/clothing/gloves/color/yellow, /obj/item/t_scanner, /obj/item/multitool, -/obj/machinery/requests_console{ - pixel_x = -30 - }, +/obj/machinery/requests_console/directional/west, /turf/simulated/floor/plating, /area/station/engineering/tech_storage) "dDo" = ( @@ -34578,6 +34540,18 @@ icon_state = "neutralcorner" }, /area/station/hallway/secondary/entry/north) +"dTc" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/requests_console/directional/east, +/obj/structure/cable/orange{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/plasteel, +/area/station/hallway/primary/fore/west) "dTd" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ @@ -37644,9 +37618,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/disposal/external/north) "eZB" = ( -/obj/machinery/requests_console{ - pixel_x = 30 - }, +/obj/machinery/requests_console/directional/east, /obj/structure/closet/secure_closet/atmos_personal, /obj/item/pickaxe/mini, /turf/simulated/floor/plasteel{ @@ -46142,9 +46114,7 @@ /area/station/medical/storage/secondary) "hUK" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/requests_console{ - pixel_x = 30 - }, +/obj/machinery/requests_console/directional/east, /turf/simulated/floor/plasteel, /area/station/supply/miningdock) "hUN" = ( @@ -52290,9 +52260,7 @@ /area/station/maintenance/port) "jMh" = ( /obj/item/kirbyplants, -/obj/machinery/requests_console{ - pixel_x = -30 - }, +/obj/machinery/requests_console/directional/west, /turf/simulated/floor/carpet, /area/station/medical/psych) "jMr" = ( @@ -53415,9 +53383,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/starboard) "kgy" = ( -/obj/machinery/requests_console{ - pixel_x = -30 - }, +/obj/machinery/requests_console/directional/west, /turf/simulated/floor/wood, /area/station/service/library) "kgP" = ( @@ -54481,9 +54447,7 @@ /turf/simulated/floor/plating/asteroid/ancient, /area/station/maintenance/asmaint) "kwS" = ( -/obj/machinery/requests_console{ - pixel_x = 30 - }, +/obj/machinery/requests_console/directional/east, /turf/simulated/floor/wood, /area/station/command/office/ntrep) "kwT" = ( @@ -59726,16 +59690,12 @@ }, /area/station/command/office/rd) "lZX" = ( -/obj/machinery/requests_console{ - pixel_x = 30 - }, +/obj/machinery/requests_console/directional/east, /obj/structure/closet/cabinet, /obj/item/reagent_containers/drinks/drinkingglass, /obj/item/reagent_containers/drinks/drinkingglass, /obj/item/reagent_containers/drinks/bottle/whiskey, -/obj/machinery/requests_console{ - pixel_x = 30 - }, +/obj/machinery/requests_console/directional/east, /turf/simulated/floor/wood, /area/station/command/office/blueshield) "maa" = ( @@ -61883,9 +61843,7 @@ /area/station/hallway/secondary/exit) "mNv" = ( /obj/structure/closet/wardrobe/black, -/obj/machinery/requests_console{ - pixel_y = -30 - }, +/obj/machinery/requests_console/directional/south, /turf/simulated/floor/mineral/titanium/blue, /area/shuttle/arrival/station) "mNw" = ( @@ -62981,9 +62939,7 @@ "nfb" = ( /obj/structure/table/glass, /obj/item/storage/box/syringes, -/obj/machinery/requests_console{ - pixel_y = 30 - }, +/obj/machinery/requests_console/directional/north, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "whiteblue" @@ -67296,9 +67252,7 @@ /area/station/maintenance/storage) "ozW" = ( /obj/structure/closet/secure_closet/freezer/kitchen, -/obj/machinery/requests_console{ - pixel_y = -30 - }, +/obj/machinery/requests_console/directional/south, /turf/simulated/floor/plasteel{ icon_state = "cafeteria" }, @@ -67400,9 +67354,7 @@ /obj/structure/table, /obj/item/stack/sheet/metal/fifty, /obj/item/stack/sheet/metal/fifty, -/obj/machinery/requests_console{ - pixel_x = 30 - }, +/obj/machinery/requests_console/directional/east, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "darkyellow" @@ -69825,9 +69777,7 @@ }, /area/station/science/misc_lab) "pqq" = ( -/obj/machinery/requests_console{ - pixel_x = -30 - }, +/obj/machinery/requests_console/directional/west, /turf/simulated/floor/plasteel{ icon_state = "whitepurplefull" }, @@ -76803,9 +76753,7 @@ }, /area/station/service/kitchen) "rCC" = ( -/obj/machinery/requests_console{ - pixel_x = -30 - }, +/obj/machinery/requests_console/directional/west, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -77504,9 +77452,7 @@ }, /area/station/hallway/primary/starboard/north) "rOy" = ( -/obj/machinery/requests_console{ - pixel_y = 30 - }, +/obj/machinery/requests_console/directional/north, /turf/simulated/floor/carpet/black, /area/station/service/chapel) "rOM" = ( @@ -80075,9 +80021,7 @@ }, /area/station/public/quantum/science) "sDY" = ( -/obj/machinery/requests_console{ - pixel_y = 30 - }, +/obj/machinery/requests_console/directional/north, /obj/machinery/hydroponics/constructable, /turf/simulated/floor/plasteel{ icon_state = "darkgreenfull" @@ -80623,9 +80567,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/requests_console{ - pixel_y = 30 - }, +/obj/machinery/requests_console/directional/north, /turf/simulated/floor/plasteel/white, /area/station/science/robotics) "sOx" = ( @@ -82805,9 +82747,7 @@ }, /area/station/hallway/primary/fore/east) "tyF" = ( -/obj/machinery/requests_console{ - pixel_x = -30 - }, +/obj/machinery/requests_console/directional/west, /obj/machinery/r_n_d/circuit_imprinter, /obj/effect/turf_decal/stripes/line, /turf/simulated/floor/plasteel, @@ -85959,9 +85899,7 @@ /turf/simulated/floor/plating, /area/station/hallway/primary/central/west) "uzI" = ( -/obj/machinery/requests_console{ - pixel_x = -30 - }, +/obj/machinery/requests_console/directional/west, /obj/machinery/computer/security{ dir = 4; network = list("Research","Research Outpost","RD","MiniSat") @@ -86541,9 +86479,7 @@ /turf/simulated/floor/plasteel, /area/station/public/locker) "uJE" = ( -/obj/machinery/requests_console{ - pixel_x = 30 - }, +/obj/machinery/requests_console/directional/east, /turf/simulated/floor/carpet, /area/station/legal/courtroom) "uJT" = ( @@ -87534,9 +87470,7 @@ /obj/item/storage/box/monkeycubes/stokcubes, /obj/item/storage/box/monkeycubes/wolpincubes, /obj/item/storage/box/monkeycubes/nian_worme_cubes, -/obj/machinery/requests_console{ - pixel_x = -30 - }, +/obj/machinery/requests_console/directional/west, /turf/simulated/floor/plasteel{ dir = 9; icon_state = "whitepurple" @@ -88435,17 +88369,6 @@ /obj/machinery/computer/card, /turf/simulated/floor/wood, /area/station/command/office/captain) -"vlX" = ( -/obj/structure/cable/orange{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/plasteel, -/area/station/hallway/primary/fore/west) "vmg" = ( /obj/structure/lattice/catwalk, /obj/machinery/atmospherics/unary/outlet_injector/on{ @@ -88544,9 +88467,7 @@ }, /obj/item/stamp/law, /obj/item/pen/multi, -/obj/machinery/requests_console{ - pixel_x = -30 - }, +/obj/machinery/requests_console/directional/west, /obj/item/taperecorder, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 @@ -92725,9 +92646,7 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/requests_console{ - pixel_x = 30 - }, +/obj/machinery/requests_console/directional/east, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ @@ -92923,9 +92842,7 @@ }, /area/station/maintenance/gambling_den) "wyn" = ( -/obj/machinery/requests_console{ - pixel_x = 30 - }, +/obj/machinery/requests_console/directional/east, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "whiteblue" @@ -95444,10 +95361,7 @@ /area/station/hallway/primary/port/north) "xnp" = ( /obj/effect/landmark/start/explorer, -/obj/machinery/requests_console{ - dir = 4; - pixel_x = -30 - }, +/obj/machinery/requests_console/directional/west, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "darkbrown" @@ -97331,9 +97245,7 @@ /turf/simulated/floor/wood, /area/station/legal/magistrate) "xSE" = ( -/obj/machinery/requests_console{ - pixel_x = -30 - }, +/obj/machinery/requests_console/directional/west, /mob/living/simple_animal/bot/cleanbot{ name = "Na2CO3" }, @@ -97718,9 +97630,7 @@ }, /area/station/hallway/primary/central/north) "xYV" = ( -/obj/machinery/requests_console{ - pixel_y = -30 - }, +/obj/machinery/requests_console/directional/south, /turf/simulated/floor/plasteel, /area/station/public/locker) "xYZ" = ( @@ -124812,7 +124722,7 @@ xas tSt vpK hOn -vlX +dTc gpe iAF jwW diff --git a/_maps/map_files/stations/deltastation.dmm b/_maps/map_files/stations/deltastation.dmm index adcce788c99..6efd32b683e 100644 --- a/_maps/map_files/stations/deltastation.dmm +++ b/_maps/map_files/stations/deltastation.dmm @@ -406,9 +406,7 @@ /area/station/hallway/secondary/entry/east) "aeF" = ( /obj/structure/filingcabinet/chestdrawer, -/obj/machinery/requests_console{ - pixel_x = -30 - }, +/obj/machinery/requests_console/directional/west, /turf/simulated/floor/wood, /area/station/medical/psych) "aeI" = ( @@ -6225,9 +6223,7 @@ c_tag = "Janitor's Closet" }, /obj/structure/closet/l3closet/janitor, -/obj/machinery/requests_console{ - pixel_y = 29 - }, +/obj/machinery/requests_console/directional/north, /obj/effect/turf_decal/delivery/hollow, /turf/simulated/floor/plasteel, /area/station/service/janitor) @@ -8976,9 +8972,7 @@ /obj/item/book/manual/barman_recipes, /obj/item/reagent_containers/drinks/shaker, /obj/item/reagent_containers/glass/rag, -/obj/machinery/requests_console{ - pixel_y = 30 - }, +/obj/machinery/requests_console/directional/north, /turf/simulated/floor/plasteel/dark, /area/station/service/bar) "aGE" = ( @@ -14314,9 +14308,7 @@ /obj/machinery/camera{ c_tag = "Cargo Office" }, -/obj/machinery/requests_console{ - pixel_y = 30 - }, +/obj/machinery/requests_console/directional/north, /obj/item/storage/firstaid/regular, /obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/plasteel{ @@ -14468,9 +14460,7 @@ /obj/machinery/computer/supplycomp{ dir = 8 }, -/obj/machinery/requests_console{ - pixel_x = 30 - }, +/obj/machinery/requests_console/directional/east, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "brown" @@ -17843,9 +17833,7 @@ }, /obj/machinery/disposal, /obj/structure/disposalpipe/trunk, -/obj/machinery/requests_console{ - pixel_x = 30 - }, +/obj/machinery/requests_console/directional/east, /obj/effect/turf_decal/delivery, /turf/simulated/floor/plasteel{ icon_state = "white" @@ -20260,9 +20248,7 @@ /obj/machinery/light{ dir = 1 }, -/obj/machinery/requests_console{ - pixel_y = 30 - }, +/obj/machinery/requests_console/directional/north, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "vault" @@ -24179,9 +24165,7 @@ /area/station/maintenance/starboard) "buG" = ( /obj/structure/closet/secure_closet/engineering_personal, -/obj/machinery/requests_console{ - pixel_y = -30 - }, +/obj/machinery/requests_console/directional/south, /obj/effect/turf_decal/delivery, /obj/machinery/firealarm/directional/east, /turf/simulated/floor/plasteel, @@ -24707,9 +24691,7 @@ /obj/item/reagent_containers/spray/plantbgone, /obj/item/watertank, /obj/item/grenade/chem_grenade/antiweed, -/obj/machinery/requests_console{ - pixel_x = 30 - }, +/obj/machinery/requests_console/directional/east, /obj/effect/turf_decal/delivery/hollow, /turf/simulated/floor/plasteel, /area/station/service/hydroponics) @@ -26742,9 +26724,7 @@ /obj/machinery/status_display{ pixel_y = -32 }, -/obj/machinery/requests_console{ - pixel_x = 30 - }, +/obj/machinery/requests_console/directional/east, /turf/simulated/floor/plasteel{ dir = 6; icon_state = "caution" @@ -26855,9 +26835,7 @@ /obj/structure/disposalpipe/trunk{ dir = 4 }, -/obj/machinery/requests_console{ - pixel_y = 30 - }, +/obj/machinery/requests_console/directional/north, /obj/effect/turf_decal/delivery/hollow, /turf/simulated/floor/plasteel, /area/station/public/storage/tools) @@ -27429,13 +27407,12 @@ pixel_x = 28; pixel_y = 5 }, -/obj/machinery/requests_console{ - pixel_y = 32; - pixel_x = 32 - }, /obj/item/radio/intercom/custom{ pixel_y = 25 }, +/obj/machinery/requests_console/directional/north{ + pixel_x = 30 + }, /turf/simulated/floor/plasteel/dark, /area/station/turret_protected/ai) "bCY" = ( @@ -29880,9 +29857,7 @@ /obj/item/stack/sheet/glass, /obj/item/stack/sheet/glass, /obj/item/stack/sheet/glass, -/obj/machinery/requests_console{ - pixel_x = 30 - }, +/obj/machinery/requests_console/directional/east, /turf/simulated/floor/plasteel/dark, /area/station/engineering/tech_storage) "bIS" = ( @@ -30872,9 +30847,7 @@ /obj/machinery/computer/med_data{ dir = 8 }, -/obj/machinery/requests_console{ - pixel_x = 30 - }, +/obj/machinery/requests_console/directional/east, /turf/simulated/floor/carpet, /area/station/security/detective) "bLv" = ( @@ -31171,9 +31144,7 @@ /obj/machinery/computer/card/minor/ce{ dir = 4 }, -/obj/machinery/requests_console{ - pixel_x = -32 - }, +/obj/machinery/requests_console/directional/west, /turf/simulated/floor/plasteel/dark, /area/station/command/office/ce) "bMh" = ( @@ -33611,9 +33582,7 @@ /obj/machinery/computer/card{ dir = 4 }, -/obj/machinery/requests_console{ - pixel_x = -30 - }, +/obj/machinery/requests_console/directional/west, /turf/simulated/floor/carpet/black, /area/station/command/office/captain) "bSP" = ( @@ -34461,9 +34430,7 @@ /obj/structure/table/wood, /obj/item/paper_bin/nanotrasen, /obj/item/stamp/hop, -/obj/machinery/requests_console{ - pixel_y = 30 - }, +/obj/machinery/requests_console/directional/north, /turf/simulated/floor/wood, /area/station/command/office/hop) "bUT" = ( @@ -36190,9 +36157,7 @@ /obj/machinery/photocopier/faxmachine/longrange{ department = "NT Representative's Office" }, -/obj/machinery/requests_console{ - pixel_y = 30 - }, +/obj/machinery/requests_console/directional/north, /turf/simulated/floor/carpet/royalblack, /area/station/command/office/ntrep) "cae" = ( @@ -36229,9 +36194,7 @@ /area/station/command/office/blueshield) "cal" = ( /obj/structure/closet/secure_closet/blueshield, -/obj/machinery/requests_console{ - pixel_y = 30 - }, +/obj/machinery/requests_console/directional/north, /turf/simulated/floor/wood, /area/station/command/office/blueshield) "cam" = ( @@ -38571,9 +38534,7 @@ /area/station/legal/magistrate) "cgk" = ( /obj/item/kirbyplants, -/obj/machinery/requests_console{ - pixel_y = -30 - }, +/obj/machinery/requests_console/directional/south, /turf/simulated/floor/plasteel{ icon_state = "cult" }, @@ -39044,9 +39005,7 @@ /area/station/legal/lawoffice) "chP" = ( /obj/structure/filingcabinet/security, -/obj/machinery/requests_console{ - pixel_x = 30 - }, +/obj/machinery/requests_console/directional/east, /turf/simulated/floor/wood, /area/station/legal/lawoffice) "chS" = ( @@ -41559,9 +41518,7 @@ pixel_x = 4; pixel_y = 4 }, -/obj/machinery/requests_console{ - pixel_x = 30 - }, +/obj/machinery/requests_console/directional/east, /turf/simulated/floor/plasteel/dark, /area/station/legal/courtroom) "coQ" = ( @@ -41942,9 +41899,7 @@ /obj/structure/table/wood, /obj/item/storage/bag/books, /obj/item/taperecorder, -/obj/machinery/requests_console{ - pixel_x = 30 - }, +/obj/machinery/requests_console/directional/east, /turf/simulated/floor/plasteel/grimy, /area/station/service/library) "cpN" = ( @@ -45737,10 +45692,7 @@ /area/station/supply/expedition) "czW" = ( /obj/effect/spawner/random_spawners/dirt_often, -/obj/machinery/requests_console{ - pixel_x = -30; - dir = 4 - }, +/obj/machinery/requests_console/directional/west, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "browncorner" @@ -46162,9 +46114,7 @@ c_tag = "EVA Storage"; dir = 8 }, -/obj/machinery/requests_console{ - pixel_x = 32 - }, +/obj/machinery/requests_console/directional/east, /turf/simulated/floor/plasteel/dark, /area/station/ai_monitored/storage/eva) "cBl" = ( @@ -50286,9 +50236,7 @@ d2 = 8; icon_state = "2-8" }, -/obj/machinery/requests_console{ - pixel_x = 30 - }, +/obj/machinery/requests_console/directional/east, /turf/simulated/floor/plasteel{ dir = 6; icon_state = "whiteblue" @@ -53023,9 +52971,7 @@ /area/station/aisat) "cYh" = ( /obj/structure/closet/wardrobe/yellow, -/obj/machinery/requests_console{ - pixel_x = 30 - }, +/obj/machinery/requests_console/directional/east, /turf/simulated/floor/plasteel{ icon_state = "neutralcorner" }, @@ -53355,9 +53301,7 @@ network = list("Research","SS13") }, /obj/machinery/reagentgrinder, -/obj/machinery/requests_console{ - pixel_x = 30 - }, +/obj/machinery/requests_console/directional/east, /obj/effect/turf_decal/delivery, /turf/simulated/floor/plasteel, /area/station/science/xenobiology) @@ -54444,9 +54388,7 @@ dir = 8; network = list("Research","SS13") }, -/obj/machinery/requests_console{ - pixel_x = 30 - }, +/obj/machinery/requests_console/directional/east, /turf/simulated/floor/plasteel{ icon_state = "whitepurplecorner" }, @@ -56476,9 +56418,7 @@ desc = "Someone has crossed out the 'Space' from Space Cleaner and written in Chemistry. Scrawled on the back is, 'Okay, whoever filled this with polytrinic acid, it was only funny the first time. It was hard enough replacing the CMO's first cat!'"; name = "Chemistry Cleaner" }, -/obj/machinery/requests_console{ - pixel_x = -30 - }, +/obj/machinery/requests_console/directional/west, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "whiteyellow" @@ -57245,10 +57185,7 @@ /obj/structure/table/reinforced, /obj/item/clipboard, /obj/item/toy/figure/crew/rd, -/obj/machinery/requests_console{ - pixel_x = -30; - pixel_y = -2 - }, +/obj/machinery/requests_console/directional/west, /obj/effect/turf_decal/delivery/hollow, /turf/simulated/floor/plasteel{ dir = 8; @@ -58079,9 +58016,7 @@ /obj/item/stack/sheet/metal{ amount = 50 }, -/obj/machinery/requests_console{ - pixel_y = 30 - }, +/obj/machinery/requests_console/directional/north, /obj/effect/turf_decal/delivery/hollow, /obj/machinery/light_switch{ dir = 4; @@ -64157,9 +64092,7 @@ /area/station/science/genetics) "dYd" = ( /obj/machinery/dna_scannernew, -/obj/machinery/requests_console{ - pixel_y = 30 - }, +/obj/machinery/requests_console/directional/north, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "whitepurple" @@ -68554,9 +68487,7 @@ pixel_x = -1; pixel_y = -2 }, -/obj/machinery/requests_console{ - pixel_y = -30 - }, +/obj/machinery/requests_console/directional/south, /turf/simulated/floor/plasteel{ dir = 6; icon_state = "whitepurple" @@ -73056,9 +72987,7 @@ }, /area/station/medical/medbay) "iWN" = ( -/obj/machinery/requests_console{ - pixel_x = 30 - }, +/obj/machinery/requests_console/directional/east, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "darkblue" @@ -77489,9 +77418,7 @@ }, /area/station/security/main) "lFG" = ( -/obj/machinery/requests_console{ - pixel_x = 30 - }, +/obj/machinery/requests_console/directional/east, /obj/structure/table, /obj/item/storage/firstaid/toxin{ pixel_x = 5; @@ -80416,9 +80343,7 @@ /area/station/service/kitchen) "nnV" = ( /obj/effect/turf_decal/delivery, -/obj/machinery/requests_console{ - pixel_y = -30 - }, +/obj/machinery/requests_console/directional/south, /turf/simulated/floor/plasteel, /area/station/supply/miningdock) "nnW" = ( @@ -81238,9 +81163,7 @@ pixel_y = 5 }, /obj/item/pen/multi, -/obj/machinery/requests_console{ - pixel_y = -30 - }, +/obj/machinery/requests_console/directional/south, /turf/simulated/floor/plasteel{ icon_state = "darkblue" }, @@ -81365,10 +81288,7 @@ /turf/simulated/floor/plating, /area/station/command/office/cmo) "nRs" = ( -/obj/machinery/requests_console{ - dir = 1; - pixel_y = -30 - }, +/obj/machinery/requests_console/directional/south, /turf/simulated/floor/plasteel{ icon_state = "darkblue" }, @@ -81640,9 +81560,7 @@ /turf/simulated/floor/plasteel/white, /area/station/medical/virology) "oar" = ( -/obj/machinery/requests_console{ - pixel_y = -30 - }, +/obj/machinery/requests_console/directional/south, /turf/simulated/floor/plasteel{ icon_state = "darkred" }, @@ -88697,9 +88615,7 @@ c_tag = "Rec Room Aft"; dir = 4 }, -/obj/machinery/requests_console{ - pixel_x = -30 - }, +/obj/machinery/requests_console/directional/west, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralcorner" @@ -92096,10 +92012,7 @@ /obj/structure/table/wood, /obj/item/paper_bin, /obj/item/pen, -/obj/machinery/requests_console{ - dir = 8; - pixel_x = 30 - }, +/obj/machinery/requests_console/directional/east, /obj/machinery/button/windowtint{ pixel_y = -27; dir = 1; @@ -92121,9 +92034,7 @@ /area/station/engineering/atmos) "tNO" = ( /obj/machinery/computer/crew, -/obj/machinery/requests_console{ - pixel_y = 30 - }, +/obj/machinery/requests_console/directional/north, /turf/simulated/floor/plasteel{ dir = 9; icon_state = "darkred" @@ -98762,9 +98673,7 @@ /obj/structure/reagent_dispensers/virusfood{ pixel_x = -30 }, -/obj/machinery/requests_console{ - pixel_y = -30 - }, +/obj/machinery/requests_console/directional/south, /turf/simulated/floor/plasteel{ dir = 10; icon_state = "whitegreen" @@ -99240,9 +99149,7 @@ /area/station/ai_monitored/storage/eva) "xPh" = ( /obj/item/kirbyplants, -/obj/machinery/requests_console{ - pixel_x = 30 - }, +/obj/machinery/requests_console/directional/east, /turf/simulated/floor/mineral/titanium/blue, /area/shuttle/arrival/station) "xPn" = ( diff --git a/_maps/map_files/stations/metastation.dmm b/_maps/map_files/stations/metastation.dmm index 7738b3e7350..e009aa46276 100644 --- a/_maps/map_files/stations/metastation.dmm +++ b/_maps/map_files/stations/metastation.dmm @@ -440,9 +440,7 @@ /turf/simulated/floor/carpet, /area/station/legal/magistrate) "afw" = ( -/obj/machinery/requests_console{ - pixel_y = 30 - }, +/obj/machinery/requests_console/directional/north, /turf/simulated/floor/carpet, /area/station/security/detective) "afy" = ( @@ -1324,9 +1322,7 @@ /area/station/maintenance/fore) "alZ" = ( /obj/structure/closet/secure_closet/security, -/obj/machinery/requests_console{ - pixel_x = 30 - }, +/obj/machinery/requests_console/directional/east, /turf/simulated/floor/plasteel{ dir = 10; icon_state = "darkred" @@ -5747,9 +5743,7 @@ "aFd" = ( /obj/structure/chair/comfy/brown, /obj/effect/landmark/start/magistrate, -/obj/machinery/requests_console{ - pixel_y = 30 - }, +/obj/machinery/requests_console/directional/north, /turf/simulated/floor/carpet, /area/station/legal/magistrate) "aFe" = ( @@ -6214,9 +6208,7 @@ /turf/simulated/floor/plasteel, /area/station/supply/miningdock) "aHs" = ( -/obj/machinery/requests_console{ - pixel_y = -30 - }, +/obj/machinery/requests_console/directional/south, /turf/simulated/floor/plasteel, /area/station/supply/miningdock) "aHu" = ( @@ -7276,9 +7268,7 @@ pixel_y = 5 }, /obj/item/storage/box/pillbottles, -/obj/machinery/requests_console{ - pixel_y = 30 - }, +/obj/machinery/requests_console/directional/north, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -8816,9 +8806,7 @@ /obj/machinery/photocopier/faxmachine{ department = "Quartermaster's Office" }, -/obj/machinery/requests_console{ - pixel_y = 30 - }, +/obj/machinery/requests_console/directional/north, /turf/simulated/floor/plasteel{ icon_state = "brown" }, @@ -12183,9 +12171,7 @@ }, /area/station/hallway/secondary/bridge) "bad" = ( -/obj/machinery/requests_console{ - pixel_x = 30 - }, +/obj/machinery/requests_console/directional/east, /turf/simulated/floor/plasteel{ icon_state = "darkgrey" }, @@ -13349,9 +13335,7 @@ pixel_x = 6; pixel_y = -6 }, -/obj/machinery/requests_console{ - pixel_y = 30 - }, +/obj/machinery/requests_console/directional/north, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -14127,9 +14111,7 @@ /area/station/aisat) "bfd" = ( /obj/machinery/computer/atmos_alert, -/obj/machinery/requests_console{ - pixel_y = 30 - }, +/obj/machinery/requests_console/directional/north, /turf/simulated/floor/plasteel{ icon_state = "darkgrey" }, @@ -15426,9 +15408,7 @@ c_tag = "Customs Checkpoint" }, /obj/machinery/computer/card, -/obj/machinery/requests_console{ - pixel_y = 30 - }, +/obj/machinery/requests_console/directional/north, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "red" @@ -16221,9 +16201,7 @@ /obj/structure/sign/poster/official/random{ pixel_x = 32 }, -/obj/machinery/requests_console{ - pixel_y = -30 - }, +/obj/machinery/requests_console/directional/south, /turf/simulated/floor/plasteel, /area/station/public/storage/tools) "bkB" = ( @@ -17787,9 +17765,7 @@ "boN" = ( /obj/item/restraints/legcuffs/beartrap, /obj/item/restraints/legcuffs/beartrap, -/obj/machinery/requests_console{ - pixel_x = -30 - }, +/obj/machinery/requests_console/directional/west, /obj/machinery/camera{ c_tag = "Custodial Closet"; dir = 4 @@ -18165,9 +18141,7 @@ "bpO" = ( /obj/structure/table, /obj/item/stack/wrapping_paper, -/obj/machinery/requests_console{ - pixel_y = -30 - }, +/obj/machinery/requests_console/directional/south, /obj/item/stack/packageWrap{ pixel_x = 2; pixel_y = -3 @@ -18563,9 +18537,7 @@ pixel_y = 3 }, /obj/item/pen/multi, -/obj/machinery/requests_console{ - pixel_x = -30 - }, +/obj/machinery/requests_console/directional/west, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -18695,9 +18667,7 @@ /turf/simulated/floor/mineral/titanium/blue, /area/shuttle/arrival/station) "brt" = ( -/obj/machinery/requests_console{ - pixel_y = -30 - }, +/obj/machinery/requests_console/directional/south, /obj/machinery/light, /turf/simulated/floor/mineral/titanium/blue, /area/shuttle/arrival/station) @@ -19885,9 +19855,7 @@ /turf/simulated/floor/plasteel, /area/station/hallway/secondary/entry/east) "buE" = ( -/obj/machinery/requests_console{ - pixel_x = 30 - }, +/obj/machinery/requests_console/directional/east, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 }, @@ -21401,9 +21369,7 @@ /area/station/command/bridge) "byu" = ( /obj/machinery/pdapainter, -/obj/machinery/requests_console{ - pixel_y = 30 - }, +/obj/machinery/requests_console/directional/north, /turf/simulated/floor/wood, /area/station/command/office/hop) "byv" = ( @@ -21513,9 +21479,7 @@ /obj/machinery/computer/card{ dir = 8 }, -/obj/machinery/requests_console{ - pixel_x = 30 - }, +/obj/machinery/requests_console/directional/east, /turf/simulated/floor/wood, /area/station/command/office/captain) "byK" = ( @@ -23959,9 +23923,7 @@ "bHu" = ( /obj/structure/chair/comfy/black, /obj/effect/landmark/start/assistant, -/obj/machinery/requests_console{ - pixel_y = 30 - }, +/obj/machinery/requests_console/directional/north, /turf/simulated/floor/wood, /area/station/service/library) "bHv" = ( @@ -26392,9 +26354,7 @@ "bQC" = ( /obj/structure/table, /obj/machinery/kitchen_machine/microwave, -/obj/machinery/requests_console{ - pixel_x = -30 - }, +/obj/machinery/requests_console/directional/west, /turf/simulated/floor/plasteel{ icon_state = "cafeteria" }, @@ -26860,9 +26820,7 @@ /turf/simulated/floor/plasteel, /area/station/command/teleporter) "bSi" = ( -/obj/machinery/requests_console{ - pixel_x = 30 - }, +/obj/machinery/requests_console/directional/east, /turf/simulated/floor/plasteel, /area/station/ai_monitored/storage/eva) "bSj" = ( @@ -28105,9 +28063,7 @@ "bWC" = ( /obj/structure/table/wood, /obj/item/paper/blueshield, -/obj/machinery/requests_console{ - pixel_x = -30 - }, +/obj/machinery/requests_console/directional/west, /obj/item/paper_bin, /obj/item/pen/blue, /turf/simulated/floor/carpet/blue, @@ -28372,9 +28328,7 @@ /obj/item/folder, /obj/item/pen/multi/fountain, /obj/item/stamp/rep, -/obj/machinery/requests_console{ - pixel_x = -30 - }, +/obj/machinery/requests_console/directional/west, /turf/simulated/floor/carpet/royalblack, /area/station/command/office/ntrep) "bXy" = ( @@ -28716,10 +28670,7 @@ /turf/simulated/floor/carpet/royalblack, /area/station/command/office/ntrep) "bYp" = ( -/obj/machinery/requests_console{ - dir = 8; - pixel_x = 30 - }, +/obj/machinery/requests_console/directional/east, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "darkyellow" @@ -29691,9 +29642,7 @@ pixel_y = -2 }, /obj/structure/table/reinforced, -/obj/machinery/requests_console{ - pixel_y = 30 - }, +/obj/machinery/requests_console/directional/north, /obj/machinery/light{ dir = 1 }, @@ -29918,9 +29867,7 @@ }, /area/station/hallway/primary/central/se) "ccZ" = ( -/obj/machinery/requests_console{ - pixel_x = -32 - }, +/obj/machinery/requests_console/directional/west, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable{ @@ -29949,9 +29896,7 @@ /area/station/service/hydroponics) "cdi" = ( /obj/structure/table/reinforced, -/obj/machinery/requests_console{ - pixel_y = 30 - }, +/obj/machinery/requests_console/directional/north, /obj/item/stack/sheet/plasteel{ amount = 10 }, @@ -34958,9 +34903,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/starboard2) "cwH" = ( -/obj/machinery/requests_console{ - pixel_x = 30 - }, +/obj/machinery/requests_console/directional/east, /obj/machinery/computer/aifixer{ dir = 8 }, @@ -35671,9 +35614,7 @@ /obj/machinery/light{ dir = 1 }, -/obj/machinery/requests_console{ - pixel_y = 30 - }, +/obj/machinery/requests_console/directional/north, /turf/simulated/floor/wood, /area/station/command/office/hos) "czA" = ( @@ -38506,9 +38447,7 @@ dir = 4 }, /obj/effect/landmark/start/geneticist, -/obj/machinery/requests_console{ - pixel_y = -30 - }, +/obj/machinery/requests_console/directional/south, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -42704,9 +42643,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 5 }, -/obj/machinery/requests_console{ - pixel_y = 30 - }, +/obj/machinery/requests_console/directional/north, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -42763,10 +42700,9 @@ }, /obj/item/restraints/handcuffs, /obj/item/radio/off, -/obj/machinery/requests_console{ +/obj/machinery/requests_console/directional/east{ department = "Security"; - departmentType = 5; - pixel_x = 30 + departmentType = 5 }, /turf/simulated/floor/plasteel{ dir = 4; @@ -42954,9 +42890,7 @@ /obj/structure/disposalpipe/segment/corner{ dir = 4 }, -/obj/machinery/requests_console{ - pixel_y = 30 - }, +/obj/machinery/requests_console/directional/north, /obj/machinery/atmospherics/unary/vent_pump/on, /turf/simulated/floor/plasteel{ icon_state = "grimy" @@ -45741,9 +45675,7 @@ pixel_x = 4; pixel_y = 4 }, -/obj/machinery/requests_console{ - pixel_x = -30 - }, +/obj/machinery/requests_console/directional/west, /turf/simulated/floor/plasteel{ dir = 10; icon_state = "yellow" @@ -46572,9 +46504,7 @@ /obj/item/assembly/signaler{ pixel_y = 8 }, -/obj/machinery/requests_console{ - pixel_y = 30 - }, +/obj/machinery/requests_console/directional/north, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -54307,9 +54237,7 @@ }, /area/station/medical/storage) "hHW" = ( -/obj/machinery/requests_console{ - pixel_x = 30 - }, +/obj/machinery/requests_console/directional/east, /turf/simulated/floor/plasteel{ icon_state = "cult" }, @@ -55122,9 +55050,7 @@ /obj/machinery/camera{ c_tag = "Science - Research Fore" }, -/obj/machinery/requests_console{ - pixel_y = 32 - }, +/obj/machinery/requests_console/directional/north, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "whitepurple" @@ -59083,9 +59009,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 6 }, -/obj/machinery/requests_console{ - pixel_x = -30 - }, +/obj/machinery/requests_console/directional/west, /obj/structure/disposalpipe/segment{ dir = 4; icon_state = "pipe-c" @@ -60986,9 +60910,7 @@ /obj/machinery/computer/card/minor/cmo{ dir = 4 }, -/obj/machinery/requests_console{ - pixel_x = -30 - }, +/obj/machinery/requests_console/directional/west, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "whiteblue" @@ -61655,9 +61577,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 6 }, -/obj/machinery/requests_console{ - pixel_y = 30 - }, +/obj/machinery/requests_console/directional/north, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "whiteblue" @@ -61766,9 +61686,7 @@ /area/station/maintenance/aft2) "kQx" = ( /obj/item/kirbyplants/plant11, -/obj/machinery/requests_console{ - pixel_x = -30 - }, +/obj/machinery/requests_console/directional/west, /turf/simulated/floor/wood, /area/station/legal/courtroom) "kQB" = ( @@ -62447,9 +62365,7 @@ /area/station/science/toxins/launch) "lfd" = ( /obj/structure/table/glass, -/obj/machinery/requests_console{ - pixel_x = -30 - }, +/obj/machinery/requests_console/directional/west, /obj/machinery/reagentgrinder, /obj/machinery/camera{ c_tag = "Chemistry"; @@ -62883,9 +62799,7 @@ /turf/simulated/floor/plasteel, /area/station/engineering/control) "llW" = ( -/obj/machinery/requests_console{ - pixel_x = -30 - }, +/obj/machinery/requests_console/directional/west, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutralcorner" @@ -63666,9 +63580,7 @@ name = "emergency shower" }, /obj/machinery/atmospherics/pipe/simple/visible/purple, -/obj/machinery/requests_console{ - pixel_x = 30 - }, +/obj/machinery/requests_console/directional/east, /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -65469,9 +65381,7 @@ /obj/structure/chair/comfy/beige{ dir = 8 }, -/obj/machinery/requests_console{ - pixel_x = 30 - }, +/obj/machinery/requests_console/directional/east, /turf/simulated/floor/carpet, /area/station/medical/psych) "moV" = ( @@ -68010,9 +67920,7 @@ }, /area/station/security/brig) "nos" = ( -/obj/machinery/requests_console{ - pixel_y = -30 - }, +/obj/machinery/requests_console/directional/south, /turf/simulated/floor/plasteel{ icon_state = "bar" }, @@ -73621,9 +73529,7 @@ /turf/simulated/floor/plasteel, /area/station/hallway/secondary/entry/east) "pNo" = ( -/obj/machinery/requests_console{ - pixel_y = -30 - }, +/obj/machinery/requests_console/directional/south, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "brown" @@ -74165,9 +74071,7 @@ /obj/item/storage/box/bodybags, /obj/item/clothing/mask/surgical, /obj/item/clothing/gloves/color/latex, -/obj/machinery/requests_console{ - pixel_x = -30 - }, +/obj/machinery/requests_console/directional/west, /obj/machinery/light/small, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -74710,9 +74614,7 @@ pixel_y = 4 }, /obj/item/storage/box, -/obj/machinery/requests_console{ - pixel_x = -30 - }, +/obj/machinery/requests_console/directional/west, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "caution" @@ -76135,9 +76037,7 @@ pixel_x = 4; pixel_y = -3 }, -/obj/machinery/requests_console{ - pixel_y = -30 - }, +/obj/machinery/requests_console/directional/south, /obj/item/stack/sheet/mineral/plasma, /obj/item/stack/sheet/mineral/plasma, /obj/item/stack/sheet/mineral/plasma, @@ -78314,9 +78214,7 @@ /area/station/engineering/atmos/control) "rJh" = ( /obj/structure/rack, -/obj/machinery/requests_console{ - pixel_y = 30 - }, +/obj/machinery/requests_console/directional/north, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -80947,9 +80845,7 @@ /area/station/maintenance/fsmaint) "sOH" = ( /obj/structure/closet/bombcloset, -/obj/machinery/requests_console{ - pixel_x = 30 - }, +/obj/machinery/requests_console/directional/east, /obj/effect/turf_decal/stripes/line{ dir = 4 }, @@ -82098,9 +81994,7 @@ }, /obj/machinery/light, /obj/effect/turf_decal/stripes/line, -/obj/machinery/requests_console{ - pixel_y = -30 - }, +/obj/machinery/requests_console/directional/south, /turf/simulated/floor/plasteel, /area/station/engineering/control) "tmZ" = ( diff --git a/code/game/area/areas/mining_areas.dm b/code/game/area/areas/mining_areas.dm index 91b4a17339a..ffe68fa46fd 100644 --- a/code/game/area/areas/mining_areas.dm +++ b/code/game/area/areas/mining_areas.dm @@ -48,6 +48,8 @@ name = "Mining Station" icon_state = "mining" sound_environment = SOUND_AREA_STANDARD_STATION + request_console_name = "Mining Outpost" + request_console_flags = RC_SUPPLY /area/mine/outpost/airlock name = "Mining Station Airlock" @@ -122,6 +124,9 @@ /area/mine/outpost/quartermaster name = "Mining Station Quartermaster's Office" icon_state = "qm" + request_console_flags = RC_ASSIST | RC_INFO + request_console_name = "Quartermaster's Desk" + request_console_announces = TRUE /area/mine/laborcamp name = "Labor Camp" diff --git a/code/game/machinery/requests_console.dm b/code/game/machinery/requests_console.dm index 19fea24abb2..41b5a28b42a 100644 --- a/code/game/machinery/requests_console.dm +++ b/code/game/machinery/requests_console.dm @@ -399,6 +399,8 @@ GLOBAL_LIST_EMPTY(allRequestConsoles) return TRUE return FALSE +MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/requests_console, 30, 30) + /proc/send_requests_console_message(message, sender, recipient, stamped, verified, priority, obj/item/radio/radio) if(!message) return diff --git a/icons/obj/terminals.dmi b/icons/obj/terminals.dmi index 846889e7773..ceab3368276 100644 Binary files a/icons/obj/terminals.dmi and b/icons/obj/terminals.dmi differ diff --git a/tools/UpdatePaths/Scripts/XXXXX_reqconsole_directionals.txt b/tools/UpdatePaths/Scripts/XXXXX_reqconsole_directionals.txt new file mode 100644 index 00000000000..48624ce860c --- /dev/null +++ b/tools/UpdatePaths/Scripts/XXXXX_reqconsole_directionals.txt @@ -0,0 +1,17 @@ +/obj/machinery/requests_console{department="Security";departmentType=5;pixel_x=30} : /obj/machinery/requests_console/directional/east{department="Security";departmentType=5} +/obj/machinery/requests_console{dir=1;pixel_y=-30} : /obj/machinery/requests_console/directional/south +/obj/machinery/requests_console{dir=4;pixel_x=-30} : /obj/machinery/requests_console/directional/west +/obj/machinery/requests_console{dir=8;pixel_x=30} : /obj/machinery/requests_console/directional/east +/obj/machinery/requests_console{pixel_x=-30} : /obj/machinery/requests_console/directional/west +/obj/machinery/requests_console{pixel_x=-32} : /obj/machinery/requests_console/directional/west +/obj/machinery/requests_console{pixel_x=30} : /obj/machinery/requests_console/directional/east +/obj/machinery/requests_console{pixel_x=32;pixel_y=-32} : /obj/machinery/requests_console/directional/east{pixel_y=-30} +/obj/machinery/requests_console{pixel_x=32;pixel_y=32} : /obj/machinery/requests_console/directional/east{pixel_y=30} +/obj/machinery/requests_console{pixel_x=32} : /obj/machinery/requests_console/directional/east +/obj/machinery/requests_console{pixel_y=-28} : /obj/machinery/requests_console/directional/south +/obj/machinery/requests_console{pixel_y=-29} : /obj/machinery/requests_console/directional/south +/obj/machinery/requests_console{pixel_y=-30} : /obj/machinery/requests_console/directional/south +/obj/machinery/requests_console{pixel_y=-32} : /obj/machinery/requests_console/directional/south +/obj/machinery/requests_console{pixel_y=29} : /obj/machinery/requests_console/directional/north +/obj/machinery/requests_console{pixel_y=30} : /obj/machinery/requests_console/directional/north +/obj/machinery/requests_console{pixel_y=32} : /obj/machinery/requests_console/directional/north