From 0e238dabc9077b03c2e5ed5f3c3827dbf37c5dbf Mon Sep 17 00:00:00 2001 From: Flareguy <78941145+Flareguy@users.noreply.github.com> Date: Sun, 18 Jun 2023 18:38:55 -0500 Subject: [PATCH] Adds the SWAT Helmet (#17384) * adds swat helmet * joever * epic > rare * A --- .../Entities/Clothing/Head/helmets.yml | 37 ++++++- .../Prototypes/Procedural/salvage_rewards.yml | 2 + .../Roles/Jobs/Fun/misc_startinggear.yml | 94 +++++++++++++++++- .../Head/Helmets/swat.rsi/equipped-HELMET.png | Bin 0 -> 688 bytes .../Clothing/Head/Helmets/swat.rsi/icon.png | Bin 0 -> 291 bytes .../Head/Helmets/swat.rsi/inhand-left.png | Bin 0 -> 649 bytes .../Head/Helmets/swat.rsi/inhand-right.png | Bin 0 -> 845 bytes .../Clothing/Head/Helmets/swat.rsi/meta.json | 26 +++++ .../swat_syndicate.rsi/equipped-HELMET.png | Bin 0 -> 744 bytes .../Head/Helmets/swat_syndicate.rsi/icon.png | Bin 0 -> 291 bytes .../swat_syndicate.rsi/inhand-left.png | Bin 0 -> 658 bytes .../swat_syndicate.rsi/inhand-right.png | Bin 0 -> 666 bytes .../Head/Helmets/swat_syndicate.rsi/meta.json | 26 +++++ 13 files changed, 182 insertions(+), 3 deletions(-) create mode 100644 Resources/Textures/Clothing/Head/Helmets/swat.rsi/equipped-HELMET.png create mode 100644 Resources/Textures/Clothing/Head/Helmets/swat.rsi/icon.png create mode 100644 Resources/Textures/Clothing/Head/Helmets/swat.rsi/inhand-left.png create mode 100644 Resources/Textures/Clothing/Head/Helmets/swat.rsi/inhand-right.png create mode 100644 Resources/Textures/Clothing/Head/Helmets/swat.rsi/meta.json create mode 100644 Resources/Textures/Clothing/Head/Helmets/swat_syndicate.rsi/equipped-HELMET.png create mode 100644 Resources/Textures/Clothing/Head/Helmets/swat_syndicate.rsi/icon.png create mode 100644 Resources/Textures/Clothing/Head/Helmets/swat_syndicate.rsi/inhand-left.png create mode 100644 Resources/Textures/Clothing/Head/Helmets/swat_syndicate.rsi/inhand-right.png create mode 100644 Resources/Textures/Clothing/Head/Helmets/swat_syndicate.rsi/meta.json diff --git a/Resources/Prototypes/Entities/Clothing/Head/helmets.yml b/Resources/Prototypes/Entities/Clothing/Head/helmets.yml index 04aa5185a7..8f9396dcee 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/helmets.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/helmets.yml @@ -22,13 +22,48 @@ parent: ClothingHeadHelmetHelmet id: ClothingHeadHelmetHelmetOld name: helmet - description: An old usual helmet. + description: Standard Security gear. Protects the head from impacts. components: - type: Sprite sprite: Clothing/Head/Helmets/securityold.rsi - type: Clothing sprite: Clothing/Head/Helmets/securityold.rsi +#SWAT Helmet +- type: entity + parent: ClothingHeadBase + id: ClothingHeadHelmetSwat + name: SWAT helmet + description: An extremely robust helmet, commonly used by paramilitary forces. This one has the Nanotrasen logo emblazoned on the top. + components: + - type: Sprite + sprite: Clothing/Head/Helmets/swat.rsi + - type: Clothing + sprite: Clothing/Head/Helmets/swat.rsi + - type: Armor #In SS13 this has 100% acid (caustic) protection, however it would be probably be silly to give this to a helmet without locational damage existing yet. + modifiers: + coefficients: + Blunt: 0.70 + Slash: 0.70 + Piercing: 0.80 + Heat: 0.80 + Radiation: 0.80 + - type: ExplosionResistance + damageCoefficient: 0.75 + +#Syndicate SWAT Helmet +- type: entity + parent: ClothingHeadHelmetSwat + id: ClothingHeadHelmetSwatSyndicate + name: SWAT helmet + suffix: Syndicate + description: An extremely robust helmet, commonly used by paramilitary forces. It is adorned in a nefarious red and black stripe pattern. + components: + - type: Sprite + sprite: Clothing/Head/Helmets/swat_syndicate.rsi + - type: Clothing + sprite: Clothing/Head/Helmets/swat_syndicate.rsi + #Light Riot Helmet - type: entity parent: ClothingHeadBase diff --git a/Resources/Prototypes/Procedural/salvage_rewards.yml b/Resources/Prototypes/Procedural/salvage_rewards.yml index 957a4b7690..f64ea80f83 100644 --- a/Resources/Prototypes/Procedural/salvage_rewards.yml +++ b/Resources/Prototypes/Procedural/salvage_rewards.yml @@ -39,6 +39,8 @@ CrateArmorySMG: 0.25 CrateArmoryLaser: 0.25 WeaponMakeshiftLaser: 0.25 + # rare armor + ClothingHeadHelmetSwat: 0.1 # rare weapons WeaponSubMachineGunC20r: 0.1 diff --git a/Resources/Prototypes/Roles/Jobs/Fun/misc_startinggear.yml b/Resources/Prototypes/Roles/Jobs/Fun/misc_startinggear.yml index 79fb317924..081733e27e 100644 --- a/Resources/Prototypes/Roles/Jobs/Fun/misc_startinggear.yml +++ b/Resources/Prototypes/Roles/Jobs/Fun/misc_startinggear.yml @@ -54,7 +54,6 @@ satchel: ClothingBackpackDuffelSyndicateAmmo duffelbag: ClothingBackpackDuffelSyndicateAmmo - # Syndicate Operative Outfit - Poverty - type: startingGear id: SyndicateOperativeGearExtremelyBasic @@ -66,7 +65,6 @@ satchel: ClothingBackpackDuffelSyndicateOperative duffelbag: ClothingBackpackDuffelSyndicateOperative - #Syndicate Operative Outfit - Basic - type: startingGear id: SyndicateOperativeGearBasic @@ -103,6 +101,7 @@ satchel: ClothingBackpackDuffelSyndicateOperative duffelbag: ClothingBackpackDuffelSyndicateOperative +#Nuclear Operative Commander Gear - type: startingGear id: SyndicateCommanderGearFull equipment: @@ -123,6 +122,7 @@ satchel: ClothingBackpackDuffelSyndicateOperative duffelbag: ClothingBackpackDuffelSyndicateOperative +#Nuclear Operative Medic Gear - type: startingGear id: SyndicateOperativeMedicFull equipment: @@ -142,6 +142,96 @@ satchel: ClothingBackpackDuffelSyndicateOperativeMedic duffelbag: ClothingBackpackDuffelSyndicateOperativeMedic +# Syndicate Footsoldier Gear - Unarmed +- type: startingGear + id: SyndicateFootsoldierGear + equipment: + jumpsuit: ClothingUniformJumpsuitOperative + head: ClothingHeadHelmetSwatSyndicate + mask: ClothingMaskGas + outerClothing: ClothingOuterVestKevlar + ears: ClothingHeadsetAltSyndicate + gloves: ClothingHandsGlovesCombat + back: ClothingBackpackFilled + shoes: ClothingShoesBootsCombat + id: SyndiPDA #a subtype of this for footsoldiers would probably be good to have + innerclothingskirt: ClothingUniformJumpsuitOperative + satchel: ClothingBackpackSatchelFilled + duffelbag: ClothingBackpackDuffelFilled + +# Syndicate Footsoldier Gear - Knife +- type: startingGear + id: SyndicateFootsoldierGearKnife + equipment: + jumpsuit: ClothingUniformJumpsuitOperative + head: ClothingHeadHelmetSwatSyndicate + mask: ClothingMaskGas + outerClothing: ClothingOuterVestKevlar + ears: ClothingHeadsetAltSyndicate + gloves: ClothingHandsGlovesCombat + back: ClothingBackpackFilled + shoes: ClothingShoesBootsCombat + pocket1: CombatKnife + id: SyndiPDA + innerclothingskirt: ClothingUniformJumpsuitOperative + satchel: ClothingBackpackSatchelFilled + duffelbag: ClothingBackpackDuffelFilled + +# Syndicate Footsoldier Gear - Energy Sword +#Add energy shield to this when that gets added. +- type: startingGear + id: SyndicateFootsoldierGearESword + equipment: + jumpsuit: ClothingUniformJumpsuitOperative + head: ClothingHeadHelmetSwatSyndicate + mask: ClothingMaskGas + outerClothing: ClothingOuterVestKevlar + ears: ClothingHeadsetAltSyndicate + gloves: ClothingHandsGlovesCombat + back: ClothingBackpackFilled + shoes: ClothingShoesBootsCombatFilled + pocket1: EnergySword + id: SyndiPDA + innerclothingskirt: ClothingUniformJumpsuitOperative + satchel: ClothingBackpackSatchelFilled + duffelbag: ClothingBackpackDuffelFilled + +# Syndicate Footsoldier Gear - Viper +- type: startingGear + id: SyndicateFootsoldierGearPistol + equipment: + jumpsuit: ClothingUniformJumpsuitOperative + head: ClothingHeadHelmetSwatSyndicate + mask: ClothingMaskGas + outerClothing: ClothingOuterVestKevlar + ears: ClothingHeadsetAltSyndicate + gloves: ClothingHandsGlovesCombat + back: ClothingBackpackFilled + shoes: ClothingShoesBootsCombat + pocket1: WeaponPistolViper + id: SyndiPDA + innerclothingskirt: ClothingUniformJumpsuitOperative + satchel: ClothingBackpackSatchelFilled + duffelbag: ClothingBackpackDuffelFilled + +# Nanotrasen Paramilitary Unit Gear - Unarmed +#I do not feel like doing more of these right now because this probably needs more stuff (like a different ID.) +- type: startingGear + id: NanotrasenParamilitaryGear + equipment: + jumpsuit: ClothingUniformJumpsuitSec + back: ClothingBackpackSecurityFilled + shoes: ClothingShoesBootsCombatFilled + eyes: ClothingEyesGlassesSecurity + head: ClothingHeadHelmetSwat + mask: ClothingMaskGasSwat + outerClothing: ClothingOuterVestKevlar + ears: ClothingHeadsetSecurity + gloves: ClothingHandsGlovesCombat + innerclothingskirt: ClothingUniformJumpskirtSec + satchel: ClothingBackpackSatchelSecurityFilled + duffelbag: ClothingBackpackDuffelSecurityFilled + #CBURN Unit Gear - Full Kit - type: startingGear id: CBURNGear diff --git a/Resources/Textures/Clothing/Head/Helmets/swat.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Helmets/swat.rsi/equipped-HELMET.png new file mode 100644 index 0000000000000000000000000000000000000000..030107f05e3e15775b5dc5b634ff75fbd3e26787 GIT binary patch literal 688 zcmV;h0#E&kP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0!2wgK~#8N?b<<0 z8$lEY@K><}iJogOVq+`>niwS_5tLklc=gf`(R)rF{R)1FUUC)5C0GzdiINC`8WZs( z2&F``P3Jw-!}P zjC>xjtLtlOx7%`XTOa;0=cYe>e)3y*ZahdFgP-%^XI+nlF$XamD73(R&&9HxgZ1;u z?*r9z`rHEm000000000006<`@{-4iP7=L}9g}Fx{$oR$=aB!~A`)l(|?-$7D^G=gc zDwU)l!+R1mJr|oj0@nKj{EKILzd)@$=3*zUnzX#K zVwC{1{Q>+WcGI z!eiEflbM$Bd4ldDdu^O||R8X*iz<_aiC1S&8X zl~gQFX`Hq2vUI9I-?6tdxSY=X@_tq@-~7Z^mP;>tC$-KlSKKn0xAFK44t{R~7r$p} Ws+T6dRjmWs&*16m=d#Wzp$Pz6Mrif` literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Head/Helmets/swat.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Helmets/swat.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..c334355ba851e9647f3a9dbe9ad2dc6d4336a326 GIT binary patch literal 649 zcmV;40(Sk0P)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!TMVg|$lXr^pH_ZRw6@P;_{0;I>+8-d%%u*||v}m*!$ktla z)${BeZa3^+o{RMT)a^XyZ1>!Ap53!I=O_RG00000004mRiAJNA4wrTIs#%vJ zXwZp7Lf7i3?sYQn^^;5{EkBYXmH--DFc46+T1~gqQJvb|4xYXjkH`5wnzU}_I<-qD zp-GqDHW(hV+S`MwwWUcNrPJK+L@dUGeR{T3xm-~f`Ll-4o1dHGdqUwb*X=Izc`kSN z_Qb|5nt)2>Q9Z<0b<3O1{WTQ~c6ds_XCxCKwghPMcEg1&9o0EM|Hx&bph~3@Ulg0m z-X=*blcc+=$Lj0t;h2_zSprwrMRjvqbp0%|&U3lk>pkza{YjJr9WrO#EvbGQ@g;5D5Nqc#N00000000000002sf1#Zsv-4y~?;QVGsZ`3M%f5YXcuj)n0SRMi zalyA=f+kL7Bog7elb5pyM0C4JYD?@h&exup^9b}t&_Rl9CiB|Xi0mMjw~wg^)NaPA zJ1f2+s-! z+bY#6mu~p-D~*nfTPNA$AL*Nx-OTJX$EVpWPyScV5ZKp04N`~V?0uVOQfYtwuc5*D jIeFu!o&x~z&nfi+u5Iy{5Lm~a00000NkvXXu0mjfCq^-u literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Head/Helmets/swat.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Helmets/swat.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..423f3fe52e61453a8d7dd00119b1bb5853864aa0 GIT binary patch literal 845 zcmV-T1G4;yP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0^&(TK~#8N?V8VP z6G0TmM=znof;a0WRE<1QNh0O{0&~bO35WC7>cFc_7V_U zN};q8umuez{vh(5&I_|YW_Od!u1Wen@YtC*J2UUSeKQF=D;S1h7=~dOhG7_nxpG`n z*P&=M8mi=`TrR89cmw-=0SI%7+Q`A6dnd(tVDeQ`C=`0CDDl<-1|Ug;sJVh{3kxX`^m8 zf&qP)&AtHq>i!kK|MbM3avsstGa_v;H$6BK)T3+~>4}C7p2U)%`MhJB z^aR?2+MrJ?07ROB7?e~3FeqV8dFPwT01SeS02ntxhG7_nVHk#C7=~e(X(jSa?k#;fE>eVi+;Pb+179{b#r&O|l(X}nQb#PdUKdr- zIP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!Tsmgf z8UKm1_Xfci4{K&}vTQyc)vbkpS5hHB9EqE>zVX!pbUIyYudX_`tjvc7aT?L>wZiv} zuM%Kld@9Q4bLQIlpPrShg^zh0w-bTD^~>ewcHDmhFz*vzy#uh_zZS<#qj6zPB_pa(tVwx{+nz zc*@}V_}d_e$f6iW9n2V$^3BLc>&Gggwo7eB+&+?_q^@?&$svk>#0FZJxc7Y^=t$2Fc2r2+NLgdkd=yLbvrl3l! zsZ^;2fL%I2i30+NvEeGV5GbSoQU?E94#5OK0rErZGA>68x!hBOJ^|+rl+9D){dU}i zG4br#bd)_r|fcxuNSLr?n~ht9?~cARt%E@zRM{!>kjL-SUF*rEsPSiI(_aKufHVpPs_ zc+FYBPx#1ZP1_K>z@;j|==^1poj532;bRa{vGi!TRzb@zl4LMi<66AKo=22S8>o)@B=th9UO#KDyZ#H z5N$^h@72rPB19DBexBmb*Efm-cJrRs*Sw^XXmd%Y3d zhvOg?mwEe>Lf*cnQ%Ie)z_O1-qAK^PTrP=H`QCS1s7EEg2vSc+cst*0FwN+y=O;#H z)A>uCFI=_UhI7!r{>>8+5fKp)5fKp)kzoj#dELg?9r`OZ&>$;}M*-T@rn zy?yWggr8^)jzT-$z+omWcBW@l&TT)D3=~4wIss@nm%CIsbI=At@2Qhx*J^8J6NTPz z)8c{L2+;j}H}QJ3WF(Z;lisvmdZK4Y51p<|IHSekaG%H&uH>EszoE3iE1+SJQVkwP zirXrspEK;9pIny{frvB?XIR}YBX0@I^86y#mb&rTC6l8vjZXuU(2+o@^M}Xuzko`9 sw28B`{fV!Z literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Head/Helmets/swat_syndicate.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Helmets/swat_syndicate.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..e0ab815b503825445f130f89ce44fcd39568966d GIT binary patch literal 666 zcmV;L0%iS)P)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!TLYwL*}nd;^7ER2mwufNRX3wx#C1{ ziffkt?#$WUn>+T-%HaP?WM1}m_Lb#h=_=Yh=_=Y9DTh>OICjsf815g12?S* z;kglQ(-%b--*zNYG47}=Jzie&vgTE;-xP??|Kc*1RWa_81!!;Uuo@a-;_1CUIx=1y z3~lt|y3=D8#MRo`B3lj>Kl;nXt=$2$>6F-sH;GK z*U>J(`uk)bhnB@n&tkEB7+kXZO@^(GovJ2`674`oAfJDhHAm;whFwOZ&PV;%O@X-Z zx8K%bw=r=*TV2zM$kGGbJ|0iV)`x8NUfgHzwD*_*am#9nz;XKrt2DStg2r8ORovg4 z7nkS8zIi|Qq)pzjL_|bHL_|bHL`1&}Qc&*v;h#4$)Ta{R>QCtkHo}ga$dfQ((TnHrk9;?YiS7uYzzMp68xqa;~HL6MA26|g~0N!{q*=@J6CEZC=9EsC(DwG`%=GcMZ z9ICVEK9fK7U*NmH2Wp1k!koPFQ_mqH`X_{V1B`y{uUq{c2LJ#707*qoM6N<$f>6pa AX#fBK literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Head/Helmets/swat_syndicate.rsi/meta.json b/Resources/Textures/Clothing/Head/Helmets/swat_syndicate.rsi/meta.json new file mode 100644 index 0000000000..8bedbfb78e --- /dev/null +++ b/Resources/Textures/Clothing/Head/Helmets/swat_syndicate.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/fb2d71495bfe81446159ef528534193d09dd8d34, inhand sprites by Flareguy, icon edited by Flareguy", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-HELMET", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +}