diff --git a/Resources/Prototypes/_NF/Entities/Clothing/Hands/gloves.yml b/Resources/Prototypes/_NF/Entities/Clothing/Hands/gloves.yml index 7656bf5bda9..1618efb61b3 100644 --- a/Resources/Prototypes/_NF/Entities/Clothing/Hands/gloves.yml +++ b/Resources/Prototypes/_NF/Entities/Clothing/Hands/gloves.yml @@ -32,3 +32,83 @@ fiberMaterial: fibers-leather fiberColor: fibers-brown - type: FingerprintMask + +# Gloves with fake guns visuals for NPCs +- type: entity + parent: ClothingHandsGlovesSyntheticBase + id: ClothingHandsGlovesColorBlackSMG + name: combat gloves + suffix: smg + description: Regular black gloves that do not keep you from frying. + noSpawn: true + components: + - type: Unremoveable + - type: GloveHeatResistance + heatResistance: 1400 + - type: Insulated + - type: Fiber + fiberColor: fibers-black + - type: Sprite + sprite: _NF/Clothing/Hands/Gloves/npc_guns_visuals/npc_smg.rsi + - type: Clothing + sprite: _NF/Clothing/Hands/Gloves/npc_guns_visuals/npc_smg.rsi + +- type: entity + parent: ClothingHandsGlovesColorBlackSMG + id: ClothingHandsGlovesColorBlackAK + name: combat gloves + suffix: ak + noSpawn: true + components: + - type: Sprite + sprite: _NF/Clothing/Hands/Gloves/npc_guns_visuals/npc_ak.rsi + - type: Clothing + sprite: _NF/Clothing/Hands/Gloves/npc_guns_visuals/npc_ak.rsi + +- type: entity + parent: ClothingHandsGlovesColorBlackSMG + id: ClothingHandsGlovesColorBlackChinaLake + name: combat gloves + suffix: china lake + noSpawn: true + components: + - type: Sprite + sprite: _NF/Clothing/Hands/Gloves/npc_guns_visuals/npc_china_lake.rsi + - type: Clothing + sprite: _NF/Clothing/Hands/Gloves/npc_guns_visuals/npc_china_lake.rsi + +- type: entity + parent: ClothingHandsGlovesColorBlackSMG + id: ClothingHandsGlovesColorBlackPistol + name: combat gloves + suffix: pistol + noSpawn: true + components: + - type: Sprite + sprite: _NF/Clothing/Hands/Gloves/npc_guns_visuals/npc_pistol.rsi + - type: Clothing + sprite: _NF/Clothing/Hands/Gloves/npc_guns_visuals/npc_pistol.rsi + +- type: entity + parent: ClothingHandsGlovesColorBlackSMG + id: ClothingHandsGlovesColorBlackPython + name: combat gloves + suffix: python + noSpawn: true + components: + - type: Sprite + sprite: _NF/Clothing/Hands/Gloves/npc_guns_visuals/npc_python.rsi + - type: Clothing + sprite: _NF/Clothing/Hands/Gloves/npc_guns_visuals/npc_python.rsi + +- type: entity + parent: ClothingHandsGlovesColorBlackSMG + id: ClothingHandsGlovesColorBlackShotgun + name: combat gloves + suffix: shotgun + noSpawn: true + components: + - type: Sprite + sprite: _NF/Clothing/Hands/Gloves/npc_guns_visuals/npc_shotgun.rsi + - type: Clothing + sprite: _NF/Clothing/Hands/Gloves/npc_guns_visuals/npc_shotgun.rsi diff --git a/Resources/Prototypes/_NF/Roles/Jobs/Hostile/syndicate_naval_forces.yml b/Resources/Prototypes/_NF/Roles/Jobs/Hostile/syndicate_naval_forces.yml index 1180fb90902..182b5d91ce9 100644 --- a/Resources/Prototypes/_NF/Roles/Jobs/Hostile/syndicate_naval_forces.yml +++ b/Resources/Prototypes/_NF/Roles/Jobs/Hostile/syndicate_naval_forces.yml @@ -5,7 +5,7 @@ head: ClothingHeadHatSyndieMAA jumpsuit: ClothingUniformJumpsuitSyndieFormal shoes: ClothingShoesBootsCombat - gloves: ClothingHandsGlovesCombat + gloves: ClothingHandsGlovesColorBlackPython neck: ClothingNeckScarfStripedSyndieRed mask: ClothingMaskGasSyndicate outerClothing: ClothingOuterCoatSyndieCapArmored @@ -21,7 +21,7 @@ jumpsuit: ClothingUniformJumpsuitChiefEngineerSyndie back: ClothingBackpackDuffelSyndicateAmmo shoes: ClothingShoesBootsCombat - gloves: ClothingHandsGlovesCombat + gloves: ClothingHandsGlovesColorBlackShotgun belt: ClothingBeltUtility mask: ClothingMaskGasSyndicate outerClothing: ClothingOuterArmorBasic @@ -68,7 +68,7 @@ jumpsuit: ClothingUniformJumpsuitOperative back: WeaponSubMachineGunAtreides shoes: ClothingShoesBootsCombat - gloves: ClothingHandsGlovesCombat + gloves: ClothingHandsGlovesColorBlackSMG belt: ClothingBeltMilitaryWebbing mask: ClothingMaskGasSyndicate outerClothing: ClothingOuterArmorBulletproof @@ -82,7 +82,7 @@ head: ClothingHeadHelmetBombSuit jumpsuit: ClothingUniformJumpsuitRecruitSyndie shoes: ClothingShoesBootsCombat - gloves: ClothingHandsGlovesCombat + gloves: ClothingHandsGlovesColorBlackChinaLake belt: ClothingBeltMilitaryWebbing mask: ClothingMaskGasSyndicate outerClothing: ClothingOuterSuitBomb @@ -95,7 +95,7 @@ back: JetpackBlackFilled jumpsuit: ClothingUniformJumpsuitOperative shoes: ClothingShoesBootsCombat - gloves: ClothingHandsGlovesCombat + gloves: ClothingHandsGlovesColorBlackPistol eyes: ClothingEyesGlassesSunglasses mask: ClothingMaskNeckGaiter outerClothing: ClothingOuterArmorBasicSlim @@ -121,7 +121,7 @@ neck: BedsheetSyndie jumpsuit: ClothingUniformJumpsuitSyndieFormal outerClothing: ClothingOuterHardsuitSyndieElite - gloves: ClothingHandsGlovesCombat + gloves: ClothingHandsGlovesColorBlackAK shoes: ClothingShoesBootsMagSyndie back: WeaponRifleAk pocket1: MagazineLightRifle @@ -137,6 +137,7 @@ jumpsuit: ClothingUniformJumpsuitRecruitSyndie shoes: ClothingShoesBootsWork outerClothing: ClothingOuterArmorBasic + gloves: ClothingHandsGlovesColorBlackPistol pocket1: WeaponPistolViper inhand: - CombatKnife diff --git a/Resources/Textures/_NF/Clothing/Hands/Gloves/npc_guns_visuals/npc_ak.rsi/equipped-HAND.png b/Resources/Textures/_NF/Clothing/Hands/Gloves/npc_guns_visuals/npc_ak.rsi/equipped-HAND.png new file mode 100644 index 00000000000..7b4ae24563b Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Hands/Gloves/npc_guns_visuals/npc_ak.rsi/equipped-HAND.png differ diff --git a/Resources/Textures/_NF/Clothing/Hands/Gloves/npc_guns_visuals/npc_ak.rsi/icon.png b/Resources/Textures/_NF/Clothing/Hands/Gloves/npc_guns_visuals/npc_ak.rsi/icon.png new file mode 100644 index 00000000000..59d0d46baa1 Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Hands/Gloves/npc_guns_visuals/npc_ak.rsi/icon.png differ diff --git a/Resources/Textures/_NF/Clothing/Hands/Gloves/npc_guns_visuals/npc_ak.rsi/meta.json b/Resources/Textures/_NF/Clothing/Hands/Gloves/npc_guns_visuals/npc_ak.rsi/meta.json new file mode 100644 index 00000000000..8da930f45d7 --- /dev/null +++ b/Resources/Textures/_NF/Clothing/Hands/Gloves/npc_guns_visuals/npc_ak.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "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 + } + ] +} diff --git a/Resources/Textures/_NF/Clothing/Hands/Gloves/npc_guns_visuals/npc_china_lake.rsi/equipped-HAND.png b/Resources/Textures/_NF/Clothing/Hands/Gloves/npc_guns_visuals/npc_china_lake.rsi/equipped-HAND.png new file mode 100644 index 00000000000..b4f7a3e0148 Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Hands/Gloves/npc_guns_visuals/npc_china_lake.rsi/equipped-HAND.png differ diff --git a/Resources/Textures/_NF/Clothing/Hands/Gloves/npc_guns_visuals/npc_china_lake.rsi/icon.png b/Resources/Textures/_NF/Clothing/Hands/Gloves/npc_guns_visuals/npc_china_lake.rsi/icon.png new file mode 100644 index 00000000000..59d0d46baa1 Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Hands/Gloves/npc_guns_visuals/npc_china_lake.rsi/icon.png differ diff --git a/Resources/Textures/_NF/Clothing/Hands/Gloves/npc_guns_visuals/npc_china_lake.rsi/meta.json b/Resources/Textures/_NF/Clothing/Hands/Gloves/npc_guns_visuals/npc_china_lake.rsi/meta.json new file mode 100644 index 00000000000..8da930f45d7 --- /dev/null +++ b/Resources/Textures/_NF/Clothing/Hands/Gloves/npc_guns_visuals/npc_china_lake.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "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 + } + ] +} diff --git a/Resources/Textures/_NF/Clothing/Hands/Gloves/npc_guns_visuals/npc_pistol.rsi/equipped-HAND.png b/Resources/Textures/_NF/Clothing/Hands/Gloves/npc_guns_visuals/npc_pistol.rsi/equipped-HAND.png new file mode 100644 index 00000000000..046003ba6b0 Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Hands/Gloves/npc_guns_visuals/npc_pistol.rsi/equipped-HAND.png differ diff --git a/Resources/Textures/_NF/Clothing/Hands/Gloves/npc_guns_visuals/npc_pistol.rsi/icon.png b/Resources/Textures/_NF/Clothing/Hands/Gloves/npc_guns_visuals/npc_pistol.rsi/icon.png new file mode 100644 index 00000000000..59d0d46baa1 Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Hands/Gloves/npc_guns_visuals/npc_pistol.rsi/icon.png differ diff --git a/Resources/Textures/_NF/Clothing/Hands/Gloves/npc_guns_visuals/npc_pistol.rsi/meta.json b/Resources/Textures/_NF/Clothing/Hands/Gloves/npc_guns_visuals/npc_pistol.rsi/meta.json new file mode 100644 index 00000000000..8da930f45d7 --- /dev/null +++ b/Resources/Textures/_NF/Clothing/Hands/Gloves/npc_guns_visuals/npc_pistol.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "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 + } + ] +} diff --git a/Resources/Textures/_NF/Clothing/Hands/Gloves/npc_guns_visuals/npc_python.rsi/equipped-HAND.png b/Resources/Textures/_NF/Clothing/Hands/Gloves/npc_guns_visuals/npc_python.rsi/equipped-HAND.png new file mode 100644 index 00000000000..fb4537b73e6 Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Hands/Gloves/npc_guns_visuals/npc_python.rsi/equipped-HAND.png differ diff --git a/Resources/Textures/_NF/Clothing/Hands/Gloves/npc_guns_visuals/npc_python.rsi/icon.png b/Resources/Textures/_NF/Clothing/Hands/Gloves/npc_guns_visuals/npc_python.rsi/icon.png new file mode 100644 index 00000000000..59d0d46baa1 Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Hands/Gloves/npc_guns_visuals/npc_python.rsi/icon.png differ diff --git a/Resources/Textures/_NF/Clothing/Hands/Gloves/npc_guns_visuals/npc_python.rsi/meta.json b/Resources/Textures/_NF/Clothing/Hands/Gloves/npc_guns_visuals/npc_python.rsi/meta.json new file mode 100644 index 00000000000..8da930f45d7 --- /dev/null +++ b/Resources/Textures/_NF/Clothing/Hands/Gloves/npc_guns_visuals/npc_python.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "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 + } + ] +} diff --git a/Resources/Textures/_NF/Clothing/Hands/Gloves/npc_guns_visuals/npc_shotgun.rsi/equipped-HAND.png b/Resources/Textures/_NF/Clothing/Hands/Gloves/npc_guns_visuals/npc_shotgun.rsi/equipped-HAND.png new file mode 100644 index 00000000000..fed22a4f35c Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Hands/Gloves/npc_guns_visuals/npc_shotgun.rsi/equipped-HAND.png differ diff --git a/Resources/Textures/_NF/Clothing/Hands/Gloves/npc_guns_visuals/npc_shotgun.rsi/icon.png b/Resources/Textures/_NF/Clothing/Hands/Gloves/npc_guns_visuals/npc_shotgun.rsi/icon.png new file mode 100644 index 00000000000..59d0d46baa1 Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Hands/Gloves/npc_guns_visuals/npc_shotgun.rsi/icon.png differ diff --git a/Resources/Textures/_NF/Clothing/Hands/Gloves/npc_guns_visuals/npc_shotgun.rsi/meta.json b/Resources/Textures/_NF/Clothing/Hands/Gloves/npc_guns_visuals/npc_shotgun.rsi/meta.json new file mode 100644 index 00000000000..8da930f45d7 --- /dev/null +++ b/Resources/Textures/_NF/Clothing/Hands/Gloves/npc_guns_visuals/npc_shotgun.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "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 + } + ] +} diff --git a/Resources/Textures/_NF/Clothing/Hands/Gloves/npc_guns_visuals/npc_smg.rsi/equipped-HAND.png b/Resources/Textures/_NF/Clothing/Hands/Gloves/npc_guns_visuals/npc_smg.rsi/equipped-HAND.png new file mode 100644 index 00000000000..1853de9d1f4 Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Hands/Gloves/npc_guns_visuals/npc_smg.rsi/equipped-HAND.png differ diff --git a/Resources/Textures/_NF/Clothing/Hands/Gloves/npc_guns_visuals/npc_smg.rsi/icon.png b/Resources/Textures/_NF/Clothing/Hands/Gloves/npc_guns_visuals/npc_smg.rsi/icon.png new file mode 100644 index 00000000000..59d0d46baa1 Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Hands/Gloves/npc_guns_visuals/npc_smg.rsi/icon.png differ diff --git a/Resources/Textures/_NF/Clothing/Hands/Gloves/npc_guns_visuals/npc_smg.rsi/meta.json b/Resources/Textures/_NF/Clothing/Hands/Gloves/npc_guns_visuals/npc_smg.rsi/meta.json new file mode 100644 index 00000000000..8da930f45d7 --- /dev/null +++ b/Resources/Textures/_NF/Clothing/Hands/Gloves/npc_guns_visuals/npc_smg.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "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 + } + ] +}