From e59f0e8aeadd0e94265eb712cdf696c544fd009c Mon Sep 17 00:00:00 2001 From: Marm <85680653+ItsMarmite@users.noreply.github.com> Date: Sun, 10 Sep 2023 20:53:05 +0100 Subject: [PATCH] Makes the Quartermaster a Head of Staff (#22133) * remote * more additions * tgui + ssu * map edits * Shut your mug More changes, huds, mugs and icons. * mug time * aaaa * fixes cere edits * should fix it * Update tgui/packages/tgui/interfaces/common/CrewManifest.js Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com> * Update code/game/machinery/suit_storage_unit.dm Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com> * Revert "Update tgui/packages/tgui/interfaces/common/CrewManifest.js" This reverts commit 5de07cba58a96024cc4deba3c5d3bf77dfd7e9ce. * mugs all the way down Fixes locker headset oversight, adds icon for supply management console, new QM mug sprite * more map changes * wow this worked? * Misplaced comma Removes a misplaced comma. Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> * Mr QM's Wild Ride Resolves a number of review comments, including preventing the QM slot being altered by the B/E event, adds a flash to the locker and reverts removal of basic cargo access from the HOP. * Forgot a var name change, I'm gonna cry edition. Renames name to board_name for supply ID computer. Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> * genesis 1:3 Alters light_color of supply management console to brown_orange from light_color_red * Update code/modules/events/bureaucratic_error.dm Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> * another misplaced comma Removes a comms where there should not be one. * saving private ryan Removes plasmacutter, adds mining GPS and crew monitor to QM locker contents. * redone map changes * oop * the last of it * merge time --------- Co-authored-by: GDN Co-authored-by: GDN <96800819+GDNgit@users.noreply.github.com> Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com> Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> --- _maps/map_files/Delta/delta.dmm | 259 +++++++++++++++--- _maps/map_files/MetaStation/MetaStation.dmm | 163 ++++++++--- _maps/map_files/cerestation/cerestation.dmm | 204 +++++++++++++- _maps/map_files/cyberiad/cyberiad.dmm | 175 ++++++++++-- _maps/map_files/generic/Lavaland.dmm | 10 +- code/__DEFINES/machines.dm | 1 + code/controllers/subsystem/SSjobs.dm | 2 +- code/game/gamemodes/revolution/revolution.dm | 2 +- code/game/gamemodes/steal_items.dm | 2 + code/game/jobs/access.dm | 2 +- code/game/jobs/departments.dm | 11 +- code/game/jobs/job/supervisor.dm | 10 +- code/game/jobs/job/support.dm | 22 +- code/game/jobs/job_globals.dm | 6 +- .../game/machinery/computer/buildandrepair.dm | 5 + code/game/machinery/computer/card.dm | 8 + code/game/machinery/suit_storage_unit.dm | 9 + code/game/machinery/tcomms/nttc.dm | 2 +- code/game/objects/items/control_wand.dm | 2 +- .../items/devices/radio/encryptionkey.dm | 7 +- .../objects/items/devices/radio/headset.dm | 7 + .../objects/items/weapons/storage/boxes.dm | 2 +- .../objects/items/weapons/storage/garment.dm | 12 +- .../closets/secure/cargo_lockers.dm | 11 +- code/modules/events/bureaucratic_error.dm | 3 +- .../food_and_drinks/drinks/drinks/mugs.dm | 6 + icons/mob/hud.dmi | Bin 16268 -> 16174 bytes icons/obj/computer.dmi | Bin 140754 -> 141523 bytes icons/obj/mugs.dmi | Bin 9558 -> 9810 bytes strings/sillytips.txt | 2 +- .../tgui/interfaces/common/CrewManifest.js | 12 +- tgui/packages/tgui/public/tgui.bundle.js | 2 +- 32 files changed, 800 insertions(+), 159 deletions(-) diff --git a/_maps/map_files/Delta/delta.dmm b/_maps/map_files/Delta/delta.dmm index 9a67741d36a..85997b76197 100644 --- a/_maps/map_files/Delta/delta.dmm +++ b/_maps/map_files/Delta/delta.dmm @@ -1599,6 +1599,16 @@ icon_state = "arrival" }, /area/station/hallway/secondary/entry) +"anr" = ( +/obj/effect/spawner/window/reinforced/polarized{ + id = "qm" + }, +/obj/structure/cable{ + d2 = 4; + icon_state = "0-4" + }, +/turf/simulated/floor/plating, +/area/station/supply/qm) "ans" = ( /obj/machinery/light{ dir = 1 @@ -14868,8 +14878,24 @@ /area/station/supply/office) "aTz" = ( /obj/structure/table, -/obj/item/clipboard, -/obj/item/toy/figure/crew/qm, +/obj/structure/cable{ + d1 = 1; + d2 = 4; + icon_state = "1-4" + }, +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/structure/cable{ + d1 = 2; + d2 = 4; + icon_state = "2-4" + }, +/obj/machinery/photocopier/faxmachine{ + department = "Quartermaster's Office" + }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "brown" @@ -14878,6 +14904,11 @@ "aTA" = ( /obj/structure/disposalpipe/trunk, /obj/machinery/disposal, +/obj/structure/cable{ + d1 = 2; + d2 = 8; + icon_state = "2-8" + }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "brown" @@ -14900,12 +14931,27 @@ /area/station/supply/qm) "aTC" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on, +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/structure/cable{ + d1 = 2; + d2 = 4; + icon_state = "2-4" + }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "brown" }, /area/station/supply/qm) "aTD" = ( +/obj/structure/cable{ + d1 = 1; + d2 = 8; + icon_state = "1-8" + }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "brown" @@ -15660,6 +15706,11 @@ /area/station/engineering/gravitygenerator) "aVf" = ( /obj/structure/disposalpipe/segment, +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, /turf/simulated/floor/plasteel{ icon_state = "neutralfull" }, @@ -15673,6 +15724,11 @@ /obj/structure/chair/office/dark{ dir = 4 }, +/obj/structure/cable{ + d1 = 2; + d2 = 4; + icon_state = "2-4" + }, /turf/simulated/floor/plasteel{ icon_state = "neutralfull" }, @@ -15681,6 +15737,11 @@ /obj/structure/table/reinforced, /obj/item/flashlight/lamp, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/cable{ + d1 = 1; + d2 = 8; + icon_state = "1-8" + }, /turf/simulated/floor/plasteel{ icon_state = "neutralfull" }, @@ -16443,6 +16504,7 @@ }, /obj/item/paper_bin, /obj/item/pen, +/obj/item/clipboard, /turf/simulated/floor/plasteel{ dir = 5; icon_state = "brown" @@ -16463,6 +16525,11 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/structure/cable{ + d1 = 2; + d2 = 8; + icon_state = "2-8" + }, /turf/simulated/floor/plasteel{ icon_state = "neutralfull" }, @@ -16483,6 +16550,11 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/structure/cable{ + d1 = 1; + d2 = 8; + icon_state = "1-8" + }, /turf/simulated/floor/plasteel{ icon_state = "neutralfull" }, @@ -16520,10 +16592,12 @@ }, /area/station/supply/qm) "aWJ" = ( -/obj/structure/closet/secure_closet/quartermaster, /obj/structure/sign/poster/official/random{ pixel_x = 32 }, +/obj/machinery/computer/card/minor/qm{ + dir = 8 + }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "brown" @@ -17110,6 +17184,11 @@ /obj/structure/chair/office/dark{ dir = 4 }, +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, /turf/simulated/floor/plasteel{ icon_state = "neutralfull" }, @@ -17129,6 +17208,8 @@ }, /obj/item/gps/mining, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/keycard_auth, +/obj/item/toy/figure/crew/qm, /turf/simulated/floor/plasteel{ icon_state = "neutralfull" }, @@ -17770,6 +17851,11 @@ c_tag = "Quartermaster Office"; dir = 1 }, +/obj/structure/cable{ + d1 = 1; + d2 = 4; + icon_state = "1-4" + }, /turf/simulated/floor/plasteel{ icon_state = "brown" }, @@ -17778,11 +17864,26 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 }, +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/structure/cable{ + d1 = 2; + d2 = 8; + icon_state = "2-8" + }, /turf/simulated/floor/plasteel{ icon_state = "brown" }, /area/station/supply/qm) "aZC" = ( +/obj/structure/cable{ + d1 = 2; + d2 = 8; + icon_state = "2-8" + }, /turf/simulated/floor/plasteel{ icon_state = "brown" }, @@ -17791,7 +17892,7 @@ /obj/machinery/light{ dir = 4 }, -/obj/structure/bed/dogbed, +/obj/structure/closet/secure_closet/quartermaster, /turf/simulated/floor/plasteel{ dir = 6; icon_state = "brown" @@ -18582,16 +18683,15 @@ icon_state = "4-8" }, /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/mining/glass{ - name = "Quartermaster"; - req_access_txt = "41" - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/machinery/door/airlock/command/glass, +/obj/effect/mapping_helpers/airlock/autoname, +/obj/effect/mapping_helpers/airlock/access/all/supply/qm, /turf/simulated/floor/plasteel, /area/station/supply/qm) "bbk" = ( @@ -18608,6 +18708,11 @@ }, /obj/machinery/hologram/holopad, /obj/effect/decal/warning_stripes/yellow/hollow, +/obj/structure/cable{ + d1 = 2; + d2 = 8; + icon_state = "2-8" + }, /turf/simulated/floor/plasteel{ icon_state = "neutralfull" }, @@ -21351,7 +21456,11 @@ }, /area/station/hallway/primary/fore) "bhZ" = ( -/obj/structure/filingcabinet/chestdrawer, +/obj/structure/cable{ + d1 = 1; + d2 = 8; + icon_state = "1-8" + }, /turf/simulated/floor/plasteel{ icon_state = "neutralfull" }, @@ -43025,9 +43134,6 @@ /turf/simulated/wall/r_wall, /area/station/command/office/hop) "cdE" = ( -/obj/machinery/computer/supplycomp{ - dir = 4 - }, /turf/simulated/floor/plasteel/dark, /area/station/command/office/hop) "cdF" = ( @@ -43793,9 +43899,6 @@ /turf/simulated/floor/plasteel, /area/station/engineering/control) "cfC" = ( -/obj/machinery/computer/security/mining{ - dir = 4 - }, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -80936,6 +81039,16 @@ /obj/effect/decal/cleanable/cobweb, /turf/simulated/floor/wood, /area/station/maintenance/library) +"eiQ" = ( +/obj/effect/spawner/window/reinforced/polarized{ + id = "qm" + }, +/obj/structure/cable{ + d2 = 8; + icon_state = "0-8" + }, +/turf/simulated/floor/plating, +/area/station/supply/qm) "ejr" = ( /obj/machinery/newscaster/security_unit{ dir = 4; @@ -82401,6 +82514,12 @@ icon_state = "neutralcorner" }, /area/station/public/fitness) +"fOa" = ( +/obj/structure/bed/dogbed, +/turf/simulated/floor/plasteel{ + icon_state = "neutralfull" + }, +/area/station/supply/qm) "fOr" = ( /obj/machinery/economy/vending/cigarette, /obj/structure/disposalpipe/segment{ @@ -85285,6 +85404,17 @@ icon_state = "whitebluecorner" }, /area/station/medical/reception) +"jiG" = ( +/obj/structure/cable{ + d1 = 1; + d2 = 8; + icon_state = "1-8" + }, +/obj/machinery/suit_storage_unit/qm/secure, +/turf/simulated/floor/plasteel{ + icon_state = "neutralfull" + }, +/area/station/supply/qm) "jji" = ( /obj/machinery/door/firedoor, /obj/effect/decal/warning_stripes/yellow, @@ -85350,6 +85480,16 @@ icon_state = "showroomfloor" }, /area/station/medical/surgery/primary) +"jkW" = ( +/obj/effect/spawner/window/reinforced/polarized{ + id = "qm" + }, +/obj/structure/cable{ + d2 = 2; + icon_state = "0-2" + }, +/turf/simulated/floor/plating, +/area/station/supply/qm) "jnp" = ( /obj/structure/sink{ dir = 8; @@ -88086,6 +88226,18 @@ /obj/item/reagent_containers/dropper, /turf/simulated/floor/engine, /area/station/science/explab) +"mPt" = ( +/obj/effect/spawner/window/reinforced/polarized{ + id = "qm" + }, +/obj/structure/cable, +/obj/structure/cable{ + d1 = 1; + d2 = 4; + icon_state = "1-4" + }, +/turf/simulated/floor/plating, +/area/station/supply/qm) "mPT" = ( /obj/effect/decal/warning_stripes/yellow/hollow, /obj/structure/cable{ @@ -88272,7 +88424,7 @@ /obj/structure/cable{ d1 = 2; d2 = 4; - icon_state = "2-4," + icon_state = "2-4" }, /obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel/white, @@ -91356,6 +91508,21 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel/dark, /area/station/legal/courtroom) +"qnz" = ( +/obj/effect/spawner/window/reinforced/polarized{ + id = "qm" + }, +/obj/structure/cable{ + d2 = 4; + icon_state = "0-4" + }, +/obj/structure/cable{ + d1 = 2; + d2 = 4; + icon_state = "2-4" + }, +/turf/simulated/floor/plating, +/area/station/supply/qm) "qpV" = ( /obj/machinery/door/airlock/external{ id_tag = "stationai_door_int"; @@ -91849,6 +92016,17 @@ icon_state = "dark" }, /area/station/security/execution) +"qYf" = ( +/obj/machinery/button/windowtint{ + pixel_x = -28; + id = "qm"; + req_access_txt = "41"; + dir = 4 + }, +/turf/simulated/floor/plasteel{ + icon_state = "neutralfull" + }, +/area/station/supply/qm) "qYC" = ( /obj/item/kirbyplants, /obj/structure/cable{ @@ -93518,6 +93696,18 @@ /obj/effect/decal/warning_stripes/northeast, /turf/simulated/floor/plasteel, /area/station/hallway/secondary/entry) +"sOd" = ( +/obj/effect/spawner/window/reinforced/polarized{ + id = "qm" + }, +/obj/structure/cable, +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/floor/plating, +/area/station/supply/qm) "sOj" = ( /obj/machinery/hologram/holopad, /turf/simulated/floor/plasteel/white, @@ -94497,6 +94687,13 @@ icon_state = "whitepurple" }, /area/station/maintenance/apmaint) +"tRI" = ( +/obj/effect/spawner/window/reinforced/polarized{ + id = "qm" + }, +/obj/structure/cable, +/turf/simulated/floor/plating, +/area/station/supply/qm) "tRM" = ( /obj/structure/cable{ d1 = 4; @@ -143110,12 +143307,12 @@ aQr aCN aKK aRZ -aSa -aSa +anr +anr bbj -aSa -aSa -aSa +qnz +sOd +mPt bfC ben hYQ @@ -143366,13 +143563,13 @@ aBS aEX aBS aKK -aSa +jkW aTz bhZ aWE -aYg +jiG aZv -aSa +eiQ boD bek bfF @@ -143623,7 +143820,7 @@ aBS aEZ aBS aWG -aSa +jkW aTA aVf aWF @@ -144137,13 +144334,13 @@ aDX aSw aQv aKJ -aSa +jkW aTC aVh aWH aYi aZB -aSa +tRI bbi bes bbi @@ -144394,13 +144591,13 @@ aJE aQs aQv aKJ -aSa +jkW aTD -aYg +qYf aWI -aYg +fOa aZC -aSa +tRI aVX beq blC diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm index a43f2c9b960..32efeab10c2 100644 --- a/_maps/map_files/MetaStation/MetaStation.dmm +++ b/_maps/map_files/MetaStation/MetaStation.dmm @@ -5096,16 +5096,22 @@ /obj/machinery/computer/supplycomp{ dir = 1 }, +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 8; + icon_state = "1-8" + }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "brown" }, /area/station/supply/qm) "azO" = ( -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable/yellow{ @@ -5113,6 +5119,7 @@ d2 = 2; icon_state = "1-2" }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel, /area/station/supply/storage) "azP" = ( @@ -8904,14 +8911,6 @@ /turf/simulated/floor/engine, /area/station/engineering/control) "aLP" = ( -/obj/structure/table, -/obj/item/paper_bin/nanotrasen, -/obj/item/folder/yellow, -/obj/item/pen{ - pixel_x = 4; - pixel_y = 4 - }, -/obj/item/pen/red, /obj/machinery/light{ dir = 1 }, @@ -8924,6 +8923,9 @@ name = "north bump"; pixel_y = 24 }, +/obj/machinery/computer/card/minor/qm{ + dir = 0 + }, /turf/simulated/floor/plasteel{ icon_state = "browncorner" }, @@ -8965,11 +8967,11 @@ /turf/simulated/floor/plasteel, /area/station/engineering/hardsuitstorage) "aLS" = ( -/obj/structure/filingcabinet/chestdrawer, /obj/machinery/status_display/supply_display{ pixel_y = 32 }, /obj/machinery/atmospherics/unary/vent_pump/on, +/obj/machinery/suit_storage_unit/qm/secure, /turf/simulated/floor/plasteel{ icon_state = "brown" }, @@ -9399,6 +9401,16 @@ dir = 4 }, /obj/effect/landmark/start/quartermaster, +/obj/structure/cable/yellow{ + d1 = 2; + d2 = 4; + icon_state = "2-4" + }, +/obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, /turf/simulated/floor/plasteel, /area/station/supply/qm) "aMX" = ( @@ -9417,7 +9429,15 @@ /turf/simulated/floor/plasteel, /area/station/engineering/control) "aMY" = ( -/obj/effect/spawner/window/reinforced, +/obj/effect/spawner/window/reinforced/polarized{ + id = "qm" + }, +/obj/structure/cable/yellow, +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, /turf/simulated/floor/plating, /area/station/supply/qm) "aMZ" = ( @@ -9428,6 +9448,11 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 }, +/obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, /turf/simulated/floor/plasteel, /area/station/supply/qm) "aNa" = ( @@ -9449,9 +9474,20 @@ }, /area/station/supply/office) "aNb" = ( -/obj/machinery/computer/security/mining{ - dir = 4 +/obj/structure/table, +/obj/item/pen/red, +/obj/item/pen{ + pixel_x = 4; + pixel_y = 4 }, +/obj/item/folder/yellow, +/obj/item/paper_bin/nanotrasen, +/obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/keycard_auth, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "brown" @@ -9782,6 +9818,11 @@ name = "east bump"; pixel_x = 28 }, +/obj/structure/cable/yellow{ + d1 = 2; + d2 = 8; + icon_state = "2-8" + }, /turf/simulated/floor/plasteel, /area/station/supply/qm) "aOa" = ( @@ -10181,6 +10222,9 @@ name = "Cargo Requests Console"; pixel_y = 30 }, +/obj/machinery/photocopier/faxmachine{ + department = "Quartermaster's Office" + }, /turf/simulated/floor/plasteel{ icon_state = "brown" }, @@ -10304,7 +10348,15 @@ /obj/machinery/light_switch{ dir = 8; name = "east bump"; - pixel_x = 24 + pixel_x = 24; + pixel_y = -5 + }, +/obj/machinery/button/windowtint{ + pixel_x = 24; + id = "qm"; + req_access_txt = "41"; + dir = 8; + pixel_y = 5 }, /turf/simulated/floor/plasteel, /area/station/supply/qm) @@ -10541,9 +10593,9 @@ icon_state = "1-2" }, /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/mining/glass, /obj/effect/mapping_helpers/airlock/autoname, /obj/effect/mapping_helpers/airlock/access/all/supply/qm, +/obj/machinery/door/airlock/command/glass, /turf/simulated/floor/plasteel, /area/station/supply/qm) "aQI" = ( @@ -18373,12 +18425,12 @@ /turf/simulated/wall/r_wall, /area/station/command/bridge) "bkX" = ( -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" +/obj/effect/spawner/window/reinforced/polarized{ + id = "qm" }, -/turf/simulated/floor/plasteel, -/area/station/supply/storage) +/obj/structure/cable/yellow, +/turf/simulated/floor/plating, +/area/station/supply/qm) "bkY" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/visible{ @@ -65169,6 +65221,15 @@ /obj/effect/turf_decal/stripes/line, /turf/simulated/floor/engine, /area/station/engineering/control) +"kBn" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/item/kirbyplants{ + icon_state = "plant-21" + }, +/turf/simulated/floor/plasteel, +/area/station/supply/storage) "kBs" = ( /obj/machinery/alarm{ name = "north bump"; @@ -72311,6 +72372,10 @@ d2 = 2; icon_state = "1-2" }, +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" + }, /turf/simulated/floor/plasteel, /area/station/supply/storage) "nLV" = ( @@ -72518,6 +72583,20 @@ icon_state = "grimy" }, /area/station/service/chapel/office) +"nSQ" = ( +/obj/machinery/computer/security/mining{ + dir = 1 + }, +/obj/structure/cable/yellow{ + d1 = 2; + d2 = 4; + icon_state = "2-4" + }, +/turf/simulated/floor/plasteel{ + dir = 4; + icon_state = "browncorner" + }, +/area/station/supply/qm) "nTF" = ( /obj/structure/cable/yellow{ d1 = 1; @@ -76247,14 +76326,11 @@ }, /area/station/science/xenobiology) "pNK" = ( -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" +/obj/effect/spawner/window/reinforced/polarized{ + id = "qm" }, -/obj/item/kirbyplants{ - icon_state = "plant-21" - }, -/turf/simulated/floor/plasteel, +/obj/structure/cable/yellow, +/turf/simulated/floor/plating, /area/station/supply/storage) "pOG" = ( /obj/machinery/door/airlock/maintenance, @@ -91561,6 +91637,21 @@ icon_state = "caution" }, /area/station/engineering/atmos) +"xuz" = ( +/obj/effect/spawner/window/reinforced/polarized{ + id = "qm" + }, +/obj/structure/cable/yellow{ + d2 = 4; + icon_state = "0-4" + }, +/obj/structure/cable/yellow{ + d1 = 2; + d2 = 4; + icon_state = "2-4" + }, +/turf/simulated/floor/plating, +/area/station/supply/qm) "xuA" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -111444,10 +111535,10 @@ bhm aMS aVl aVl -aMY +xuz aMY pNK -bkX +aYl aKi aRo cjv @@ -111702,9 +111793,9 @@ aHu aVl aLP aNb -aMY -aMY -aYl +nSQ +bkX +kBn aWj aRo hjj @@ -111960,7 +112051,7 @@ aOB aPw aMW azN -aMY +bkX eEy uxV aOu diff --git a/_maps/map_files/cerestation/cerestation.dmm b/_maps/map_files/cerestation/cerestation.dmm index c35ebc3c369..f828a98aa67 100644 --- a/_maps/map_files/cerestation/cerestation.dmm +++ b/_maps/map_files/cerestation/cerestation.dmm @@ -374,6 +374,11 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 }, +/obj/structure/cable/orange{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, /turf/simulated/floor/plasteel, /area/station/supply/qm) "acj" = ( @@ -2228,7 +2233,9 @@ /turf/simulated/floor/plating, /area/station/maintenance/disposal/north) "ann" = ( -/obj/structure/closet/firecloset/full, +/obj/machinery/computer/card/minor/qm{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 10; icon_state = "brown" @@ -6468,6 +6475,11 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/structure/cable/orange{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, /turf/simulated/floor/plasteel{ icon_state = "darkbrown" }, @@ -6754,6 +6766,11 @@ /obj/effect/spawner/window/reinforced, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/cable/orange{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, /turf/simulated/floor/plating, /area/station/supply/office) "aPL" = ( @@ -6873,6 +6890,11 @@ dir = 5 }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/structure/cable/orange{ + d1 = 1; + d2 = 4; + icon_state = "1-4" + }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "darkbrown" @@ -7949,6 +7971,11 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/cable/orange{ + d1 = 1; + d2 = 8; + icon_state = "1-8" + }, /turf/simulated/floor/plasteel, /area/station/supply/office) "aWl" = ( @@ -23471,6 +23498,11 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 8 }, +/obj/structure/cable/orange{ + d1 = 2; + d2 = 4; + icon_state = "2-4" + }, /turf/simulated/floor/plasteel{ icon_state = "darkbrown" }, @@ -23500,6 +23532,11 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/structure/cable/orange{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, /turf/simulated/floor/plasteel{ icon_state = "darkbrown" }, @@ -23514,6 +23551,11 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/structure/cable/orange{ + d1 = 2; + d2 = 8; + icon_state = "2-8" + }, /turf/simulated/floor/plasteel{ icon_state = "darkbrown" }, @@ -23981,6 +24023,12 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/cable/orange, +/obj/structure/cable/orange{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, /turf/simulated/floor/plating, /area/station/supply/qm) "ctC" = ( @@ -25006,8 +25054,8 @@ pixel_y = 24; name = "north bump" }, -/obj/item/kirbyplants{ - icon_state = "plant-22" +/obj/machinery/keycard_auth{ + pixel_x = -28 }, /turf/simulated/floor/plasteel{ dir = 9; @@ -25046,6 +25094,21 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 }, +/obj/structure/cable/orange{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/structure/cable/orange{ + d1 = 1; + d2 = 8; + icon_state = "1-8" + }, +/obj/structure/cable/orange{ + d1 = 1; + d2 = 4; + icon_state = "1-4" + }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "brown" @@ -25117,6 +25180,11 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 }, +/obj/structure/cable/orange{ + d1 = 2; + d2 = 8; + icon_state = "2-8" + }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "darkbrown" @@ -25316,6 +25384,11 @@ /obj/machinery/hologram/holopad, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/cable/orange{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -25656,7 +25729,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/fore2) "cDS" = ( -/obj/structure/closet/secure_closet/quartermaster, +/obj/machinery/suit_storage_unit/qm/secure, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "brown" @@ -25722,6 +25795,11 @@ dir = 8 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/cable/orange{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -26476,6 +26554,11 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/structure/cable/orange{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, /turf/simulated/floor/plasteel{ icon_state = "darkbrown" }, @@ -30133,8 +30216,9 @@ /area/station/hallway/primary/fore) "cWB" = ( /obj/structure/table, -/obj/machinery/cell_charger, -/obj/item/clipboard, +/obj/machinery/photocopier/faxmachine{ + department = "Quartermaster's Office" + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "brown" @@ -31692,6 +31776,11 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/structure/cable/orange{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, /turf/simulated/floor/plasteel{ icon_state = "darkbrown" }, @@ -32025,6 +32114,11 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4 }, +/obj/structure/cable/orange{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "browncorner" @@ -37797,14 +37891,13 @@ /area/station/maintenance/starboard) "epp" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/mining/glass{ - name = "Quartermaster"; - req_access_txt = "41" - }, /obj/effect/mapping_helpers/airlock/polarized{ id = "qm" }, /obj/structure/disposalpipe/segment, +/obj/machinery/door/airlock/command/glass, +/obj/effect/mapping_helpers/airlock/autoname, +/obj/effect/mapping_helpers/airlock/access/all/supply/qm, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "darkbrownfull" @@ -40471,6 +40564,11 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 8 }, +/obj/structure/cable/orange{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, /turf/simulated/floor/plasteel, /area/station/supply/office) "fvM" = ( @@ -49882,6 +49980,7 @@ pixel_x = -28; name = "custom placement" }, +/obj/structure/closet/crate, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -54233,6 +54332,10 @@ /obj/effect/spawner/window/reinforced/polarized{ id = "qm" }, +/obj/structure/cable/orange{ + d2 = 2; + icon_state = "0-2" + }, /turf/simulated/floor/plating, /area/station/supply/qm) "kdf" = ( @@ -56748,6 +56851,7 @@ dir = 9 }, /obj/structure/disposalpipe/segment, +/obj/machinery/cell_charger, /turf/simulated/floor/plasteel, /area/station/supply/qm) "kRY" = ( @@ -57917,6 +58021,11 @@ name = "Cargo Bay"; req_access_txt = "50" }, +/obj/structure/cable/orange{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "darkbrownfull" @@ -63715,6 +63824,11 @@ pixel_y = -24; name = "south bump" }, +/obj/structure/cable/orange{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, /turf/simulated/floor/plasteel{ icon_state = "darkbrown" }, @@ -66810,6 +66924,10 @@ /obj/effect/spawner/window/reinforced/polarized{ id = "qm" }, +/obj/structure/cable/orange{ + d2 = 8; + icon_state = "0-8" + }, /turf/simulated/floor/plating, /area/station/supply/office) "omg" = ( @@ -67229,6 +67347,13 @@ /obj/effect/spawner/window/reinforced, /turf/simulated/floor/plating, /area/station/security/prison/cell_block/A) +"ore" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/closet/firecloset/full, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/station/supply/storage) "org" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/disposalpipe/segment, @@ -67240,6 +67365,11 @@ "orr" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/cable/orange{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, /turf/simulated/floor/plasteel, /area/station/supply/office) "orw" = ( @@ -71187,6 +71317,11 @@ }, /area/station/security/warden) "pJm" = ( +/obj/structure/cable/orange{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, /turf/simulated/floor/plasteel, /area/station/supply/qm) "pJG" = ( @@ -77331,6 +77466,11 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/structure/cable/orange{ + d1 = 1; + d2 = 4; + icon_state = "1-4" + }, /turf/simulated/floor/plasteel{ icon_state = "brown" }, @@ -83082,6 +83222,12 @@ }, /area/station/medical/medbay) "tLh" = ( +/obj/structure/closet/secure_closet/quartermaster, +/obj/structure/cable/orange{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, /turf/simulated/floor/plasteel{ dir = 5; icon_state = "brown" @@ -86068,6 +86214,11 @@ dir = 6 }, /obj/structure/disposalpipe/segment, +/obj/structure/cable/orange{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "brown" @@ -87583,6 +87734,11 @@ }, /area/station/hallway/primary/aft/east) "vnl" = ( +/obj/structure/cable/orange{ + d1 = 1; + d2 = 4; + icon_state = "1-4" + }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "brown" @@ -88783,6 +88939,25 @@ icon_state = "white" }, /area/station/medical/medbay) +"vEB" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/cable/orange{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/simulated/floor/plasteel{ + icon_state = "darkbrown" + }, +/area/station/supply/office) "vED" = ( /obj/effect/spawner/window/reinforced, /obj/machinery/door/poddoor/preopen{ @@ -90700,6 +90875,11 @@ /obj/structure/disposalpipe/trunk{ dir = 8 }, +/obj/structure/cable/orange{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, /turf/simulated/floor/plasteel{ dir = 6; icon_state = "brown" @@ -144545,7 +144725,7 @@ aDM alk aYU xEK -bkX +ore bro bkX iHZ @@ -147639,7 +147819,7 @@ rNK rNK any rJE -scI +vEB cut cAj hZJ diff --git a/_maps/map_files/cyberiad/cyberiad.dmm b/_maps/map_files/cyberiad/cyberiad.dmm index 2ed3edc5d0d..8c7890d3a9f 100644 --- a/_maps/map_files/cyberiad/cyberiad.dmm +++ b/_maps/map_files/cyberiad/cyberiad.dmm @@ -35184,10 +35184,10 @@ }, /area/station/science/robotics) "bRo" = ( -/obj/structure/closet/secure_closet/quartermaster, /obj/machinery/camera{ c_tag = "Quartermaster's Office" }, +/obj/machinery/computer/card/minor/qm, /turf/simulated/floor/carpet, /area/station/supply/qm) "bRp" = ( @@ -35337,6 +35337,11 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 }, +/obj/structure/cable{ + d1 = 2; + d2 = 4; + icon_state = "2-4" + }, /turf/simulated/floor/carpet, /area/station/supply/qm) "bRY" = ( @@ -36004,6 +36009,16 @@ /area/station/supply/storage) "bTs" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/cable{ + d1 = 2; + d2 = 4; + icon_state = "2-4" + }, +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, /turf/simulated/floor/carpet, /area/station/supply/qm) "bTu" = ( @@ -36160,9 +36175,11 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/pdapainter, -/turf/simulated/floor/carpet, -/area/station/command/office/hop) +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "brown" + }, +/area/station/supply/qm) "bTL" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ @@ -36775,6 +36792,11 @@ pixel_x = 24; pixel_y = -5 }, +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, /turf/simulated/floor/carpet, /area/station/supply/qm) "bVq" = ( @@ -37430,9 +37452,7 @@ /obj/machinery/keycard_auth{ pixel_x = -24 }, -/obj/machinery/computer/security/mining{ - dir = 4 - }, +/obj/machinery/pdapainter, /turf/simulated/floor/plasteel{ dir = 9; icon_state = "blue" @@ -37467,7 +37487,14 @@ /area/station/supply/storage) "bXf" = ( /obj/structure/table, -/obj/item/flashlight/lamp/green, +/obj/structure/cable{ + d1 = 2; + d2 = 8; + icon_state = "2-8" + }, +/obj/machinery/keycard_auth{ + pixel_y = -28 + }, /turf/simulated/floor/carpet, /area/station/supply/qm) "bXh" = ( @@ -38027,6 +38054,16 @@ }, /obj/item/paper_bin, /obj/item/pen, +/obj/structure/cable{ + d1 = 2; + d2 = 8; + icon_state = "2-8" + }, +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, /turf/simulated/floor/carpet, /area/station/supply/qm) "bYs" = ( @@ -38162,6 +38199,7 @@ /area/station/supply/office) "bYL" = ( /obj/effect/spawner/window/reinforced, +/obj/structure/cable, /turf/simulated/floor/plating, /area/station/supply/qm) "bYM" = ( @@ -41536,6 +41574,16 @@ /area/station/supply/miningdock) "ciu" = ( /obj/machinery/atmospherics/unary/vent_pump/on, +/obj/structure/cable{ + d1 = 2; + d2 = 4; + icon_state = "2-4" + }, +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, /turf/simulated/floor/plasteel, /area/station/supply/qm) "ciy" = ( @@ -64376,14 +64424,13 @@ /turf/simulated/floor/plating, /area/station/maintenance/apmaint) "fnX" = ( -/obj/machinery/door/airlock/mining/glass{ - name = "Quartermaster"; - req_access_txt = "41" - }, /obj/effect/mapping_helpers/airlock/polarized{ id = "qm" }, /obj/machinery/door/firedoor, +/obj/effect/mapping_helpers/airlock/access/all/supply/qm, +/obj/effect/mapping_helpers/airlock/autoname, +/obj/machinery/door/airlock/command/glass, /turf/simulated/floor/plasteel, /area/station/supply/qm) "fog" = ( @@ -64676,6 +64723,16 @@ }, /turf/simulated/floor/plasteel, /area/station/engineering/atmos/control) +"fxC" = ( +/obj/effect/spawner/window/reinforced/polarized{ + id = "qm" + }, +/obj/structure/cable{ + d2 = 8; + icon_state = "0-8" + }, +/turf/simulated/floor/plating, +/area/station/supply/qm) "fxD" = ( /obj/machinery/camera{ c_tag = "Research Access"; @@ -65298,6 +65355,11 @@ /area/station/command/office/rd) "fPF" = ( /obj/structure/filingcabinet, +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, /turf/simulated/floor/plasteel{ icon_state = "brown" }, @@ -68196,7 +68258,6 @@ }, /area/station/medical/surgery) "hyR" = ( -/obj/structure/table, /obj/item/toy/figure/crew/cargotech, /obj/item/cartridge/quartermaster, /obj/item/cartridge/quartermaster{ @@ -68207,6 +68268,17 @@ pixel_x = 6; pixel_y = 5 }, +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/structure/closet/secure_closet/quartermaster, +/obj/item/toy/figure/crew/qm, +/obj/item/coin/silver{ + pixel_y = 5; + pixel_x = 3 + }, /turf/simulated/floor/plasteel{ icon_state = "brown" }, @@ -70635,6 +70707,10 @@ /obj/effect/spawner/window/reinforced/polarized{ id = "qm" }, +/obj/structure/cable{ + d2 = 4; + icon_state = "0-4" + }, /turf/simulated/floor/plating, /area/station/supply/qm) "jdz" = ( @@ -72269,6 +72345,11 @@ name = "east bump"; pixel_x = 28 }, +/obj/structure/cable{ + d1 = 1; + d2 = 8; + icon_state = "1-8" + }, /turf/simulated/floor/plasteel{ dir = 5; icon_state = "brown" @@ -75502,10 +75583,6 @@ /turf/simulated/floor/bluegrid, /area/station/telecomms/chamber) "mkM" = ( -/obj/machinery/door/airlock/mining/glass{ - name = "Quartermaster"; - req_access_txt = "41" - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -75524,6 +75601,9 @@ id = "qm" }, /obj/machinery/door/firedoor, +/obj/effect/mapping_helpers/airlock/access/all/supply/qm, +/obj/effect/mapping_helpers/airlock/autoname, +/obj/machinery/door/airlock/command/glass, /turf/simulated/floor/plasteel, /area/station/supply/qm) "mlv" = ( @@ -77391,6 +77471,17 @@ pixel_x = 4; pixel_y = -4 }, +/obj/structure/cable{ + d1 = 2; + d2 = 8; + icon_state = "2-8" + }, +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/item/flashlight/lamp/green, /turf/simulated/floor/carpet, /area/station/supply/qm) "nBI" = ( @@ -81703,6 +81794,16 @@ d2 = 2; icon_state = "1-2" }, +/obj/structure/cable{ + d1 = 2; + d2 = 4; + icon_state = "2-4" + }, +/obj/structure/cable{ + d1 = 2; + d2 = 8; + icon_state = "2-8" + }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "browncorner" @@ -85367,6 +85468,11 @@ d2 = 4; icon_state = "1-4" }, +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, /turf/simulated/floor/plasteel, /area/station/supply/qm) "sCW" = ( @@ -86850,6 +86956,11 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 }, +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, /turf/simulated/floor/plasteel, /area/station/supply/qm) "twu" = ( @@ -87887,12 +87998,10 @@ name = "west bump"; pixel_x = -28 }, -/obj/structure/table, -/obj/item/coin/silver{ - pixel_y = 5; - pixel_x = 3 +/obj/machinery/photocopier/faxmachine{ + department = "Quartermaster's Office" }, -/obj/item/toy/figure/crew/qm, +/obj/structure/table, /turf/simulated/floor/plasteel{ dir = 10; icon_state = "brown" @@ -89839,7 +89948,12 @@ /turf/simulated/floor/wood, /area/station/maintenance/aft) "vnZ" = ( -/obj/item/kirbyplants, +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/suit_storage_unit/qm/secure, /turf/simulated/floor/plasteel{ dir = 5; icon_state = "brown" @@ -92825,6 +92939,11 @@ d2 = 4; icon_state = "0-4" }, +/obj/structure/cable{ + d1 = 1; + d2 = 4; + icon_state = "1-4" + }, /turf/simulated/floor/plasteel{ dir = 9; icon_state = "brown" @@ -115133,7 +115252,7 @@ bXf bYr nBz xoE -nxg +bTK nxg tZo bYM @@ -115900,8 +116019,8 @@ bWO bKB bYM bYM -jdi -jdi +fxC +fxC bYM bYM vnZ @@ -116161,7 +116280,7 @@ bVr bWW bYG bzJ -jdi +fxC mkM bYM bYM @@ -121039,7 +121158,7 @@ bMG bOC bQl bVc -bTK +bTD bVy bWZ bYV diff --git a/_maps/map_files/generic/Lavaland.dmm b/_maps/map_files/generic/Lavaland.dmm index fbe5798597d..2c927a4b437 100644 --- a/_maps/map_files/generic/Lavaland.dmm +++ b/_maps/map_files/generic/Lavaland.dmm @@ -3078,10 +3078,6 @@ }, /area/mine/sleeper) "gh" = ( -/obj/machinery/door/airlock/maintenance{ - name = "Mining Station Communications"; - req_access_txt = "48" - }, /obj/structure/fans/tiny, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -3095,6 +3091,12 @@ d2 = 8; icon_state = "4-8" }, +/obj/machinery/door/airlock/maintenance{ + name = "Mining Station Communications"; + req_access_txt = null + }, +/obj/effect/mapping_helpers/airlock/access/all/supply/qm, +/obj/effect/mapping_helpers/airlock/autoname, /turf/simulated/floor/plasteel/dark, /area/mine/comms) "gi" = ( diff --git a/code/__DEFINES/machines.dm b/code/__DEFINES/machines.dm index 77b25e56917..f7b7790b714 100644 --- a/code/__DEFINES/machines.dm +++ b/code/__DEFINES/machines.dm @@ -17,6 +17,7 @@ #define TARGET_DEPT_MED 3 #define TARGET_DEPT_SCI 4 #define TARGET_DEPT_ENG 5 +#define TARGET_DEPT_SUP 6 // These are used by supermatter and supermatter monitor program, mostly for UI updating purposes. Higher should always be worse! // These are warning defines, they should trigger before the state, not after. diff --git a/code/controllers/subsystem/SSjobs.dm b/code/controllers/subsystem/SSjobs.dm index 0d281a3e062..7ba5195c2a4 100644 --- a/code/controllers/subsystem/SSjobs.dm +++ b/code/controllers/subsystem/SSjobs.dm @@ -625,7 +625,7 @@ SUBSYSTEM_DEF(jobs) /datum/controller/subsystem/jobs/proc/announce_department_accounts(users_departments, mob/living/H, datum/job/job) var/remembered_info = "" for(var/datum/station_department/department as anything in users_departments) - if(job.title != department.head_of_staff && job.title != "Quartermaster") + if(job.title != department.head_of_staff) continue var/datum/money_account/department_account = department.department_account if(!department_account) diff --git a/code/game/gamemodes/revolution/revolution.dm b/code/game/gamemodes/revolution/revolution.dm index 1bcb2c2ed5f..30b841c9ccb 100644 --- a/code/game/gamemodes/revolution/revolution.dm +++ b/code/game/gamemodes/revolution/revolution.dm @@ -30,7 +30,7 @@ /////////////////////////// /datum/game_mode/revolution/announce() to_chat(world, "The current game mode is - Revolution!") - to_chat(world, "Some crewmembers are attempting to start a revolution!
\nRevolutionaries - Kill the Captain, HoP, HoS, CE, RD and CMO. Convert other crewmembers (excluding the heads of staff, and security officers) to your cause by flashing them. Protect your leaders.
\nPersonnel - Protect the heads of staff. Kill the leaders of the revolution, and brainwash the other revolutionaries (by beating them in the head).") + to_chat(world, "Some crewmembers are attempting to start a revolution!
\nRevolutionaries - Kill the Captain, HoP, HoS, CE, QM, RD and CMO. Convert other crewmembers (excluding the heads of staff, and security officers) to your cause by flashing them. Protect your leaders.
\nPersonnel - Protect the heads of staff. Kill the leaders of the revolution, and brainwash the other revolutionaries (by beating them in the head).") /////////////////////////////////////////////////////////////////////////////// diff --git a/code/game/gamemodes/steal_items.dm b/code/game/gamemodes/steal_items.dm index f5b02e2ffb2..7e0d4788016 100644 --- a/code/game/gamemodes/steal_items.dm +++ b/code/game/gamemodes/steal_items.dm @@ -128,6 +128,7 @@ name = "any set of secret documents of any organization" typepath = /obj/item/documents //Any set of secret documents. Doesn't have to be NT's location_override = "the Vault" + protected_jobs = list("Quartermaster") /datum/theft_objective/hypospray name = "the chief medical officer's advanced hypospray" @@ -157,6 +158,7 @@ typepath = /obj/item/nuke_core/plutonium location_override = "the Vault. You can use the box and instructions provided to remove the core, with some extra tools" special_equipment = /obj/item/storage/box/syndie_kit/nuke + protected_jobs = list("Quartermaster") /datum/theft_objective/number var/min=0 diff --git a/code/game/jobs/access.dm b/code/game/jobs/access.dm index 5fea2ae2846..51f378e2138 100644 --- a/code/game/jobs/access.dm +++ b/code/game/jobs/access.dm @@ -164,7 +164,7 @@ if(REGION_ENGINEERING) //engineering and maintenance return list(ACCESS_CONSTRUCTION, ACCESS_MAINT_TUNNELS, ACCESS_ENGINE, ACCESS_ENGINE_EQUIP, ACCESS_EXTERNAL_AIRLOCKS, ACCESS_TECH_STORAGE, ACCESS_ATMOSPHERICS, ACCESS_MINISAT, ACCESS_CE) if(REGION_SUPPLY) //supply - return list(ACCESS_MAILSORTING, ACCESS_MINING, ACCESS_MINING_STATION, ACCESS_MINERAL_STOREROOM, ACCESS_CARGO, ACCESS_QM) + return list(ACCESS_MAILSORTING, ACCESS_MINING, ACCESS_MINING_STATION, ACCESS_MINERAL_STOREROOM, ACCESS_CARGO, ACCESS_QM, ACCESS_HEADS_VAULT) if(REGION_COMMAND) //command return list(ACCESS_HEADS, ACCESS_RC_ANNOUNCE, ACCESS_KEYCARD_AUTH, ACCESS_CHANGE_IDS, ACCESS_AI_UPLOAD, ACCESS_TELEPORTER, ACCESS_EVA, ACCESS_TCOMSAT, ACCESS_EXPEDITION, ACCESS_ALL_PERSONAL_LOCKERS, ACCESS_HEADS_VAULT, ACCESS_BLUESHIELD, ACCESS_NTREP, ACCESS_HOP, ACCESS_CAPTAIN) if(REGION_CENTCOMM) //because why the heck not diff --git a/code/game/jobs/departments.dm b/code/game/jobs/departments.dm index df89249bc80..43a562d559b 100644 --- a/code/game/jobs/departments.dm +++ b/code/game/jobs/departments.dm @@ -71,7 +71,8 @@ "Chief Engineer", "Research Director", "Chief Medical Officer", - "Nanotrasen Representative" + "Nanotrasen Representative", + "Quartermaster" ) head_of_staff = "Captain" @@ -122,9 +123,6 @@ "Chef", "Janitor", "Librarian", - "Quartermaster", - "Cargo Technician", - "Shaft Miner", "Internal Affairs Agent", "Chaplain", "Clown", @@ -142,15 +140,14 @@ account_starting_balance = DEPARTMENT_BALANCE_LOW account_base_pay = DEPARTMENT_BASE_PAY_LOW - account_access = list(ACCESS_HOP, ACCESS_QM, ACCESS_CARGO) //Supply account is a lot less "secure", CT's need to access it aswell on the supply comp + account_access = list(ACCESS_QM, ACCESS_CARGO) //Supply account is a lot less "secure", CT's need to access it aswell on the supply comp department_roles = list( - "Head of Personnel", "Quartermaster", "Cargo Technician", "Shaft Miner", "Spelunker" ) - head_of_staff = "Head of Personnel" + head_of_staff = "Quartermaster" /datum/station_department/engineering department_name = DEPARTMENT_ENGINEERING diff --git a/code/game/jobs/job/supervisor.dm b/code/game/jobs/job/supervisor.dm index f340aa09caa..585325b5dd0 100644 --- a/code/game/jobs/job/supervisor.dm +++ b/code/game/jobs/job/supervisor.dm @@ -69,18 +69,18 @@ is_command = 1 minimal_player_age = 21 department_account_access = TRUE - exp_map = list(EXP_TYPE_COMMAND = 1200) + exp_map = list(EXP_TYPE_SERVICE = 1200) access = list(ACCESS_SECURITY, ACCESS_SEC_DOORS, ACCESS_BRIG, ACCESS_COURT, ACCESS_FORENSICS_LOCKERS, ACCESS_MEDICAL, ACCESS_ENGINE, ACCESS_CHANGE_IDS, ACCESS_AI_UPLOAD, ACCESS_EVA, ACCESS_HEADS, ACCESS_ALL_PERSONAL_LOCKERS, ACCESS_MAINT_TUNNELS, ACCESS_BAR, ACCESS_JANITOR, ACCESS_CONSTRUCTION, ACCESS_MORGUE, - ACCESS_CREMATORIUM, ACCESS_KITCHEN, ACCESS_CARGO, ACCESS_CARGO_BOT, ACCESS_MAILSORTING, ACCESS_QM, ACCESS_HYDROPONICS, ACCESS_LAWYER, - ACCESS_THEATRE, ACCESS_CHAPEL_OFFICE, ACCESS_LIBRARY, ACCESS_RESEARCH, ACCESS_MINING, ACCESS_HEADS_VAULT, ACCESS_MINING_STATION, + ACCESS_CREMATORIUM, ACCESS_KITCHEN, ACCESS_HYDROPONICS, ACCESS_LAWYER, + ACCESS_THEATRE, ACCESS_CHAPEL_OFFICE, ACCESS_LIBRARY, ACCESS_RESEARCH, ACCESS_HEADS_VAULT, ACCESS_CARGO, ACCESS_CLOWN, ACCESS_MIME, ACCESS_HOP, ACCESS_RC_ANNOUNCE, ACCESS_KEYCARD_AUTH, ACCESS_EXPEDITION, ACCESS_WEAPONS, ACCESS_MINERAL_STOREROOM) minimal_access = list(ACCESS_SECURITY, ACCESS_SEC_DOORS, ACCESS_BRIG, ACCESS_COURT, ACCESS_MEDICAL, ACCESS_ENGINE, ACCESS_CHANGE_IDS, ACCESS_AI_UPLOAD, ACCESS_EVA, ACCESS_HEADS, ACCESS_ALL_PERSONAL_LOCKERS, ACCESS_MAINT_TUNNELS, ACCESS_BAR, ACCESS_JANITOR, ACCESS_CONSTRUCTION, ACCESS_MORGUE, - ACCESS_CREMATORIUM, ACCESS_KITCHEN, ACCESS_CARGO, ACCESS_CARGO_BOT, ACCESS_MAILSORTING, ACCESS_QM, ACCESS_HYDROPONICS, ACCESS_LAWYER, - ACCESS_THEATRE, ACCESS_CHAPEL_OFFICE, ACCESS_LIBRARY, ACCESS_RESEARCH, ACCESS_MINING, ACCESS_HEADS_VAULT, ACCESS_MINING_STATION, + ACCESS_CREMATORIUM, ACCESS_KITCHEN, ACCESS_HYDROPONICS, ACCESS_LAWYER, + ACCESS_THEATRE, ACCESS_CHAPEL_OFFICE, ACCESS_LIBRARY, ACCESS_RESEARCH, ACCESS_HEADS_VAULT, ACCESS_CARGO, ACCESS_CLOWN, ACCESS_MIME, ACCESS_HOP, ACCESS_RC_ANNOUNCE, ACCESS_KEYCARD_AUTH, ACCESS_EXPEDITION, ACCESS_WEAPONS, ACCESS_MINERAL_STOREROOM) blacklisted_disabilities = list(DISABILITY_FLAG_BLIND, DISABILITY_FLAG_DEAF, DISABILITY_FLAG_MUTE, DISABILITY_FLAG_DIZZY) outfit = /datum/outfit/job/hop diff --git a/code/game/jobs/job/support.dm b/code/game/jobs/job/support.dm index 1564fdc46be..eaef20e4fa9 100644 --- a/code/game/jobs/job/support.dm +++ b/code/game/jobs/job/support.dm @@ -6,13 +6,15 @@ total_positions = 1 spawn_positions = 1 is_supply = 1 - supervisors = "the head of personnel" - department_head = list("Head of Personnel") + supervisors = "the captain" + department_head = list("Captain") department_account_access = TRUE selection_color = "#e2c59d" - access = list(ACCESS_MAINT_TUNNELS, ACCESS_MAILSORTING, ACCESS_CARGO, ACCESS_CARGO_BOT, ACCESS_QM, ACCESS_MINT, ACCESS_MINING, ACCESS_MINING_STATION, ACCESS_MINERAL_STOREROOM) - minimal_access = list(ACCESS_MAINT_TUNNELS, ACCESS_MAILSORTING, ACCESS_CARGO, ACCESS_CARGO_BOT, ACCESS_QM, ACCESS_MINT, ACCESS_MINING, ACCESS_MINING_STATION, ACCESS_MINERAL_STOREROOM) + access = list(ACCESS_MAINT_TUNNELS, ACCESS_MAILSORTING, ACCESS_CARGO, ACCESS_CARGO_BOT, ACCESS_QM, ACCESS_MINT, ACCESS_MINING, ACCESS_MINING_STATION, ACCESS_MINERAL_STOREROOM, ACCESS_HEADS, ACCESS_RC_ANNOUNCE, ACCESS_KEYCARD_AUTH, ACCESS_SEC_DOORS, ACCESS_HEADS_VAULT) + minimal_access = list(ACCESS_MAINT_TUNNELS, ACCESS_MAILSORTING, ACCESS_CARGO, ACCESS_CARGO_BOT, ACCESS_QM, ACCESS_MINT, ACCESS_MINING, ACCESS_MINING_STATION, ACCESS_MINERAL_STOREROOM, ACCESS_HEADS, ACCESS_RC_ANNOUNCE, ACCESS_KEYCARD_AUTH, ACCESS_SEC_DOORS, ACCESS_HEADS_VAULT) + blacklisted_disabilities = list(DISABILITY_FLAG_BLIND, DISABILITY_FLAG_DEAF, DISABILITY_FLAG_MUTE, DISABILITY_FLAG_DIZZY) outfit = /datum/outfit/job/qm + important_information = "This role requires you to coordinate a department. You are required to be familiar with Standard Operating Procedure (Supply), basic job duties, and act professionally (roleplay)." exp_map = list(EXP_TYPE_SUPPLY = 1200) /datum/outfit/job/qm @@ -20,12 +22,16 @@ jobtype = /datum/job/qm uniform = /obj/item/clothing/under/rank/cargo/quartermaster - shoes = /obj/item/clothing/shoes/brown - l_ear = /obj/item/radio/headset/headset_cargo + shoes = /obj/item/clothing/shoes/workboots/mining + l_ear = /obj/item/radio/headset/heads/qm glasses = /obj/item/clothing/glasses/sunglasses + mask = /obj/item/clothing/mask/cigarette/cigar/cohiba id = /obj/item/card/id/quartermaster l_hand = /obj/item/clipboard pda = /obj/item/pda/quartermaster + backpack_contents = list( + /obj/item/melee/classic_baton/telescopic = 1 + ) @@ -37,7 +43,7 @@ spawn_positions = 2 is_supply = 1 supervisors = "the quartermaster" - department_head = list("Head of Personnel") + department_head = list("Quartermaster") selection_color = "#eeddbe" access = list(ACCESS_MAINT_TUNNELS, ACCESS_MAILSORTING, ACCESS_CARGO, ACCESS_QM, ACCESS_MINT, ACCESS_MINING, ACCESS_MINING_STATION, ACCESS_MINERAL_STOREROOM) minimal_access = list(ACCESS_MAINT_TUNNELS, ACCESS_CARGO, ACCESS_MAILSORTING, ACCESS_MINERAL_STOREROOM) @@ -63,7 +69,7 @@ spawn_positions = 8 is_supply = 1 supervisors = "the quartermaster" - department_head = list("Head of Personnel") + department_head = list("Quartermaster") selection_color = "#eeddbe" access = list(ACCESS_MAINT_TUNNELS, ACCESS_MAILSORTING, ACCESS_CARGO, ACCESS_QM, ACCESS_MINT, ACCESS_MINING, ACCESS_MINING_STATION, ACCESS_MINERAL_STOREROOM) minimal_access = list(ACCESS_MINING, ACCESS_MINT, ACCESS_MINING_STATION, ACCESS_MAILSORTING, ACCESS_MAINT_TUNNELS, ACCESS_MINERAL_STOREROOM) diff --git a/code/game/jobs/job_globals.dm b/code/game/jobs/job_globals.dm index eb10fbc52c4..e14c0197223 100644 --- a/code/game/jobs/job_globals.dm +++ b/code/game/jobs/job_globals.dm @@ -11,6 +11,7 @@ GLOBAL_LIST_INIT(command_positions, list( "Chief Engineer", "Research Director", "Chief Medical Officer", + "Quartermaster", "Nanotrasen Representative", "Magistrate", "Blueshield" @@ -24,6 +25,7 @@ GLOBAL_LIST_INIT(command_head_positions, list( "Chief Engineer", "Research Director", "Chief Medical Officer", + "Quartermaster" )) @@ -61,9 +63,6 @@ GLOBAL_LIST_INIT(support_positions, list( "Chef", "Janitor", "Librarian", - "Quartermaster", - "Cargo Technician", - "Shaft Miner", "Internal Affairs Agent", "Chaplain", "Clown", @@ -73,7 +72,6 @@ GLOBAL_LIST_INIT(support_positions, list( )) GLOBAL_LIST_INIT(supply_positions, list( - "Head of Personnel", "Quartermaster", "Cargo Technician", "Shaft Miner" diff --git a/code/game/machinery/computer/buildandrepair.dm b/code/game/machinery/computer/buildandrepair.dm index f06a943d473..336f39fc8ef 100644 --- a/code/game/machinery/computer/buildandrepair.dm +++ b/code/game/machinery/computer/buildandrepair.dm @@ -222,6 +222,11 @@ build_path = /obj/machinery/computer/card/minor/cmo target_dept = TARGET_DEPT_MED +/obj/item/circuitboard/card/minor/qm + board_name = "Supply ID Computer" + build_path = /obj/machinery/computer/card/minor/qm + target_dept = TARGET_DEPT_SUP + /obj/item/circuitboard/card/minor/rd board_name = "Science ID Computer" icon_state = "science" diff --git a/code/game/machinery/computer/card.dm b/code/game/machinery/computer/card.dm index 049d699630d..f593d6c9c40 100644 --- a/code/game/machinery/computer/card.dm +++ b/code/game/machinery/computer/card.dm @@ -756,6 +756,14 @@ GLOBAL_VAR_INIT(time_last_changed_position, 0) req_access = list(ACCESS_CMO) circuit = /obj/item/circuitboard/card/minor/cmo +/obj/machinery/computer/card/minor/qm + name = "supply management console" + target_dept = TARGET_DEPT_SUP + icon_screen = "idqm" + light_color = COLOR_BROWN_ORANGE + req_access = list(ACCESS_QM) + circuit = /obj/item/circuitboard/card/minor/qm + /obj/machinery/computer/card/minor/rd name = "science management console" target_dept = TARGET_DEPT_SCI diff --git a/code/game/machinery/suit_storage_unit.dm b/code/game/machinery/suit_storage_unit.dm index 8f7828012a5..b17d32a22c1 100644 --- a/code/game/machinery/suit_storage_unit.dm +++ b/code/game/machinery/suit_storage_unit.dm @@ -110,6 +110,15 @@ /obj/machinery/suit_storage_unit/rd/secure secure = TRUE +/obj/machinery/suit_storage_unit/qm + name = "quartermaster's suit storage unit" + suit_type = /obj/item/mod/control/pre_equipped/loader + mask_type = /obj/item/clothing/mask/gas/explorer + req_access = list(ACCESS_QM) + +/obj/machinery/suit_storage_unit/qm/secure + secure = TRUE + /obj/machinery/suit_storage_unit/security name = "security suit storage unit" mask_type = /obj/item/clothing/mask/gas/sechailer diff --git a/code/game/machinery/tcomms/nttc.dm b/code/game/machinery/tcomms/nttc.dm index 4a1f63ec6f7..e54539e20ae 100644 --- a/code/game/machinery/tcomms/nttc.dm +++ b/code/game/machinery/tcomms/nttc.dm @@ -129,7 +129,7 @@ "Mime" = "srvradio", ) /// List of Command jobs - var/list/heads = list("Captain", "Head of Personnel", "Nanotrasen Representative", "Blueshield", "Chief Engineer", "Chief Medical Officer", "Research Director", "Head of Security", "Magistrate", "AI") + var/list/heads = list("Captain", "Head of Personnel", "Nanotrasen Representative", "Blueshield", "Chief Engineer", "Chief Medical Officer", "Research Director", "Head of Security", "Magistrate", "Quartermaster", "AI") /// List of ERT jobs var/list/ert_jobs = list("Emergency Response Team Officer", "Emergency Response Team Engineer", "Emergency Response Team Medic", "Emergency Response Team Inquisitor", "Emergency Response Team Janitor", "Emergency Response Team Leader", "Emergency Response Team Member") /// List of CentComm jobs diff --git a/code/game/objects/items/control_wand.dm b/code/game/objects/items/control_wand.dm index 44af7ae080f..7c0a93737e6 100644 --- a/code/game/objects/items/control_wand.dm +++ b/code/game/objects/items/control_wand.dm @@ -124,7 +124,7 @@ /obj/item/door_remote/civillian name = "civilian door remote" icon_state = "gangtool-white" - region_access = list(REGION_GENERAL, REGION_SUPPLY) + region_access = list(REGION_GENERAL) additional_access = list(ACCESS_HOP) /obj/item/door_remote/centcomm diff --git a/code/game/objects/items/devices/radio/encryptionkey.dm b/code/game/objects/items/devices/radio/encryptionkey.dm index ea0a4115266..8c4bec0239a 100644 --- a/code/game/objects/items/devices/radio/encryptionkey.dm +++ b/code/game/objects/items/devices/radio/encryptionkey.dm @@ -129,7 +129,12 @@ /obj/item/encryptionkey/heads/hop name = "Head of Personnel's Encryption Key" icon_state = "hop_cypherkey" - channels = list("Supply" = 1, "Service" = 1, "Security" = 0, "Command" = 1) + channels = list("Service" = 1, "Security" = 0, "Command" = 1) + +/obj/item/encryptionkey/heads/qm + name = "Quartermaster's Encryption Key" + icon_state = "qm_cypherkey" + channels = list("Supply" = 1, "Command" = 1) /obj/item/encryptionkey/heads/ntrep name = "Nanotrasen Representative's Encryption Key" diff --git a/code/game/objects/items/devices/radio/headset.dm b/code/game/objects/items/devices/radio/headset.dm index ff5be58426f..e5abfe0c342 100644 --- a/code/game/objects/items/devices/radio/headset.dm +++ b/code/game/objects/items/devices/radio/headset.dm @@ -267,6 +267,13 @@ item_state = "headset" ks2type = /obj/item/encryptionkey/heads/hop +/obj/item/radio/headset/heads/qm + name = "quartermaster's headset" + desc = "Smelling of tobacco and gunpowder, this headset has likely seen many backroom deals." + icon_state = "com_headset" + item_state = "headset" + ks2type = /obj/item/encryptionkey/heads/qm + /obj/item/radio/headset/headset_cargo name = "supply radio headset" desc = "A headset used by the cargo department." diff --git a/code/game/objects/items/weapons/storage/boxes.dm b/code/game/objects/items/weapons/storage/boxes.dm index 44b1b3a7d95..54f7c7db72a 100644 --- a/code/game/objects/items/weapons/storage/boxes.dm +++ b/code/game/objects/items/weapons/storage/boxes.dm @@ -312,7 +312,7 @@ /obj/item/storage/box/deathimp/populate_contents() for(var/I in 1 to 6) new /obj/item/implantcase/death_alarm(src) - new /obj/item/implanter(src) + new /obj/item/implanter/death_alarm (src) /obj/item/storage/box/tapes name = "Tape Box" diff --git a/code/game/objects/items/weapons/storage/garment.dm b/code/game/objects/items/weapons/storage/garment.dm index 812605b31b3..344be6016cf 100644 --- a/code/game/objects/items/weapons/storage/garment.dm +++ b/code/game/objects/items/weapons/storage/garment.dm @@ -195,12 +195,16 @@ new /obj/item/clothing/under/rank/cargo/quartermaster(src) new /obj/item/clothing/under/rank/cargo/quartermaster/skirt(src) new /obj/item/clothing/shoes/brown(src) - new /obj/item/clothing/mask/gas(src) + new /obj/item/clothing/suit/hooded/wintercoat/cargo(src) + new /obj/item/clothing/suit/jacket/cargobomber(src) + new /obj/item/clothing/head/hardhat/orange(src) + new /obj/item/clothing/suit/storage/hazardvest(src) + new /obj/item/clothing/mask/gas/explorer(src) + new /obj/item/clothing/suit/hooded/explorer(src) new /obj/item/clothing/glasses/meson(src) new /obj/item/clothing/head/soft(src) - new /obj/item/clothing/gloves/fingerless(src) - new /obj/item/clothing/suit/fire/firefighter(src) - new /obj/item/tank/internals/emergency_oxygen(src) + new /obj/item/clothing/gloves/color/black(src) + new /obj/item/tank/internals/emergency_oxygen/double(src) /obj/item/storage/bag/garment/warden name = "warden's garment bag" diff --git a/code/game/objects/structures/crates_lockers/closets/secure/cargo_lockers.dm b/code/game/objects/structures/crates_lockers/closets/secure/cargo_lockers.dm index 478b8c01c32..c162b7acdda 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/cargo_lockers.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/cargo_lockers.dm @@ -21,8 +21,17 @@ open_door_sprite = "mining_door" /obj/structure/closet/secure_closet/quartermaster/populate_contents() - new /obj/item/radio/headset/headset_cargo(src) + new /obj/item/radio/headset/heads/qm(src) new /obj/item/door_remote/quartermaster(src) new /obj/item/organ/internal/eyes/cybernetic/meson(src) new /obj/item/storage/bag/garment/quartermaster(src) new /obj/item/clothing/accessory/medal/supply(src) + new /obj/item/fulton_core(src) + new /obj/item/extraction_pack(src) + new /obj/item/gps/mining(src) + new /obj/item/sensor_device(src) + new /obj/item/rcs(src) + new /obj/item/destTagger(src) + new /obj/item/reagent_containers/food/drinks/mug/qm(src) + new /obj/item/flash(src) + diff --git a/code/modules/events/bureaucratic_error.dm b/code/modules/events/bureaucratic_error.dm index 2cd6b800dab..e1657fbf23f 100644 --- a/code/modules/events/bureaucratic_error.dm +++ b/code/modules/events/bureaucratic_error.dm @@ -17,7 +17,8 @@ /datum/job/chaplain, /datum/job/officer, /datum/job/detective, - /datum/job/warden + /datum/job/warden, + /datum/job/qm ) /datum/event/bureaucratic_error/announce() diff --git a/code/modules/food_and_drinks/drinks/drinks/mugs.dm b/code/modules/food_and_drinks/drinks/drinks/mugs.dm index 8226b69f49c..5238d8a8874 100644 --- a/code/modules/food_and_drinks/drinks/drinks/mugs.dm +++ b/code/modules/food_and_drinks/drinks/drinks/mugs.dm @@ -153,6 +153,12 @@ icon_state = "mug_cmo" preset = TRUE +/obj/item/reagent_containers/food/drinks/mug/qm + name = "quartermaster's mug" + desc = "A newly imported mug, express delivery." + icon_state = "mug_qm" + preset = TRUE + /obj/item/reagent_containers/food/drinks/mug/hop name = "head of personnel's mug" desc = "Are the stains on the bottom coffee or ink?" diff --git a/icons/mob/hud.dmi b/icons/mob/hud.dmi index fa2d49111f9b44e62158f1456a0d4c900d719c61..8a42cfd9cd880c482383d92e20a88bf606e14586 100644 GIT binary patch literal 16174 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 b8%T^9`= literal 16268 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 CfDb7E delta 9463 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 diff --git a/icons/obj/mugs.dmi b/icons/obj/mugs.dmi index 381cef14985f8bd62e7cd964eb21b2949518c359..f6e2035b108d4d71a84efeff268ddcc12d53acea 100644 GIT binary patch literal 9810 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 diff --git a/strings/sillytips.txt b/strings/sillytips.txt index cf49a79c0c7..abf295ab888 100644 --- a/strings/sillytips.txt +++ b/strings/sillytips.txt @@ -10,7 +10,7 @@ Cleanbot. Sometimes a round will just be a bust. C'est la vie. This is a game that is constantly being developed for. Expect things to be added, removed, fixed, and broken on a daily basis. It's fun to try and predict the round type from the tip of the round message. -The quartermaster is not a head of staff and will never be one. +HOP and QM sitting in a tree, a-r-g-u-i-n-g. Your sprite represents your hitbox, so that afro makes you easier to kill. The sacrifices we make for style. Sometimes admins will just do stuff. Roll with it. The remake will never come out. diff --git a/tgui/packages/tgui/interfaces/common/CrewManifest.js b/tgui/packages/tgui/interfaces/common/CrewManifest.js index d3e77057097..692b28a245c 100644 --- a/tgui/packages/tgui/interfaces/common/CrewManifest.js +++ b/tgui/packages/tgui/interfaces/common/CrewManifest.js @@ -12,6 +12,7 @@ const HeadRoles = [ 'Chief Medical Officer', 'Research Director', 'Head of Personnel', + 'Quartermaster', ]; // Head colour check. Abbreviated to save on 80 char @@ -21,22 +22,15 @@ const HCC = (role) => { return 'green'; } - // Return yellow if its the qm - if (role === 'Quartermaster') { - return 'yellow'; - } - // Return orange if its a regular person return 'orange'; }; // Head bold check. Abbreviated to save on 80 char const HBC = (role) => { - // Return true if they are a head, or a QM - if (HeadRoles.indexOf(role) !== -1 || role === 'Quartermaster') { + // Return true if they are a head + if (HeadRoles.indexOf(role) !== -1) { return true; - } else { - return false; } }; diff --git a/tgui/packages/tgui/public/tgui.bundle.js b/tgui/packages/tgui/public/tgui.bundle.js index e30b33fa61e..49d3e6ec3e8 100644 --- a/tgui/packages/tgui/public/tgui.bundle.js +++ b/tgui/packages/tgui/public/tgui.bundle.js @@ -1,4 +1,4 @@ -!function(e){var t={};function n(o){if(t[o])return t[o].exports;var r=t[o]={i:o,l:!1,exports:{}};return e[o].call(r.exports,r,r.exports,n),r.l=!0,r.exports}n.m=e,n.c=t,n.d=function(e,t,o){n.o(e,t)||Object.defineProperty(e,t,{enumerable:!0,get:o})},n.r=function(e){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},n.t=function(e,t){if(1&t&&(e=n(e)),8&t)return e;if(4&t&&"object"==typeof e&&e&&e.__esModule)return e;var o=Object.create(null);if(n.r(o),Object.defineProperty(o,"default",{enumerable:!0,value:e}),2&t&&"string"!=typeof e)for(var r in e)n.d(o,r,function(t){return e[t]}.bind(null,r));return o},n.n=function(e){var t=e&&e.__esModule?function(){return e["default"]}:function(){return e};return n.d(t,"a",t),t},n.o=function(e,t){return Object.prototype.hasOwnProperty.call(e,t)},n.p="",n(n.s=231)}([function(e,t,n){"use strict";t.__esModule=!0;var o=n(233);Object.keys(o).forEach((function(e){"default"!==e&&"__esModule"!==e&&(e in t&&t[e]===o[e]||(t[e]=o[e]))}))},function(e,t,n){"use strict";t.__esModule=!0,t.useSharedState=t.useLocalState=t.useBackend=t.deleteLocalState=t.backendUpdate=t.backendSetSharedState=t.backendReducer=t.backendDeleteSharedState=void 0;var o=n(32),r=n(43);t.backendUpdate=function(e){return{type:"backend/update",payload:e}};var a=function(e,t){return{type:"backend/setSharedState",payload:{key:e,nextState:t}}};t.backendSetSharedState=a;var c=function(e){return{type:"backend/deleteSharedState",payload:e}};t.backendDeleteSharedState=c;t.backendReducer=function(e,t){var n=t.type,o=t.payload;if("backend/update"===n){var a=Object.assign({},e.config,o.config),c=Object.assign({},e.data,o.static_data,o.data),i=Object.assign({},e.shared);if(o.shared)for(var l=0,d=Object.keys(o.shared);l1?n-1:0),r=1;rn?n:e};t.clamp01=function(e){return e<0?0:e>1?1:e};t.scale=function(e,t,n){return(e-t)/(n-t)};t.round=function(e,t){return!e||isNaN(e)?e:(t|=0,a=(e*=n=Math.pow(10,t))>0|-(e<0),r=Math.abs(e%1)>=.4999999999854481,o=Math.floor(e),r&&(e=o+(a>0)),(r?e:Math.round(e))/n);var n,o,r,a};t.toFixed=function(e,t){return void 0===t&&(t=0),Number(e).toFixed(Math.max(t,0))};var o=function(e,t){return t&&e>=t[0]&&e<=t[1]};t.inRange=o;t.keyOfMatchingRange=function(e,t){for(var n=0,r=Object.keys(t);n0&&(t.style=l),t};t.computeBoxProps=N;var b=function(e){var t=e.textColor||e.color,n=e.backgroundColor;return(0,o.classes)([u(t)&&"color-"+t,u(n)&&"color-bg-"+n])};t.computeBoxClassName=b;var V=function(e){var t=e.as,n=void 0===t?"div":t,o=e.className,c=e.children,l=function(e,t){if(null==e)return{};var n,o,r={},a=Object.keys(e);for(o=0;o=0||(r[n]=e[n]);return r}(e,i);if("function"==typeof c)return c(N(e));var d="string"==typeof o?o+" "+b(l):b(l),u=N(l);return(0,r.createVNode)(a.VNodeFlags.HtmlElement,n,d,c,a.ChildFlags.UnknownChildren,u)};t.Box=V,V.defaultHooks=o.pureComponentHooks},function(e,t,n){"use strict";function o(e,t){var n="undefined"!=typeof Symbol&&e[Symbol.iterator]||e["@@iterator"];if(n)return(n=n.call(e)).next.bind(n);if(Array.isArray(e)||(n=function(e,t){if(!e)return;if("string"==typeof e)return r(e,t);var n=Object.prototype.toString.call(e).slice(8,-1);"Object"===n&&e.constructor&&(n=e.constructor.name);if("Map"===n||"Set"===n)return Array.from(e);if("Arguments"===n||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n))return r(e,t)}(e))||t&&e&&"number"==typeof e.length){n&&(e=n);var o=0;return function(){return o>=e.length?{done:!0}:{done:!1,value:e[o++]}}}throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}function r(e,t){(null==t||t>e.length)&&(t=e.length);for(var n=0,o=new Array(t);n",apos:"'"};return e.replace(/
/gi,"\n").replace(/<\/?[a-z0-9-_]+[^>]*>/gi,"").replace(/&(nbsp|amp|quot|lt|gt|apos);/g,(function(e,n){return t[n]})).replace(/&#?([0-9]+);/gi,(function(e,t){var n=parseInt(t,10);return String.fromCharCode(n)})).replace(/&#x?([0-9a-f]+);/gi,(function(e,t){var n=parseInt(t,16);return String.fromCharCode(n)}))};t.buildQueryString=function(e){return Object.keys(e).map((function(t){return encodeURIComponent(t)+"="+encodeURIComponent(e[t])})).join("&")}},function(e,t,n){"use strict";var o=n(40);e.exports=function(e){return o(e.length)}},function(e,t,n){"use strict";var o=n(5),r=n(12),a=n(49),c=n(129),i=n(127);e.exports=function(e,t,n,l){var d=!!l&&!!l.unsafe,u=!!l&&!!l.enumerable,s=!!l&&!!l.noTargetGet,m=l&&l.name!==undefined?l.name:t;return r(n)&&c(n,m,l),e===o?(u?e[t]=n:i(t,n),e):(d?!s&&e[t]&&(u=!0):delete e[t],u?e[t]=n:a(e,t,n),e)}},function(e,t,n){"use strict";var o=n(60),r=n(7),a=n(85),c=n(19),i=n(23),l=n(91),d=r([].push),u=function(e){var t=1==e,n=2==e,r=3==e,u=4==e,s=6==e,m=7==e,p=5==e||s;return function(h,f,C,N){for(var b,V,g=c(h),v=a(g),y=o(f,C),x=i(v),_=0,k=N||l,L=t?k(h,x):n||m?k(h,0):undefined;x>_;_++)if((p||_ in v)&&(V=y(b=v[_],_,g),e))if(t)L[_]=V;else if(V)switch(e){case 3:return!0;case 5:return b;case 6:return _;case 2:d(L,b)}else switch(e){case 4:return!1;case 7:d(L,b)}return s?-1:r||u?u:L}};e.exports={forEach:u(0),map:u(1),filter:u(2),some:u(3),every:u(4),find:u(5),findIndex:u(6),filterReject:u(7)}},function(e,t,n){"use strict";var o=n(8),r=n(14),a=n(100),c=n(64),i=n(30),l=n(56),d=n(18),u=n(172),s=Object.getOwnPropertyDescriptor;t.f=o?s:function(e,t){if(e=i(e),t=l(t),u)try{return s(e,t)}catch(n){}if(d(e,t))return c(!r(a.f,e,t),e[t])}},function(e,t,n){"use strict";var o=n(5),r=n(12),a=n(70),c=o.TypeError;e.exports=function(e){if(r(e))return e;throw c(a(e)+" is not a function")}},function(e,t,n){"use strict";var o=n(5),r=n(12),a=function(e){return r(e)?e:undefined};e.exports=function(e,t){return arguments.length<2?a(o[e]):o[e]&&o[e][t]}},function(e,t,n){"use strict";t.__esModule=!0,t.modalRegisterBodyOverride=t.modalOpen=t.modalClose=t.modalAnswer=t.ComplexModal=void 0;var o=n(0),r=n(1),a=n(2),c={};t.modalOpen=function(e,t,n){var o=(0,r.useBackend)(e),a=o.act,c=o.data,i=Object.assign(c.modal?c.modal.args:{},n||{});a("modal_open",{id:t,arguments:JSON.stringify(i)})};t.modalRegisterBodyOverride=function(e,t){c[e]=t};var i=function(e,t,n,o){var a=(0,r.useBackend)(e),c=a.act,i=a.data;if(i.modal){var l=Object.assign(i.modal.args||{},o||{});c("modal_answer",{id:t,answer:n,arguments:JSON.stringify(l)})}};t.modalAnswer=i;var l=function(e,t){(0,(0,r.useBackend)(e).act)("modal_close",{id:t})};t.modalClose=l;t.ComplexModal=function(e,t){var n=(0,r.useBackend)(t).data;if(n.modal){var d,u,s=n.modal,m=s.id,p=s.text,h=s.type,f=(0,o.createComponentVNode)(2,a.Button,{icon:"arrow-left",content:"Cancel",color:"grey",onClick:function(){return l(t)}}),C="auto";if(c[m])u=c[m](n.modal,t);else if("input"===h){var N=n.modal.value;d=function(e){return i(t,m,N)},u=(0,o.createComponentVNode)(2,a.Input,{value:n.modal.value,placeholder:"ENTER to submit",width:"100%",my:"0.5rem",autofocus:!0,onChange:function(e,t){N=t}}),f=(0,o.createComponentVNode)(2,a.Box,{mt:"0.5rem",children:[(0,o.createComponentVNode)(2,a.Button,{icon:"arrow-left",content:"Cancel",color:"grey",onClick:function(){return l(t)}}),(0,o.createComponentVNode)(2,a.Button,{icon:"check",content:"Confirm",color:"good",float:"right",m:"0",onClick:function(){return i(t,m,N)}}),(0,o.createComponentVNode)(2,a.Box,{clear:"both"})]})}else if("choice"===h){var b="object"==typeof n.modal.choices?Object.values(n.modal.choices):n.modal.choices;u=(0,o.createComponentVNode)(2,a.Dropdown,{options:b,selected:n.modal.value,width:"100%",my:"0.5rem",onSelected:function(e){return i(t,m,e)}}),C="initial"}else"bento"===h?u=(0,o.createComponentVNode)(2,a.Flex,{spacingPrecise:"1",wrap:"wrap",my:"0.5rem",maxHeight:"1%",children:n.modal.choices.map((function(e,r){return(0,o.createComponentVNode)(2,a.Flex.Item,{flex:"1 1 auto",children:(0,o.createComponentVNode)(2,a.Button,{selected:r+1===parseInt(n.modal.value,10),onClick:function(){return i(t,m,r+1)},children:(0,o.createVNode)(1,"img",null,null,1,{src:e})})},r)}))}):"boolean"===h&&(f=(0,o.createComponentVNode)(2,a.Box,{mt:"0.5rem",children:[(0,o.createComponentVNode)(2,a.Button,{icon:"times",content:n.modal.no_text,color:"bad",float:"left",mb:"0",onClick:function(){return i(t,m,0)}}),(0,o.createComponentVNode)(2,a.Button,{icon:"check",content:n.modal.yes_text,color:"good",float:"right",m:"0",onClick:function(){return i(t,m,1)}}),(0,o.createComponentVNode)(2,a.Box,{clear:"both"})]}));return(0,o.createComponentVNode)(2,a.Modal,{maxWidth:e.maxWidth||window.innerWidth/2+"px",maxHeight:e.maxHeight||window.innerHeight/2+"px",onEnter:d,mx:"auto",overflowY:C,children:[(0,o.createComponentVNode)(2,a.Box,{display:"inline",children:p}),u,f]})}}},function(e,t,n){"use strict";var o=n(85),r=n(31);e.exports=function(e){return o(r(e))}},function(e,t,n){"use strict";var o=n(5).TypeError;e.exports=function(e){if(e==undefined)throw o("Can't call method on "+e);return e}},function(e,t,n){"use strict";function o(e,t,n,o,r,a,c){try{var i=e[a](c),l=i.value}catch(d){return void n(d)}i.done?t(l):Promise.resolve(l).then(o,r)}t.__esModule=!0,t.winset=t.winget=t.runCommand=t.callByondAsync=t.callByond=t.IS_IE8=void 0;var r=window.Byond,a=function(){var e=navigator.userAgent.match(/Trident\/(\d+).+?;/i);if(!e)return null;var t=e[1];return t?parseInt(t,10):null}(),c=null!==a&&a<=6;t.IS_IE8=c;var i=function(e,t){void 0===t&&(t={}),r.call(e,t)};t.callByond=i;var l=function(e,t){void 0===t&&(t={}),window.__callbacks__=window.__callbacks__||[];var n=window.__callbacks__.length,o=new Promise((function(e){window.__callbacks__.push(e)}));return r.call(e,Object.assign({},t,{callback:"__callbacks__["+n+"]"})),o};t.callByondAsync=l;t.runCommand=function(e){return i("winset",{command:e})};var d=function(){var e,t=(e=regeneratorRuntime.mark((function n(e,t){var o;return regeneratorRuntime.wrap((function(n){for(;;)switch(n.prev=n.next){case 0:return n.next=2,l("winget",{id:e,property:t});case 2:return o=n.sent,n.abrupt("return",o[t]);case 4:case"end":return n.stop()}}),n)})),function(){var t=this,n=arguments;return new Promise((function(r,a){var c=e.apply(t,n);function i(e){o(c,r,a,i,l,"next",e)}function l(e){o(c,r,a,i,l,"throw",e)}i(undefined)}))});return function(e,n){return t.apply(this,arguments)}}();t.winget=d;t.winset=function(e,t,n){var o;return i("winset",((o={})[e+"."+t]=n,o))}},function(e,t,n){"use strict";t.__esModule=!0,t.zipWith=t.zip=t.uniqBy=t.toKeyedArray=t.toArray=t.sortBy=t.reduce=t.map=t.filter=void 0;t.toArray=function(e){if(Array.isArray(e))return e;if("object"==typeof e){var t=Object.prototype.hasOwnProperty,n=[];for(var o in e)t.call(e,o)&&n.push(e[o]);return n}return[]};t.toKeyedArray=function(e,t){return void 0===t&&(t="key"),o((function(e,n){var o;return Object.assign(((o={})[t]=n,o),e)}))(e)};t.filter=function(e){return function(t){if(null===t&&t===undefined)return t;if(Array.isArray(t)){for(var n=[],o=0;oi)return 1}return 0};t.sortBy=function(){for(var e=arguments.length,t=new Array(e),n=0;n"+l+""}},function(e,t,n){"use strict";var o=n(6);e.exports=function(e){return o((function(){var t=""[e]('"');return t!==t.toLowerCase()||t.split('"').length>3}))}},function(e,t,n){"use strict";var o,r,a,c=n(174),i=n(5),l=n(7),d=n(11),u=n(49),s=n(18),m=n(126),p=n(102),h=n(87),f=i.TypeError,C=i.WeakMap;if(c||m.state){var N=m.state||(m.state=new C),b=l(N.get),V=l(N.has),g=l(N.set);o=function(e,t){if(V(N,e))throw new f("Object already initialized");return t.facade=e,g(N,e,t),t},r=function(e){return b(N,e)||{}},a=function(e){return V(N,e)}}else{var v=p("state");h[v]=!0,o=function(e,t){if(s(e,v))throw new f("Object already initialized");return t.facade=e,u(e,v,t),t},r=function(e){return s(e,v)?e[v]:{}},a=function(e){return s(e,v)}}e.exports={set:o,get:r,has:a,enforce:function(e){return a(e)?r(e):o(e,{})},getterFor:function(e){return function(t){var n;if(!d(t)||(n=r(t)).type!==e)throw f("Incompatible receiver, "+e+" required");return n}}}},function(e,t,n){"use strict";var o=Math.ceil,r=Math.floor;e.exports=function(e){var t=+e;return t!=t||0===t?0:(t>0?r:o)(t)}},function(e,t,n){"use strict";var o=n(39),r=Math.min;e.exports=function(e){return e>0?r(o(e),9007199254740991):0}},function(e,t,n){"use strict";t.__esModule=!0,t.computeFlexProps=t.computeFlexItemProps=t.FlexItem=t.Flex=void 0;var o=n(0),r=n(10),a=n(32),c=n(21),i=["className","direction","wrap","align","alignContent","justify","inline","spacing","spacingPrecise"],l=["className","grow","order","shrink","basis","align"];function d(e,t){if(null==e)return{};var n,o,r={},a=Object.keys(e);for(o=0;o=0||(r[n]=e[n]);return r}var u=function(e){var t=e.className,n=e.direction,o=e.wrap,c=e.align,l=e.alignContent,u=e.justify,s=e.inline,m=e.spacing,p=void 0===m?0:m,h=e.spacingPrecise,f=void 0===h?0:h,C=d(e,i);return Object.assign({className:(0,r.classes)(["Flex",a.IS_IE8&&("column"===n?"Flex--ie8--column":"Flex--ie8"),s&&"Flex--inline",p>0&&"Flex--spacing--"+p,f>0&&"Flex--spacingPrecise--"+f,t]),style:Object.assign({},C.style,{"flex-direction":n,"flex-wrap":o,"align-items":c,"align-content":l,"justify-content":u})},C)};t.computeFlexProps=u;var s=function(e){return(0,o.normalizeProps)((0,o.createComponentVNode)(2,c.Box,Object.assign({},u(e))))};t.Flex=s,s.defaultHooks=r.pureComponentHooks;var m=function(e){var t=e.className,n=e.grow,o=e.order,i=e.shrink,u=e.basis,s=void 0===u?e.width:u,m=e.align,p=d(e,l);return Object.assign({className:(0,r.classes)(["Flex__item",a.IS_IE8&&"Flex__item--ie8",t]),style:Object.assign({},p.style,{"flex-grow":n,"flex-shrink":i,"flex-basis":(0,c.unit)(s),order:o,"align-self":m})},p)};t.computeFlexItemProps=m;var p=function(e){return(0,o.normalizeProps)((0,o.createComponentVNode)(2,c.Box,Object.assign({},m(e))))};t.FlexItem=p,p.defaultHooks=r.pureComponentHooks,s.Item=p},function(e,t,n){"use strict";var o=n(5),r=n(18),a=n(12),c=n(19),i=n(102),l=n(139),d=i("IE_PROTO"),u=o.Object,s=u.prototype;e.exports=l?u.getPrototypeOf:function(e){var t=c(e);if(r(t,d))return t[d];var n=t.constructor;return a(n)&&t instanceof n?n.prototype:t instanceof u?s:null}},function(e,t,n){"use strict";t.__esModule=!0,t.timeAgo=t.getGasLabel=t.getGasColor=t.UI_UPDATE=t.UI_INTERACTIVE=t.UI_DISABLED=t.UI_CLOSE=t.RADIO_CHANNELS=t.CSS_COLORS=t.COLORS=void 0;t.UI_INTERACTIVE=2;t.UI_UPDATE=1;t.UI_DISABLED=0;t.UI_CLOSE=-1;t.COLORS={department:{command:"#526aff",security:"#CF0000",medical:"#009190",science:"#993399",engineering:"#A66300",supply:"#9F8545",service:"#80A000",centcom:"#78789B",other:"#C38312"},damageType:{oxy:"#3498db",toxin:"#2ecc71",burn:"#e67e22",brute:"#e74c3c"}};t.CSS_COLORS=["black","white","red","orange","yellow","olive","green","teal","blue","violet","purple","pink","brown","grey","good","average","bad","label"];t.RADIO_CHANNELS=[{name:"Syndicate",freq:1213,color:"#a52a2a"},{name:"SyndTeam",freq:1244,color:"#a52a2a"},{name:"Red Team",freq:1215,color:"#ff4444"},{name:"Blue Team",freq:1217,color:"#3434fd"},{name:"Response Team",freq:1345,color:"#2681a5"},{name:"Special Ops",freq:1341,color:"#2681a5"},{name:"Supply",freq:1347,color:"#b88646"},{name:"Service",freq:1349,color:"#6ca729"},{name:"Science",freq:1351,color:"#c68cfa"},{name:"Command",freq:1353,color:"#5177ff"},{name:"Procedure",freq:1339,color:"#F70285"},{name:"Medical",freq:1355,color:"#57b8f0"},{name:"Medical(I)",freq:1485,color:"#57b8f0"},{name:"Engineering",freq:1357,color:"#f37746"},{name:"Security",freq:1359,color:"#dd3535"},{name:"Security(I)",freq:1475,color:"#dd3535"},{name:"AI Private",freq:1343,color:"#d65d95"},{name:"Common",freq:1459,color:"#1ecc43"}];var o=[{id:"o2",name:"Oxygen",label:"O\u2082",color:"blue"},{id:"n2",name:"Nitrogen",label:"N\u2082",color:"red"},{id:"co2",name:"Carbon Dioxide",label:"CO\u2082",color:"grey"},{id:"plasma",name:"Plasma",label:"Plasma",color:"pink"},{id:"water_vapor",name:"Water Vapor",label:"H\u2082O",color:"grey"},{id:"nob",name:"Hyper-noblium",label:"Hyper-nob",color:"teal"},{id:"n2o",name:"Nitrous Oxide",label:"N\u2082O",color:"red"},{id:"no2",name:"Nitryl",label:"NO\u2082",color:"brown"},{id:"tritium",name:"Tritium",label:"Tritium",color:"green"},{id:"bz",name:"BZ",label:"BZ",color:"purple"},{id:"stim",name:"Stimulum",label:"Stimulum",color:"purple"},{id:"pluox",name:"Pluoxium",label:"Pluoxium",color:"blue"},{id:"miasma",name:"Miasma",label:"Miasma",color:"olive"},{id:"hydrogen",name:"Hydrogen",label:"H\u2082",color:"white"},{id:"ab",name:"Agent B",label:"Agent B",color:"purple"}];t.getGasLabel=function(e,t){var n=String(e).toLowerCase(),r=o.find((function(e){return e.id===n||e.name.toLowerCase()===n}));return r&&r.label||t||e};t.getGasColor=function(e){var t=String(e).toLowerCase(),n=o.find((function(e){return e.id===t||e.name.toLowerCase()===t}));return n&&n.color};t.timeAgo=function(e,t){if(e>t)return"in the future";var n=(t/=10)-(e/=10);if(n>3600){var o=Math.round(n/3600);return o+" hour"+(1===o?"":"s")+" ago"}if(n>60){var r=Math.round(n/60);return r+" minute"+(1===r?"":"s")+" ago"}var a=Math.round(n);return a+" second"+(1===a?"":"s")+" ago"}},function(e,t,n){"use strict";var o=n(7),r=o({}.toString),a=o("".slice);e.exports=function(e){return a(r(e),8,-1)}},function(e,t,n){"use strict";var o=n(7);e.exports=o({}.isPrototypeOf)},function(e,t,n){"use strict";var o=n(84),r=Function.prototype,a=r.apply,c=r.call;e.exports="object"==typeof Reflect&&Reflect.apply||(o?c.bind(a):function(){return c.apply(a,arguments)})},function(e,t,n){"use strict";t.__esModule=!0,t.LabeledListItem=t.LabeledListDivider=t.LabeledList=void 0;var o=n(0),r=n(10),a=n(21),c=n(220),i=["className","label","labelColor","color","textAlign","verticalAlign","buttons","content","children","noColon"];var l=function(e){var t=e.children;return(0,o.createVNode)(1,"table","LabeledList",t,0)};t.LabeledList=l,l.defaultHooks=r.pureComponentHooks;var d=function(e){var t=e.className,n=e.label,c=e.labelColor,l=void 0===c?"label":c,d=e.color,u=e.textAlign,s=e.verticalAlign,m=e.buttons,p=e.content,h=e.children,f=e.noColon,C=void 0!==f&&f,N=function(e,t){if(null==e)return{};var n,o,r={},a=Object.keys(e);for(o=0;o=0||(r[n]=e[n]);return r}(e,i),b=C?"":":";return(0,o.createVNode)(1,"tr",(0,r.classes)(["LabeledList__row",t]),[(0,o.createComponentVNode)(2,a.Box,{as:"td",color:l,verticalAlign:s,className:(0,r.classes)(["LabeledList__cell","LabeledList__label"]),children:n?n+b:null}),(0,o.normalizeProps)((0,o.createComponentVNode)(2,a.Box,Object.assign({as:"td",color:d,textAlign:u,verticalAlign:s,className:(0,r.classes)(["LabeledList__cell","LabeledList__content"]),colSpan:m?undefined:2},N,{children:[p,h]}))),m&&(0,o.createVNode)(1,"td","LabeledList__cell LabeledList__buttons",m,0)],0)};t.LabeledListItem=d,d.defaultHooks=r.pureComponentHooks;var u=function(e){var t=e.size?(0,a.unit)(Math.max(0,e.size-1)):0;return(0,o.createVNode)(1,"tr","LabeledList__row",(0,o.createVNode)(1,"td",null,(0,o.createComponentVNode)(2,c.Divider),2,{colSpan:3,style:{"padding-top":t,"padding-bottom":t}}),2)};t.LabeledListDivider=u,u.defaultHooks=r.pureComponentHooks,l.Item=d,l.Divider=u},function(e,t,n){"use strict";var o=n(28);e.exports=o("navigator","userAgent")||""},function(e,t,n){"use strict";var o=n(8),r=n(17),a=n(64);e.exports=o?function(e,t,n){return r.f(e,t,a(1,n))}:function(e,t,n){return e[t]=n,e}},function(e,t,n){"use strict";var o=n(39),r=Math.max,a=Math.min;e.exports=function(e,t){var n=o(e);return n<0?r(n+t,0):a(n,t)}},function(e,t,n){"use strict";var o,r=n(9),a=n(133),c=n(131),i=n(87),l=n(177),d=n(128),u=n(102),s=u("IE_PROTO"),m=function(){},p=function(e){return"