From 486346bc14775e9a56eedeec9039bab294ede215 Mon Sep 17 00:00:00 2001 From: Morrow Date: Mon, 20 Nov 2023 14:57:14 -0500 Subject: [PATCH 1/4] Initial --- .../jobs/job/civilians/other/mess_seargent.dm | 20 ++++++++++++++++++- code/game/jobs/slot_scaling.dm | 3 +++ 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/code/game/jobs/job/civilians/other/mess_seargent.dm b/code/game/jobs/job/civilians/other/mess_seargent.dm index 4b1975015a95..936c1e90d9e9 100644 --- a/code/game/jobs/job/civilians/other/mess_seargent.dm +++ b/code/game/jobs/job/civilians/other/mess_seargent.dm @@ -1,13 +1,31 @@ /datum/job/civilian/chef title = JOB_MESS_SERGEANT - total_positions = 1 + total_positions = 2 spawn_positions = 1 + allow_additional = 1 + scaled = 1 selection_class = "job_ot" flags_startup_parameters = ROLE_ADD_TO_DEFAULT supervisors = "the auxiliary support officer" gear_preset = /datum/equipment_preset/uscm_ship/chef entry_message_body = "Your job is to service the marines with excellent food, drinks and entertaining the shipside crew when needed. You have a lot of freedom and it is up to you, to decide what to do with it. Good luck!" +/datum/job/civilian/chef/set_spawn_positions(count) + spawn_positions = mess_sergeant_slot_formula(count) + +/datum/job/civilian/chef/get_total_positions(latejoin = 0) + var/positions = spawn_positions + if(latejoin) + positions = mess_sergeant_slot_formula(get_total_marines()) + if(positions <= total_positions_so_far) + positions = total_positions_so_far + else + total_positions_so_far = positions + else + total_positions_so_far = positions + + return positions + /obj/effect/landmark/start/chef name = JOB_MESS_SERGEANT icon_state = "chef_spawn" diff --git a/code/game/jobs/slot_scaling.dm b/code/game/jobs/slot_scaling.dm index 7230f57eb745..2d444d06e5ab 100644 --- a/code/game/jobs/slot_scaling.dm +++ b/code/game/jobs/slot_scaling.dm @@ -50,3 +50,6 @@ /proc/working_joe_slot_formula(playercount) return job_slot_formula(playercount,30,1,3,6) + +/proc/mess_sergeant_slot_formula(playercount) + return job_slot_formula(playercount, 70, 1, 1, 2) From 0090e1cc1d4d3f3a234a3e8bb63525030cca1a06 Mon Sep 17 00:00:00 2001 From: Morrow Date: Mon, 20 Nov 2023 14:57:36 -0500 Subject: [PATCH 2/4] prereview review --- code/game/jobs/job/civilians/other/mess_seargent.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/jobs/job/civilians/other/mess_seargent.dm b/code/game/jobs/job/civilians/other/mess_seargent.dm index 936c1e90d9e9..9382c3053bbe 100644 --- a/code/game/jobs/job/civilians/other/mess_seargent.dm +++ b/code/game/jobs/job/civilians/other/mess_seargent.dm @@ -13,7 +13,7 @@ /datum/job/civilian/chef/set_spawn_positions(count) spawn_positions = mess_sergeant_slot_formula(count) -/datum/job/civilian/chef/get_total_positions(latejoin = 0) +/datum/job/civilian/chef/get_total_positions(latejoin = FALSE) var/positions = spawn_positions if(latejoin) positions = mess_sergeant_slot_formula(get_total_marines()) From 021a9bec48453b63254b97595b9b137e346ace1c Mon Sep 17 00:00:00 2001 From: morrowwolf Date: Mon, 20 Nov 2023 15:35:45 -0500 Subject: [PATCH 3/4] Update code/game/jobs/job/civilians/other/mess_seargent.dm Co-authored-by: BeagleGaming1 <56142455+BeagleGaming1@users.noreply.github.com> --- code/game/jobs/job/civilians/other/mess_seargent.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/jobs/job/civilians/other/mess_seargent.dm b/code/game/jobs/job/civilians/other/mess_seargent.dm index 9382c3053bbe..eb826bbc4e73 100644 --- a/code/game/jobs/job/civilians/other/mess_seargent.dm +++ b/code/game/jobs/job/civilians/other/mess_seargent.dm @@ -3,7 +3,7 @@ total_positions = 2 spawn_positions = 1 allow_additional = 1 - scaled = 1 + scaled = TRUE selection_class = "job_ot" flags_startup_parameters = ROLE_ADD_TO_DEFAULT supervisors = "the auxiliary support officer" From ef9b330b2772941d6374447cbbd4aba365eb5ecc Mon Sep 17 00:00:00 2001 From: morrowwolf Date: Mon, 20 Nov 2023 15:35:49 -0500 Subject: [PATCH 4/4] Update code/game/jobs/job/civilians/other/mess_seargent.dm Co-authored-by: BeagleGaming1 <56142455+BeagleGaming1@users.noreply.github.com> --- code/game/jobs/job/civilians/other/mess_seargent.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/jobs/job/civilians/other/mess_seargent.dm b/code/game/jobs/job/civilians/other/mess_seargent.dm index eb826bbc4e73..f0ccaafe1ff6 100644 --- a/code/game/jobs/job/civilians/other/mess_seargent.dm +++ b/code/game/jobs/job/civilians/other/mess_seargent.dm @@ -2,7 +2,7 @@ title = JOB_MESS_SERGEANT total_positions = 2 spawn_positions = 1 - allow_additional = 1 + allow_additional = TRUE scaled = TRUE selection_class = "job_ot" flags_startup_parameters = ROLE_ADD_TO_DEFAULT