From 2f7ad782c5cb1544b584d92ecc4ba8614e538e18 Mon Sep 17 00:00:00 2001 From: DieselMohawk Date: Mon, 9 Sep 2024 14:19:16 -0500 Subject: [PATCH] Trooper Uniform and Hat (#31997) * Adds entities, sprites, and loadout accessibility * Fixing Uniform file issues --- .../Entities/Clothing/Head/hats.yml | 15 +++++++++ .../Entities/Clothing/Uniforms/jumpsuits.yml | 11 +++++++ .../Jobs/Security/security_officer.yml | 10 ++++++ .../equipped-HELMET.png | Bin 0 -> 344 bytes .../Hats/security_trooper_hat.rsi/icon.png | Bin 0 -> 256 bytes .../security_trooper_hat.rsi/inhand-left.png | Bin 0 -> 351 bytes .../security_trooper_hat.rsi/inhand-right.png | Bin 0 -> 355 bytes .../Hats/security_trooper_hat.rsi/meta.json | 26 +++++++++++++++ .../equipped-INNERCLOTHING-monkey.png | Bin 0 -> 964 bytes .../equipped-INNERCLOTHING.png | Bin 0 -> 1205 bytes .../Jumpsuit/security_trooper.rsi/icon.png | Bin 0 -> 514 bytes .../security_trooper.rsi/inhand-left.png | Bin 0 -> 555 bytes .../security_trooper.rsi/inhand-right.png | Bin 0 -> 561 bytes .../Jumpsuit/security_trooper.rsi/meta.json | 30 ++++++++++++++++++ 14 files changed, 92 insertions(+) create mode 100644 Resources/Textures/Clothing/Head/Hats/security_trooper_hat.rsi/equipped-HELMET.png create mode 100644 Resources/Textures/Clothing/Head/Hats/security_trooper_hat.rsi/icon.png create mode 100644 Resources/Textures/Clothing/Head/Hats/security_trooper_hat.rsi/inhand-left.png create mode 100644 Resources/Textures/Clothing/Head/Hats/security_trooper_hat.rsi/inhand-right.png create mode 100644 Resources/Textures/Clothing/Head/Hats/security_trooper_hat.rsi/meta.json create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpsuit/security_trooper.rsi/equipped-INNERCLOTHING-monkey.png create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpsuit/security_trooper.rsi/equipped-INNERCLOTHING.png create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpsuit/security_trooper.rsi/icon.png create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpsuit/security_trooper.rsi/inhand-left.png create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpsuit/security_trooper.rsi/inhand-right.png create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpsuit/security_trooper.rsi/meta.json diff --git a/Resources/Prototypes/Entities/Clothing/Head/hats.yml b/Resources/Prototypes/Entities/Clothing/Head/hats.yml index 02275d5a2f..c2e921bcbf 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/hats.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/hats.yml @@ -58,6 +58,21 @@ - HamsterWearable - WhitelistChameleon +- type: entity + parent: ClothingHeadBase + id: ClothingHeadHatSecurityTrooper + name: trooper hat + description: A campaign hat for the Nanotrasen Troopers, comes with a case too, but you lost it. + components: + - type: Sprite + sprite: Clothing/Head/Hats/security_trooper_hat.rsi + - type: Clothing + sprite: Clothing/Head/Hats/security_trooper_hat.rsi + - type: Tag + tags: + - ClothMade + - WhitelistChameleon + - type: entity parent: ClothingHeadBase id: ClothingHeadHatCasa diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml index 8a265c5811..a3ffc5952a 100644 --- a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml +++ b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml @@ -634,6 +634,17 @@ - type: Clothing sprite: Clothing/Uniforms/Jumpsuit/security_grey.rsi +- type: entity + parent: [ClothingUniformBase, BaseRestrictedContraband] + id: ClothingUniformSecurityTrooper + name: trooper uniform + description: A formal uniform issued to the Nanotrasen Troopers, usually it comes with a car. + components: + - type: Sprite + sprite: Clothing/Uniforms/Jumpsuit/security_trooper.rsi + - type: Clothing + sprite: Clothing/Uniforms/Jumpsuit/security_trooper.rsi + - type: entity parent: [ClothingUniformBase, BaseRestrictedContraband] id: ClothingUniformJumpsuitWarden diff --git a/Resources/Prototypes/Loadouts/Jobs/Security/security_officer.yml b/Resources/Prototypes/Loadouts/Jobs/Security/security_officer.yml index e479d822dd..6cc0dedf72 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Security/security_officer.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Security/security_officer.yml @@ -39,6 +39,11 @@ equipment: head: ClothingHeadHatBeretSecurity +- type: loadout + id: TrooperHat + equipment: + head: ClothingHeadHatSecurityTrooper + # Jumpsuit - type: loadout id: SecurityJumpsuit @@ -60,6 +65,11 @@ equipment: jumpsuit: ClothingUniformJumpskirtSecGrey +- type: loadout + id: TrooperUniform + equipment: + jumpsuit: ClothingUniformSecurityTrooper + - type: loadout id: SeniorOfficerJumpsuit effects: diff --git a/Resources/Textures/Clothing/Head/Hats/security_trooper_hat.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hats/security_trooper_hat.rsi/equipped-HELMET.png new file mode 100644 index 0000000000000000000000000000000000000000..e2415d48d464fa46bf005e220f0346632115d31d GIT binary patch literal 344 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%zg*;sxLn`LH zz2%tIVjyztW4;&jM281!t0t}4T)Angw9v9AK5p3Ze7{!Zk4&` zCoM^=JHfW&RJ``t`(N&E$+fnAe#NABPVxS@$;H!DdLOTtvw7D#>o@Z^sMgOsZ2O53 z=r=HEuwSsFE^M>=gA;FNOQ~E-eU&*&ZWD)l`ulhM6Z+O)yng21U3mrB_{HmI?yWq1 jWzEIQ@-UqY4YzBVH*IK*{HZ%@GDy(V)z4*}Q$iB}4Uv`0 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Head/Hats/security_trooper_hat.rsi/icon.png b/Resources/Textures/Clothing/Head/Hats/security_trooper_hat.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..ed64010e818a6075c1e46a61ce63d7001ac0c68c GIT binary patch literal 256 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 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/security_trooper.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/security_trooper.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..7a4841f09b6cb13c070f9eb60f2830b4150d48ea GIT binary patch literal 561 zcmV-10?z%3P)Px$>q$gGRCt{2*|BQdP#DGWzX}faV&Y^71fjtiI(v{8`x%TnmF~<&^tGq4WW| zc}UP&Iu*ZzU!se~OiCQQ*vOdMp*V!pa%FLQYs&e77hO2_@<~YG10o_KA|fIpA|g`P za5ywk6q#Mu>*l?@7DbV%o43m=TS24I$oRfb7>2*C`M%F+G&<;FszkV#@YZb zW;22yAP52gv;8GWVuB#xVm7Olmn6wk7GSn}9GX|gvk`KAc4oRKCuBuI=jsZ8$z;NK zJO*HXd&_qH=HcOwd)m(1$I271iDR;&;N0_=PNx9eeEs&ce(rf>MZqSH|4H6HRtAu! zskez^?u}tE7yxkn?kxa$o^x*un>Z#-(@J;CcHTbL-T`TvdRecxb1m!j4nC~yyfW4X z@LZnf^!t7CJU`03=d4T-pxf=5Mx#Ni)uP#K^8Uj|zI^_~YPDjyT(VxT$+E2Sezx<< zSR25b(^K=~@)Cefr^8~gpxtgWpU(k!eRs$A$H&V1+0H9tZ2<7=^HsK1=W}H{PeepS zL_|bHL_`kbqOEnUaxdVjt#z&P09>`Tu2uSL*=1YnTBRqzWn1f7r2)8XYhA1S4sg}h zx>l