QM is now a Head of Staff, everyone rejoice

code/game/objects/items/devices/radio/encryptionkey.dm

@@ -94,11 +94,13 @@
 	icon_state = "cmo_cypherkey"
 	channels = list("Medical" = 1, "Command" = 1)
 
+/*CITADEL CHANGE - comments this out to be overridden in modular_citadel
 /obj/item/device/encryptionkey/heads/hop
 	name = "\proper the head of personnel's encryption key"
 	desc = "An encryption key for a radio headset.  Channels are as follows: :u - supply, :v - service, :c - command."
 	icon_state = "hop_cypherkey"
 	channels = list("Supply" = 1, "Service" = 1, "Command" = 1)
+*/
 
 /obj/item/device/encryptionkey/headset_cargo
 	name = "supply radio encryption key"

code/game/objects/items/devices/radio/headset.dm

@@ -163,11 +163,13 @@
 	icon_state = "com_headset"
 	keyslot = new /obj/item/device/encryptionkey/heads/cmo
 
+/*CITADEL CHANGE - comments this out to be overridden in modular_citadel
 /obj/item/device/radio/headset/heads/hop
 	name = "\proper the head of personnel's headset"
 	desc = "The headset of the guy who will one day be captain.\nChannels are as follows: :u - supply, :v - service, :c - command."
 	icon_state = "com_headset"
 	keyslot = new /obj/item/device/encryptionkey/heads/hop
+*/
 
 /obj/item/device/radio/headset/headset_cargo
 	name = "supply radio headset"

code/game/objects/structures/crates_lockers/closets/secure/cargo.dm

@@ -9,7 +9,7 @@
 	new /obj/item/storage/lockbox/medal/cargo(src)
 	new /obj/item/clothing/under/rank/cargo(src)
 	new /obj/item/clothing/shoes/sneakers/brown(src)
-	new /obj/item/device/radio/headset/headset_cargo(src)
+//	new /obj/item/device/radio/headset/headset_cargo(src)
 	new /obj/item/clothing/suit/fire/firefighter(src)
 	new /obj/item/clothing/gloves/fingerless(src)
 	new /obj/item/device/megaphone/cargo(src)

code/modules/jobs/jobs.dm

@@ -1,3 +1,4 @@
+/*CITADEL CHANGE - comments this out to be overridden in modular_citadel
 GLOBAL_LIST_INIT(command_positions, list(
 	"Captain",
 	"Head of Personnel",
@@ -5,7 +6,7 @@ GLOBAL_LIST_INIT(command_positions, list(
 	"Chief Engineer",
 	"Research Director",
 	"Chief Medical Officer"))
-
+*/
 
 GLOBAL_LIST_INIT(engineering_positions, list(
 	"Chief Engineer",
@@ -26,13 +27,13 @@ GLOBAL_LIST_INIT(science_positions, list(
 	"Scientist",
 	"Roboticist"))
 
-
+/*CITADEL CHANGE - comments this out to be overridden in modular_citadel
 GLOBAL_LIST_INIT(supply_positions, list(
 	"Head of Personnel",
 	"Quartermaster",
 	"Cargo Technician",
 	"Shaft Miner"))
-
+*/
 
 GLOBAL_LIST_INIT(civilian_positions, list(
 	"Bartender",