From 0375fa27f3d0797e56518a142b3c0d9d61d7ef8c Mon Sep 17 00:00:00 2001
From: Bobby <spartanbobb@hotmail.com>
Date: Fri, 4 Aug 2023 16:51:20 +0100
Subject: [PATCH] updates how the ERT is handled to hopefully be better and not
 break

---
 code/datums/emergency_calls/royal_marines.dm |  21 ++++++++++---------
 code/datums/factions/royalmarinescommando.dm |   2 +-
 icons/mob/hud/marine_hud.dmi                 | Bin 5786 -> 5785 bytes
 3 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/code/datums/emergency_calls/royal_marines.dm b/code/datums/emergency_calls/royal_marines.dm
index c1e4c2237909..665949d027a1 100644
--- a/code/datums/emergency_calls/royal_marines.dm
+++ b/code/datums/emergency_calls/royal_marines.dm
@@ -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)
diff --git a/code/datums/factions/royalmarinescommando.dm b/code/datums/factions/royalmarinescommando.dm
index b531357baed9..c7b1c671d134 100644
--- a/code/datums/factions/royalmarinescommando.dm
+++ b/code/datums/factions/royalmarinescommando.dm
@@ -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)
diff --git a/icons/mob/hud/marine_hud.dmi b/icons/mob/hud/marine_hud.dmi
index 3e43974c10589bb87d1fd8f119390792c89f4387..bd562d7a2cc902aa503df20c72e4a07185193b74 100644
GIT binary patch
delta 741
zcmV<B0vi3AEtxH_oB;vjlbrz`f0*RlPLuT70|C-zhOa_srYA<o3--jaR7p1F-&ZoE
zO%Fu-a<k!Cd9|NfUH9%sUmvHv;pDN~kadNwdS7~<KYr?V_C@CN@N#$C?c`MKa({er
zUU&+RSF^=%v{+tsJ6T~}_~EA8*;=9K^sID4iYni}{T0gVY^!DM&WXJRe{)@C94>w-
z$t}OH`orG0)eu+M{i+2|5n+ppHri%nrB+H*EU|X|wN-`>ON>U~y$I@8d>&a_87VUI
ze1RQRWJL*VRrA^30P7BbNgS}S0oY7Rz!K@4_~#eEB^qGEKhBfPkx)hKp{3UrNHKCG
ztjr0JscP#0OIkpE30N{Hf6j+X3Rz~?umqp?KuS78K-lhTAknDW6-YD!<=6u{3&-kb
zNBH6C27zx8_>K>687_RDUDzzw`OX0m(&RfnjIp8wk}PNq#p+%|{U+c@%L%xWmiCYY
zQh%cQIjO<{CJHiW)s3HFRQ35{_G7kux-{Yp;|%x)25O^efEp8Ee;{K`;}wu6rcpov
zE5d0W!X01~#?s6AXfT^!Fd)1hqNG$n!4AAHk)GEIKzI`FkH=x0>Q4tFeAk2V14o(F
ze9pn1Km6oii_!9|gZ`UrY9A&W#tC6Q8Gu_iO0Hen&k<vcgAwyQjB})q9OIZ4F-EMu
z<GVA)sf}SBTO#L#e=!UXwJ4{}wO~3yju<2H+P$QQ#fUMQ_VKekPKg7Hd(q789x9)n
zX(B0gx?-O=uA2kO^h(3?amFZYkqgZ#$-Ps=&P2E@x4dI~1UWW}94o$CFm1^r#)$70
zWJN|KC6y&7I@)a)X*CCvd(`r36EY)RFd~;xI&mY%si~1GQW!TGk<**>WVL`>jt%8{
zV@a@X0wNsD^x~9A?=8Z%*p|eF!>ZPYnYUtU;z=mxupaTUpxRR<s&wi`{B&t~e(~$x
XXgX|fi~j(WJC;6m=p<XSi3AZ6{y=Fk

delta 742
zcmV<C0vY|8Et)N`oB;vklbrz`e>};#ohIqE2Lhzc3}1z$nVuLSFW3{yQYG1xe_zQY
zZF(TumzxdG%B%g<>N2|>f4!e&qv?IWCF@FEXJ4|<A3ybb`!e@Mc)7Xm_X;X^g+IPH
zFFb|Ei}`XiUal_sy}Yz8{BYIpZLLuB@~m`AifZ4z{S_*je5+;SPKmt*e+ymZ94>w-
z$*sOW4o2Cx#}Tfu`_%}ZBEpt6ZM4nFO0ATrSz_J#YpV<&mKcq|dlA&H`8=|=GE(H^
z`2stt$%+cts^+u50oEM=lQ>{u1F*T2fF;s7@y{=SOEkcSf1D>-AfbxbLrbqMkYeOW
zSXmGtQ#aNDmb8HS60l@Yf1D3j6tc{&VF^C(fs}NHfUw;)K%!B-E0Jgf%CQG@7LL`=
zj_}>X6#`!)@C_f{GF<pHKeJh`i=6`^q%C%Q7-K~RBw5fJiq*Y_`c1%*mJ@I#E$tx*
zr2a(p3sR*6OcZ3$svAGUsOpR5{KtItaBjpI#u@Mp4Ae%`0yQSUe?Z2X)+-=SOsjwb
zR)*6&ggd|}jHOqL@o>I4V?cO4L`kWDf*p8YAw91Xfbb+dm`uVrHJA;@_^yYOJB~7s
ziv<UJ`tXy3Eyt^q4*GAhX?&P$7$=0qbO>(UD7kiNKSzu)4o1xLFwT)aa*ShI#2B&q
zj_*zwr!j_gY>Au`f5tF8)S;X<*MaE-Ibw{&>-Lf!79+-J+Q-lGI3*4&?pZUpd#HVS
zrirA~>5BcraorqHrdL{?k8?(0i(F_{N$#B@b|S)MwdEb-BgnB)<XG|DfoV$~F-ClM
zAS*H=DXFSB(a~+YOshGZ-lCRQn~)jlf)Tl#(uo^6PECzmQ^~l=h@9S}C#xmga%?Eq
z8%u(96A<BGre~)_dT$Z7<+dU&99FeH%)B*I6Hh{A%xOLHRY{GfTGZ*>jrhy0<>|#Q
Yv+-=yT^IiW6mphcr`eEyvxo!{5&;Qmwg3PC