From ca7a6717a5a4697daf82b8842390b310f018f232 Mon Sep 17 00:00:00 2001 From: Morrow Date: Mon, 6 Nov 2023 09:54:10 -0500 Subject: [PATCH] weird merge --- code/game/jobs/job/marine/squad/standard.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/game/jobs/job/marine/squad/standard.dm b/code/game/jobs/job/marine/squad/standard.dm index c30b7e149c..b5cab3a265 100644 --- a/code/game/jobs/job/marine/squad/standard.dm +++ b/code/game/jobs/job/marine/squad/standard.dm @@ -10,12 +10,12 @@ flags_startup_parameters = ROLE_ADD_TO_DEFAULT|ROLE_ADD_TO_SQUAD gear_preset = /datum/equipment_preset/uscm/pfc + job_options = list(PFC_VARIANT = "PFC", PVT_VARIANT = "PVT") + /datum/job/marine/standard/on_config_load() entry_message_body = "You are a rank-and-file Marine of the USCM, and that is your strength. What you lack alone, you gain standing shoulder to shoulder with the men and women of the corps. Ooh-rah!" return ..() - job_options = list(PFC_VARIANT = "PFC", PVT_VARIANT = "PVT") - /datum/job/marine/standard/set_spawn_positions(count) spawn_positions = max((round(count * STANDARD_MARINE_TO_TOTAL_SPAWN_RATIO)), 8)