Various fixes

cmss13-devs · Aug 4, 2023 · 5113efd · 5113efd
1 parent 2ebfa5c
commit 5113efd
Show file tree

Hide file tree

Showing 6 changed files with 57 additions and 90 deletions.
diff --git a/code/__DEFINES/mode.dm b/code/__DEFINES/mode.dm
@@ -239,7 +239,7 @@ var/global/list/whitelist_hierarchy = list(WHITELIST_NORMAL, WHITELIST_COUNCIL,
 
 #define FACTION_LIST_MARINE list(FACTION_MARINE)
 #define FACTION_LIST_HUMANOID list(FACTION_MARINE, FACTION_PMC, FACTION_WY, FACTION_WY_DEATHSQUAD, FACTION_CLF, FACTION_CONTRACTOR, 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)
-#define FACTION_LIST_ERT list(FACTION_PMC, FACTION_WY_DEATHSQUAD, FACTION_CLF, FACTION_CONTRACTOR, FACTION_UPP, FACTION_FREELANCER, FACTION_MERCENARY, FACTION_DUTCH, FACTION_HEFA, FACTION_GLADIATOR, FACTION_PIRATE, FACTION_PIZZA, FACTION_SOUTO, FACTION_MARSHAL)
+#define FACTION_LIST_ERT list(FACTION_PMC, FACTION_WY_DEATHSQUAD, 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)
 #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)

diff --git a/code/controllers/subsystem/communications.dm b/code/controllers/subsystem/communications.dm
@@ -140,6 +140,7 @@ var/list/radiochannels = list(
 	RADIO_CHANNEL_VAI = VAI_FREQ,
 	RADIO_CHANNEL_CMB = CMB_FREQ,
 	RADIO_CHANNEL_DUTCH_DOZEN = DUT_FREQ,
+	RADIO_CHANNEL_ROYAL_MARINE = RMC_FREQ,
 
 	RADIO_CHANNEL_HIGHCOM = HC_FREQ,
 	RADIO_CHANNEL_ALMAYER = PUB_FREQ,
@@ -189,7 +190,7 @@ var/list/radiochannels = list(
 )
 
 // Response Teams
-#define ERT_FREQS list(VAI_FREQ, DUT_FREQ, YAUT_FREQ, CMB_FREQ)
+#define ERT_FREQS list(VAI_FREQ, DUT_FREQ, YAUT_FREQ, CMB_FREQ, RMC_FREQ)
 
 // UPP Frequencies
 #define UPP_FREQS list(UPP_FREQ, UPP_CMD_FREQ, UPP_ENGI_FREQ, UPP_MED_FREQ, UPP_CCT_FREQ, UPP_KDO_FREQ)

diff --git a/code/datums/emergency_calls/royal_marines.dm b/code/datums/emergency_calls/royal_marines.dm
@@ -29,22 +29,22 @@
 	if(!leader && HAS_FLAG(mob.client.prefs.toggles_ert, PLAY_LEADER) && check_timelock(mob.client, JOB_SQUAD_LEADER, time_required_for_job))
 		leader = mob
 		to_chat(mob, SPAN_ROLE_HEADER("You are an Officer in the Royal Marines Commando. Born in the three world empire."))
-		arm_equipment(mob, /datum/equipment_preset/royal_marine/lieuteant, TRUE, TRUE)
+		arm_equipment(mob, /datum/equipment_preset/twe/royal_marine/lieuteant, TRUE, TRUE)
 	else if(heavies < max_heavies && HAS_FLAG(mob.client.prefs.toggles_ert, PLAY_HEAVY) && check_timelock(mob.client, JOB_SQUAD_SPECIALIST))
 		heavies++
 		to_chat(mob, SPAN_ROLE_HEADER("You are a skilled marksman in the Royal Marines Commando. Born in the three world empire."))
-		arm_equipment(mob, /datum/equipment_preset/royal_marine/spec, TRUE, TRUE)
+		arm_equipment(mob, /datum/equipment_preset/twe/royal_marine/spec, TRUE, TRUE)
 	else if(heavies < max_heavies && HAS_FLAG(mob.client.prefs.toggles_ert, PLAY_HEAVY) && check_timelock(mob.client, JOB_SQUAD_SPECIALIST))
 		heavies++
 		to_chat(mob, SPAN_ROLE_HEADER("You are a Smartgunner in the Royal Marines Commando. Born in the three world empire."))
-		arm_equipment(mob, /datum/equipment_preset/royal_marine/spec/machinegun, TRUE, TRUE)
+		arm_equipment(mob, /datum/equipment_preset/twe/royal_marine/spec/machinegun, TRUE, TRUE)
 	else if(heavies < max_heavies && HAS_FLAG(mob.client.prefs.toggles_ert, PLAY_HEAVY) && check_timelock(mob.client, JOB_SQUAD_SPECIALIST))
 		heavies++
 		to_chat(mob, SPAN_ROLE_HEADER("You are a CQB Specialist in the Royal Marines Commando. Born in the three world empire."))
-		arm_equipment(mob, /datum/equipment_preset/royal_marine/spec/breacher, TRUE, TRUE)
+		arm_equipment(mob, /datum/equipment_preset/twe/royal_marine/spec/breacher, TRUE, TRUE)
 	else
 		to_chat(mob, SPAN_ROLE_HEADER("You are a Contractor of Vanguard's Arrow Incorporated!"))
-		arm_equipment(mob, /datum/equipment_preset/royal_marine/standard, TRUE, TRUE)
+		arm_equipment(mob, /datum/equipment_preset/twe/royal_marine/standard, TRUE, TRUE)
 
 	print_backstory(mob)
 
@@ -67,7 +67,7 @@
 	to_chat(M, SPAN_BOLD("Assist the USCMC Force of the [MAIN_SHIP_NAME] however you can."))
 
 
-/datum/emergency_call/contractors/platoon
+/datum/emergency_call/royal_marines/platoon
 	name = "Royal Marines Commando (Platoon) (Friendly)"
 	mob_min = 7
 	mob_max = 28

diff --git a/code/game/objects/items/devices/radio/headset.dm b/code/game/objects/items/devices/radio/headset.dm
@@ -971,6 +971,7 @@
 	icon_state = "vai_headset"
 	initial_keys = list(/obj/item/device/encryptionkey/public, /obj/item/device/encryptionkey/royal_marine)
 	has_hud = TRUE
+	volume = RADIO_VOLUME_IMPORTANT
 
 //CMB Headsets
 /obj/item/device/radio/headset/distress/CMB

diff --git a/code/modules/clothing/head/head.dm b/code/modules/clothing/head/head.dm
@@ -787,7 +787,7 @@ D
 	item_state = "rmc_turban"
 
 /obj/item/clothing/head/beret/royal_marine
-	name = "royal marine baret"
+	name = "royal marine beret"
 	desc = "A green beret belonging to the royal marines commando. This beret symbolizes a royal marines ability to fight in any environment, desert, sea, artic or space a royal marine will always be ready."
 	icon_state = "rmc_beret"
 	item_state = "rmc_beret"

diff --git a/code/modules/gear_presets/royal_marines.dm b/code/modules/gear_presets/royal_marines.dm
@@ -1,12 +1,10 @@
-/datum/equipment_preset/royal_marine
-	name = "Royal Marines"
-
-	assignment = "Royal Marine"
-	rank = JOB_TWE_RMC_RIFLEMAN
-	idtype = /obj/item/card/id/dogtag
+/datum/equipment_preset/twe
+	name = "Three World Empirer"
 	faction = FACTION_TWE
+	faction_group = list(FACTION_TWE, FACTION_USCM)
+	languages = list(LANGUAGE_ENGLISH, LANGUAGE_JAPANESE)
 
-/datum/equipment_preset/royal_marine/load_name(mob/living/carbon/human/new_human, randomise)
+/datum/equipment_preset/twe/royal_marine/load_name(mob/living/carbon/human/new_human, randomise)
 	new_human.gender = pick(80;MALE,20;FEMALE)
 	var/datum/preferences/A = new()
 	A.randomize_appearance(new_human)
@@ -24,7 +22,7 @@
 	new_human.r_eyes = colors[eye_color][1]
 	new_human.g_eyes = colors[eye_color][2]
 	new_human.b_eyes = colors[eye_color][3]
-	idtype = /obj/item/card/id/data
+	idtype = /obj/item/card/id/dogtag
 	if(new_human.gender == MALE)
 		random_name = "[pick(first_names_male)] [pick(last_names)]"
 		new_human.h_style = pick("Crewcut", "Shaved Head", "Buzzcut", "Undercut", "Side Undercut", "Pvt. Joker", "Marine Fade", "Low Fade", "Medium Fade", "High Fade", "No Fade", "Coffee House Cut", "Flat Top",)
@@ -38,54 +36,7 @@
 	new_human.g_hair = rand(15,35)
 	new_human.b_hair = rand(25,45)
 
-//*****************************************************************************************************/
-
-/datum/equipment_preset/royal_marine
-	name = "Royal Marine Commando"
-	faction = FACTION_TWE
-	rank = JOB_TWE_RMC_RIFLEMAN
-	faction = FACTION_TWE
-	faction_group = FACTION_LIST_ERT
-	languages = list(LANGUAGE_ENGLISH, LANGUAGE_JAPANESE)
-	var/human_versus_human = FALSE
-	var/headset_type = /obj/item/device/radio/headset/distress/royal_marine
-
-/datum/equipment_preset/royal_marine/load_name(mob/living/carbon/human/new_human)
-	new_human.gender = pick(60;MALE,40;FEMALE)
-	var/datum/preferences/A = new()
-	A.randomize_appearance(new_human)
-	var/random_name
-	random_name = capitalize(pick(new_human.gender == MALE ? first_names_male : first_names_female)) + " " + capitalize(pick(last_names))
-	new_human.change_real_name(new_human, random_name)
-	new_human.name = new_human.real_name
-	new_human.age = rand(22,45)
-
-	var/static/list/colors = list("BLACK" = list(15, 15, 25), "BROWN" = list(102, 51, 0), "AUBURN" = list(139, 62, 19))
-	var/static/list/hair_colors = colors.Copy() + list("BLONDE" = list(197, 164, 30), "CARROT" = list(174, 69, 42))
-	var/hair_color = pick(hair_colors)
-	new_human.r_hair = hair_colors[hair_color][1]
-	new_human.g_hair = hair_colors[hair_color][2]
-	new_human.b_hair = hair_colors[hair_color][3]
-	new_human.r_facial = hair_colors[hair_color][1]
-	new_human.g_facial = hair_colors[hair_color][2]
-	new_human.b_facial = hair_colors[hair_color][3]
-	var/eye_color = pick(colors)
-	new_human.r_eyes = colors[eye_color][1]
-	new_human.g_eyes = colors[eye_color][2]
-	new_human.b_eyes = colors[eye_color][3]
-	idtype = /obj/item/card/id/data
-	if(new_human.gender == MALE)
-		new_human.h_style = pick("Crewcut", "Shaved Head", "Buzzcut", "Undercut", "Side Undercut", "Pvt. Joker", "Marine Fade", "Low Fade", "Medium Fade", "High Fade", "No Fade", "Coffee House Cut", "Flat Top",)
-		new_human.f_style = pick("5 O'clock Shadow", "Shaved", "Full Beard", "3 O'clock Moustache", "5 O'clock Shadow", "5 O'clock Moustache", "7 O'clock Shadow", "7 O'clock Moustache",)
-	else
-		new_human.h_style = pick("Ponytail 1", "Ponytail 2", "Ponytail 3", "Ponytail 4", "Pvt. Redding", "Pvt. Clarison", "Cpl. Dietrich", "Pvt. Vasquez", "Marine Bun", "Marine Bun 2", "Marine Flat Top",)
-	new_human.change_real_name(new_human, random_name)
-	new_human.age = rand(20,45)
-	new_human.r_hair = rand(15,35)
-	new_human.g_hair = rand(15,35)
-	new_human.b_hair = rand(25,45)
-
-/datum/equipment_preset/royal_marine/load_id(mob/living/carbon/human/new_human, client/mob_client)
+/datum/equipment_preset/twe/royal_marine/load_id(mob/living/carbon/human/new_human, client/mob_client)
 	if(human_versus_human)
 		var/obj/item/clothing/under/uniform = new_human.w_uniform
 		if(istype(uniform))
@@ -95,17 +46,25 @@
 
 //*****************************************************************************************************/
 
-/datum/equipment_preset/royal_marine/standard
+/datum/equipment_preset/twe/royal_marine
+	name = "Royal Marines Commando"
+	assignment = "Royal Marine"
+	rank = JOB_TWE_RMC_RIFLEMAN
+	var/human_versus_human = FALSE
+	var/headset_type = /obj/item/device/radio/headset/distress/royal_marine
+
+//*****************************************************************************************************/
+
+/datum/equipment_preset/twe/royal_marine/standard
 	name = "RMC TWE Royal Marine Commando (Rifleman)"
-	paygrade = "TC1"
+	paygrade = "RMC E1"
 	role_comm_title = "RMC"
 	flags = EQUIPMENT_PRESET_EXTRA
-	assignment = "Royal Marine Rifleman"
+	assignment = "Royal Marines Rifleman"
 	rank = JOB_TWE_RMC_RIFLEMAN
 	skills = /datum/skills/rmc/rifleman
-	faction = FACTION_TWE
 
-/datum/equipment_preset/royal_marine/standard/load_gear(mob/living/carbon/human/new_human)
+/datum/equipment_preset/twe/royal_marine/standard/load_gear(mob/living/carbon/human/new_human)
 	new_human.equip_to_slot_or_del(new headset_type, WEAR_L_EAR)
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/veteran/royal_marine, WEAR_BODY)
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/patch/royal_marines, WEAR_ACCESSORY)
@@ -116,6 +75,7 @@
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/veteran/royal_marine, WEAR_HANDS)
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/head/beret/royal_marine, WEAR_IN_ACCESSORY)
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/veteran/royal_marine/knife, WEAR_FEET)
+	new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/hud/health, WEAR_EYES)
 	//
 	new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/rmc/heavy, WEAR_BACK)
 	new_human.equip_to_slot_or_del(new /obj/item/explosive/plastic/breaching_charge, WEAR_IN_JACKET)
