cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 02:34:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Job whitelist removal (#9163)

Browse Source
This commit is contained in:
Guti
2024-10-06 22:12:50 +02:00
committed by GitHub
parent 9840952f90
commit c2d07ac951
12 changed files with 12 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/controllers/configuration_ch.dm
View File

@@ -4,7 +4,7 @@
/datum/configuration /datum/configuration
var/discord_restriction = FALSE var/discord_restriction = FALSE
var/use_jobwhitelist = TRUE var/use_jobwhitelist = FALSE
var/emojis = 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 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

2
code/controllers/configuration_ch/entries/chompstation.dm
View File

@@ -3,7 +3,7 @@
// default = FALSE // default = FALSE
/datum/config_entry/flag/use_jobwhitelist /datum/config_entry/flag/use_jobwhitelist
default = TRUE default = FALSE
// FIXME: Unused // FIXME: Unused
///datum/config_entry/flag/emojis ///datum/config_entry/flag/emojis

2
code/controllers/configuration_ch/entries/vorestation.dm
View File

@@ -34,7 +34,7 @@
/// Hours /// Hours
/datum/config_entry/number/pto_cap /datum/config_entry/number/pto_cap
default = 100 default = 200
protection = CONFIG_ENTRY_LOCKED protection = CONFIG_ENTRY_LOCKED
/datum/config_entry/flag/require_flavor /datum/config_entry/flag/require_flavor

4
code/game/jobs/job/captain_vr.dm
View File

@@ -1,7 +1,7 @@
/datum/job/captain /datum/job/captain
disallow_jobhop = TRUE disallow_jobhop = TRUE
pto_type = PTO_CIVILIAN 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, 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) JOB_ALT_CAPTAIN = /datum/alt_title/captain)
@@ -22,7 +22,7 @@
pto_type = PTO_CIVILIAN pto_type = PTO_CIVILIAN
departments = list(DEPARTMENT_COMMAND, DEPARTMENT_CIVILIAN) departments = list(DEPARTMENT_COMMAND, DEPARTMENT_CIVILIAN)
departments_managed = list(DEPARTMENT_CIVILIAN, DEPARTMENT_CARGO, DEPARTMENT_PLANET) 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, 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 JOB_ALT_FACILITY_STEWARD = /datum/alt_title/facility_steward, JOB_ALT_FIRST_MATE = /datum/alt_title/first_mate //CHOMPEdit

2
code/game/jobs/job/civilian_vr.dm
View File

@@ -52,7 +52,7 @@
/datum/job/qm /datum/job/qm
pto_type = PTO_CARGO 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) 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 /datum/alt_title/logistics_manager

2
code/game/jobs/job/engineering_vr.dm
View File

@@ -1,7 +1,7 @@
/datum/job/chief_engineer /datum/job/chief_engineer
disallow_jobhop = TRUE disallow_jobhop = TRUE
pto_type = PTO_ENGINEERING 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 = list(access_engine, access_engine_equip, access_tech_storage, access_maint_tunnels,
access_teleporter, access_external_airlocks, access_atmospherics, access_emergency_storage, access_eva, access_teleporter, access_external_airlocks, access_atmospherics, access_emergency_storage, access_eva,

2
code/game/jobs/job/exploration_vr.dm
View File

@@ -43,7 +43,7 @@
economic_modifier = 8 economic_modifier = 8
minimal_player_age = 7 minimal_player_age = 7
pto_type = PTO_EXPLORATION 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) 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) minimal_access = list(access_eva, access_maint_tunnels, access_external_airlocks, access_pilot, access_explorer, access_gateway, access_pathfinder, access_RC_announce)

2
code/game/jobs/job/medical_vr.dm
View File

@@ -1,7 +1,7 @@
/datum/job/cmo /datum/job/cmo
disallow_jobhop = TRUE disallow_jobhop = TRUE
pto_type = PTO_MEDICAL 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 = 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 access_chemistry, access_virology, access_cmo, access_surgery, access_RC_announce, access_teleporter, //CHOMPEdit

2
code/game/jobs/job/science_vr.dm
View File

@@ -1,7 +1,7 @@
/datum/job/rd /datum/job/rd
disallow_jobhop = TRUE disallow_jobhop = TRUE
pto_type = PTO_SCIENCE 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 = list(access_rd, access_heads, access_tox, access_genetics, access_morgue,
access_tox_storage, access_teleporter, access_tox_storage, access_teleporter,

4
code/game/jobs/job/security_vr.dm
View File

@@ -1,7 +1,7 @@
/datum/job/hos /datum/job/hos
disallow_jobhop = TRUE disallow_jobhop = TRUE
pto_type = PTO_SECURITY 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 = list(access_security, access_eva, access_sec_doors, access_brig, access_armory,
access_forensics_lockers, access_morgue, access_maint_tunnels, access_all_personal_lockers, access_forensics_lockers, access_morgue, access_maint_tunnels, access_all_personal_lockers,
@@ -22,7 +22,7 @@
/datum/job/warden /datum/job/warden
pto_type = PTO_SECURITY 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) 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 /datum/alt_title/brig_sentry

32
modular_chomp/code/game/jobs/job/job_whitelist_overrides.dm
View File

@@ -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

1
vorestation.dme
View File

@@ -4747,7 +4747,6 @@
#include "modular_chomp\code\game\jobs\job\captain.dm" #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\department.dm"
#include "modular_chomp\code\game\jobs\job\job_goodies.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\noncrew.dm"
#include "modular_chomp\code\game\jobs\job\security.dm" #include "modular_chomp\code\game\jobs\job\security.dm"
#include "modular_chomp\code\game\jobs\job\silicon.dm" #include "modular_chomp\code\game\jobs\job\silicon.dm"