Skip to content

Commit

Permalink
Add Chef's Belt (space-wizards#22868)
Browse files Browse the repository at this point in the history
* Add Chef's Belt

* Reduce contents in filled belt to just s&p

---------

Co-authored-by: Jeff <[email protected]>
  • Loading branch information
IamVelcroboy and BurningRash authored Dec 23, 2023
1 parent a09efd4 commit dfa71af
Show file tree
Hide file tree
Showing 26 changed files with 194 additions and 4 deletions.
10 changes: 10 additions & 0 deletions Resources/Prototypes/Catalog/Fills/Items/belt.yml
Original file line number Diff line number Diff line change
Expand Up @@ -176,3 +176,13 @@
- id: WeaponRevolverInspector
- id: SpeedLoaderMagnum
- id: SpeedLoaderMagnumRubber

- type: entity
id: ClothingBeltChefFilled
parent: ClothingBeltChef
suffix: Filled
components:
- type: StorageFill
contents:
- id: FoodShakerSalt
- id: FoodShakerPepper
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,4 @@
ClothingUniformJumpskirtChef: 2
ClothingHeadHatChef: 2
ClothingShoesColorBlack: 2
ClothingBeltChef: 2
78 changes: 77 additions & 1 deletion Resources/Prototypes/Entities/Clothing/Belt/belts.yml
Original file line number Diff line number Diff line change
Expand Up @@ -356,6 +356,82 @@
sprite: Clothing/Belt/belt_overlay.rsi
- type: Appearance

- type: entity
parent: ClothingBeltStorageBase
id: ClothingBeltChef
name: chef belt
description: A belt used to hold kitchen knives and condiments for quick access.
components:
- type: Sprite
sprite: Clothing/Belt/chef.rsi
- type: Clothing
sprite: Clothing/Belt/chef.rsi
- type: Storage
whitelist:
tags:
- KitchenKnife
- Cleaver
- RollingPin
- Coldsauce
- Enzyme
- Hotsauce
- Ketchup
- BBQsauce
- SaltShaker
- PepperShaker
- CigPack
- Packet
- Skewer
- MonkeyCube
components:
- Mousetrap
- Smokable
- Utensil
- type: ItemMapper
mapLayers:
kitchenknife:
whitelist:
tags:
- KitchenKnife
cleaver:
whitelist:
tags:
- Cleaver
rollingpin:
whitelist:
tags:
- RollingPin
coldsauce:
whitelist:
tags:
- Coldsauce
enzyme:
whitelist:
tags:
- Enzyme
hotsauce:
whitelist:
tags:
- Hotsauce
ketchup:
whitelist:
tags:
- Ketchup
bbqsauce:
whitelist:
tags:
- BBQsauce
saltshaker:
whitelist:
tags:
- SaltShaker
peppershaker:
whitelist:
tags:
- PepperShaker
sprite: Clothing/Belt/belt_overlay.rsi
- type: Appearance

- type: entity
parent: ClothingBeltStorageBase
id: ClothingBeltSecurity
Expand Down Expand Up @@ -427,7 +503,7 @@
tags:
- CaptainSabre
- type: Appearance

# Belts without visualizers

- type: entity
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@
abstract: true
description: A small plastic pack with condiments to put on your food.
components:
- type: Item
size: Tiny
- type: Drink
solution: food
refillable: false
Expand All @@ -37,7 +39,7 @@
# Since this one is closed, the only way to insert liquid is with a syringe.
- type: InjectableSolution
solution: food
# Note NOT refillable.
# Note NOT refillable.
# It be a shame if it turned out ALL drinks were ALWAYS refillable.... ffs.
# Well its fixed now, but I want to share my pain.
- type: SolutionContainerManager
Expand All @@ -53,6 +55,9 @@
- type: PhysicalComposition
materialComposition:
Plastic: 50
- type: Tag
tags:
- Packet

- type: entity
parent: BaseFoodCondimentPacket
Expand Down Expand Up @@ -444,6 +449,9 @@
visible: true
- type: Icon
state: bottle-enzyme
- type: Tag
tags:
- Enzyme

- type: entity
parent: BaseFoodCondimentBottle
Expand Down Expand Up @@ -552,6 +560,8 @@
name: empty shaker
description: A shaker used to store and dispense spices.
components:
- type: Item
size: Tiny
- type: Drink
solution: food
- type: SolutionContainerManager
Expand Down Expand Up @@ -599,6 +609,9 @@
state: shaker-salt
- type: Icon
state: shaker-salt
- type: Tag
tags:
- SaltShaker

