From c2d07ac9511a82d402e9bd7a96adbf3a82cbf5b0 Mon Sep 17 00:00:00 2001 From: Guti <32563288+TheCaramelion@users.noreply.github.com> Date: Sun, 6 Oct 2024 22:12:50 +0200 Subject: [PATCH] Job whitelist removal (#9163) --- code/controllers/configuration_ch.dm | 2 +- .../configuration_ch/entries/chompstation.dm | 2 +- .../configuration_ch/entries/vorestation.dm | 2 +- code/game/jobs/job/captain_vr.dm | 4 +-- code/game/jobs/job/civilian_vr.dm | 2 +- code/game/jobs/job/engineering_vr.dm | 2 +- code/game/jobs/job/exploration_vr.dm | 2 +- code/game/jobs/job/medical_vr.dm | 2 +- code/game/jobs/job/science_vr.dm | 2 +- code/game/jobs/job/security_vr.dm | 4 +-- .../game/jobs/job/job_whitelist_overrides.dm | 32 ------------------- vorestation.dme | 1 - 12 files changed, 12 insertions(+), 45 deletions(-) delete mode 100644 modular_chomp/code/game/jobs/job/job_whitelist_overrides.dm diff --git a/code/controllers/configuration_ch.dm b/code/controllers/configuration_ch.dm index 2dcb5657db..901c6fe432 100644 --- a/code/controllers/configuration_ch.dm +++ b/code/controllers/configuration_ch.dm @@ -4,7 +4,7 @@ /datum/configuration var/discord_restriction = FALSE - var/use_jobwhitelist = TRUE + var/use_jobwhitelist = FALSE var/emojis = FALSE var/vorefootstep_volume = 75 //In future see about making a function to adjust volume serverside in config.txt, easy to do with reenable values. - Jack diff --git a/code/controllers/configuration_ch/entries/chompstation.dm b/code/controllers/configuration_ch/entries/chompstation.dm index 6721c9a13b..703270d91d 100644 --- a/code/controllers/configuration_ch/entries/chompstation.dm +++ b/code/controllers/configuration_ch/entries/chompstation.dm @@ -3,7 +3,7 @@ // default = FALSE /datum/config_entry/flag/use_jobwhitelist - default = TRUE + default = FALSE // FIXME: Unused ///datum/config_entry/flag/emojis diff --git a/code/controllers/configuration_ch/entries/vorestation.dm b/code/controllers/configuration_ch/entries/vorestation.dm index 09f49497ec..38d0dcda5c 100644 --- a/code/controllers/configuration_ch/entries/vorestation.dm +++ b/code/controllers/configuration_ch/entries/vorestation.dm @@ -34,7 +34,7 @@ /// Hours /datum/config_entry/number/pto_cap - default = 100 + default = 200 protection = CONFIG_ENTRY_LOCKED /datum/config_entry/flag/require_flavor diff --git a/code/game/jobs/job/captain_vr.dm b/code/game/jobs/job/captain_vr.dm index 856031a283..413b4d1258 100644 --- a/code/game/jobs/job/captain_vr.dm +++ b/code/game/jobs/job/captain_vr.dm @@ -1,7 +1,7 @@ /datum/job/captain disallow_jobhop = TRUE pto_type = PTO_CIVILIAN - dept_time_required = 80 //Pending something more complicated + dept_time_required = 200 //Pending something more complicated - CHOMPEdit alt_titles = list(JOB_ALT_OVERSEER= /datum/alt_title/overseer, JOB_ALT_FACILITY_DIRECTOR = /datum/alt_title/facility_director, JOB_ALT_CHIEF_SUPERVISOR = /datum/alt_title/chief_supervisor, JOB_ALT_CAPTAIN = /datum/alt_title/captain) @@ -22,7 +22,7 @@ pto_type = PTO_CIVILIAN departments = list(DEPARTMENT_COMMAND, DEPARTMENT_CIVILIAN) departments_managed = list(DEPARTMENT_CIVILIAN, DEPARTMENT_CARGO, DEPARTMENT_PLANET) - dept_time_required = 60 + dept_time_required = 120 // CHOMPEdit alt_titles = list(JOB_ALT_CREW_RESOURCE_OFFICER = /datum/alt_title/cro, JOB_ALT_DEPUTY_MANAGER = /datum/alt_title/deputy_manager, JOB_ALT_STAFF_MANAGER = /datum/alt_title/staff_manager, JOB_ALT_FACILITY_STEWARD = /datum/alt_title/facility_steward, JOB_ALT_FIRST_MATE = /datum/alt_title/first_mate //CHOMPEdit diff --git a/code/game/jobs/job/civilian_vr.dm b/code/game/jobs/job/civilian_vr.dm index 72aeb03cc7..b213d92791 100644 --- a/code/game/jobs/job/civilian_vr.dm +++ b/code/game/jobs/job/civilian_vr.dm @@ -52,7 +52,7 @@ /datum/job/qm pto_type = PTO_CARGO - dept_time_required = 20 + dept_time_required = 60 // CHOMPEdit alt_titles = list(JOB_ALT_SUPPLY_CHIEF = /datum/alt_title/supply_chief, JOB_ALT_LOGISTICS_MANAGER = /datum/alt_title/logistics_manager, JOB_ALT_CARGO_SUPERVISOR = /datum/alt_title/cargo_supervisor) /datum/alt_title/logistics_manager diff --git a/code/game/jobs/job/engineering_vr.dm b/code/game/jobs/job/engineering_vr.dm index 81f9d84502..1302bef647 100644 --- a/code/game/jobs/job/engineering_vr.dm +++ b/code/game/jobs/job/engineering_vr.dm @@ -1,7 +1,7 @@ /datum/job/chief_engineer disallow_jobhop = TRUE pto_type = PTO_ENGINEERING - dept_time_required = 60 + dept_time_required = 120 // CHOMPEdit access = list(access_engine, access_engine_equip, access_tech_storage, access_maint_tunnels, access_teleporter, access_external_airlocks, access_atmospherics, access_emergency_storage, access_eva, diff --git a/code/game/jobs/job/exploration_vr.dm b/code/game/jobs/job/exploration_vr.dm index 6648cf40a8..851d74ec88 100644 --- a/code/game/jobs/job/exploration_vr.dm +++ b/code/game/jobs/job/exploration_vr.dm @@ -43,7 +43,7 @@ economic_modifier = 8 minimal_player_age = 7 pto_type = PTO_EXPLORATION - dept_time_required = 20 + dept_time_required = 60 // CHOMPEdit access = list(access_eva, access_maint_tunnels, access_external_airlocks, access_pilot, access_explorer, access_gateway, access_pathfinder, access_RC_announce) minimal_access = list(access_eva, access_maint_tunnels, access_external_airlocks, access_pilot, access_explorer, access_gateway, access_pathfinder, access_RC_announce) diff --git a/code/game/jobs/job/medical_vr.dm b/code/game/jobs/job/medical_vr.dm index dc45c42168..8c3a98ef51 100644 --- a/code/game/jobs/job/medical_vr.dm +++ b/code/game/jobs/job/medical_vr.dm @@ -1,7 +1,7 @@ /datum/job/cmo disallow_jobhop = TRUE pto_type = PTO_MEDICAL - dept_time_required = 60 + dept_time_required = 120 // CHOMPEdit access = list(access_medical, access_medical_equip, access_morgue, access_genetics, access_heads, access_chemistry, access_virology, access_cmo, access_surgery, access_RC_announce, access_teleporter, //CHOMPEdit diff --git a/code/game/jobs/job/science_vr.dm b/code/game/jobs/job/science_vr.dm index 23d6acabe8..e5744da6d3 100644 --- a/code/game/jobs/job/science_vr.dm +++ b/code/game/jobs/job/science_vr.dm @@ -1,7 +1,7 @@ /datum/job/rd disallow_jobhop = TRUE pto_type = PTO_SCIENCE - dept_time_required = 60 + dept_time_required = 120 // CHOMPEdit access = list(access_rd, access_heads, access_tox, access_genetics, access_morgue, access_tox_storage, access_teleporter, diff --git a/code/game/jobs/job/security_vr.dm b/code/game/jobs/job/security_vr.dm index 21a1026ae4..35cb63615a 100644 --- a/code/game/jobs/job/security_vr.dm +++ b/code/game/jobs/job/security_vr.dm @@ -1,7 +1,7 @@ /datum/job/hos disallow_jobhop = TRUE pto_type = PTO_SECURITY - dept_time_required = 60 + dept_time_required = 120 // CHOMPEdit access = list(access_security, access_eva, access_sec_doors, access_brig, access_armory, access_forensics_lockers, access_morgue, access_maint_tunnels, access_all_personal_lockers, @@ -22,7 +22,7 @@ /datum/job/warden pto_type = PTO_SECURITY - dept_time_required = 20 + dept_time_required = 60 // CHOMPEdit alt_titles = list(JOB_ALT_BRIG_SENTRY = /datum/alt_title/brig_sentry, JOB_ALT_ARMORY_SUPERINTENDENT = /datum/alt_title/armory_superintendent, JOB_ALT_MASTERATARMS = /datum/alt_title/master_at_arms) /datum/alt_title/brig_sentry diff --git a/modular_chomp/code/game/jobs/job/job_whitelist_overrides.dm b/modular_chomp/code/game/jobs/job/job_whitelist_overrides.dm deleted file mode 100644 index 96ac9cd732..0000000000 --- a/modular_chomp/code/game/jobs/job/job_whitelist_overrides.dm +++ /dev/null @@ -1,32 +0,0 @@ -// Probably could code this to use a config file to set whitelist_only but I don't get paid for this. -// Captain -/datum/job/captain - whitelist_only = TRUE - -// Head of Personnel -/datum/job/hop - whitelist_only = TRUE - -// Head of Security -/datum/job/hos - whitelist_only = TRUE - -// Chief Engineer -/datum/job/chief_engineer - whitelist_only = TRUE - -// Research Director -/datum/job/rd - whitelist_only = TRUE - -// Chief Medical Officer -/datum/job/cmo - whitelist_only = TRUE - -// AI -/datum/job/ai - whitelist_only = TRUE - -// Internal Affairs Agent -/datum/job/lawyer - whitelist_only = TRUE diff --git a/vorestation.dme b/vorestation.dme index 7c39ea788e..858b6da310 100644 --- a/vorestation.dme +++ b/vorestation.dme @@ -4747,7 +4747,6 @@ #include "modular_chomp\code\game\jobs\job\captain.dm" #include "modular_chomp\code\game\jobs\job\department.dm" #include "modular_chomp\code\game\jobs\job\job_goodies.dm" -#include "modular_chomp\code\game\jobs\job\job_whitelist_overrides.dm" #include "modular_chomp\code\game\jobs\job\noncrew.dm" #include "modular_chomp\code\game\jobs\job\security.dm" #include "modular_chomp\code\game\jobs\job\silicon.dm"