cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-07-11 16:14:08 +01:00
Code Issues Packages Projects Releases Wiki Activity

CARGONIA THE FREE: The Quartermaster is now a head of staff. (#67518)

Browse Source 
* The Quartermaster is officially a head of staff, with new accesses, a silver ID, ect ect.
* The HoP lost their cargo-related equipment and access, including the Vault monitor, and frequency.
This commit is contained in:
Iamgoofball
2022-06-07 18:38:02 -07:00
committed by GitHub
parent 9c67e8de8c
commit aebd156a43
33 changed files with 300 additions and 245 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/antagonists/traitor/objectives/bug_room.dm
+1
View File
@@ -25,6 +25,7 @@
JOB_CHIEF_ENGINEER = /area/station/command/heads_quarters/ce,
JOB_HEAD_OF_PERSONNEL = /area/station/command/heads_quarters/hop,
JOB_CAPTAIN = /area/station/command/heads_quarters/captain, // For head roles so that they can still get this objective.
JOB_QUARTERMASTER = /area/station/cargo/qm,
)
var/datum/job/target_office
var/requires_head_as_supervisor = TRUE
code/modules/antagonists/traitor/objectives/destroy_heirloom.dm
+1 -1
View File
@@ -66,7 +66,6 @@
progression_maximum = 45 MINUTES
target_jobs = list(
// Cargo
/datum/job/quartermaster,
/datum/job/shaft_miner,
// Service
/datum/job/chaplain,
@@ -88,6 +87,7 @@
/datum/job/head_of_personnel,
/datum/job/chief_medical_officer,
/datum/job/research_director,
/datum/job/quartermaster,
)
/datum/traitor_objective/destroy_heirloom/captain
code/modules/antagonists/traitor/objectives/destroy_machinery.dm
+1
View File
@@ -23,6 +23,7 @@
JOB_CHIEF_ENGINEER = /obj/machinery/rnd/production/protolathe/department/engineering,
JOB_HEAD_OF_PERSONNEL = /obj/machinery/rnd/production/techfab/department/service,
JOB_SHAFT_MINER = /obj/machinery/mineral/ore_redemption,
JOB_QUARTERMASTER = /obj/machinery/rnd/production/techfab/department/cargo,
)
/// Whether this can bypass the maximum_allowed value or not
var/allow_more_than_max = FALSE
code/modules/antagonists/traitor/objectives/kidnapping.dm
+1 -1
View File
@@ -73,7 +73,6 @@
// Medical
/datum/job/virologist,
// Cargo
/datum/job/quartermaster,
/datum/job/shaft_miner,
// Service
/datum/job/cook,
@@ -97,6 +96,7 @@
/datum/job/head_of_personnel,
/datum/job/chief_medical_officer,
/datum/job/research_director,
/datum/job/quartermaster,
)
progression_reward = list(8 MINUTES, 12 MINUTES)
code/modules/antagonists/traitor/objectives/kill_pet.dm
+5
View File
@@ -24,6 +24,11 @@
JOB_CAPTAIN = /mob/living/simple_animal/pet/fox/renault,
JOB_CHIEF_MEDICAL_OFFICER = /mob/living/simple_animal/pet/cat/runtime,
JOB_CHIEF_ENGINEER = /mob/living/simple_animal/parrot/poly,
JOB_QUARTERMASTER = list(
/mob/living/simple_animal/sloth/citrus,
/mob/living/simple_animal/sloth/paperwork,
/mob/living/simple_animal/hostile/gorilla/cargo_domestic,
)
)
/// The head that we are targetting
var/datum/job/target
code/modules/jobs/job_types/_job.dm
+7
View File
@@ -120,6 +120,9 @@
///RPG job names, for the memes
var/rpg_title
/// Does this job ignore human authority?
var/ignore_human_authority = FALSE
/datum/job/New()
. = ..()
@@ -441,6 +444,10 @@
return // Disconnected while checking for the appearance ban.
var/require_human = CONFIG_GET(flag/enforce_human_authority) && (job.departments_bitflags & DEPARTMENT_BITFLAG_COMMAND)
if(require_human)
var/all_authority_require_human = CONFIG_GET(flag/enforce_human_authority_on_everyone)
if(!all_authority_require_human && job.ignore_human_authority)
require_human = FALSE
src.job = job.title
code/modules/jobs/job_types/cargo_technician.dm
+2 -2
View File
@@ -3,11 +3,11 @@
description = "Distribute supplies to the departments that ordered them, \
collect empty crates, load and unload the supply shuttle, \
ship bounty cubes."
department_head = list(JOB_HEAD_OF_PERSONNEL)
department_head = list(JOB_QUARTERMASTER)
faction = FACTION_STATION
total_positions = 3
spawn_positions = 2
supervisors = "the quartermaster and the head of personnel"
supervisors = "the quartermaster"
selection_color = "#dcba97"
exp_granted_type = EXP_TYPE_CREW
code/modules/jobs/job_types/head_of_personnel.dm
+1 -2
View File
@@ -4,7 +4,7 @@
protect Ian, run the station when the captain dies."
auto_deadmin_role_flags = DEADMIN_POSITION_HEAD
department_head = list(JOB_CAPTAIN)
head_announce = list(RADIO_CHANNEL_SUPPLY, RADIO_CHANNEL_SERVICE)
head_announce = list(RADIO_CHANNEL_SERVICE)
faction = FACTION_STATION
total_positions = 1
spawn_positions = 1
@@ -21,7 +21,6 @@
plasmaman_outfit = /datum/outfit/plasmaman/head_of_personnel
departments_list = list(
/datum/job_department/service,
/datum/job_department/cargo,
/datum/job_department/command,
)
code/modules/jobs/job_types/quartermaster.dm
+14 -8
View File
@@ -2,11 +2,13 @@
title = JOB_QUARTERMASTER
description = "Coordinate cargo technicians and shaft miners, assist with \
economical purchasing."
department_head = list(JOB_HEAD_OF_PERSONNEL)
auto_deadmin_role_flags = DEADMIN_POSITION_HEAD
department_head = list(JOB_CAPTAIN)
faction = FACTION_STATION
total_positions = 1
spawn_positions = 1
supervisors = "the head of personnel"
minimal_player_age = 7
supervisors = "the captain"
selection_color = "#d7b088"
exp_required_type_department = EXP_TYPE_SUPPLY
exp_granted_type = EXP_TYPE_CREW
@@ -14,15 +16,16 @@
outfit = /datum/outfit/job/quartermaster
plasmaman_outfit = /datum/outfit/plasmaman/cargo
paycheck = PAYCHECK_CREW
paycheck = PAYCHECK_COMMAND
paycheck_department = ACCOUNT_CAR
liver_traits = list(TRAIT_PRETENDER_ROYAL_METABOLISM)
liver_traits = list(TRAIT_ROYAL_METABOLISM) // finally upgraded
display_order = JOB_DISPLAY_ORDER_QUARTERMASTER
bounty_types = CIV_JOB_RANDOM
departments_list = list(
/datum/job_department/cargo,
/datum/job_department/command,
)
family_heirlooms = list(/obj/item/stamp, /obj/item/stamp/denied)
mail_goodies = list(
@@ -30,16 +33,19 @@
)
rpg_title = "Steward"
job_flags = JOB_ANNOUNCE_ARRIVAL | JOB_CREW_MANIFEST | JOB_EQUIP_RANK | JOB_CREW_MEMBER | JOB_NEW_PLAYER_JOINABLE | JOB_BOLD_SELECT_TEXT | JOB_REOPEN_ON_ROUNDSTART_LOSS | JOB_ASSIGN_QUIRKS | JOB_CAN_BE_INTERN
ignore_human_authority = TRUE
/datum/outfit/job/quartermaster
name = "Quartermaster"
jobtype = /datum/job/quartermaster
backpack_contents = list(
/obj/item/melee/baton/telescopic = 1,
)
id_trim = /datum/id_trim/job/quartermaster
id = /obj/item/card/id/advanced/silver
uniform = /obj/item/clothing/under/rank/cargo/qm
belt = /obj/item/modular_computer/tablet/pda/quartermaster
ears = /obj/item/radio/headset/headset_cargo
belt = /obj/item/modular_computer/tablet/pda/heads/quartermaster
ears = /obj/item/radio/headset/heads/qm
glasses = /obj/item/clothing/glasses/sunglasses
shoes = /obj/item/clothing/shoes/sneakers/brown
l_hand = /obj/item/clipboard
code/modules/jobs/job_types/shaft_miner.dm
+2 -2
View File
@@ -2,11 +2,11 @@
title = JOB_SHAFT_MINER
description = "Travel to strange lands. Mine ores. \
Meet strange creatures. Kill them for their gold."
department_head = list(JOB_HEAD_OF_PERSONNEL)
department_head = list(JOB_QUARTERMASTER)
faction = FACTION_STATION
total_positions = 3
spawn_positions = 3
supervisors = "the quartermaster and the head of personnel"
supervisors = "the quartermaster"
selection_color = "#dcba97"
exp_granted_type = EXP_TYPE_CREW
code/modules/jobs/job_types/warden.dm
+1 -1
View File
@@ -22,7 +22,7 @@
paycheck_department = ACCOUNT_SEC
mind_traits = list(TRAIT_DONUT_LOVER)
liver_traits = list(TRAIT_LAW_ENFORCEMENT_METABOLISM)
liver_traits = list(TRAIT_LAW_ENFORCEMENT_METABOLISM, TRAIT_PRETENDER_ROYAL_METABOLISM)
display_order = JOB_DISPLAY_ORDER_WARDEN
bounty_types = CIV_JOB_SEC
code/modules/modular_computers/computers/item/role_tablet_presets.dm
+23 -19
View File
@@ -103,6 +103,29 @@
/datum/computer_file/program/signal_commander,
)
/obj/item/modular_computer/tablet/pda/heads/quartermaster/Initialize(mapload)
. = ..()
install_component(new /obj/item/computer_hardware/printer/mini)
/obj/item/modular_computer/tablet/pda/heads/quartermaster
name = "quartermaster PDA"
greyscale_config = /datum/greyscale_config/tablet/stripe_thick
greyscale_colors = "#D6B328#6506CA#927444"
insert_type = /obj/item/pen/survival
default_applications = list(
/datum/computer_file/program/crew_manifest,
/datum/computer_file/program/status,
/datum/computer_file/program/science,
/datum/computer_file/program/robocontrol,
/datum/computer_file/program/budgetorders,
/datum/computer_file/program/shipping,
/datum/computer_file/program/robocontrol,
)
/obj/item/modular_computer/tablet/pda/heads/quartermaster/Initialize(mapload)
. = ..()
install_component(new /obj/item/computer_hardware/printer/mini)
/**
* Security
*/
@@ -232,25 +255,6 @@
/datum/computer_file/program/robocontrol,
)
/obj/item/modular_computer/tablet/pda/quartermaster/Initialize(mapload)
. = ..()
install_component(new /obj/item/computer_hardware/printer/mini)
/obj/item/modular_computer/tablet/pda/quartermaster
name = "quartermaster PDA"
greyscale_config = /datum/greyscale_config/tablet/stripe_thick
greyscale_colors = "#D6B328#6506CA#927444"
insert_type = /obj/item/pen/survival
default_applications = list(
/datum/computer_file/program/shipping,
/datum/computer_file/program/budgetorders,
/datum/computer_file/program/robocontrol,
)
/obj/item/modular_computer/tablet/pda/quartermaster/Initialize(mapload)
. = ..()
install_component(new /obj/item/computer_hardware/printer/mini)
/obj/item/modular_computer/tablet/pda/shaftminer
name = "shaft miner PDA"
greyscale_config = /datum/greyscale_config/tablet/stripe_thick
code/modules/modular_computers/file_system/programs/budgetordering.dm
+1 -1
View File
@@ -73,7 +73,7 @@
var/obj/item/computer_hardware/card_slot/card_slot = computer.all_components[MC_CARD]
var/obj/item/card/id/id_card = card_slot?.GetID()
if(id_card?.registered_account)
if((ACCESS_COMMAND in id_card.access) || (ACCESS_QM in id_card.access))
if((ACCESS_COMMAND in id_card.access))
requestonly = FALSE
buyer = SSeconomy.get_dep_account(id_card.registered_account.account_job.paycheck_department)
can_approve_requests = TRUE