From 5f5e5a67b7e477385a919296cc7ce626afc4fac2 Mon Sep 17 00:00:00 2001 From: Pandora Date: Sat, 2 Nov 2024 21:18:34 +0000 Subject: [PATCH 01/13] Fixes the rest of the missed Section Sergeant related things (#534) --- code/game/jobs/job/marine/squads.dm | 8 ++++---- .../objects/items/devices/radio/headset.dm | 8 ++++---- code/modules/cm_marines/overwatch.dm | 18 +++++++++--------- code/modules/gear_presets/uscm.dm | 2 +- .../tgui/interfaces/OverwatchConsole.jsx | 8 ++++---- tgui/packages/tgui/interfaces/SquadInfo.tsx | 14 +++++++------- 6 files changed, 29 insertions(+), 29 deletions(-) diff --git a/code/game/jobs/job/marine/squads.dm b/code/game/jobs/job/marine/squads.dm index ab76d72d49..c6e590cd4a 100644 --- a/code/game/jobs/job/marine/squads.dm +++ b/code/game/jobs/job/marine/squads.dm @@ -826,10 +826,10 @@ id.access.Remove(squad_one_access, squad_two_access) for(var/obj/item/device/radio/headset/cycled_headset in H) - if(!("Platoon Sergeant" in cycled_headset.tracking_options)) + if(!("Section Sergeant" in cycled_headset.tracking_options)) continue - cycled_headset.locate_setting = cycled_headset.tracking_options["Platoon Sergeant"] + cycled_headset.locate_setting = cycled_headset.tracking_options["Section Sergeant"] /datum/squad/proc/assign_ft_leader(fireteam, mob/living/carbon/human/H, upd_ui = TRUE) if(fireteam_leaders[fireteam]) @@ -843,10 +843,10 @@ to_chat(H, FONT_SIZE_HUGE(SPAN_BLUE("You were assigned as [fireteam] Team Leader."))) for(var/obj/item/device/radio/headset/cycled_headset in H) - if(!("Platoon Sergeant" in cycled_headset.tracking_options)) + if(!("Section Sergeant" in cycled_headset.tracking_options)) continue - cycled_headset.locate_setting = cycled_headset.tracking_options["Platoon Sergeant"] + cycled_headset.locate_setting = cycled_headset.tracking_options["Section Sergeant"] /datum/squad/proc/unassign_ft_leader(fireteam, clear_group_id, upd_ui = TRUE) if(!fireteam_leaders[fireteam]) diff --git a/code/game/objects/items/devices/radio/headset.dm b/code/game/objects/items/devices/radio/headset.dm index 0f28c2aab9..eb20ed2e02 100644 --- a/code/game/objects/items/devices/radio/headset.dm +++ b/code/game/objects/items/devices/radio/headset.dm @@ -21,7 +21,7 @@ var/list/inbuilt_tracking_options = list( "Platoon Commander" = TRACKER_PLTCO, - "Platoon Sergeant" = TRACKER_SL, + "Section Sergeant" = TRACKER_SL, "Squad Sergeant" = TRACKER_FTL, "Landing Zone" = TRACKER_LZ ) @@ -410,8 +410,8 @@ /obj/item/device/radio/headset/almayer/equipped(mob/living/carbon/human/user, slot) . = ..() - if((user == user.assigned_squad?.fireteam_leaders["SQ1"] || user == user.assigned_squad?.fireteam_leaders["SQ2"]) && ("Platoon Sergeant" in tracking_options)) - locate_setting = tracking_options["Platoon Sergeant"] + if((user == user.assigned_squad?.fireteam_leaders["SQ1"] || user == user.assigned_squad?.fireteam_leaders["SQ2"]) && ("Section Sergeant" in tracking_options)) + locate_setting = tracking_options["Section Sergeant"] return if(((user in user.assigned_squad?.fireteams["SQ1"]) || (user in user.assigned_squad?.fireteams["SQ2"])) && ("Squad Sergeant" in tracking_options)) @@ -614,7 +614,7 @@ inbuilt_tracking_options = list( "Platoon Commander" = TRACKER_PLTCO, - "Platoon Sergeant" = TRACKER_ASL, + "Section Sergeant" = TRACKER_ASL, "Landing Zone" = TRACKER_LZ ) diff --git a/code/modules/cm_marines/overwatch.dm b/code/modules/cm_marines/overwatch.dm index ceee199367..3275276efc 100644 --- a/code/modules/cm_marines/overwatch.dm +++ b/code/modules/cm_marines/overwatch.dm @@ -383,12 +383,12 @@ if(!current_squad) return TRUE - var/input = tgui_input_text(user, "Please write a message to announce to the squad:", "Squad Message") + var/input = tgui_input_text(user, "Please write a message to announce to the section:", "Section Message") if(!input) return TRUE current_squad.send_message(input, 1) //message, adds username - current_squad.send_maptext(input, "Platoon Message:") + current_squad.send_maptext(input, "Section Message:") visible_message("[icon2html(src, viewers(src))] [SPAN_BOLDNOTICE("Message '[input]' sent to all Marines of platoon '[current_squad]'.")]") log_overwatch("[key_name(user)] sent '[input]' to platoon [current_squad].") @@ -405,14 +405,14 @@ if(!current_squad) return TRUE - var/input = tgui_input_text(user, "Please write a message to announce to the Platoon leader:", "SL Message") + var/input = tgui_input_text(user, "Please write a message to announce to the Section Leader:", "SL Message") if(!input) return TRUE current_squad.send_message(input, 1, 1) //message, adds username, only to leader - current_squad.send_maptext(input, "Platoon Sergeant Message:", 1) - visible_message("[icon2html(src, viewers(src))] [SPAN_BOLDNOTICE("Message '[input]' sent to Platoon Sergeant [current_squad.squad_leader] of platoon '[current_squad]'.")]") - log_overwatch("[key_name(user)] sent '[input]' to Platoon Sergeant [current_squad.squad_leader] of squad [current_squad].") + current_squad.send_maptext(input, "Section Sergeant Message:", 1) + visible_message("[icon2html(src, viewers(src))] [SPAN_BOLDNOTICE("Message '[input]' sent to Section Sergeant [current_squad.squad_leader] of platoon '[current_squad]'.")]") + log_overwatch("[key_name(user)] sent '[input]' to Section Sergeant [current_squad.squad_leader] of squad [current_squad].") var/comm_paygrade = user.get_paygrade() @@ -438,7 +438,7 @@ current_squad.send_maptext(current_squad.secondary_objective, "Secondary Objective:") if("set_primary") - var/input = sanitize_control_chars(stripped_input(usr, "What will be the squad's primary objective?", "Primary Objective")) + var/input = sanitize_control_chars(stripped_input(usr, "What will be the section's primary objective?", "Primary Objective")) if(current_squad && input) current_squad.primary_objective = "[input] ([worldtime2text()])" current_squad.send_message("Your primary objective has been changed to '[input]'. See Status pane for details.") @@ -448,7 +448,7 @@ return TRUE if("set_secondary") - var/input = sanitize_control_chars(stripped_input(usr, "What will be the squad's secondary objective?", "Secondary Objective")) + var/input = sanitize_control_chars(stripped_input(usr, "What will be the section's secondary objective?", "Secondary Objective")) if(input) current_squad.secondary_objective = input + " ([worldtime2text()])" current_squad.send_message("Your secondary objective has been changed to '[input]'. See Status pane for details.") @@ -477,7 +477,7 @@ switch(z_hidden) if(HIDE_NONE) z_hidden = HIDE_ALMAYER - to_chat(user, "[icon2html(src, usr)] [SPAN_NOTICE("Marines on the Almayer are now hidden.")]") + to_chat(user, "[icon2html(src, usr)] [SPAN_NOTICE("Marines on the deployed vessel are now hidden.")]") if(HIDE_ALMAYER) z_hidden = HIDE_GROUND to_chat(user, "[icon2html(src, usr)] [SPAN_NOTICE("Marines on the ground are now hidden.")]") diff --git a/code/modules/gear_presets/uscm.dm b/code/modules/gear_presets/uscm.dm index b45f82f1e0..17fda6f56a 100644 --- a/code/modules/gear_presets/uscm.dm +++ b/code/modules/gear_presets/uscm.dm @@ -641,7 +641,7 @@ new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m41aMK1(new_human.back), WEAR_IN_BACK) /datum/equipment_preset/uscm/leader_equipped/random - name = "USCM Platoon Sergeant (Equipped Random)" + name = "USCM Section Sergeant (Equipped Random)" /datum/equipment_preset/uscm/leader_equipped/random/load_gear(mob/living/carbon/human/new_human) new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine(new_human), WEAR_BODY) diff --git a/tgui/packages/tgui/interfaces/OverwatchConsole.jsx b/tgui/packages/tgui/interfaces/OverwatchConsole.jsx index 9ee3ad2f69..08c8bea763 100644 --- a/tgui/packages/tgui/interfaces/OverwatchConsole.jsx +++ b/tgui/packages/tgui/interfaces/OverwatchConsole.jsx @@ -204,7 +204,7 @@ const MainDashboard = (props) => { icon="envelope" onClick={() => act('message')} > - MESSAGE SQUAD + MESSAGE SECTION @@ -244,7 +244,7 @@ const RoleTable = (props) => { - Platoon Sergeant + Section Sergeant Squad Sergeants @@ -322,7 +322,7 @@ const SquadMonitor = (props) => { a = a.role; b = b.role; const roleValues = { - 'Platoon Sergeant': 10, + 'Section Sergeant': 10, 'Squad Sergeant': 9, 'Weapons Specialist': 8, Smartgunner: 7, diff --git a/tgui/packages/tgui/interfaces/SquadInfo.tsx b/tgui/packages/tgui/interfaces/SquadInfo.tsx index 8d97ff9cc7..36feb780f1 100644 --- a/tgui/packages/tgui/interfaces/SquadInfo.tsx +++ b/tgui/packages/tgui/interfaces/SquadInfo.tsx @@ -34,7 +34,7 @@ interface FireTeams { } interface SquadProps { - pltsgt?: SquadLeadEntry; + sctsgt?: SquadLeadEntry; fireteams: FireTeams; mar_free: SquadMarineEntry[]; total_mar: number; @@ -44,7 +44,7 @@ interface SquadProps { squad: string; partial_squad_ref: string; squad_color: string; - is_lead: 'pltsgt' | 'SQ1' | 'SQ2' | 0; + is_lead: 'sctsgt' | 'SQ1' | 'SQ2' | 0; objective: { primary?: string; secondary?: string }; } @@ -101,7 +101,7 @@ const FireTeamLead = (props: { {assignedFireteamLead.name !== 'Not assigned' && - data.is_lead === 'pltsgt' &&