From 3456bf717daa851e92bcba4d2fbf23c86ac9a651 Mon Sep 17 00:00:00 2001 From: SabreML <57483089+SabreML@users.noreply.github.com> Date: Fri, 3 Dec 2021 07:11:38 +0000 Subject: [PATCH] Gives the Cargo/Supply department a colour in the job selection menu (#16956) --- code/game/jobs/job/support.dm | 248 +++++++++++++++++----------------- 1 file changed, 125 insertions(+), 123 deletions(-) diff --git a/code/game/jobs/job/support.dm b/code/game/jobs/job/support.dm index 4f0c1aa0d64..e0c3ae19e97 100644 --- a/code/game/jobs/job/support.dm +++ b/code/game/jobs/job/support.dm @@ -1,3 +1,128 @@ +//Cargo +/datum/job/qm + title = "Quartermaster" + flag = JOB_QUARTERMASTER + department_flag = JOBCAT_SUPPORT + total_positions = 1 + spawn_positions = 1 + is_supply = 1 + supervisors = "the head of personnel" + department_head = list("Head of Personnel") + 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) + outfit = /datum/outfit/job/qm + +/datum/outfit/job/qm + name = "Quartermaster" + jobtype = /datum/job/qm + + uniform = /obj/item/clothing/under/rank/cargo + shoes = /obj/item/clothing/shoes/brown + l_ear = /obj/item/radio/headset/headset_cargo + glasses = /obj/item/clothing/glasses/sunglasses + id = /obj/item/card/id/supply + l_hand = /obj/item/clipboard + pda = /obj/item/pda/quartermaster + + + +/datum/job/cargo_tech + title = "Cargo Technician" + flag = JOB_CARGOTECH + department_flag = JOBCAT_SUPPORT + total_positions = 2 + spawn_positions = 2 + is_supply = 1 + supervisors = "the quartermaster" + department_head = list("Head of Personnel") + selection_color = "#eeddbe" + 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_CARGO, ACCESS_CARGO_BOT, ACCESS_MAILSORTING, ACCESS_MINERAL_STOREROOM) + outfit = /datum/outfit/job/cargo_tech + +/datum/outfit/job/cargo_tech + name = "Cargo Technician" + jobtype = /datum/job/cargo_tech + + uniform = /obj/item/clothing/under/rank/cargotech + shoes = /obj/item/clothing/shoes/black + l_ear = /obj/item/radio/headset/headset_cargo + id = /obj/item/card/id/supply + pda = /obj/item/pda/cargo + + + +/datum/job/mining + title = "Shaft Miner" + flag = JOB_MINER + department_flag = JOBCAT_SUPPORT + total_positions = 6 + spawn_positions = 8 + is_supply = 1 + supervisors = "the quartermaster" + department_head = list("Head of Personnel") + selection_color = "#eeddbe" + 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_MINING, ACCESS_MINT, ACCESS_MINING_STATION, ACCESS_MAILSORTING, ACCESS_MAINT_TUNNELS, ACCESS_MINERAL_STOREROOM) + alt_titles = list("Spelunker") + outfit = /datum/outfit/job/mining + +/datum/outfit/job/mining + name = "Shaft Miner" + jobtype = /datum/job/mining + + l_ear = /obj/item/radio/headset/headset_cargo/mining + shoes = /obj/item/clothing/shoes/workboots/mining + gloves = /obj/item/clothing/gloves/color/black + uniform = /obj/item/clothing/under/rank/miner/lavaland + l_pocket = /obj/item/reagent_containers/hypospray/autoinjector/survival + r_pocket = /obj/item/storage/bag/ore + id = /obj/item/card/id/supply + pda = /obj/item/pda/shaftminer + backpack_contents = list( + /obj/item/flashlight/seclite=1,\ + /obj/item/kitchen/knife/combat/survival=1,\ + /obj/item/mining_voucher=1,\ + /obj/item/stack/marker_beacon/ten=1 + ) + + backpack = /obj/item/storage/backpack/explorer + satchel = /obj/item/storage/backpack/satchel/explorer + box = /obj/item/storage/box/survival_mining + +/datum/outfit/job/mining/equipped + name = "Shaft Miner" + + suit = /obj/item/clothing/suit/hooded/explorer + mask = /obj/item/clothing/mask/gas/explorer + glasses = /obj/item/clothing/glasses/meson + suit_store = /obj/item/tank/internals/emergency_oxygen + internals_slot = slot_s_store + backpack_contents = list( + /obj/item/flashlight/seclite=1,\ + /obj/item/kitchen/knife/combat/survival=1, + /obj/item/mining_voucher=1, + /obj/item/t_scanner/adv_mining_scanner/lesser=1, + /obj/item/gun/energy/kinetic_accelerator=1,\ + /obj/item/stack/marker_beacon/ten=1 + ) + +/datum/outfit/job/miner/equipped/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) + ..() + if(visualsOnly) + return + if(istype(H.wear_suit, /obj/item/clothing/suit/hooded)) + var/obj/item/clothing/suit/hooded/S = H.wear_suit + S.ToggleHood() + +/datum/outfit/job/miner/equipped/hardsuit + name = "Shaft Miner (Equipment + Hardsuit)" + suit = /obj/item/clothing/suit/space/hardsuit/mining + mask = /obj/item/clothing/mask/breath + + + //Food /datum/job/bartender title = "Bartender" @@ -112,129 +237,6 @@ -//Cargo -/datum/job/qm - title = "Quartermaster" - flag = JOB_QUARTERMASTER - department_flag = JOBCAT_SUPPORT - total_positions = 1 - spawn_positions = 1 - is_supply = 1 - supervisors = "the head of personnel" - department_head = list("Head of Personnel") - selection_color = "#dddddd" - 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) - outfit = /datum/outfit/job/qm - -/datum/outfit/job/qm - name = "Quartermaster" - jobtype = /datum/job/qm - - uniform = /obj/item/clothing/under/rank/cargo - shoes = /obj/item/clothing/shoes/brown - l_ear = /obj/item/radio/headset/headset_cargo - glasses = /obj/item/clothing/glasses/sunglasses - id = /obj/item/card/id/supply - l_hand = /obj/item/clipboard - pda = /obj/item/pda/quartermaster - - - -/datum/job/cargo_tech - title = "Cargo Technician" - flag = JOB_CARGOTECH - department_flag = JOBCAT_SUPPORT - total_positions = 2 - spawn_positions = 2 - is_supply = 1 - supervisors = "the quartermaster" - department_head = list("Head of Personnel") - selection_color = "#dddddd" - 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_CARGO, ACCESS_CARGO_BOT, ACCESS_MAILSORTING, ACCESS_MINERAL_STOREROOM) - outfit = /datum/outfit/job/cargo_tech - -/datum/outfit/job/cargo_tech - name = "Cargo Technician" - jobtype = /datum/job/cargo_tech - - uniform = /obj/item/clothing/under/rank/cargotech - shoes = /obj/item/clothing/shoes/black - l_ear = /obj/item/radio/headset/headset_cargo - id = /obj/item/card/id/supply - pda = /obj/item/pda/cargo - - - -/datum/job/mining - title = "Shaft Miner" - flag = JOB_MINER - department_flag = JOBCAT_SUPPORT - total_positions = 6 - spawn_positions = 8 - is_supply = 1 - supervisors = "the quartermaster" - department_head = list("Head of Personnel") - selection_color = "#dddddd" - 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_MINING, ACCESS_MINT, ACCESS_MINING_STATION, ACCESS_MAILSORTING, ACCESS_MAINT_TUNNELS, ACCESS_MINERAL_STOREROOM) - alt_titles = list("Spelunker") - outfit = /datum/outfit/job/mining - -/datum/outfit/job/mining - name = "Shaft Miner" - jobtype = /datum/job/mining - - l_ear = /obj/item/radio/headset/headset_cargo/mining - shoes = /obj/item/clothing/shoes/workboots/mining - gloves = /obj/item/clothing/gloves/color/black - uniform = /obj/item/clothing/under/rank/miner/lavaland - l_pocket = /obj/item/reagent_containers/hypospray/autoinjector/survival - r_pocket = /obj/item/storage/bag/ore - id = /obj/item/card/id/supply - pda = /obj/item/pda/shaftminer - backpack_contents = list( - /obj/item/flashlight/seclite=1,\ - /obj/item/kitchen/knife/combat/survival=1,\ - /obj/item/mining_voucher=1,\ - /obj/item/stack/marker_beacon/ten=1 - ) - - backpack = /obj/item/storage/backpack/explorer - satchel = /obj/item/storage/backpack/satchel/explorer - box = /obj/item/storage/box/survival_mining - -/datum/outfit/job/mining/equipped - name = "Shaft Miner" - - suit = /obj/item/clothing/suit/hooded/explorer - mask = /obj/item/clothing/mask/gas/explorer - glasses = /obj/item/clothing/glasses/meson - suit_store = /obj/item/tank/internals/emergency_oxygen - internals_slot = slot_s_store - backpack_contents = list( - /obj/item/flashlight/seclite=1,\ - /obj/item/kitchen/knife/combat/survival=1, - /obj/item/mining_voucher=1, - /obj/item/t_scanner/adv_mining_scanner/lesser=1, - /obj/item/gun/energy/kinetic_accelerator=1,\ - /obj/item/stack/marker_beacon/ten=1 - ) - -/datum/outfit/job/miner/equipped/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - ..() - if(visualsOnly) - return - if(istype(H.wear_suit, /obj/item/clothing/suit/hooded)) - var/obj/item/clothing/suit/hooded/S = H.wear_suit - S.ToggleHood() - -/datum/outfit/job/miner/equipped/hardsuit - name = "Shaft Miner (Equipment + Hardsuit)" - suit = /obj/item/clothing/suit/space/hardsuit/mining - mask = /obj/item/clothing/mask/breath - //Griff //BS12 EDIT /datum/job/clown