@@ -138,16 +98,16 @@
 
 //*****************************************************************************************************/
 
-/datum/equipment_preset/royal_marine/spec
+/datum/equipment_preset/twe/royal_marine/spec
 	name = "RMC TWE Royal Marine Commando (Marksman)"
-	paygrade = "TC2"
+	paygrade = "RMC E2"
 	role_comm_title = "RMC"
 	flags = EQUIPMENT_PRESET_EXTRA
-	assignment = "Royal Marine Marksman"
+	assignment = "Royal Marines Marksman"
 	rank = JOB_TWE_RMC_SPECIALIST
 	skills = /datum/skills/rmc/specialist
 
-/datum/equipment_preset/royal_marine/spec/load_gear(mob/living/carbon/human/new_human)
+/datum/equipment_preset/twe/royal_marine/spec/load_gear(mob/living/carbon/human/new_human)
 	new_human.equip_to_slot_or_del(new headset_type, WEAR_L_EAR)
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/veteran/royal_marine, WEAR_BODY)
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/patch/royal_marines, WEAR_ACCESSORY)
@@ -158,6 +118,7 @@
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/veteran/royal_marine, WEAR_HANDS)
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/head/beret/royal_marine, WEAR_IN_ACCESSORY)
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/veteran/royal_marine/knife, WEAR_FEET)
+	new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/hud/health, WEAR_EYES)
 	//
 	new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/rmc/medium, WEAR_BACK)
 	new_human.equip_to_slot_or_del(new /obj/item/explosive/plastic/breaching_charge, WEAR_IN_JACKET)
