From fcb1c57638729336c0ad940b5f70871003954353 Mon Sep 17 00:00:00 2001 From: Rosycup <178287475+Rosycup@users.noreply.github.com> Date: Sat, 25 Jan 2025 10:37:29 +0800 Subject: [PATCH] Added Combat Helmet and Mask for Security --- .../Jobs/Security/uncategorized.yml | 4 +++ .../_DEN/Entities/Clothing/Head/helmets.yml | 10 ++++++ .../_DEN/Entities/Clothing/Masks/masks.yml | 11 +++++- .../Loadouts/Jobs/Security/uncategorized.yml | 28 +++++++++++++++ .../equipped-HELMET.png | Bin 0 -> 854 bytes .../Helmets/securitycombathelmet.rsi/icon.png | Bin 0 -> 460 bytes .../securitycombathelmet.rsi/inhand-left.png | Bin 0 -> 785 bytes .../securitycombathelmet.rsi/inhand-right.png | Bin 0 -> 695 bytes .../securitycombathelmet.rsi/meta.json | 26 ++++++++++++++ .../equipped-MASK-reptilian.png | Bin 0 -> 766 bytes .../equipped-MASK-vulpkanin.png | Bin 0 -> 1026 bytes .../equipped-MASK.png | Bin 0 -> 984 bytes .../Mask/securitycombatgasmask.rsi/icon.png | Bin 0 -> 686 bytes .../securitycombatgasmask.rsi/inhand-left.png | Bin 0 -> 443 bytes .../inhand-right.png | Bin 0 -> 440 bytes .../Mask/securitycombatgasmask.rsi/meta.json | 34 ++++++++++++++++++ 16 files changed, 112 insertions(+), 1 deletion(-) create mode 100644 Resources/Prototypes/_DEN/Entities/Clothing/Head/helmets.yml create mode 100644 Resources/Textures/_DEN/Clothing/Head/Helmets/securitycombathelmet.rsi/equipped-HELMET.png create mode 100644 Resources/Textures/_DEN/Clothing/Head/Helmets/securitycombathelmet.rsi/icon.png create mode 100644 Resources/Textures/_DEN/Clothing/Head/Helmets/securitycombathelmet.rsi/inhand-left.png create mode 100644 Resources/Textures/_DEN/Clothing/Head/Helmets/securitycombathelmet.rsi/inhand-right.png create mode 100644 Resources/Textures/_DEN/Clothing/Head/Helmets/securitycombathelmet.rsi/meta.json create mode 100644 Resources/Textures/_DEN/Clothing/Mask/securitycombatgasmask.rsi/equipped-MASK-reptilian.png create mode 100644 Resources/Textures/_DEN/Clothing/Mask/securitycombatgasmask.rsi/equipped-MASK-vulpkanin.png create mode 100644 Resources/Textures/_DEN/Clothing/Mask/securitycombatgasmask.rsi/equipped-MASK.png create mode 100644 Resources/Textures/_DEN/Clothing/Mask/securitycombatgasmask.rsi/icon.png create mode 100644 Resources/Textures/_DEN/Clothing/Mask/securitycombatgasmask.rsi/inhand-left.png create mode 100644 Resources/Textures/_DEN/Clothing/Mask/securitycombatgasmask.rsi/inhand-right.png create mode 100644 Resources/Textures/_DEN/Clothing/Mask/securitycombatgasmask.rsi/meta.json diff --git a/Resources/Prototypes/CharacterItemGroups/Jobs/Security/uncategorized.yml b/Resources/Prototypes/CharacterItemGroups/Jobs/Security/uncategorized.yml index d157ae8f5f..c2aa975be5 100644 --- a/Resources/Prototypes/CharacterItemGroups/Jobs/Security/uncategorized.yml +++ b/Resources/Prototypes/CharacterItemGroups/Jobs/Security/uncategorized.yml @@ -170,6 +170,8 @@ id: LoadoutClothingHeadHelmetBasic - type: loadout id: LoadoutSecurityHeadHelmetInsulated + - type: loadout + id: LoadoutSecurityHeadHelmetCombat #- type: characterItemGroup # id: LoadoutSecurityId @@ -187,6 +189,8 @@ items: - type: loadout id: LoadoutSecurityMaskGasSwat + - type: loadout + id: LoadoutSecurityMaskGasCombat - type: characterItemGroup id: LoadoutSecurityOuter diff --git a/Resources/Prototypes/_DEN/Entities/Clothing/Head/helmets.yml b/Resources/Prototypes/_DEN/Entities/Clothing/Head/helmets.yml new file mode 100644 index 0000000000..a36107581c --- /dev/null +++ b/Resources/Prototypes/_DEN/Entities/Clothing/Head/helmets.yml @@ -0,0 +1,10 @@ +- type: entity + parent: ClothingHeadHelmetBasic + id: ClothingHeadHelmetSecurityCombat + name: security combat helmet + description: A repainted tactical helmet commonly used by mercenaries around the sol system, it has a distinct jungle smell. + components: + - type: Sprite + sprite: _DEN/Clothing/Head/Helmets/securitycombathelmet.rsi + - type: Clothing + sprite: _DEN/Clothing/Head/Helmets/securitycombathelmet.rsi diff --git a/Resources/Prototypes/_DEN/Entities/Clothing/Masks/masks.yml b/Resources/Prototypes/_DEN/Entities/Clothing/Masks/masks.yml index 8389d3dcc3..31d51e084e 100644 --- a/Resources/Prototypes/_DEN/Entities/Clothing/Masks/masks.yml +++ b/Resources/Prototypes/_DEN/Entities/Clothing/Masks/masks.yml @@ -1 +1,10 @@ -# smile \ No newline at end of file +- type: entity + parent: ClothingMaskGasExplorer + id: ClothingMaskGasSecurityCombat + name: security combat gas mask + description: Slightly outdated, but reliable military-style gas mask, painted in security's colors. + components: + - type: Sprite + sprite: _DEN/Clothing/Mask/securitycombatgasmask.rsi + - type: Clothing + sprite: _DEN/Clothing/Mask/securitycombatgasmask.rsi diff --git a/Resources/Prototypes/_DEN/Loadouts/Jobs/Security/uncategorized.yml b/Resources/Prototypes/_DEN/Loadouts/Jobs/Security/uncategorized.yml index e7fc18c2d5..c6202063e9 100644 --- a/Resources/Prototypes/_DEN/Loadouts/Jobs/Security/uncategorized.yml +++ b/Resources/Prototypes/_DEN/Loadouts/Jobs/Security/uncategorized.yml @@ -25,3 +25,31 @@ - Security items: - ClothingUniformJumpsuitSeniorTrooper + +- type: loadout + id: LoadoutSecurityHeadHelmetCombat + category: JobsSecurityAUncategorized + cost: 0 + exclusive: true + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutSecurityHead + - !type:CharacterDepartmentRequirement + departments: + - Security + items: + - ClothingHeadHelmetSecurityCombat + +- type: loadout + id: LoadoutSecurityMaskGasCombat + category: JobsSecurityAUncategorized + cost: 2 # Slightly tougher than the normal security mask + exclusive: true + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutSecurityMask + - !type:CharacterDepartmentRequirement + departments: + - Security + items: + - ClothingMaskGasSecurityCombat diff --git a/Resources/Textures/_DEN/Clothing/Head/Helmets/securitycombathelmet.rsi/equipped-HELMET.png b/Resources/Textures/_DEN/Clothing/Head/Helmets/securitycombathelmet.rsi/equipped-HELMET.png new file mode 100644 index 0000000000000000000000000000000000000000..17da18f947fe609324a1dfcd7579b07dad55be7a GIT binary patch literal 854 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9GGLLkg|>2BR01_q{g zo-U3d6>)E8UG$cA6gYO>IMijQkVml8LNnHh7t-U8u>b$D@29%Rs;v^Yq;_cV7P-!P zxBa?)tbSb8=0e_zVgV1m-PWJ~mZhDwO!hgveyhOWzvb_jKdnrEKEL@|)YiY#t}u4^ zU!J}>Q+oF8cYmKePx+Pn#n!4t>-V+R%oA!IGJ4YLtWH0QzMVYM;_!RRckTHW;y)@& zOih9~7ID1T^GZ@;sUy>ay>Dfud6hGLT6>rO*l_cI+Eum-Z}*f{))yD&zWY>s`Bu*P zu$`wj-%Ri67G#YOU&;PsUq$`*jgFT>*6=c92_{`@;Qf4NnO_-y-S*9frGf$<7gg9Z zJrvgKcwXJf-I-!=EbMJwPwe+v=9oE#EgQCez5Sqd#e#~Qz7pXq<^~6esFH`jBNPgD z{1nK`7ykV9(QI!|H?@7!<(e)r7__$^FW%3%!Q*P}#>W3X2jZFLus^--yx&*u_O|H$ z_QcAM>ct9OTCpLV8jPw7Sf(@xWhga%ojkcQ(s-q0|9ks8CaiASr`5i3>gRXevz&YK z;zjn)%eMbed~SI;(%$05%#UBWH}C#^ZExG*?&oXD{i0ug`gF?9?^#7p&Xj^K-&=2G zf9tPHlWS<0z{6I(Y`=ZRlXt5#Aoc_>@v1AV;`_ZO?56UE8QWa9Ix;mdKlL)?nzloJ zx6$W-&OiBU4NjE3y(DpTvB9J1Cluy9ExhtFNz9|>;}-Az4}wE4rUg#xW=t>)OZ=;) z>wT?2g^k5c_D%TIWpy)-xUP_*~80^{@5UUN0pEgA=jO{MLBwsaMc{Jeh-`M~Um( zuixkD-Yi>TwesO_;Y%v2Yz`bf3@!IxzC6C5^c6>p37aivPTv6w&lkn97Zp!<8ar=O zKEqUSmP_&2bjAaJ;!C;o7CS!If(CK`la~WL#1Wi%a}LPoT@Pnp+sES!%np315uRzj az6@GGHU|)cz@^~HAj;F#&t;ucLK6VKB6^+x literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DEN/Clothing/Head/Helmets/securitycombathelmet.rsi/icon.png b/Resources/Textures/_DEN/Clothing/Head/Helmets/securitycombathelmet.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..9a35f06e09a64a25cb50230ede8ebbec72b6bcfc GIT binary patch literal 460 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 U007cclK=n!07*qoM6N<$f{+q5B>(^b literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DEN/Clothing/Mask/securitycombatgasmask.rsi/inhand-left.png b/Resources/Textures/_DEN/Clothing/Mask/securitycombatgasmask.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..c1c25c969fbd5a301b561afc345645425ac0ce73 GIT binary patch literal 443 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9GGLLkg|>2BR01_s7p zPZ!6KinzD84D${-2(&&tI58kEVfRLjfJ;jkY{*zq#5TY4@DHAqmzH#??s5sy%Xy(8 z=wu|NlJA_cXR}9Nop*G=o6l#CJ8afI)Xc!dq0oRyRB(v6UaZXdUz|Pf`CPr%F=xAV zoVWhW3f}3#&68X6%SJR-Q9vz>;a1M>{M4;Kizd#`_x5}oa%z*zmwEesUjC@^e*gXJ zcfLNf(Rdv#Wd1H~|H?Fb)~FI8^|2BR01_s6e zPZ!6KinzD8Hg+9y5NLR4IWZwqe6mu+iP-c+!JIYkBtIG01SWC@O#Pj z-D`I=EawH@OWpe0wCupciU|w$ggD>d{V(IuO8aT=@5^tzxqjoM|FH|Wd;bJJU%me5%o^WQ zkD@#z+Ip{E|8Xp=Z_$chGoMu6llcFRuP}H2`)`kaV|6Fo?O{xMGSj0~FR8t-%e3t% zkzIH-arx?UHXl~Ad;Aq97mr#qt2KnlF5uo-k^W#M!!C*R54rzl9Z>>#y(Ihrzr>}g orsjQ%6MzBEmm1-j=IhI#1!QvoF$i1=o(!TqUHx3vIVCg!0MiDn;{X5v literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DEN/Clothing/Mask/securitycombatgasmask.rsi/meta.json b/Resources/Textures/_DEN/Clothing/Mask/securitycombatgasmask.rsi/meta.json new file mode 100644 index 0000000000..2d8065e938 --- /dev/null +++ b/Resources/Textures/_DEN/Clothing/Mask/securitycombatgasmask.rsi/meta.json @@ -0,0 +1,34 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "modified sprite from Jackal298 based on the sprite from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Reptilian edit by Nairod(Github) | vulpkanin version edited by Floofers | Modified for The Den by PatchFM on Github.", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-MASK", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "equipped-MASK-vulpkanin", + "directions": 4 + }, + { + "name": "equipped-MASK-reptilian", + "directions": 4 + } + ] +}