diff --git a/code/game/jobs/job/command/cic/staffofficer.dm b/code/game/jobs/job/command/cic/staffofficer.dm index 9f7d1d09bf..0a243a99b8 100644 --- a/code/game/jobs/job/command/cic/staffofficer.dm +++ b/code/game/jobs/job/command/cic/staffofficer.dm @@ -11,7 +11,7 @@ flags_startup_parameters = ROLE_ADD_TO_DEFAULT gear_preset = /datum/equipment_preset/uscm_ship/so gear_preset_secondary = /datum/equipment_preset/uscm_ship/so/lesser_rank - entry_message_body = "Your job is to monitor the Marines, man the CIC, and listen to your superior officers. You are in charge of logistics and the overwatch system. You are also in line to take command after other eligible superior commissioned officers." + entry_message_body = "Your job is to conduct the briefing for the platoon, monitor the operation, and listen to your superior officers. You are in charge of the platoon for the current operation and supported by your Company Command.
They will give your orders VIA the telephone in your office once they are ready.
You remember that you've stored your personal gear are located in your personal quarters.
Your job involves heavy roleplay and requires you to behave like an officer and to stay in character at all times." job_options = list(FIRST_LT_VARIANT = "1stLt", SECOND_LT_VARIANT = "2ndLt") diff --git a/code/game/jobs/job/marine/marine.dm b/code/game/jobs/job/marine/marine.dm index e07c1edd31..c50a0420a9 100644 --- a/code/game/jobs/job/marine/marine.dm +++ b/code/game/jobs/job/marine/marine.dm @@ -1,5 +1,5 @@ /datum/job/marine - supervisors = "the acting squad leader" + supervisors = "the acting platoon leader" selection_class = "job_marine" total_positions = 8 spawn_positions = 8 @@ -7,7 +7,7 @@ /datum/job/marine/generate_entry_message(mob/living/carbon/human/current_human) if(current_human.assigned_squad) - entry_message_intro = "You are a [title]!
You have been assigned to: [lowertext(current_human.assigned_squad.name)] squad.[Check_WO() ? "" : " Make your way to the cafeteria for some post-cryosleep chow, and then get equipped in your squad's prep room." ]" + entry_message_intro = "You are a [title]!
You have been assigned to the [lowertext(current_human.assigned_squad.name)] platoon.[Check_WO() ? "" : " Make your way to the cafeteria for some post-cryosleep chow, and then get equipped in your team's prep room." ]" return ..() /datum/job/marine/generate_entry_conditions(mob/living/carbon/human/current_human) diff --git a/code/game/jobs/job/marine/squad/leader.dm b/code/game/jobs/job/marine/squad/leader.dm index 24233c95d5..8e1122b166 100644 --- a/code/game/jobs/job/marine/squad/leader.dm +++ b/code/game/jobs/job/marine/squad/leader.dm @@ -10,7 +10,7 @@ flags_startup_parameters = ROLE_ADD_TO_DEFAULT|ROLE_ADD_TO_SQUAD gear_preset = /datum/equipment_preset/uscm/leader gear_preset_secondary = /datum/equipment_preset/uscm/leader/lesser_rank - entry_message_body = "You are responsible for the men and women of your squad. Make sure they are on task, working together, and communicating. You are also in charge of communicating with command and letting them know about the situation first hand. Keep out of harm's way." + entry_message_body = "You are responsible for the men and women of your entire platoon. Make sure they are on task, working together, and communicating. You are also in charge of communicating with command and letting them know about the situation first hand. Keep out of harm's way.
You remember that you've stored your personal gear and uniform are located in the dorm or locker rooms." job_options = list(GYSGT_VARIANT = "GYSGT", SSGT_VARIANT = "SSGT") diff --git a/code/game/jobs/job/marine/squad/medic.dm b/code/game/jobs/job/marine/squad/medic.dm index 0b6f9f0702..02b438c048 100644 --- a/code/game/jobs/job/marine/squad/medic.dm +++ b/code/game/jobs/job/marine/squad/medic.dm @@ -10,7 +10,7 @@ flags_startup_parameters = ROLE_ADD_TO_DEFAULT|ROLE_ADD_TO_SQUAD gear_preset = /datum/equipment_preset/uscm/medic gear_preset_secondary = /datum/equipment_preset/uscm/medic/lesser_rank - entry_message_body = "You tend the wounds of your squad mates and make sure they are healthy and active. You may not be a fully-fledged doctor, but you stand between life and death when it matters." + entry_message_body = "You tend the wounds of your squad mates and make sure they are healthy and active. You may not be a fully-fledged doctor, but you stand between life and death when it matters.
You remember that you've stored your personal gear and uniform are located in your medical office." job_options = list(CPL_VARIANT = "CPL", LCPL_VARIANT = "LCPL") diff --git a/code/game/jobs/job/marine/squad/smartgunner.dm b/code/game/jobs/job/marine/squad/smartgunner.dm index e10724355c..6c27f5ec27 100644 --- a/code/game/jobs/job/marine/squad/smartgunner.dm +++ b/code/game/jobs/job/marine/squad/smartgunner.dm @@ -11,7 +11,7 @@ flags_startup_parameters = ROLE_ADD_TO_DEFAULT|ROLE_ADD_TO_SQUAD gear_preset = /datum/equipment_preset/uscm/sg gear_preset_secondary = /datum/equipment_preset/uscm/sg/lesser_rank - entry_message_body = "You are the smartgunner. Your task is to provide heavy weapons support." + entry_message_body = "You are a specialized automatic rifleman. Your task is to provide heavy weapons support for your squad.
You remember that you've stored your personal gear and uniform are located in the dorm or locker rooms." job_options = list(CPL_VARIANT = "CPL", LCPL_VARIANT = "LCPL") diff --git a/code/game/jobs/job/marine/squad/standard.dm b/code/game/jobs/job/marine/squad/standard.dm index 0269366bbf..71533679d9 100644 --- a/code/game/jobs/job/marine/squad/standard.dm +++ b/code/game/jobs/job/marine/squad/standard.dm @@ -13,7 +13,7 @@ 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!" + entry_message_body = "You are a rank-and-file Soldier of your standing army, and that is your strength. What you lack alone, you gain standing shoulder to shoulder with the men and women of the platoon. Ooh-rah!
You remember that you've stored your personal gear and uniform are located in the dorm or locker rooms." return ..() /datum/job/marine/standard/set_spawn_positions(count) diff --git a/code/game/jobs/job/marine/squad/tl.dm b/code/game/jobs/job/marine/squad/tl.dm index 987c5d58d8..be876dc0b3 100644 --- a/code/game/jobs/job/marine/squad/tl.dm +++ b/code/game/jobs/job/marine/squad/tl.dm @@ -8,7 +8,7 @@ allow_additional = 1 flags_startup_parameters = ROLE_ADD_TO_DEFAULT|ROLE_ADD_TO_SQUAD gear_preset = /datum/equipment_preset/uscm/tl - entry_message_body = "You are the Team Leader.Your task is to assist the squad leader in leading the squad as well as utilize ordnance such as orbital bombardments, CAS, and mortar as well as coordinating resupply with Requisitions and CIC. If the squad leader dies, you are expected to lead in their place." + entry_message_body = "You are the Squad Leader. Your task is leading the designated squad and utilize available ordnance. If the platoon leader dies, you are expected to lead in their place.
You remember that you've stored your personal gear and uniform are located in the dorm or locker rooms." job_options = list(SGT_VARIANT = "SGT")