@@ -180,16 +141,16 @@
 
 //*****************************************************************************************************/
 
-/datum/equipment_preset/royal_marine/spec/breacher
+/datum/equipment_preset/twe/royal_marine/spec/breacher
 	name = "RMC TWE Royal Marine Commando (Breacher)"
-	paygrade = "TC2"
+	paygrade = "RMC E2"
 	role_comm_title = "RMC"
 	flags = EQUIPMENT_PRESET_EXTRA
-	assignment = "Royal Marine Breacher"
+	assignment = "Royal Marines Breacher"
 	rank = JOB_TWE_RMC_SPECIALIST
 	skills = /datum/skills/rmc/specialist
 
-/datum/equipment_preset/royal_marine/spec/breacher/load_gear(mob/living/carbon/human/new_human)
+/datum/equipment_preset/twe/royal_marine/spec/breacher/load_gear(mob/living/carbon/human/new_human)
 	new_human.equip_to_slot_or_del(new headset_type, WEAR_L_EAR)
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/veteran/royal_marine, WEAR_BODY)
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/patch/royal_marines, WEAR_ACCESSORY)
@@ -200,6 +161,7 @@
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/veteran/royal_marine, WEAR_HANDS)
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/head/beret/royal_marine, WEAR_IN_ACCESSORY)
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/veteran/royal_marine/knife, WEAR_FEET)
+	new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/hud/health, WEAR_EYES)
 	//
 	new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/rmc/medium, WEAR_BACK)
 	new_human.equip_to_slot_or_del(new /obj/item/explosive/plastic/breaching_charge, WEAR_IN_JACKET)
