Skip to content

Commit

Permalink
Merge pull request #1 from Mark9013100/platoon-sgt-to-section-sgt
Browse files Browse the repository at this point in the history
platoon sgt to section sgt
  • Loading branch information
WolfOrion authored Nov 4, 2023
2 parents 7ee43a6 + c6813c4 commit 982d120
Show file tree
Hide file tree
Showing 9 changed files with 24 additions and 24 deletions.
2 changes: 1 addition & 1 deletion code/__DEFINES/job.dm
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

// Job name defines
#define JOB_SQUAD_MARINE "Rifleman"
#define JOB_SQUAD_LEADER "Platoon Sergeant"
#define JOB_SQUAD_LEADER "Section Sergeant"
#define JOB_SQUAD_ENGI "Combat Technician"
#define JOB_SQUAD_MEDIC "Platoon Corpsman"
#define JOB_SQUAD_SPECIALIST "Weapons Specialist"
Expand Down
2 changes: 1 addition & 1 deletion code/datums/factions/uscm.dm
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
if(JOB_MARINE_RAIDER_CMD) marine_rk = "soccmd"
if(squad.squad_leader == current_human)
switch(squad.squad_type)
if("Platoon") marine_rk = "leader_a"
if("Section") marine_rk = "leader_a"
if("Team") marine_rk = "soctl_a"

current_human.langchat_styles = "langchat_bolded" // bold text for bold leaders
Expand Down
2 changes: 1 addition & 1 deletion code/game/area/golden_arrow.dm
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
icon_state = "port"

/area/golden_arrow/platoon_sergeant
name = "\improper Platoon Sergeant Office"
name = "\improper Section Sergeant Office"
icon_state = "alpha"

/area/golden_arrow/squad_one
Expand Down
2 changes: 1 addition & 1 deletion code/game/jobs/job/marine/squad/leader.dm
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
supervisors = "the acting commanding officer"
flags_startup_parameters = ROLE_ADD_TO_DEFAULT|ROLE_ADD_TO_SQUAD
gear_preset = /datum/equipment_preset/uscm/leader
entry_message_body = "<a href='%WIKIPAGE%'>You are responsible for the men and women of your squad.</a> 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 = "<a href='%WIKIPAGE%'>You are responsible for the men and women of your section.</a> 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."

job_options = list(GYSGT_VARIANT = "GYSGT", SSGT_VARIANT = "SSGT")

Expand Down
6 changes: 3 additions & 3 deletions code/game/jobs/job/marine/squads.dm
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
var/sub_leader

/datum/squad_type/marine_squad
name = "Platoon"
lead_name = "Platoon Sergeant"
name = "Section"
lead_name = "Section Sergeant"
lead_icon = "leader"
sub_squad = "Squad"
sub_leader = "Squad Sergeant"
Expand Down Expand Up @@ -70,7 +70,7 @@
var/faction = FACTION_MARINE

/// What will the assistant squad leader be called
var/squad_type = "Platoon" //Referenced for aSL details. Squad/Team/Cell etc.
var/squad_type = "Section" //Referenced for aSL details. Squad/Team/Cell etc.
/// Squad leaders icon
var/lead_icon //Referenced for SL's 'L' icon. If nulled, won't override icon for aSLs.

Expand Down
2 changes: 1 addition & 1 deletion code/game/objects/items/devices/radio/headset.dm
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
maxf = 1489

var/list/inbuilt_tracking_options = list(
"Platoon Sergeant" = TRACKER_SL,
"Section Sergeant" = TRACKER_SL,
"Squad Sergeant" = TRACKER_FTL,
"Landing Zone" = TRACKER_LZ
)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -76,8 +76,8 @@
new /obj/item/clothing/shoes/black(src)

/obj/structure/closet/secure_closet/platoon_sergeant
name = "platoon sergeant locker"
desc = "A secure storage unit for the platoon sergeant."
name = "section sergeant locker"
desc = "A secure storage unit for the section sergeant."
req_one_access = list(ACCESS_MARINE_LEADER)

/obj/structure/closet/secure_closet/platoon_sergeant/Initialize()
Expand Down
16 changes: 8 additions & 8 deletions code/modules/cm_marines/overwatch.dm
Original file line number Diff line number Diff line change
Expand Up @@ -388,9 +388,9 @@
return TRUE

