Skip to content

Commit

Permalink
Merge pull request #382 from crekulon/more-spider-silk-products
Browse files Browse the repository at this point in the history
More spider silk products (clothing + bookcase)
  • Loading branch information
formlessnameless authored Oct 1, 2024
2 parents 46cef37 + 2bcbd5e commit 07318f3
Show file tree
Hide file tree
Showing 64 changed files with 949 additions and 1 deletion.
1 change: 1 addition & 0 deletions Resources/Locale/en-US/forensics/fibers.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ fibers-grey = grey
fibers-green = green
fibers-orange = orange
fibers-white = white
fibers-web = silky white
fibers-yellow = yellow
fibers-regal-blue = regal blue
fibers-regal-black = regal black
Expand Down
48 changes: 48 additions & 0 deletions Resources/Prototypes/Entities/Clothing/Hands/colored.yml
Original file line number Diff line number Diff line change
Expand Up @@ -292,6 +292,54 @@
- type: Fiber
fiberColor: fibers-white

# Web Gloves
- type: entity
parent: ClothingHandsGlovesSyntheticBase
id: ClothingHandsGlovesColorWeb
name: web gloves
description: Gloves made out of spider silk. Still won't keep you from frying.
components:
- type: Sprite
sprite: Clothing/Hands/Gloves/Color/color.rsi
layers:
- state: WEB-icon
- type: Item
inhandVisuals:
left:
- state: inhand-left
color: "#ebebeb"
right:
- state: inhand-right
color: "#ebebeb"
- type: Clothing
sprite: Clothing/Hands/Gloves/Color/color.rsi
clothingVisuals:
gloves:
- state: equipped-HAND
color: "#ebebeb"
- type: Fiber
fiberColor: fibers-web
- type: Butcherable
butcheringType: Knife
spawned:
- id: MaterialWebSilk1
amount: 2
- type: FlavorProfile
flavors:
- cobwebs
ignoreReagents:
- Fiber
- type: SolutionContainerManager
solutions: # 6 (3 (fiber count of web) * 2 (to craft)) + 6 (magical crafting bonus)
food:
maxVol: 12
reagents:
- ReagentId: Fiber
Quantity: 12
- type: Construction
graph: WebObjects
node: gloves

# Black Gloves
# TECHNICALLY, if you ported the worn state to the RSI, this could be greyscaled, but I do not really feel like doing that.
- type: entity
Expand Down
35 changes: 35 additions & 0 deletions Resources/Prototypes/Entities/Clothing/Head/hats.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1142,6 +1142,41 @@
- !type:DoActsBehavior
acts: [ "Destruction" ]

- type: entity
parent: ClothingHeadBase
id: ClothingHeadHatWebHat
name: web hat
description: A roughly woven wide-brim hat made of spider silk! Some strands drift in the air.
components:
- type: Sprite
sprite: Clothing/Head/Hats/web_hat.rsi
- type: Clothing
sprite: Clothing/Head/Hats/web_hat.rsi
- type: Tag
tags:
- HamsterWearable
- type: Butcherable
butcheringType: Knife
spawned:
- id: MaterialWebSilk1
amount: 2
- type: FlavorProfile
flavors:
- cobwebs
ignoreReagents:
- Fiber
- type: SolutionContainerManager
solutions: # 9 (3 (fiber count of web) * 3 (to craft)) + 6 (magical crafting bonus)
food:
maxVol: 15
reagents:
- ReagentId: Fiber
Quantity: 15
- type: Construction
graph: WebObjects
node: widehat


- type: entity
parent: ClothingHeadBase
id: ClothingHeadHatBeretMedic
Expand Down
36 changes: 36 additions & 0 deletions Resources/Prototypes/Entities/Clothing/Head/soft.yml
Original file line number Diff line number Diff line change
Expand Up @@ -312,3 +312,39 @@
- ClothMade
- HamsterWearable
- WhitelistChameleon

- type: entity
parent: ClothingHeadHeadHatBaseFlippable
id: ClothingHeadHatWebsoft
name: web cap
description: "It's a baseball hat in a tasteless off-white color. It has a faint shine to it."
components:
- type: Sprite
sprite: Clothing/Head/Soft/websoft.rsi
- type: Clothing
sprite: Clothing/Head/Soft/websoft.rsi
- type: Butcherable
butcheringType: Knife
spawned:
- id: MaterialWebSilk1
amount: 2
- type: FlavorProfile
flavors:
- cobwebs
ignoreReagents:
- Fiber
- type: SolutionContainerManager
solutions: # 12 (3 (fiber count of web) * 2 (to craft)) + 6 (magical crafting bonus)
food:
maxVol: 12
reagents:
- ReagentId: Fiber
Quantity: 12
- type: Construction
graph: WebObjects
node: cap