@@ -221,16 +183,16 @@
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/mask/gas/pmc/royal_marine, WEAR_FACE)
 
 //*****************************************************************************************************/
-/datum/equipment_preset/royal_marine/spec/machinegun
+/datum/equipment_preset/twe/royal_marine/spec/machinegun
 	name = "RMC TWE Royal Marine Commando (Smartgunner)"
-	paygrade = "TC2"
+	paygrade = "RMC E2"
 	role_comm_title = "RMC"
 	flags = EQUIPMENT_PRESET_EXTRA
-	assignment = "Royal Marine Smartgunner"
+	assignment = "Royal Marines Smartgunner"
 	rank = JOB_TWE_RMC_SPECIALIST
 	skills = /datum/skills/rmc/specialist
 
-/datum/equipment_preset/royal_marine/spec/machinegun/load_gear(mob/living/carbon/human/new_human)
+/datum/equipment_preset/twe/royal_marine/spec/machinegun/load_gear(mob/living/carbon/human/new_human)
 	new_human.equip_to_slot_or_del(new headset_type, WEAR_L_EAR)
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/veteran/royal_marine, WEAR_BODY)
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/patch/royal_marines, WEAR_ACCESSORY)
@@ -241,6 +203,7 @@
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/veteran/royal_marine, WEAR_HANDS)
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/head/beret/royal_marine, WEAR_IN_ACCESSORY)
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/veteran/royal_marine/knife, WEAR_FEET)
+	new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/hud/health, WEAR_EYES)
 	//
 	new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/rmc/medium, WEAR_BACK)
 	new_human.equip_to_slot_or_del(new /obj/item/explosive/plastic/breaching_charge, WEAR_IN_JACKET)
