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 0000000000..4e6575db2f Binary files /dev/null and b/Resources/Textures/White/Clothing/Hands/Gloves/blacksecurity.rsi/equipped-HAND-body-slim.png differ 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 0000000000..5599a2914e Binary files /dev/null and b/Resources/Textures/White/Clothing/Hands/Gloves/blacksecurity.rsi/equipped-HAND.png differ diff --git a/Resources/Textures/White/Clothing/Hands/Gloves/blacksecurity.rsi/icon.png b/Resources/Textures/White/Clothing/Hands/Gloves/blacksecurity.rsi/icon.png new file mode 100644 index 0000000000..44e5dfe38a Binary files /dev/null and b/Resources/Textures/White/Clothing/Hands/Gloves/blacksecurity.rsi/icon.png differ 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 0000000000..8f8953d635 Binary files /dev/null and b/Resources/Textures/White/Clothing/Hands/Gloves/blacksecurity.rsi/inhand-left.png differ 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 0000000000..dec3a7db6d Binary files /dev/null and b/Resources/Textures/White/Clothing/Hands/Gloves/blacksecurity.rsi/inhand-right.png differ 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