- type: entity
parent: [ClothingHeadHeadHatBaseFlipped, ClothingHeadHatWebsoft]
id: ClothingHeadHatWebsoftFlipped
name: web cap
62 changes: 62 additions & 0 deletions Resources/Prototypes/Entities/Clothing/Neck/scarfs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,37 @@
- type: Clothing
sprite: Clothing/Neck/Scarfs/purple.rsi

- type: entity
parent: ClothingScarfBase
id: ClothingNeckScarfStripedWeb
name: striped web scarf
description: A stylish striped web scarf. The perfect winter accessory for those with a keen fashion sense, and those who just can't handle a cold breeze on their necks.
components:
- type: Sprite
sprite: Clothing/Neck/Scarfs/web.rsi
- type: Clothing
sprite: Clothing/Neck/Scarfs/web.rsi
- type: Butcherable
butcheringType: Knife
spawned:
- id: MaterialWebSilk1
amount: 5
- type: FlavorProfile
flavors:
- cobwebs
ignoreReagents:
- Fiber
- type: SolutionContainerManager
solutions: # 15 (3 (fiber count of web) * 5 (to craft)) + 6 (magical crafting bonus)
food:
maxVol: 21
reagents:
- ReagentId: Fiber
Quantity: 21
- type: Construction
graph: WebObjects
node: scarf

- type: entity
parent: [ ClothingScarfBase, BaseSyndicateContraband ]
id: ClothingNeckScarfStripedSyndieGreen
Expand Down Expand Up @@ -129,3 +160,34 @@
sprite: Clothing/Neck/Scarfs/zebra.rsi
- type: Clothing
sprite: Clothing/Neck/Scarfs/zebra.rsi

- type: entity
parent: ClothingScarfBase
id: ClothingNeckScarfStripedZebraWeb
name: short web scarf
description: A short, striped web scarf. Feels like an unfinished cocoon.
components:
- type: Sprite
sprite: Clothing/Neck/Scarfs/zebraweb.rsi
- type: Clothing
sprite: Clothing/Neck/Scarfs/zebraweb.rsi
- type: Butcherable
butcheringType: Knife
spawned:
- id: MaterialWebSilk1
amount: 3
- type: FlavorProfile
flavors:
- cobwebs
ignoreReagents:
- Fiber
- type: SolutionContainerManager
solutions: # 9 (3 (fiber count of web) * 3 (to craft)) + 6 (magical crafting bonus)
food:
maxVol: 14
reagents:
- ReagentId: Fiber
Quantity: 14
- type: Construction
graph: WebObjects
node: shortscarf
49 changes: 48 additions & 1 deletion Resources/Prototypes/Entities/Clothing/Shoes/color.yml
Original file line number Diff line number Diff line change
Expand Up @@ -275,4 +275,51 @@
shoes:
- state: equipped-FEET
color: "#9C0DE1"
- state: soles-equipped-FEET
- state: soles-equipped-FEET

# Web Shoes
- type: entity
parent: ClothingShoesBaseButcherable
id: ClothingShoesColorWeb
name: web shoes
description: Sleek, silky shoes. They pick up a lot of dust...
components:
- type: Sprite
sprite: Clothing/Shoes/color.rsi
layers:
- state: WEB-icon
- type: Item
inhandVisuals:
left:
- state: inhand-left
color: "#ebebeb"
right:
- state: inhand-right
color: "#ebebeb"
- type: Clothing
sprite: Clothing/Shoes/color.rsi
clothingVisuals:
shoes:
- state: equipped-FEET
color: "#ebebeb"
- state: contrastedsoles-equipped-FEET
- type: Butcherable
butcheringType: Knife
spawned:
- id: MaterialWebSilk1
amount: 2
- type: FlavorProfile
flavors:
- cobwebs
ignoreReagents:
- Fiber
- type: SolutionContainerManager
solutions: # 6 (3 (fiber count of web) * 2 (to craft)) + 6 (magical crafting bonus)
food:
maxVol: 12
reagents:
- ReagentId: Fiber
Quantity: 12
- type: Construction
graph: WebObjects
node: shoes
Loading

0 comments on commit 07318f3

Please sign in to comment.