BASIC Foundation for roles (#4)

* foundation shit

* ticks the correct things

* ahem

correct comm titles

* suggestions

* th

* squad go away

* reshuffle

later

do later

fool

* :(

* basic start up shit (no backend)

* ds

* fix

* overthinking

* faction icons plus manifest

* "

* f

Author: Joelampost

code/__DEFINES/job.dm

@@ -3,7 +3,7 @@
 #define GET_DEFAULT_ROLE(title) (GLOB.RoleAuthority?.default_roles[title] ? GLOB.RoleAuthority.default_roles[title] : title)
 
 // Squad name defines
-#define SQUAD_MARINE_1 "Sun Riders"
+#define SQUAD_MARINE_1 "Alpha 1-1" //place holder name
 #define SQUAD_MARINE_2 "Bravo"
 #define SQUAD_MARINE_3 "Charlie"
 #define SQUAD_MARINE_4 "Delta"
@@ -19,11 +19,11 @@
 
 // Job name defines
 #define JOB_SQUAD_MARINE "Rifleman"
-#define JOB_SQUAD_LEADER "Section Sergeant"
+#define JOB_SQUAD_LEADER "Squad Sergeant"
 #define JOB_SQUAD_ENGI "Combat Technician"
 #define JOB_SQUAD_MEDIC "Corpsman"
 #define JOB_SQUAD_SPECIALIST "Weapons Specialist"
-#define JOB_SQUAD_TEAM_LEADER "Squad Sergeant"
+#define JOB_SQUAD_TEAM_LEADER "Fire Team Leader"
 #define JOB_SQUAD_SMARTGUN "Smartgunner"
 #define JOB_SQUAD_ROLES /datum/timelock/squad
 #define JOB_SQUAD_ROLES_LIST list(JOB_SQUAD_MARINE, JOB_SQUAD_LEADER, JOB_SQUAD_ENGI, JOB_SQUAD_MEDIC, JOB_SQUAD_SPECIALIST, JOB_SQUAD_SMARTGUN, JOB_SQUAD_TEAM_LEADER)
@@ -94,7 +94,7 @@ GLOBAL_LIST_INIT(job_command_roles, JOB_COMMAND_ROLES_LIST)
 
 #define JOB_AUXILIARY_OFFICER "Auxiliary Support Officer"
 #define JOB_CAS_PILOT "Gunship Pilot"
-#define JOB_DROPSHIP_PILOT "Dropship Pilot"
+#define JOB_DROPSHIP_PILOT "Pilot"
 #define JOB_TANK_CREW "Tank Crew"
 #define JOB_DROPSHIP_CREW_CHIEF "Dropship Crew Chief"
 #define JOB_INTEL "Intelligence Officer"
@@ -411,6 +411,16 @@ GLOBAL_LIST_INIT(job_command_roles, JOB_COMMAND_ROLES_LIST)
 
 #define DUTCH_JOB_LIST list(JOB_DUTCH_ARNOLD, JOB_DUTCH_RIFLEMAN, JOB_DUTCH_MINIGUNNER, JOB_DUTCH_FLAMETHROWER, JOB_DUTCH_MEDIC)
 
+//Covenant
+#define JOB_COV_MINOR "Minor"
+#define JOB_COV_MAJOR "Major"
+#define JOB_COV_ULTRA "Ultra"
+#define JOB_COV_ZEALOT "Zealot"
+#define JOB_COV_COMMANDER "Sub-Commander"
+#define JOB_COV_COMANDER "Commander"
+
+//-------- HALO Ends Here --------//
+
 #define JOB_PREDATOR "Predator"
 #define JOB_XENOMORPH    "Xenomorph"
 #define JOB_XENOMORPH_QUEEN  "Queen"

code/__DEFINES/mob_hud.dm

@@ -44,9 +44,10 @@
 #define MOB_HUD_FACTION_TWE 13
 #define MOB_HUD_FACTION_CLF 14
 #define MOB_HUD_FACTION_PMC 15
-#define MOB_HUD_HUNTER 16
-#define MOB_HUD_HUNTER_CLAN 17
-#define MOB_HUD_EXECUTE 18
+#define MOB_HUD_FACTION_UNSC 16
+#define MOB_HUD_HUNTER 17
+#define MOB_HUD_HUNTER_CLAN 18
+#define MOB_HUD_EXECUTE 19
 
 //for SL/FTL/LZ targeting on locator huds
 #define TRACKER_SL "track_sl"

code/__DEFINES/mode.dm

@@ -150,7 +150,7 @@ GLOBAL_LIST_INIT(ROLES_FACTION_CLASH, ROLES_USCM + JOB_PREDATOR)
 
 
 GLOBAL_LIST_INIT(ROLES_UNASSIGNED, list(JOB_SQUAD_MARINE))
-GLOBAL_LIST_INIT(ROLES_AI, list(JOB_SO, JOB_SQUAD_LEADER, JOB_SQUAD_MEDIC, JOB_SQUAD_TEAM_LEADER, JOB_SQUAD_SMARTGUN, JOB_SQUAD_MARINE))
+GLOBAL_LIST_INIT(ROLES_AI, list(JOB_SQUAD_LEADER, JOB_SQUAD_RTO, JOB_SQUAD_MEDIC, JOB_SQUAD_TEAM_LEADER, JOB_SQUAD_SPECIALIST, JOB_SQUAD_MARINE))
 GLOBAL_LIST_INIT(ROLES_AI_UPP, list(JOB_SO_UPP, JOB_SQUAD_LEADER_UPP, JOB_SQUAD_MEDIC_UPP, JOB_SQUAD_TEAM_LEADER_UPP, JOB_SQUAD_SMARTGUN_UPP, JOB_SQUAD_MARINE_UPP))
 GLOBAL_LIST_INIT(ROLES_AI_FORECON, list(JOB_SQUAD_LEADER_FORECON, JOB_SQUAD_MEDIC_FORECON, JOB_SQUAD_TEAM_LEADER_FORECON, JOB_SQUAD_SMARTGUN_FORECON, JOB_SQUAD_MARINE_FORECON, JOB_SQUAD_RTO))
 //Role lists used for switch() checks in show_blurb_uscm(). Cosmetic, determines ex. "Engineering, USS Almayer", "2nd Bat. 'Falling Falcons'" etc.
@@ -284,9 +284,13 @@ DEFINE_BITFIELD(whitelist_status, list(
 #define FACTION_YAUTJA "Yautja"
 #define FACTION_ZOMBIE "Zombie"
 #define FACTION_MONKEY "Monkey" // Nanu
+// Halo stuff
+#define FACTION_UNSC "UNSC"
+#define FACTION_COVENANT "Covenant"
+
 
 #define FACTION_LIST_MARINE list(FACTION_MARINE, FACTION_ARMY, FACTION_NAVY)
-#define FACTION_LIST_HUMANOID list(FACTION_MARINE, FACTION_PMC, FACTION_WY, FACTION_WY_DEATHSQUAD, FACTION_CLF, FACTION_CONTRACTOR, FACTION_MARSHAL, FACTION_UPP, FACTION_FREELANCER, FACTION_SURVIVOR, FACTION_NEUTRAL, FACTION_COLONIST, FACTION_MERCENARY, FACTION_DUTCH, FACTION_HEFA, FACTION_GLADIATOR, FACTION_PIRATE, FACTION_PIZZA, FACTION_SOUTO, FACTION_YAUTJA, FACTION_ZOMBIE, FACTION_TWE)
+#define FACTION_LIST_HUMANOID list(FACTION_MARINE, FACTION_PMC, FACTION_WY, FACTION_WY_DEATHSQUAD, FACTION_CLF, FACTION_CONTRACTOR, FACTION_MARSHAL, FACTION_UPP, FACTION_FREELANCER, FACTION_SURVIVOR, FACTION_NEUTRAL, FACTION_COLONIST, FACTION_MERCENARY, FACTION_DUTCH, FACTION_HEFA, FACTION_GLADIATOR, FACTION_PIRATE, FACTION_PIZZA, FACTION_SOUTO, FACTION_YAUTJA, FACTION_ZOMBIE, FACTION_TWE, FACTION_UNSC)
 #define FACTION_LIST_ERT_OTHER list(FACTION_HEFA, FACTION_GLADIATOR, FACTION_PIRATE, FACTION_PIZZA, FACTION_SOUTO)
 #define FACTION_LIST_ERT_ALL list(FACTION_PMC, FACTION_WY_DEATHSQUAD, FACTION_WY, FACTION_CLF, FACTION_CONTRACTOR, FACTION_UPP, FACTION_FREELANCER, FACTION_MERCENARY, FACTION_DUTCH, FACTION_HEFA, FACTION_GLADIATOR, FACTION_PIRATE, FACTION_PIZZA, FACTION_SOUTO, FACTION_MARSHAL, FACTION_TWE)
 #define FACTION_LIST_WY list(FACTION_PMC, FACTION_WY_DEATHSQUAD, FACTION_WY)
@@ -305,6 +309,8 @@ DEFINE_BITFIELD(whitelist_status, list(
 #define FACTION_LIST_MARINE_WY list(FACTION_MARINE, FACTION_PMC, FACTION_WY_DEATHSQUAD, FACTION_WY)
 #define FACTION_LIST_MARINE_UPP list(FACTION_MARINE, FACTION_UPP)
 #define FACTION_LIST_MARINE_TWE list(FACTION_MARINE, FACTION_TWE)
+#define FACTION_LIST_HALO list(FACTION_UNSC, FACTION_COVENANT)
+#define FACTION_LIST_UNSC list(FACTION_UNSC)
 
 // Xenomorphs
 #define FACTION_PREDALIEN "Predalien"

code/__DEFINES/paygrade_defs/covenant.dm

@@ -0,0 +1,21 @@
+// Paygrade shorthand defines, to allow clearer designation.
+
+///Covenant
+
+/// COV1, Minor
+#define PAY_SHORT_COV_MINOR "COV1"
+
+/// COV2, Major
+#define PAY_SHORT_COV_MAJOR "COV2"
+
+/// COV3, Ultra
+#define PAY_SHORT_COV_ULTRA "COV3"
+
+/// COV4, Zealot
+#define PAY_SHORT_COV_ZEALOT "COV4"
+
+/// COV5, Sub-Commander
+#define PAY_SHORT_COV_SUB_COMMANDER "COV5"
+
+/// COV6, Commander
+#define PAY_SHORT_COV_COMMANDER "COV6"

code/__DEFINES/paygrade_defs/marines.dm

@@ -1,6 +1,6 @@
 // Paygrade shorthand defines, to allow clearer designation.
 
-// USCM MARINES
+// UNSC MARINES
 /// ME1, Private
 #define PAY_SHORT_ME1 "ME1"
 

code/controllers/subsystem/communications.dm

@@ -148,6 +148,10 @@ Radiochat range: 1441 to 1489 (most devices refuse to be tune to other frequency
 
 #define AI_FREQ 1500
 
+//Halo channels
+#define UNSC_FREQ 1501
+#define COV_FREQ 1502
+
 #define MAX_FREE_FREQ 1599 // -------------------------------------------------
 
 GLOBAL_LIST_INIT(radiochannels, list(
@@ -172,7 +176,7 @@ GLOBAL_LIST_INIT(radiochannels, list(
 	RADIO_CHANNEL_JTAC = JTAC_FREQ,
 	RADIO_CHANNEL_INTEL = INTEL_FREQ,
 
-	SQUAD_MARINE_1 = ALPHA_FREQ,
+	SQUAD_MARINE_1 = UNSC_FREQ,
 	SQUAD_MARINE_2 = BRAVO_FREQ,
 	SQUAD_MARINE_3 = CHARLIE_FREQ,
 	SQUAD_MARINE_4 = DELTA_FREQ,
@@ -214,6 +218,8 @@ GLOBAL_LIST_INIT(radiochannels, list(
 
 	RADIO_CHANNEL_BUG_A = BUG_A_FREQ,
 	RADIO_CHANNEL_BUG_B = BUG_B_FREQ,
+
+	RADIO_CHANNEL_COV = COV_FREQ,
 ))
 
 // Response Teams
@@ -312,6 +318,8 @@ SUBSYSTEM_DEF(radio)
 		"[CLF_ENGI_FREQ]" = "opforeng",
 		"[CLF_MED_FREQ]" = "opformed",
 		"[CLF_CCT_FREQ]" = "opforcct",
+		"[UNSC_FREQ]" = "unscradio",
+		"[COV_FREQ]" = "covradio",
 	)
 
 /datum/controller/subsystem/radio/proc/add_object(obj/device as obj, new_frequency as num, filter = null as text|null)

code/datums/datacore.dm

@@ -47,7 +47,7 @@ GLOBAL_DATUM_INIT(data_core, /datum/datacore, new)
 		departments += marines_by_squad
 		var/list/manifest_out = list()
 		for(var/datum/data/record/record_entry in GLOB.data_core.general)
-			if(record_entry.fields["mob_faction"] != FACTION_MARINE) //we process only USCM humans
+			if(record_entry.fields["mob_faction"] != FACTION_UNSC) //we process only UNSC humans
 				continue
 			var/name = record_entry.fields["name"]
 			var/rank = record_entry.fields["rank"]
@@ -100,7 +100,7 @@ GLOBAL_DATUM_INIT(data_core, /datum/datacore, new)
 	var/list/squad_sublists = GLOB.ROLES_SQUAD_ALL.Copy() //Are there any marines in the squad?
 
 	for(var/datum/data/record/record_entry in GLOB.data_core.general)
-		if(record_entry.fields["mob_faction"] != FACTION_MARINE) //we process only USCM humans
+		if(record_entry.fields["mob_faction"] != FACTION_UNSC) //we process only UNSC humans
 			continue
 
 		var/name = record_entry.fields["name"]
@@ -168,7 +168,6 @@ GLOBAL_DATUM_INIT(data_core, /datum/datacore, new)
 				dat += "<tr[even ? " class='alt'" : ""]><td>[name]</td><td>[auxil[real_rank][name]]</td><td>[isactive[name]]</td></tr>"
 				even = !even
 	if(dept_flags & FLAG_SHOW_MARINES)
-		dat += "<tr><th colspan=3>Marines</th></tr>"
 		for(var/squad_name in GLOB.ROLES_SQUAD_ALL)
 			if(!squad_sublists[squad_name])
 				continue

code/datums/factions/unsc.dm

@@ -0,0 +1,52 @@
+/datum/faction/unsc
+	name = "United Nations Space Command"
+	faction_tag = FACTION_UNSC
+
+/datum/faction/unsc/modify_hud_holder(image/holder, mob/living/carbon/human/H)
+	var/hud_icon_state
+	var/obj/item/card/id/ID = H.get_idcard()
+	var/_role
+	if(H.mind)
+		_role = H.job
+	else if(ID)
+		_role = ID.rank
+	switch(_role)
+		if(JOB_DROPSHIP_PILOT)
+			hud_icon_state = "dp"
+		if(JOB_SO)
+			hud_icon_state = "lt"
+	if(hud_icon_state)
+		holder.overlays += image('icons/mob/hud/marine_hud.dmi', H, "hudsquad_[hud_icon_state]")
+
+	var/datum/squad/squad = H.assigned_squad
+	if(istype(squad, /datum/squad/marine/alpha))
+		var/squad_clr = H.assigned_squad.equipment_color
+		switch(GET_DEFAULT_ROLE(_role))
+			if(JOB_SQUAD_MEDIC) hud_icon_state = "med"
+			if(JOB_SQUAD_SPECIALIST) hud_icon_state = "spec"
+			if(JOB_SQUAD_RTO) hud_icon_state = "ftl"
+			if(JOB_SQUAD_TEAM_LEADER) hud_icon_state = "tl"
+			if(JOB_SQUAD_LEADER) hud_icon_state = "leader_a"
+		if(squad.fireteam_leaders["SQ1"] == H || squad.fireteam_leaders["SQ2"] == H)
+			H.langchat_styles = "langchat_smaller_bolded"
+		else
+			H.langchat_styles = initial(H.langchat_styles)
+		H.langchat_color = H.assigned_squad.chat_color
+
+		if(!hud_icon_state) hud_icon_state = H.rank_fallback
+		if(hud_icon_state)
+			var/image/IMG = image('icons/mob/hud/marine_hud.dmi', H, "hudsquad")
+			if(squad_clr)
+				IMG.color = squad_clr
+			else
+				IMG.color = "#4148c8"
+			holder.overlays += IMG
+			holder.overlays += image('icons/mob/hud/marine_hud.dmi', H, "hudsquad_[hud_icon_state]")
+		if(H.assigned_squad && H.assigned_fireteam)
+			var/image/IMG2 = image('icons/mob/hud/marine_hud.dmi', H, "hudsquad_[H.assigned_fireteam]")
+			IMG2.color = squad_clr
+			holder.overlays += IMG2
+			if(H.assigned_squad.fireteam_leaders[H.assigned_fireteam] == H)
+				var/image/IMG3 = image('icons/mob/hud/marine_hud.dmi', H, "hudsquad_ftl")
+				IMG3.color = squad_clr
+				holder.overlays += IMG3

code/datums/mob_hud.dm

@@ -17,6 +17,7 @@ GLOBAL_LIST_INIT_TYPED(huds, /datum/mob_hud, list(
 	MOB_HUD_FACTION_TWE = new /datum/mob_hud/faction/twe(),
 	MOB_HUD_FACTION_CLF = new /datum/mob_hud/faction/clf(),
 	MOB_HUD_FACTION_PMC = new /datum/mob_hud/faction/pmc(),
+	MOB_HUD_FACTION_UNSC = new /datum/mob_hud/faction/unsc(),
 	MOB_HUD_HUNTER = new /datum/mob_hud/hunter_hud(),
 	MOB_HUD_HUNTER_CLAN = new /datum/mob_hud/hunter_clan(),
 	MOB_HUD_EXECUTE = new /datum/mob_hud/execute_hud(),
@@ -212,6 +213,9 @@ GLOBAL_LIST_INIT_TYPED(huds, /datum/mob_hud, list(
 /datum/mob_hud/faction/pmc
 	faction_to_check = FACTION_PMC
 
+/datum/mob_hud/faction/unsc
+	faction_to_check = FACTION_UNSC
+
 /datum/mob_hud/faction/observer
 	hud_icons = list(FACTION_HUD, ORDER_HUD, HUNTER_CLAN, HOLOCARD_HUD)
 

code/datums/paygrades/factions/halo/covenant_ranks.dm

@@ -0,0 +1,46 @@
+/datum/paygrade/covenant
+	name = "Covy paygrades"
+	pay_multiplier = 1.4
+	default_faction = FACTION_COVENANT
+
+/datum/paygrade/covenant/minor
+	paygrade = PAY_SHORT_COV_MINOR
+	name = "Minor"
+	prefix = "Min"
+	ranking = 0
+	pay_multiplier = 1.6
+
+/datum/paygrade/covenant/major
+	paygrade = PAY_SHORT_COV_MAJOR
+	name = "Major"
+	prefix = "Maj"
+	ranking = 1
+	pay_multiplier = 1.8
+
+/datum/paygrade/covenant/ultra
+	paygrade = PAY_SHORT_COV_ULTRA
+	name = "Ultra"
+	prefix = "Ult"
+	ranking = 2
+	pay_multiplier = 2.0
+
+/datum/paygrade/covenant/zealot
+	paygrade = PAY_SHORT_COV_ZEALOT
+	name = "Zealot"
+	prefix = "Zel"
+	ranking = 3
+	pay_multiplier = 2.2
+
+/datum/paygrade/covenant/sub_commander
+	paygrade = PAY_SHORT_COV_SUB_COMMANDER
+	name = "Sub-Commander"
+	prefix = "S-Cmdr"
+	ranking = 4
+	pay_multiplier = 2.4
+
+/datum/paygrade/covenant/commander
+	paygrade = PAY_SHORT_COV_COMMANDER
+	name = "Commander"
+	prefix = "Cmdr"
+	ranking = 5
+	pay_multiplier = 2.6

code/game/gamemodes/colonialmarines/ai/colonialmarines_ai.dm

@@ -16,11 +16,11 @@
 	var/game_started = FALSE
 
 	role_mappings = list(
-		/datum/job/command/bridge/ai = JOB_SO,
 		/datum/job/marine/leader/ai = JOB_SQUAD_LEADER,
+		/datum/job/marine/standard/ai/rto = JOB_SQUAD_RTO,
 		/datum/job/marine/medic/ai = JOB_SQUAD_MEDIC,
 		/datum/job/marine/tl/ai = JOB_SQUAD_TEAM_LEADER,
-		/datum/job/marine/smartgunner/ai = JOB_SQUAD_SMARTGUN,
+		/datum/job/marine/specialist/ai = JOB_SQUAD_SPECIALIST,
 		/datum/job/marine/standard/ai = JOB_SQUAD_MARINE,
 	)
 
@@ -80,25 +80,11 @@
 /datum/game_mode/colonialmarines/ai/check_queen_status()
 	return
 
-GLOBAL_LIST_INIT(platoon_to_jobs, list(/datum/squad/marine/alpha = list(/datum/job/command/bridge/ai = JOB_SO,\
-		/datum/job/marine/leader/ai = JOB_SQUAD_LEADER,\
+GLOBAL_LIST_INIT(platoon_to_jobs, list(/datum/squad/marine/alpha = list(/datum/job/marine/leader/ai = JOB_SQUAD_LEADER,\
+		/datum/job/marine/standard/ai/rto = JOB_SQUAD_RTO,\
 		/datum/job/marine/medic/ai = JOB_SQUAD_MEDIC,\
 		/datum/job/marine/tl/ai = JOB_SQUAD_TEAM_LEADER,
-		/datum/job/marine/smartgunner/ai = JOB_SQUAD_SMARTGUN,\
-		/datum/job/marine/standard/ai = JOB_SQUAD_MARINE), \
-		/datum/squad/marine/upp = list(/datum/job/command/bridge/ai/upp = JOB_SO,\
-		/datum/job/marine/leader/ai/upp = JOB_SQUAD_LEADER,\
-		/datum/job/marine/medic/ai/upp = JOB_SQUAD_MEDIC,\
-		/datum/job/marine/tl/ai/upp = JOB_SQUAD_TEAM_LEADER,
-		/datum/job/marine/smartgunner/ai/upp = JOB_SQUAD_SMARTGUN,\
-		/datum/job/marine/standard/ai/upp = JOB_SQUAD_MARINE),\
-		/datum/squad/marine/forecon = list(/datum/job/marine/standard/ai/forecon = JOB_SQUAD_MARINE,\
-		/datum/job/marine/standard/ai/rto = JOB_SQUAD_RTO,\
-		/datum/job/marine/leader/ai/forecon = JOB_SQUAD_LEADER,\
-		/datum/job/marine/medic/ai/forecon = JOB_SQUAD_MEDIC,\
-		/datum/job/marine/tl/ai/forecon = JOB_SQUAD_TEAM_LEADER,\
-		/datum/job/marine/smartgunner/ai/forecon = JOB_SQUAD_SMARTGUN)))
-
-GLOBAL_LIST_INIT(platoon_to_role_list, list(/datum/squad/marine/alpha = ROLES_AI,\
-												/datum/squad/marine/upp = ROLES_AI_UPP,\
-												/datum/squad/marine/forecon = ROLES_AI_FORECON))
+		/datum/job/marine/specialist/ai = JOB_SQUAD_SPECIALIST,\
+		/datum/job/marine/standard/ai = JOB_SQUAD_MARINE)))
+
+GLOBAL_LIST_INIT(platoon_to_role_list, list(/datum/squad/marine/alpha = ROLES_AI))

code/game/jobs/job/command/cic/staffofficer.dm

@@ -9,8 +9,8 @@
 	allow_additional = 1
 	scaled = FALSE
 	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
+	gear_preset = /datum/equipment_preset/unsc/pc
+	gear_preset_secondary = /datum/equipment_preset/unsc/pc/lesser_rank
 	entry_message_body = "<a href='"+WIKI_PLACEHOLDER+"'>Your job is to conduct the briefing for the platoon, monitor the operation, and listen to your superior officers.</a> You are in charge of the platoon for the current operation and supported by your Company Command.<br>They will give your orders VIA the telephone in your office once they are ready.<br><b>You remember that you've stored your personal gear are located in your personal quarters.</b><br>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")

code/game/jobs/job/marine/squad/leader.dm

@@ -8,8 +8,8 @@
 	spawn_positions = 4
 	supervisors = "the acting commanding officer"
 	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
+	gear_preset = /datum/equipment_preset/unsc/leader
+	gear_preset_secondary = /datum/equipment_preset/unsc/leader/lesser_rank
 	entry_message_body = "<a href='"+WIKI_PLACEHOLDER+"'>You are responsible for the men and women of your entire 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.<br><b>You remember that you've stored your personal gear and uniform are located in the dorm or locker rooms.</b>"
 
 	job_options = list(GYSGT_VARIANT = "GYSGT", SSGT_VARIANT = "SSGT")