Skip to content

Commit

Permalink
glued guns to gloves (visual)
Browse files Browse the repository at this point in the history
  • Loading branch information
ErhardSteinhauer committed Mar 27, 2024
1 parent 2dc5df9 commit 0fe1570
Show file tree
Hide file tree
Showing 20 changed files with 195 additions and 6 deletions.
80 changes: 80 additions & 0 deletions Resources/Prototypes/_NF/Entities/Clothing/Hands/gloves.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
head: ClothingHeadHatSyndieMAA
jumpsuit: ClothingUniformJumpsuitSyndieFormal
shoes: ClothingShoesBootsCombat
gloves: ClothingHandsGlovesCombat
gloves: ClothingHandsGlovesColorBlackPython
neck: ClothingNeckScarfStripedSyndieRed
mask: ClothingMaskGasSyndicate
outerClothing: ClothingOuterCoatSyndieCapArmored
Expand All @@ -21,7 +21,7 @@
jumpsuit: ClothingUniformJumpsuitChiefEngineerSyndie
back: ClothingBackpackDuffelSyndicateAmmo
shoes: ClothingShoesBootsCombat
gloves: ClothingHandsGlovesCombat
gloves: ClothingHandsGlovesColorBlackShotgun
belt: ClothingBeltUtility
mask: ClothingMaskGasSyndicate
outerClothing: ClothingOuterArmorBasic
Expand Down Expand Up @@ -68,7 +68,7 @@
jumpsuit: ClothingUniformJumpsuitOperative
back: WeaponSubMachineGunAtreides
shoes: ClothingShoesBootsCombat
gloves: ClothingHandsGlovesCombat
gloves: ClothingHandsGlovesColorBlackSMG
belt: ClothingBeltMilitaryWebbing
mask: ClothingMaskGasSyndicate
outerClothing: ClothingOuterArmorBulletproof
Expand All @@ -82,7 +82,7 @@
head: ClothingHeadHelmetBombSuit
jumpsuit: ClothingUniformJumpsuitRecruitSyndie
shoes: ClothingShoesBootsCombat
gloves: ClothingHandsGlovesCombat
gloves: ClothingHandsGlovesColorBlackChinaLake
belt: ClothingBeltMilitaryWebbing
mask: ClothingMaskGasSyndicate
outerClothing: ClothingOuterSuitBomb
Expand All @@ -95,7 +95,7 @@
back: JetpackBlackFilled
jumpsuit: ClothingUniformJumpsuitOperative
shoes: ClothingShoesBootsCombat
gloves: ClothingHandsGlovesCombat
gloves: ClothingHandsGlovesColorBlackPistol
eyes: ClothingEyesGlassesSunglasses
mask: ClothingMaskNeckGaiter
outerClothing: ClothingOuterArmorBasicSlim
Expand All @@ -121,7 +121,7 @@
neck: BedsheetSyndie
jumpsuit: ClothingUniformJumpsuitSyndieFormal
outerClothing: ClothingOuterHardsuitSyndieElite
gloves: ClothingHandsGlovesCombat
gloves: ClothingHandsGlovesColorBlackAK
shoes: ClothingShoesBootsMagSyndie
back: WeaponRifleAk
pocket1: MagazineLightRifle
Expand All @@ -137,6 +137,7 @@
jumpsuit: ClothingUniformJumpsuitRecruitSyndie
shoes: ClothingShoesBootsWork
outerClothing: ClothingOuterArmorBasic
gloves: ClothingHandsGlovesColorBlackPistol
pocket1: WeaponPistolViper
inhand:
- CombatKnife
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -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
}
]
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -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
}
]
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -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
}
]
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -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
}
]
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -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
}
]
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -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
}
]
}

0 comments on commit 0fe1570

Please sign in to comment.