actual HUD

cmss13-devs · Aug 4, 2023 · 24d0396 · 24d0396
1 parent 70b5b7d
commit 24d0396
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 7 deletions.
diff --git a/code/__DEFINES/job.dm b/code/__DEFINES/job.dm
@@ -287,11 +287,14 @@ var/global/list/job_command_roles = JOB_COMMAND_ROLES_LIST
 
 //RMC
 #define JOB_TWE_RMC_RIFLEMAN "RMC Rifleman"
-#define JOB_TWE_RMC_SPECIALIST "RMC Specialist"
+#define JOB_TWE_RMC_MARKSMAN "RMC Marksman"
+#define JOB_TWE_RMC_SMARTGUNNER "RMC Smartgunner"
+#define JOB_TWE_RMC_BREACHER "RMC Breacher"
 #define JOB_TWE_RMC_TEAMLEADER "RMC Team Leader"
 #define JOB_TWE_RMC_LIEUTENANT "RMC Lieutenant"
+#define JOB_TWE_RMC_COMMANDER "RMC Commander"
 
-#define TWE_COMMANDO_JOB_LIST list(JOB_TWE_RMC_RIFLEMAN, JOB_TWE_RMC_SPECIALIST, JOB_TWE_RMC_TEAMLEADER, JOB_TWE_RMC_LIEUTENANT)
+#define TWE_COMMANDO_JOB_LIST list(JOB_TWE_RMC_RIFLEMAN, JOB_TWE_RMC_BREACHER, JOB_TWE_RMC_SMARTGUNNER,JOB_TWE_RMC_MARKSMAN ,JOB_TWE_RMC_TEAMLEADER, JOB_TWE_RMC_LIEUTENANT, JOB_TWE_RMC_COMMANDER)
 
 #define JOB_TWE_SEAMAN "TWE Seaman"
 #define JOB_TWE_LSEAMAN "TWE Leading Seaman"

diff --git a/code/datums/factions/royalmarinescommando.dm b/code/datums/factions/royalmarinescommando.dm
@@ -15,10 +15,14 @@
 			hud_icon_state = "lieutenant"
 		if(JOB_TWE_RMC_TEAMLEADER)
 			hud_icon_state = "teamlead"
-		if(JOB_TWE_RMC_SPECIALIST)
-			hud_icon_state = "spec"
+		if(JOB_TWE_RMC_MARKSMAN)
+			hud_icon_state = "marksman"
 		if(JOB_TWE_RMC_RIFLEMAN)
 			hud_icon_state = "rifleman"
+		if(JOB_TWE_RMC_SMARTGUNNER)
+			hud_icon_state = "smartgunner"
+		if(JOB_TWE_RMC_BREACHER)
+			hud_icon_state = "breacher"
 	if(hud_icon_state)
 		holder.overlays += image('icons/mob/hud/marine_hud.dmi', H, "rmc_[hud_icon_state]")
 

diff --git a/code/modules/gear_presets/royal_marines.dm b/code/modules/gear_presets/royal_marines.dm
@@ -107,7 +107,7 @@
 	role_comm_title = "RMC"
 	flags = EQUIPMENT_PRESET_EXTRA
 	assignment = "Royal Marines Marksman"
-	rank = JOB_TWE_RMC_SPECIALIST
+	rank = JOB_TWE_RMC_MARKSMAN
 	skills = /datum/skills/rmc/specialist
 
 /datum/equipment_preset/twe/royal_marine/spec/marksman/load_gear(mob/living/carbon/human/new_human)
@@ -152,7 +152,7 @@
 	role_comm_title = "RMC"
 	flags = EQUIPMENT_PRESET_EXTRA
 	assignment = "Royal Marines Breacher"
-	rank = JOB_TWE_RMC_SPECIALIST
+	rank = JOB_TWE_RMC_BREACHER
 	skills = /datum/skills/rmc/specialist
 
 /datum/equipment_preset/twe/royal_marine/spec/breacher/load_gear(mob/living/carbon/human/new_human)
@@ -200,7 +200,7 @@
 	role_comm_title = "RMC"
 	flags = EQUIPMENT_PRESET_EXTRA
 	assignment = "Royal Marines Smartgunner"
-	rank = JOB_TWE_RMC_SPECIALIST
+	rank = JOB_TWE_RMC_SMARTGUNNER
 	skills = /datum/skills/rmc/specialist
 
 /datum/equipment_preset/twe/royal_marine/spec/machinegun/load_gear(mob/living/carbon/human/new_human)

diff --git a/icons/mob/hud/marine_hud.dmi b/icons/mob/hud/marine_hud.dmi