Skip to content

Commit

Permalink
updates how the ERT is handled to hopefully be better and not break
Browse files Browse the repository at this point in the history
  • Loading branch information
spartanbobby committed Aug 4, 2023
1 parent 24d0396 commit 0375fa2
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 11 deletions.
21 changes: 11 additions & 10 deletions code/datums/emergency_calls/royal_marines.dm
Original file line number Diff line number Diff line change
Expand Up @@ -31,17 +31,18 @@
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/twe/royal_marine/team_leader, TRUE, TRUE)
else if(heavies < max_heavies && HAS_FLAG(mob.client.prefs.toggles_ert, PLAY_HEAVY) && check_timelock(mob.client, JOB_SQUAD_SPECIALIST))
var/specialist_kit = pick("Sniper", "Smartgun", "Breach")
switch(specialist_kit)
if("Sniper")
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/twe/royal_marine/spec/marksman, TRUE, TRUE)
if("Smartgun")
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/twe/royal_marine/spec/machinegun, TRUE, TRUE)
if("Breach")
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/twe/royal_marine/spec/breacher, TRUE, TRUE)
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/twe/royal_marine/spec/marksman, 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/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/twe/royal_marine/spec/breacher, TRUE, TRUE)
else
to_chat(mob, SPAN_ROLE_HEADER("You are a member of the Royal Marines Commando. Born in the three world empire."))
arm_equipment(mob, /datum/equipment_preset/twe/royal_marine/standard, TRUE, TRUE)
Expand Down
2 changes: 1 addition & 1 deletion code/datums/factions/royalmarinescommando.dm
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
if(JOB_TWE_RMC_LIEUTENANT)
hud_icon_state = "lieutenant"
if(JOB_TWE_RMC_TEAMLEADER)
hud_icon_state = "teamlead"
hud_icon_state = "teamleader"
if(JOB_TWE_RMC_MARKSMAN)
hud_icon_state = "marksman"
if(JOB_TWE_RMC_RIFLEMAN)
Expand Down
Binary file modified icons/mob/hud/marine_hud.dmi
Binary file not shown.

0 comments on commit 0375fa2

Please sign in to comment.