current_squad.send_message(input, 1) //message, adds username
current_squad.send_maptext(input, "Platoon 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].")
current_squad.send_maptext(input, "Section Message:")
visible_message("[icon2html(src, viewers(src))] [SPAN_BOLDNOTICE("Message '[input]' sent to all Marines of section '[current_squad]'.")]")
log_overwatch("[key_name(user)] sent '[input]' to section [current_squad].")

var/comm_paygrade = user.get_paygrade()

Expand All @@ -405,20 +405,20 @@
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 section '[current_squad]'.")]")
log_overwatch("[key_name(user)] sent '[input]' to Section Sergeant [current_squad.squad_leader] of section [current_squad].")

var/comm_paygrade = user.get_paygrade()

for(var/mob/dead/observer/cycled_observer in GLOB.player_list)
if(cycled_observer.client && cycled_observer.client.prefs && (cycled_observer.client.prefs.toggles_chat & CHAT_GHOSTRADIO))
var/ghost_message = "<span class='medium'><span class='orange'><span class='name'>[comm_paygrade][user] (<a href='byond://?src=\ref[cycled_observer];track=\ref[user]'>F</a>)</span> messaged platoon leader of '[current_squad]': <span class='body'>\"[input]\"</span></span></span>"
var/ghost_message = "<span class='medium'><span class='orange'><span class='name'>[comm_paygrade][user] (<a href='byond://?src=\ref[cycled_observer];track=\ref[user]'>F</a>)</span> messaged section leader of '[current_squad]': <span class='body'>\"[input]\"</span></span></span>"
cycled_observer.show_message(ghost_message)

return TRUE
Expand Down
12 changes: 6 additions & 6 deletions code/modules/gear_presets/uscm.dm
Original file line number Diff line number Diff line change
Expand Up @@ -359,14 +359,14 @@
//*****************************************************************************************************/

/datum/equipment_preset/uscm/leader
name = "USCM Platoon Sergeant"
name = "USCM Section Sergeant"
flags = EQUIPMENT_PRESET_EXTRA|EQUIPMENT_PRESET_MARINE

access = list(ACCESS_MARINE_PREP, ACCESS_MARINE_LEADER, ACCESS_MARINE_DROPSHIP)
assignment = JOB_SQUAD_LEADER
rank = JOB_SQUAD_LEADER
paygrade = "ME7"
role_comm_title = "PltSgt"
role_comm_title = "SctSgt"
minimum_age = 27
skills = /datum/skills/SL

Expand All @@ -380,7 +380,7 @@
new_human.equip_to_slot_or_del(new back_item(new_human), WEAR_BACK)

/datum/equipment_preset/uscm/leader/cryo
name = "USCM Cryo Platoon Sergeant"
name = "USCM Cryo Section Sergeant"
auto_squad_name = SQUAD_MARINE_CRYO

/datum/equipment_preset/uscm/leader/cryo/load_gear(mob/living/carbon/human/new_human)
Expand Down Expand Up @@ -442,7 +442,7 @@
//*****************************************************************************************************/

/datum/equipment_preset/uscm/leader_equipped
name = "USCM Platoon Sergeant (Equipped)"
name = "USCM Section Sergeant (Equipped)"
flags = EQUIPMENT_PRESET_EXTRA|EQUIPMENT_PRESET_MARINE

/datum/equipment_preset/uscm/leader_equipped/load_status(mob/living/carbon/human/new_human)
Expand All @@ -452,7 +452,7 @@
assignment = JOB_SQUAD_LEADER
rank = JOB_SQUAD_LEADER
paygrade = "ME7"
role_comm_title = "PltSgt"
role_comm_title = "SctSgt"
minimum_age = 27
skills = /datum/skills/SL

Expand All @@ -478,7 +478,7 @@
new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/extended(new_human.back), WEAR_IN_BACK)

/datum/equipment_preset/uscm/leader_equipped/cryo
name = "USCM Cryo Platoon Sergeant (Equipped)"
name = "USCM Cryo Section Sergeant (Equipped)"
auto_squad_name = SQUAD_MARINE_CRYO

//*****************************************************************************************************/
Expand Down

0 comments on commit 982d120

Please sign in to comment.