- type: entity
parent: BaseFoodShaker
Expand All @@ -616,3 +629,6 @@
state: shaker-pepper
- type: Icon
state: shaker-pepper
- type: Tag
tags:
- PepperShaker
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@
- type: Tag
tags:
- Trash
- Skewer

# Custom Kebab Example

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -66,4 +66,4 @@
description: Useful for catching rodents sneaking into your kitchen.
components:
- type: Mousetrap
isActive: true
isActive: true
3 changes: 3 additions & 0 deletions Resources/Prototypes/Entities/Objects/Tools/tools.yml
Original file line number Diff line number Diff line change
Expand Up @@ -545,3 +545,6 @@
- type: PhysicalComposition
materialComposition:
Wood: 100
- type: Tag
tags:
- RollingPin
2 changes: 2 additions & 0 deletions Resources/Prototypes/Entities/Objects/Weapons/Melee/knife.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@
- type: Tag
tags:
- Knife
- KitchenKnife
- type: Sprite
sprite: Objects/Weapons/Melee/kitchen_knife.rsi
state: icon
Expand All @@ -54,6 +55,7 @@
- type: Tag
tags:
- Knife
- Cleaver
- type: Sprite
sprite: Objects/Weapons/Melee/cleaver.rsi
state: butch
Expand Down
1 change: 1 addition & 0 deletions Resources/Prototypes/Roles/Jobs/Civilian/chef.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
id: ChefPDA
ears: ClothingHeadsetService
outerClothing: ClothingOuterApronChef
belt: ClothingBeltChefFilled
innerClothingSkirt: ClothingUniformJumpskirtChef
satchel: ClothingBackpackSatchelFilled
duffelbag: ClothingBackpackDuffelFilled
26 changes: 25 additions & 1 deletion Resources/Prototypes/tags.yml
Original file line number Diff line number Diff line change
Expand Up @@ -302,6 +302,9 @@
- type: Tag
id: CigPack

- type: Tag
id: Cleaver

- type: Tag
id: ClothMade

Expand Down Expand Up @@ -461,6 +464,9 @@
- type: Tag
id: EmitterBolt

- type: Tag
id: Enzyme

- type: Tag
id: ExplosivePassable

Expand Down Expand Up @@ -671,6 +677,9 @@
- type: Tag
id: KeyedInstrument

- type: Tag
id: KitchenKnife

- type: Tag
id: Knife

Expand Down Expand Up @@ -809,6 +818,9 @@
- type: Tag
id: Ore

- type: Tag
id: Packet

- type: Tag
id: Payload # for grenade/bomb crafting

Expand All @@ -818,6 +830,9 @@
- type: Tag
id: Pancake

- type: Tag
id: PepperShaker

- type: Tag
id: PercussionInstrument

Expand Down Expand Up @@ -939,6 +954,12 @@
- type: Tag
id: RollingPaper

- type: Tag
id: RollingPin

- type: Tag
id: SaltShaker

- type: Tag
id: SalvageExperiment

Expand Down Expand Up @@ -975,6 +996,9 @@
- type: Tag
id: SkeletonMotorcycleKeys

- type: Tag
id: Skewer

- type: Tag
id: SmallAIChip

Expand Down Expand Up @@ -1153,4 +1177,4 @@
id: MindShield

- type: Tag
id: boots
id: boots
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.
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.
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.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
30 changes: 30 additions & 0 deletions Resources/Textures/Clothing/Belt/belt_overlay.rsi/meta.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,21 @@
"y": 32
},
"states": [
{
"name": "bbqsauce"
},
{
"name": "bottle"
},
{
"name": "bottle_spray"
},
{
"name": "cleaver"
},
{
"name": "coldsauce"
},
{
"name": "crowbar"
},
Expand Down Expand Up @@ -40,6 +49,9 @@
{
"name": "drill"
},
{
"name": "enzyme"
},
{
"name": "flashbang"
},
Expand All @@ -49,6 +61,9 @@
{
"name": "hoe"
},
{
"name": "hotsauce"
},
{
"name": "hydro"
},
Expand All @@ -58,15 +73,30 @@
{
"name": "jaws"
},
{
"name": "ketchup"
},
{
"name": "kitchenknife"
},
{
"name": "multitool"
},
{
"name": "peppershaker"
},
{
"name": "pill"
},
{
"name": "plantbgone"
},
{
"name": "rollingpin"
},
{
"name": "saltshaker"
},
{
"name": "screwdriver"
},
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.
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.
Binary file added Resources/Textures/Clothing/Belt/chef.rsi/icon.png
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.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit dfa71af

Please sign in to comment.