Ditto

cmss13-devs · Oct 22, 2024 · c416a74 · c416a74
1 parent 8d837ae
commit c416a74
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 22 deletions.
diff --git a/code/__DEFINES/job.dm b/code/__DEFINES/job.dm
@@ -19,9 +19,9 @@
 
 // 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_MEDIC "Corpsman"
 #define JOB_SQUAD_SPECIALIST "Weapons Specialist"
 #define JOB_SQUAD_TEAM_LEADER "Squad Sergeant"
 #define JOB_SQUAD_SMARTGUN "Smartgunner"

diff --git a/code/game/jobs/job/marine/squad_info.dm b/code/game/jobs/job/marine/squad_info.dm
@@ -13,7 +13,7 @@
 		update_all_squad_info()
 	if(squad_info_data["total_mar"] != count) //updates for new marines
 		update_free_mar()
-		if(squad_leader && squad_info_data["pltsgt"]["name"] != squad_leader.real_name)
+		if(squad_leader && squad_info_data["sctsgt"]["name"] != squad_leader.real_name)
 			update_squad_leader()
 	var/list/data = squad_info_data.Copy()
 	data["squad"] = name
@@ -29,7 +29,7 @@
 /datum/squad/proc/get_leadership(mob/user)
 	var/mob/living/carbon/human/H = user
 	if (squad_leader && H.name == squad_leader.name)
-		return "pltsgt"
+		return "sctsgt"
 	else
 		for(var/fireteam in fireteams)
 			var/mob/living/carbon/human/ftl = fireteam_leaders[fireteam]
@@ -58,7 +58,7 @@
 			var/target_marine = params["target_marine"]
 			var/target_team = params["target_ft"]
 
-			if (islead != "pltsgt")
+			if (islead != "sctsgt")
 				return
 
 			var/mob/living/carbon/human/target = get_marine_from_name(target_marine)
@@ -72,7 +72,7 @@
 		if ("unassign_ft")
 			var/target_marine = params["target_marine"]
 
-			if (islead != "pltsgt")
+			if (islead != "sctsgt")
 				return
 
 			var/mob/living/carbon/human/target = get_marine_from_name(target_marine)
@@ -85,7 +85,7 @@
 		if ("demote_ftl")
 			var/target_team = params["target_ft"]
 
-			if (islead != "pltsgt")
+			if (islead != "sctsgt")
 				return
 
 			unassign_ft_leader(target_team, FALSE, TRUE)
@@ -96,7 +96,7 @@
 			var/target_marine = params["target_marine"]
 			var/target_team = params["target_ft"]
 
-			if (islead != "pltsgt")
+			if (islead != "sctsgt")
 				return
 
 			var/mob/living/carbon/human/target = get_marine_from_name(target_marine)
@@ -108,7 +108,7 @@
 
 //used once on first opening
 /datum/squad/proc/update_all_squad_info()
-	squad_info_data["pltsgt"] = list()
+	squad_info_data["sctsgt"] = list()
 	update_squad_leader()
 	squad_info_data["fireteams"] = list()
 	var/i = 1
@@ -120,14 +120,14 @@
 	squad_info_data["mar_free"] = list()
 	update_free_mar()
 
-//pltsgt update. Should always be paired up with FT or free marines update
+//sctsgt update. Should always be paired up with FT or free marines update
 /datum/squad/proc/update_squad_leader()
 	var/obj/item/card/id/ID = null
 	if(squad_leader)
 		ID = squad_leader.get_idcard()
-	squad_info_data["pltsgt"]["name"] = squad_leader ? squad_leader.real_name : "None"
-	squad_info_data["pltsgt"]["refer"] = squad_leader ? "\ref[squad_leader]" : null
-	squad_info_data["pltsgt"]["paygrade"] = ID ? get_paygrades(ID.paygrade, 1) : ""
+	squad_info_data["sctsgt"]["name"] = squad_leader ? squad_leader.real_name : "None"
+	squad_info_data["sctsgt"]["refer"] = squad_leader ? "\ref[squad_leader]" : null
+	squad_info_data["sctsgt"]["paygrade"] = ID ? get_paygrades(ID.paygrade, 1) : ""
 
 //fireteam and TL update
 /datum/squad/proc/update_fireteam(team)
@@ -173,7 +173,7 @@
 				if(JOB_SQUAD_TEAM_LEADER)
 					rank = "SqSgt"
 				if(JOB_SQUAD_LEADER)
-					rank = "PltSgt"
+					rank = "SctSgt"
 				if(JOB_SQUAD_RTO)
 					rank = "RTO"
 				else
@@ -252,7 +252,7 @@
 					if(JOB_SQUAD_TEAM_LEADER)
 						rank = "SqSgt"
 					if(JOB_SQUAD_LEADER)
-						rank = "PltSgt"
+						rank = "SctSgt"
 					if(JOB_SQUAD_RTO)
 						rank = "RTO"
 					else
@@ -301,7 +301,7 @@
 					if(JOB_SQUAD_TEAM_LEADER)
 						rank = "SqSgt"
 					if(JOB_SQUAD_LEADER)
-						rank = "PltSgt"
+						rank = "SctSgt"
 					if(JOB_SQUAD_RTO)
 						rank = "RTO"
 					else

diff --git a/code/game/jobs/job/marine/squads.dm b/code/game/jobs/job/marine/squads.dm
@@ -701,7 +701,7 @@
 			old_lead.comm_title = "SG"
 		if(JOB_SQUAD_LEADER)
 			if(!leader_killed)
-				old_lead.comm_title = "PltSgt"
+				old_lead.comm_title = "SctSgt"
 		if(JOB_SQUAD_RTO)
 			old_lead.comm_title = "RTO"
 		if(JOB_MARINE_RAIDER)

diff --git a/code/modules/asset_cache/asset_list_items.dm b/code/modules/asset_cache/asset_list_items.dm
@@ -259,7 +259,7 @@
 		list("SG", "hudsquad_gun"),
 		list("Spc", "hudsquad_spec"),
 		list("SqSgt", "hudsquad_tl"),
-		list("PltSgt", "hudsquad_leader"),
+		list("SctSgt", "hudsquad_leader"),
 		list("RTO", "hudsquad_rto"),
 	)
 

diff --git a/code/modules/gear_presets/uscm.dm b/code/modules/gear_presets/uscm.dm
@@ -467,13 +467,13 @@
 //*****************************************************************************************************/
 
 /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
 	paygrades = list(PAY_SHORT_ME7 = JOB_PLAYTIME_TIER_0)
-	role_comm_title = "PltSgt"
+	role_comm_title = "SctSgt"
 	minimum_age = 27
 	skills = /datum/skills/SL
 
@@ -569,14 +569,14 @@
 //*****************************************************************************************************/
 
 /datum/equipment_preset/uscm/leader_equipped
-	name = "USCM Platoon Sergeant (Equipped)"
+	name = "USCM Section Sergeant (Equipped)"
 	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
 	paygrades = list(PAY_SHORT_ME7 = JOB_PLAYTIME_TIER_0)
-	role_comm_title = "PltSgt"
+	role_comm_title = "SctSgt"
 	minimum_age = 27
 	skills = /datum/skills/SL