Skip to content

Commit

Permalink
Merge pull request new-frontiers-14#1439 from dvir001/2024-05-29-Gloves
Browse files Browse the repository at this point in the history
Detective Gameplay, Gloves are made in Space China
  • Loading branch information
GreaseMonk authored Jun 2, 2024
2 parents 34adf3a + a71a720 commit 2de63cd
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 15 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -43,4 +43,4 @@
components:
- type: Fiber
fiberMaterial: fibers-synthetic
- type: FingerprintMask
# - type: FingerprintMask # Frontier
2 changes: 1 addition & 1 deletion Resources/Prototypes/Entities/Clothing/Hands/colored.yml
Original file line number Diff line number Diff line change
Expand Up @@ -300,7 +300,7 @@
name: insulated gloves
description: These gloves will protect the wearer from electric shocks.
components:
- type: FingerprintMask
# - type: FingerprintMask # Frontier
- type: Sprite
sprite: Clothing/Hands/Gloves/Color/yellow.rsi
- type: Clothing
Expand Down
27 changes: 14 additions & 13 deletions Resources/Prototypes/Entities/Clothing/Hands/gloves.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
- type: Fiber
fiberMaterial: fibers-leather
fiberColor: fibers-red
- type: FingerprintMask
# - type: FingerprintMask # Frontier
- type: Tag
tags:
- Kangaroo
Expand All @@ -44,7 +44,7 @@
- type: Fiber
fiberMaterial: fibers-leather
fiberColor: fibers-blue
- type: FingerprintMask
# - type: FingerprintMask # Frontier

- type: entity
parent: ClothingHandsGlovesBoxingRed
Expand All @@ -60,7 +60,7 @@
- type: Fiber
fiberMaterial: fibers-leather
fiberColor: fibers-green
- type: FingerprintMask
# - type: FingerprintMask # Frontier

- type: entity
parent: ClothingHandsGlovesBoxingRed
Expand All @@ -76,7 +76,7 @@
- type: Fiber
fiberMaterial: fibers-leather
fiberColor: fibers-yellow
- type: FingerprintMask
# - type: FingerprintMask # Frontier

- type: entity
parent: ClothingHandsGlovesBoxingBlue
Expand Down Expand Up @@ -109,7 +109,7 @@
- type: Fiber
fiberMaterial: fibers-durathread
fiberColor: fibers-regal-blue
- type: FingerprintMask
# - type: FingerprintMask # Frontier

- type: entity
parent: ClothingHandsBase
Expand All @@ -128,7 +128,7 @@
modifiers:
coefficients:
Slash: 0.95
- type: FingerprintMask
# - type: FingerprintMask # Frontier

#### Medical
- type: entity
Expand All @@ -143,7 +143,7 @@
sprite: Clothing/Hands/Gloves/latex.rsi
- type: Fiber
fiberMaterial: fibers-latex
- type: FingerprintMask
# - type: FingerprintMask # Frontier

- type: entity
parent: ClothingHandsButcherable
Expand All @@ -157,7 +157,7 @@
sprite: Clothing/Hands/Gloves/nitrile.rsi
- type: Fiber
fiberMaterial: fibers-nitrile
- type: FingerprintMask
# - type: FingerprintMask # Frontier
####
- type: entity
parent: ClothingHandsButcherable
Expand All @@ -174,7 +174,7 @@
- type: Fiber
fiberMaterial: fibers-leather
fiberColor: fibers-brown
- type: FingerprintMask
# - type: FingerprintMask # Frontier

- type: entity
parent: ClothingHandsBase
Expand All @@ -188,7 +188,7 @@
sprite: Clothing/Hands/Gloves/powerglove.rsi
- type: Fiber
fiberMaterial: fibers-nanomachines
- type: FingerprintMask
# - type: FingerprintMask # Frontier

- type: entity
parent: ClothingHandsButcherable
Expand All @@ -203,7 +203,7 @@
- type: Fiber
fiberMaterial: fibers-leather
fiberColor: fibers-black
- type: FingerprintMask
# - type: FingerprintMask # Frontier

- type: entity
parent: ClothingHandsBase
Expand Down Expand Up @@ -335,7 +335,8 @@
- type: Thieving
stripTimeReduction: 1.5
stealthy: true
- type: Contraband #frontier
- type: FingerprintMask # Frontier
- type: Contraband # Frontier

- type: entity
parent: ClothingHandsGlovesColorWhite
Expand Down Expand Up @@ -412,4 +413,4 @@
- type: Fiber
fiberMaterial: fibers-rubber
fiberColor: fibers-yellow
- type: FingerprintMask
# - type: FingerprintMask # Frontier

0 comments on commit 2de63cd

Please sign in to comment.