diff --git a/code/datums/outfits/jobs/cargo.dm b/code/datums/outfits/jobs/cargo.dm index 10ddb9b7b0..1b48efcb9d 100644 --- a/code/datums/outfits/jobs/cargo.dm +++ b/code/datums/outfits/jobs/cargo.dm @@ -5,6 +5,7 @@ /decl/hierarchy/outfit/job/cargo/qm name = OUTFIT_JOB_NAME("Cargo") uniform = /obj/item/clothing/under/rank/cargo + l_ear = /obj/item/device/radio/headset/headset_qm //VOREStation Add shoes = /obj/item/clothing/shoes/brown glasses = /obj/item/clothing/glasses/sunglasses l_hand = /obj/item/weapon/clipboard diff --git a/code/game/jobs/job/captain_vr.dm b/code/game/jobs/job/captain_vr.dm index ea9f8ebed9..f08a1b4079 100644 --- a/code/game/jobs/job/captain_vr.dm +++ b/code/game/jobs/job/captain_vr.dm @@ -5,6 +5,8 @@ /datum/job/hop disallow_jobhop = TRUE pto_type = PTO_CIVILIAN + departments = list(DEPARTMENT_COMMAND, DEPARTMENT_CIVILIAN) + departments_managed = list(DEPARTMENT_CIVILIAN, DEPARTMENT_CARGO, DEPARTMENT_PLANET) alt_titles = list("Crew Resources Officer" = /datum/alt_title/cro, "Deputy Director" = /datum/alt_title/deputy_director) diff --git a/code/game/jobs/job/exploration_vr.dm b/code/game/jobs/job/exploration_vr.dm index 96f1995ca6..987041de61 100644 --- a/code/game/jobs/job/exploration_vr.dm +++ b/code/game/jobs/job/exploration_vr.dm @@ -39,7 +39,7 @@ var/const/SAR =(1<<14) faction = "Station" total_positions = 1 spawn_positions = 1 - supervisors = "the Colony Director" + supervisors = "the Head of Personnel" selection_color = "#d6d05c" economic_modifier = 8 minimal_player_age = 7 @@ -61,7 +61,7 @@ var/const/SAR =(1<<14) faction = "Station" total_positions = 4 spawn_positions = 4 - supervisors = "the Pathfinder" + supervisors = "the Pathfinder and the Head of Personnel" selection_color = "#999440" economic_modifier = 5 minimal_player_age = 3 @@ -82,7 +82,7 @@ var/const/SAR =(1<<14) faction = "Station" total_positions = 3 spawn_positions = 3 - supervisors = "the Pathfinder" + supervisors = "the Pathfinder and the Head of Personnel" selection_color = "#999440" economic_modifier = 6 pto_type = PTO_EXPLORATION @@ -102,7 +102,7 @@ var/const/SAR =(1<<14) faction = "Station" total_positions = 2 spawn_positions = 2 - supervisors = "the Pathfinder" + supervisors = "the Pathfinder and the Chief Medical Officer" selection_color = "#999440" economic_modifier = 6 minimal_player_age = 3 diff --git a/code/game/objects/items/devices/radio/encryptionkey_vr.dm b/code/game/objects/items/devices/radio/encryptionkey_vr.dm index af94d381ba..1f6110d16a 100644 --- a/code/game/objects/items/devices/radio/encryptionkey_vr.dm +++ b/code/game/objects/items/devices/radio/encryptionkey_vr.dm @@ -26,22 +26,27 @@ channels = list("Mercenary" = 1, "Raider" = 1, "Response Team" = 1, "Science" = 1, "Command" = 1, "Medical" = 1, "Engineering" = 1, "Security" = 1, "Supply" = 1, "Service" = 1, "Explorer" = 1) /obj/item/device/encryptionkey/pathfinder - name = "pathfinder radio encryption key" + name = "pathfinder's encryption key" icon_state = "com_cypherkey" channels = list("Command" = 1, "Explorer" = 1) +/obj/item/device/encryptionkey/qm + name = "quartermaster's encryption key" + icon_state = "qm_cypherkey" + channels = list("Command" = 1, "Supply" = 1) + /obj/item/device/encryptionkey/pilot name = "pilot's encryption key" icon_state = "cypherkey" channels = list("Explorer" = 1) /obj/item/device/encryptionkey/explorer - name = "explorer radio encryption key" + name = "explorer's encryption key" icon_state = "rob_cypherkey" channels = list("Explorer" = 1) /obj/item/device/encryptionkey/sar - name = "sar's encryption key" + name = "fm's encryption key" icon_state = "med_cypherkey" channels = list("Medical" = 1, "Explorer" = 1) diff --git a/code/game/objects/items/devices/radio/headset_vr.dm b/code/game/objects/items/devices/radio/headset_vr.dm index 2fe871ac25..9204c81dd1 100644 --- a/code/game/objects/items/devices/radio/headset_vr.dm +++ b/code/game/objects/items/devices/radio/headset_vr.dm @@ -50,6 +50,23 @@ return ..() +/obj/item/device/radio/headset/headset_cargo + desc = "A headset used by the QM's slaves." + +/obj/item/device/radio/headset/headset_cargo/alt + desc = "A bowman headset used by the QM's slaves." + +/obj/item/device/radio/headset/headset_qm + name = "qm radio headset" + desc = "A headset used by the QM." + icon_state = "cargo_headset" + ks2type = /obj/item/device/encryptionkey/qm + +/obj/item/device/radio/headset/headset_qm/alt + name = "qm bowman headset" + desc = "A bowman headset used by the QM." + icon_state = "cargo_headset_alt" + /obj/item/device/radio/headset/pathfinder name = "pathfinder's headset" desc = "Headset used by pathfinders for exploring. Access to the explorer and command channels." diff --git a/code/game/objects/structures/crates_lockers/closets/secure/cargo.dm b/code/game/objects/structures/crates_lockers/closets/secure/cargo.dm index 8429b5abdd..9ab55aa86c 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/cargo.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/cargo.dm @@ -47,8 +47,8 @@ /obj/item/clothing/under/rank/cargo/jeans, /obj/item/clothing/under/rank/cargo/jeans/female, /obj/item/clothing/shoes/brown, - /obj/item/device/radio/headset/headset_cargo, - /obj/item/device/radio/headset/headset_cargo/alt, + /obj/item/device/radio/headset/headset_qm, //VOREStation Edit, + /obj/item/device/radio/headset/headset_qm/alt, //VOREStation Edit, /obj/item/clothing/gloves/black, /obj/item/clothing/gloves/fingerless, /obj/item/clothing/suit/fire/firefighter,