@@ -265,16 +228,16 @@
 	new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/smartgun/holo_targetting, WEAR_IN_BACK)
 
 //*****************************************************************************************************/
-/datum/equipment_preset/royal_marine/team_leader
+/datum/equipment_preset/twe/royal_marine/team_leader
 	name = "RMC TWE Royal Marine Commando (Teamleader)"
-	paygrade = "TC4"
+	paygrade = "RMC E4"
 	role_comm_title = "RMC"
 	flags = EQUIPMENT_PRESET_EXTRA
-	assignment = "Royal Marine Team Leader"
+	assignment = "Royal Marines Team Leader"
 	rank = JOB_TWE_RMC_TEAMLEADER
 	skills = /datum/skills/rmc/leader
 
-/datum/equipment_preset/royal_marine/team_leader/load_gear(mob/living/carbon/human/new_human)
+/datum/equipment_preset/twe/royal_marine/team_leader/load_gear(mob/living/carbon/human/new_human)
 	new_human.equip_to_slot_or_del(new headset_type, WEAR_L_EAR)
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/veteran/royal_marine/tl, WEAR_BODY)
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/patch/royal_marines, WEAR_ACCESSORY)
@@ -285,6 +248,7 @@
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/veteran/royal_marine, WEAR_HANDS)
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/head/beret/royal_marine/team_leader, WEAR_HEAD)
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/veteran/royal_marine/knife, WEAR_FEET)
+	new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/hud/health, WEAR_EYES)
 	//
 	new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/rmc/light, WEAR_BACK)
 	new_human.equip_to_slot_or_del(new /obj/item/explosive/plastic/breaching_charge, WEAR_IN_JACKET)
@@ -311,16 +275,16 @@
 
 //*****************************************************************************************************/
 
-/datum/equipment_preset/royal_marine/lieuteant //they better say it Lef-tenant or they should be banned for LRP
+/datum/equipment_preset/twe/royal_marine/lieuteant //they better say it Lef-tenant or they should be banned for LRP
 	name = "RMC TWE Royal Marine Commando (Officer)"
-	paygrade = "TO1"
+	paygrade = "RMC O1"
 	role_comm_title = "RMC"
 	flags = EQUIPMENT_PRESET_EXTRA
-	assignment = "Royal Marine Officer"
+	assignment = "Royal Marines Officer"
 	rank = JOB_TWE_RMC_LIEUTENANT
 	skills = /datum/skills/rmc/leader
 
-/datum/equipment_preset/royal_marine/lieuteant/load_gear(mob/living/carbon/human/new_human)
+/datum/equipment_preset/twe/royal_marine/lieuteant/load_gear(mob/living/carbon/human/new_human)
 	new_human.equip_to_slot_or_del(new headset_type, WEAR_L_EAR)
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/veteran/royal_marine/lt, WEAR_BODY)
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/patch/royal_marines, WEAR_ACCESSORY)
@@ -331,6 +295,7 @@
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/veteran/royal_marine, WEAR_HANDS)
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/head/beret/royal_marine/team_leader, WEAR_HEAD)
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/veteran/royal_marine/knife, WEAR_FEET)
+	new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/hud/health, WEAR_EYES)
 	//
 	new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/rmc/light, WEAR_BACK)
 	new_human.equip_to_slot_or_del(new /obj/item/explosive/plastic/breaching_charge, WEAR_IN_JACKET)