From b46691032cdbb56c4ce56d34d0b76c513949817f Mon Sep 17 00:00:00 2001 From: chesse20 Date: Wed, 13 Sep 2023 13:20:58 -0700 Subject: [PATCH 1/3] Overflow = Shaft Miners --- code/controllers/configuration/entries/game_options.dm | 2 +- code/modules/jobs/job_types/assistant.dm | 4 ++-- code/modules/jobs/job_types/shaft_miner.dm | 4 ++-- config/game_options.txt | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/code/controllers/configuration/entries/game_options.dm b/code/controllers/configuration/entries/game_options.dm index 9b7f7d99567..25eb6d96279 100644 --- a/code/controllers/configuration/entries/game_options.dm +++ b/code/controllers/configuration/entries/game_options.dm @@ -303,7 +303,7 @@ min_val = -1 /datum/config_entry/string/overflow_job - default = JOB_ASSISTANT + default = JOB_SHAFT_MINER /datum/config_entry/flag/starlight /datum/config_entry/flag/grey_assistants diff --git a/code/modules/jobs/job_types/assistant.dm b/code/modules/jobs/job_types/assistant.dm index 004c5540805..67b63b9e52f 100644 --- a/code/modules/jobs/job_types/assistant.dm +++ b/code/modules/jobs/job_types/assistant.dm @@ -7,8 +7,8 @@ Assistant title = JOB_ASSISTANT description = "Get your space legs, assist people, ask the HoP to give you a job." faction = FACTION_STATION - total_positions = 5 - spawn_positions = 5 + total_positions = 0 //dont need them in ds13 + spawn_positions = 0 supervisors = "absolutely everyone" exp_granted_type = EXP_TYPE_CREW diff --git a/code/modules/jobs/job_types/shaft_miner.dm b/code/modules/jobs/job_types/shaft_miner.dm index 6ccc3e76684..45e698b1161 100644 --- a/code/modules/jobs/job_types/shaft_miner.dm +++ b/code/modules/jobs/job_types/shaft_miner.dm @@ -4,8 +4,8 @@ Meet strange creatures. Kill them for their gold." department_head = list(JOB_HEAD_OF_PERSONNEL) faction = FACTION_STATION - total_positions = 3 - spawn_positions = 3 + total_positions = 100 + spawn_positions = 25 supervisors = "the quartermaster and the head of personnel" selection_color = "#15381b" exp_granted_type = EXP_TYPE_CREW diff --git a/config/game_options.txt b/config/game_options.txt index 03899c13d37..85acf261e65 100644 --- a/config/game_options.txt +++ b/config/game_options.txt @@ -359,7 +359,7 @@ ROUNDSTART_RACES vox #ROUNDSTART_NO_HARD_CHECK felinid ##Overflow job. Default is assistant -OVERFLOW_JOB Assistant +OVERFLOW_JOB Shaft Miner ## Overflow slot cap. Set to -1 for unlimited. If limited, it will still open up if every other job is full. OVERFLOW_CAP -1 From 52299495b89d4e1726a33907d1f1e2c1e074c8d6 Mon Sep 17 00:00:00 2001 From: chesse20 Date: Wed, 13 Sep 2023 13:35:58 -0700 Subject: [PATCH 2/3] use map json instead --- _maps/aegis.json | 3 +++ code/modules/jobs/job_types/assistant.dm | 4 ++-- code/modules/jobs/job_types/shaft_miner.dm | 4 ++-- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/_maps/aegis.json b/_maps/aegis.json index db999c49b2d..f4aba3db6f5 100644 --- a/_maps/aegis.json +++ b/_maps/aegis.json @@ -51,6 +51,9 @@ "assistant": { "total_positions": 0 }, + "shaft_miner": { + "total_positions": 100 + }, "atmospheric_technician": { "total_positions": 0 }, diff --git a/code/modules/jobs/job_types/assistant.dm b/code/modules/jobs/job_types/assistant.dm index 67b63b9e52f..50ca366b04a 100644 --- a/code/modules/jobs/job_types/assistant.dm +++ b/code/modules/jobs/job_types/assistant.dm @@ -7,8 +7,8 @@ Assistant title = JOB_ASSISTANT description = "Get your space legs, assist people, ask the HoP to give you a job." faction = FACTION_STATION - total_positions = 0 //dont need them in ds13 - spawn_positions = 0 + total_positions = 5 //dont need them in ds13 + spawn_positions = 5 supervisors = "absolutely everyone" exp_granted_type = EXP_TYPE_CREW diff --git a/code/modules/jobs/job_types/shaft_miner.dm b/code/modules/jobs/job_types/shaft_miner.dm index 1ebacb30de7..6e48d211cf7 100644 --- a/code/modules/jobs/job_types/shaft_miner.dm +++ b/code/modules/jobs/job_types/shaft_miner.dm @@ -4,8 +4,8 @@ Meet strange creatures. Kill them for their gold." department_head = list(JOB_HEAD_OF_PERSONNEL) faction = FACTION_STATION - total_positions = 100 - spawn_positions = 25 + total_positions = 3 + spawn_positions = 3 supervisors = "the quartermaster and the head of personnel" selection_color = "#15381b" exp_granted_type = EXP_TYPE_CREW From 9cd474f2c748219818bb6c62ef0b511d0305db07 Mon Sep 17 00:00:00 2001 From: chesse20 Date: Wed, 13 Sep 2023 13:37:35 -0700 Subject: [PATCH 3/3] remove unneccsary comment --- code/modules/jobs/job_types/assistant.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/jobs/job_types/assistant.dm b/code/modules/jobs/job_types/assistant.dm index 50ca366b04a..004c5540805 100644 --- a/code/modules/jobs/job_types/assistant.dm +++ b/code/modules/jobs/job_types/assistant.dm @@ -7,7 +7,7 @@ Assistant title = JOB_ASSISTANT description = "Get your space legs, assist people, ask the HoP to give you a job." faction = FACTION_STATION - total_positions = 5 //dont need them in ds13 + total_positions = 5 spawn_positions = 5 supervisors = "absolutely everyone" exp_granted_type = EXP_TYPE_CREW