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 5de07cba58.

* 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 <Roanrichards1@Gmail.com>
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

@@ -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

_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

_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

_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

_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" = (

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.

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)

code/game/gamemodes/revolution/revolution.dm

@@ -30,7 +30,7 @@
 ///////////////////////////
 /datum/game_mode/revolution/announce()
 	to_chat(world, "<B>The current game mode is - Revolution!</B>")
-	to_chat(world, "<B>Some crewmembers are attempting to start a revolution!<BR>\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.<BR>\nPersonnel - Protect the heads of staff. Kill the leaders of the revolution, and brainwash the other revolutionaries (by beating them in the head).</B>")
+	to_chat(world, "<B>Some crewmembers are attempting to start a revolution!<BR>\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.<BR>\nPersonnel - Protect the heads of staff. Kill the leaders of the revolution, and brainwash the other revolutionaries (by beating them in the head).</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

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

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

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

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)

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"

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"

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

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

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

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

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"

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."

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"

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"

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)
+

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()

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?"

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.

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;
   }
 };