From c3ac0a52a4858d18d51d0c2dc9d658f537d4bb9c Mon Sep 17 00:00:00 2001 From: BIGZi0348 Date: Sun, 12 Jan 2025 23:39:38 +0300 Subject: [PATCH] =?UTF-8?q?=D0=9F=D0=B5=D1=80=D1=87=D0=B0=D1=82=D0=BA?= =?UTF-8?q?=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Catalog/Fills/Backpacks/duffelbag.yml | 2 +- .../Catalog/Fills/Lockers/security.yml | 2 +- .../VendingMachines/Inventories/detdrobe.yml | 2 +- .../VendingMachines/Inventories/secdrobe.yml | 2 +- .../Entities/Markers/Spawners/Random/loot.yml | 2 +- .../Prototypes/Entities/White/mag-gloves.yml | 1 + Resources/Prototypes/Loadouts/Jobs/common.yml | 10 ++++++ .../Prototypes/Loadouts/loadout_groups.yml | 10 +++++- .../Prototypes/Loadouts/role_loadouts.yml | 10 +++--- .../Roles/Jobs/Command/centcom_official.yml | 2 +- .../_White/Entities/Clothing/Hands/gloves.yml | 15 +++++++++ .../Structures/Storage/SenorsLockers.yml | 2 +- .../equipped-HAND-body-slim.png | Bin 0 -> 1990 bytes .../blacksecurity.rsi/equipped-HAND.png | Bin 0 -> 360 bytes .../Hands/Gloves/blacksecurity.rsi/icon.png | Bin 0 -> 365 bytes .../Gloves/blacksecurity.rsi/inhand-left.png | Bin 0 -> 205 bytes .../Gloves/blacksecurity.rsi/inhand-right.png | Bin 0 -> 214 bytes .../Hands/Gloves/blacksecurity.rsi/meta.json | 30 ++++++++++++++++++ 18 files changed, 77 insertions(+), 13 deletions(-) create mode 100644 Resources/Prototypes/_White/Entities/Clothing/Hands/gloves.yml create mode 100644 Resources/Textures/White/Clothing/Hands/Gloves/blacksecurity.rsi/equipped-HAND-body-slim.png create mode 100644 Resources/Textures/White/Clothing/Hands/Gloves/blacksecurity.rsi/equipped-HAND.png create mode 100644 Resources/Textures/White/Clothing/Hands/Gloves/blacksecurity.rsi/icon.png create mode 100644 Resources/Textures/White/Clothing/Hands/Gloves/blacksecurity.rsi/inhand-left.png create mode 100644 Resources/Textures/White/Clothing/Hands/Gloves/blacksecurity.rsi/inhand-right.png create mode 100644 Resources/Textures/White/Clothing/Hands/Gloves/blacksecurity.rsi/meta.json diff --git a/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml b/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml index 58b04be377..c11edbe3e5 100644 --- a/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml +++ b/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml @@ -165,7 +165,7 @@ - id: ClothingEyesGlassesSunglasses - id: ClothingUniformJumpsuitCentcomOfficial - id: ClothingShoesBootsJack - - id: ClothingHandsGlovesColorBlack + - id: ClothingHandsGlovesColorBlackSecurity # WD - id: ClothingHeadsetAltCentComFake - id: Paper - id: Pen diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/security.yml b/Resources/Prototypes/Catalog/Fills/Lockers/security.yml index fa6d20fa7e..30178008d4 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/security.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/security.yml @@ -65,7 +65,7 @@ prob: 0.5 - id: ClothingEyesGlassesSecurity - id: ClothingHeadsetAltSecurity # WD - - id: ClothingHandsGlovesColorBlack + - id: ClothingHandsGlovesColorBlackSecurity # WD - id: ClothingShoesBootsJack - id: WeaponMeleeNeedle prob: 0.1 diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/detdrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/detdrobe.yml index 70417b5074..8ff37c2064 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/detdrobe.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/detdrobe.yml @@ -17,7 +17,7 @@ ClothingNeckTieDet: 2 ClothingShoesLeather: 2 ClothingShoesColorBrown: 2 - ClothingHandsGlovesColorBlack: 2 + ClothingHandsGlovesColorBlackSecurity: 2 # WD ClothingHandsGlovesLatex: 2 CigPackGreen: 4 SmokingPipeFilledTobacco: 1 diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/secdrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/secdrobe.yml index a9b01ba045..7c5966de73 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/secdrobe.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/secdrobe.yml @@ -19,7 +19,7 @@ ClothingUniformJumpskirtSec: 4 ClothingUniformJumpsuitSecGrey: 4 ClothingUniformJumpsuitSecBlue: 4 - ClothingHandsGlovesColorBlack: 4 + ClothingHandsGlovesColorBlackSecurity: 4 # WD ClothingShoesBootsJack: 4 ClothingShoesBootsCombat: 4 ClothingHeadHatBeretSecurity: 3 diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/loot.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/loot.yml index 364cdf3057..93a6b5e18a 100644 --- a/Resources/Prototypes/Entities/Markers/Spawners/Random/loot.yml +++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/loot.yml @@ -135,7 +135,7 @@ - WeaponDisabler - ClothingOuterArmorBulletproof - FlashlightSeclite - - ClothingHandsGlovesColorBlack + - ClothingHandsGlovesColorBlackSecurity # WD - ClothingHeadHelmetBasic - Handcuffs - Zipties diff --git a/Resources/Prototypes/Entities/White/mag-gloves.yml b/Resources/Prototypes/Entities/White/mag-gloves.yml index ff87e36ddb..7c682087d9 100644 --- a/Resources/Prototypes/Entities/White/mag-gloves.yml +++ b/Resources/Prototypes/Entities/White/mag-gloves.yml @@ -23,6 +23,7 @@ - type: Fiber fiberMaterial: fibers-nanomachines - type: FingerprintMask + - type: Insulated - type: MagneticGloves glovesActiveTime: 60 glovesCooldown: 60 diff --git a/Resources/Prototypes/Loadouts/Jobs/common.yml b/Resources/Prototypes/Loadouts/Jobs/common.yml index 514d4c7bac..172cfd48d4 100644 --- a/Resources/Prototypes/Loadouts/Jobs/common.yml +++ b/Resources/Prototypes/Loadouts/Jobs/common.yml @@ -173,6 +173,16 @@ equipment: gloves: ClothingHandsGlovesColorBlack + +- type: itemLoadout # WD + id: GlovesColorBlackSecurity + equipment: GlovesColorBlackSecurity +- type: startingGear + id: GlovesColorBlackSecurity + equipment: + gloves: ClothingHandsGlovesColorBlackSecurity + + - type: itemLoadout id: GlovesColorWhite equipment: GlovesColorWhite diff --git a/Resources/Prototypes/Loadouts/loadout_groups.yml b/Resources/Prototypes/Loadouts/loadout_groups.yml index 8418716349..40297b8caa 100644 --- a/Resources/Prototypes/Loadouts/loadout_groups.yml +++ b/Resources/Prototypes/Loadouts/loadout_groups.yml @@ -745,6 +745,14 @@ - GlovesColorBlack - GlovesFingerless +- type: loadoutGroup # WD + id: CommonGlovesSecurity + name: loadout-group-gloves + minLimit: 0 + loadouts: + - GlovesColorBlackSecurity + - GlovesFingerless + - type: loadoutGroup id: CommonShoes name: loadout-group-shoes @@ -1584,7 +1592,7 @@ minLimit: 0 loadouts: - GlovesLatex - - GlovesColorBlack + - GlovesColorBlackSecurity # WD - GlovesForensic - type: loadoutGroup diff --git a/Resources/Prototypes/Loadouts/role_loadouts.yml b/Resources/Prototypes/Loadouts/role_loadouts.yml index 48a7055a24..95106396ff 100644 --- a/Resources/Prototypes/Loadouts/role_loadouts.yml +++ b/Resources/Prototypes/Loadouts/role_loadouts.yml @@ -481,7 +481,7 @@ - CommonSecurityCommandMask # WD - HeadofSecurityNeck - HeadofSecurityJumpsuit - - CommonGloves # WD + - CommonGlovesSecurity # WD - CommonSecurityBelt # WD - CommonSecurityBackpack - CommonSecurityShoes @@ -502,7 +502,7 @@ - CommonSecurityNeck - WardenJumpsuit - CommonSecurityBackpack - - CommonGloves # WD + - CommonGlovesSecurity # WD - CommonSecurityBelt # WD - CommonSecurityShoes - WardenPDA @@ -523,7 +523,7 @@ - CommonSecurityBackpack - SecurityOuterClothing - CommonSecurityBelt # WD - - CommonGloves # WD + - CommonGlovesSecurity # WD - CommonSecurityShoes - SeniorOfficerPDA - CommonSecurityJobTrinkets # WD @@ -560,7 +560,7 @@ - CommonSecurityBackpack - SecurityOuterClothing - CommonSecurityBelt # WD - - CommonGloves # WD + - CommonGlovesSecurity # WD - CommonSecurityShoes - SecurityPDA - CommonSecurityJobTrinkets # WD @@ -596,7 +596,7 @@ - CommonSecurityNeck - SecurityCadetJumpsuit - CommonSecurityBackpack - - CommonGloves # WD + - CommonGlovesSecurity # WD - CommonSecurityShoes - SecurityCadetPDA - CommonSecurityJobTrinkets # WD diff --git a/Resources/Prototypes/Roles/Jobs/Command/centcom_official.yml b/Resources/Prototypes/Roles/Jobs/Command/centcom_official.yml index 37c73f38e0..158d61c601 100644 --- a/Resources/Prototypes/Roles/Jobs/Command/centcom_official.yml +++ b/Resources/Prototypes/Roles/Jobs/Command/centcom_official.yml @@ -20,7 +20,7 @@ shoes: ClothingShoesBootsCombatFilled head: ClothingHeadHatCentcom eyes: ClothingEyesGlassesSunglasses - gloves: ClothingHandsGlovesColorBlack + gloves: ClothingHandsGlovesColorBlackSecurity # WD outerClothing: ClothingOuterArmorBasic id: CentcomPDA ears: ClothingHeadsetAltCentCom diff --git a/Resources/Prototypes/_White/Entities/Clothing/Hands/gloves.yml b/Resources/Prototypes/_White/Entities/Clothing/Hands/gloves.yml new file mode 100644 index 0000000000..ba7e67e5ad --- /dev/null +++ b/Resources/Prototypes/_White/Entities/Clothing/Hands/gloves.yml @@ -0,0 +1,15 @@ +- type: entity + parent: ClothingHandsGlovesColorBlack + id: ClothingHandsGlovesColorBlackSecurity + name: офицерские перчатки + description: Кожанные чёрные перчатки, которые не спасут вас от поджаривания. + components: + - type: Sprite + sprite: White/Clothing/Hands/Gloves/blacksecurity.rsi + - type: Clothing + sprite: White/Clothing/Hands/Gloves/blacksecurity.rsi + - type: Fiber + fiberMaterial: fibers-leather + fiberColor: fibers-black + - type: Item + sprite: White/Clothing/Hands/Gloves/blacksecurity.rsi diff --git a/Resources/Prototypes/_White/Entities/Structures/Storage/SenorsLockers.yml b/Resources/Prototypes/_White/Entities/Structures/Storage/SenorsLockers.yml index d35766275d..778d343bfb 100644 --- a/Resources/Prototypes/_White/Entities/Structures/Storage/SenorsLockers.yml +++ b/Resources/Prototypes/_White/Entities/Structures/Storage/SenorsLockers.yml @@ -39,7 +39,7 @@ prob: 0.5 - id: ClothingEyesGlassesSecurity - id: ClothingHeadsetAltSecurity - - id: ClothingHandsGlovesColorBlack + - id: ClothingHandsGlovesColorBlackSecurity # WD - id: ClothingShoesBootsJack - id: WeaponMeleeNeedle prob: 0.1 diff --git a/Resources/Textures/White/Clothing/Hands/Gloves/blacksecurity.rsi/equipped-HAND-body-slim.png b/Resources/Textures/White/Clothing/Hands/Gloves/blacksecurity.rsi/equipped-HAND-body-slim.png new file mode 100644 index 0000000000000000000000000000000000000000..4e6575db2fbfdf233fbe3e7fc65efc62ff277ae1 GIT binary patch literal 1990 zcma)7du-Hn9PcFKF(fg7fsi0gXMDu<`s?G`Yr`?NyNzAk@z^c`{-OS^{q?TdwLRKy zcN-y0Q9zzi5>Z){n8;&6f`1rLVnB@#RW>pacF(uX%ZNcyP{ylL#e)bwGe#Wm!*{0<#K}??J-xb80Ju?ZS zvfoH7^OnV%71cHaP_vULkTseEoBPljLE|+!v+9jntosfwClB?5jVy}yNS*$Vp@=Ew>v7r@ahqALkG58 zis2r}4IRkx%50fM#flBPRTmFuf{a9PXR3lW{1;SAa6l16g_HjQ#pgzY9{gXhrYgGa zm=Jf6VZsz*vQ~;B%LP&*cE)zFVeB36_kOWdQREmMNNaR#lPol^VvLbE4Ip0DIFSZA z7or7(iw1$r(y9b>DJb)zAPH27uZ=2t@$};rocs|_1U7`zE~vDqgCL!hgdh#Mq(<`` z6lI>31u@A}OxeXI!^NfOEFJh(w4x+s3~Ujf7zL{S;SEzR#F6-J_={tOac}i6@^fi~ zRhH{`XK{)!*VerpbWmLi_xYWz!U+L(be|MSY8qN8gr_M}2$S*0PBAW~Se22G3wxtR z6pp>Hgy)_wmM1R$D9>zUVbuM84$!W(@`_{ky>W!V_`t}eCvAOE5Lj3Z5 z^VD%)oPF}bP3^VwR*(DZHTQ!y^~|nqy}g^})V{s@hxhm1f9uePw}sUUeqT_Tzi@N< z>~kCEe6r-~w(Z?RmCu~*;g35fs=80jcx5}I-rfbzc(EPp%#=K_}T%Rq}E-X`qrvk&7w`eq`IrV zx^?v2^p#@&mdv}KUoiL1zBpy=ivyMW4{p3Vxckp@*OTuBBeff9R~|Uue6;$sRCi*@ z0O6co`3SrcCjU6~W!Lq=hxZ*GXs*9D^-^o!oTWETq_&(qdFa{kS318w^3bYuZ#F^9 l?ryB?t4NoH4KprHeq-u48z!Bc5cmJIv4(}w{q@hi@HfB1rRx9y literal 0 HcmV?d00001 diff --git a/Resources/Textures/White/Clothing/Hands/Gloves/blacksecurity.rsi/equipped-HAND.png b/Resources/Textures/White/Clothing/Hands/Gloves/blacksecurity.rsi/equipped-HAND.png new file mode 100644 index 0000000000000000000000000000000000000000..5599a2914e70ecee06431d6545cbd13ffa136a6c GIT binary patch literal 360 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5M?jcysy3fA0|TR! zr;B4q#hkaZHu4=Z;Bn#aTqwNe0L!2M=8VD{F0G87*skNDvTpK$g74Q<%6`AnYTnCc zDa25u!tlg{;lxCS3CfHL?o1ASEDbW843XCl_FJDh zY@jfA_dUI%#{bW}U&X-vOjR}C^ZXw@#+Td`9>1f!Ud*)DK5**zsSD9{ZErUl`8*Fi zsQ*b^Tj7(?z4osctoP?JqFIB}{taIoR;K5_-s*cX=H2-lTR(F=OHF z`ux4y$NMLo7N5Ey0;uf%CewGFvDWz!-V|^}=3Y2A{^$Qd6o>**U}-!7=Fl^>4w|==00000 LNkvXXu0mjfE&P!8 literal 0 HcmV?d00001 diff --git a/Resources/Textures/White/Clothing/Hands/Gloves/blacksecurity.rsi/inhand-left.png b/Resources/Textures/White/Clothing/Hands/Gloves/blacksecurity.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..8f8953d6350a9eaafc02aae11628dea79f4f41c6 GIT binary patch literal 205 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=Q#@T9Ln`LHy|t0|umKN?gXLVa zhyN}Y2v7A(Wm)%`PvJ>kL;HtGT17lSwG0jVAy;<>ztffs3w=JvxbDXCqT?K50io&T z^4V)co}7)!F8MxDPciI3=?=?utxwOY81L4q6fcfX=sEAJYCOLt5@ZGg!vVQ{bH$Fg zFWx`phV+eX4Oi?AZDU>XO>mp;gHK27m>B+anqQu7cUvs?|9p^YPgg&ebxsLQ0Mmj` A*#H0l literal 0 HcmV?d00001 diff --git a/Resources/Textures/White/Clothing/Hands/Gloves/blacksecurity.rsi/inhand-right.png b/Resources/Textures/White/Clothing/Hands/Gloves/blacksecurity.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..dec3a7db6d67a6c1eff1564080f53fa59d5f1212 GIT binary patch literal 214 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=b3I)gLn`LHy=BOE$biQoaJsJf z$-n-OXQ$`{i?_4{tIS&T{aeU2|Lqn`K*bCXdhh+N`^qD_x!7)%eC}FZ`G;rbEM*WB zOzt^xCig1G-tV@?+YOIh*;&-EI43Rd^5wq=3N6=eU0J-8A^lX`(;va>=P`qfVPN=o za+Us3<5TMouYb46_`}JU41%xU^MurhCVZXS*marl-4bMIK|3DV-} L>gTe~DWM4fmf=_r literal 0 HcmV?d00001 diff --git a/Resources/Textures/White/Clothing/Hands/Gloves/blacksecurity.rsi/meta.json b/Resources/Textures/White/Clothing/Hands/Gloves/blacksecurity.rsi/meta.json new file mode 100644 index 0000000000..453d7e2ce4 --- /dev/null +++ b/Resources/Textures/White/Clothing/Hands/Gloves/blacksecurity.rsi/meta.json @@ -0,0 +1,30 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-HAND", + "directions": 4 + }, + { + "name": "equipped-HAND-body-slim", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} \ No newline at end of file