Add Chef's Belt (#22868)

* Add Chef's Belt

* Reduce contents in filled belt to just s&p

---------

Co-authored-by: Jeff <velcroboy333@hotmail.com>

diff --git a/Resources/Prototypes/Catalog/Fills/Items/belt.yml b/Resources/Prototypes/Catalog/Fills/Items/belt.yml
index 80eac027976f0ec1e46409e62fc685a935aff20c..8a27e36f08b6544a00d1d71fda2d2be981b904c9 100644 (file)
--- a/Resources/Prototypes/Catalog/Fills/Items/belt.yml
+++ b/Resources/Prototypes/Catalog/Fills/Items/belt.yml
@@ -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

diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/chefdrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/chefdrobe.yml
index da5ce32d21648ef5bc341539598ba9d1ca83f709..b6914b7f5eb4538f6df7d96b4726390fcfd5dca3 100644 (file)
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/chefdrobe.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/chefdrobe.yml
@@ -10,3 +10,4 @@
     ClothingUniformJumpskirtChef:  2
     ClothingHeadHatChef: 2
     ClothingShoesColorBlack: 2
+    ClothingBeltChef: 2

diff --git a/Resources/Prototypes/Entities/Clothing/Belt/belts.yml b/Resources/Prototypes/Entities/Clothing/Belt/belts.yml
index 52de2300569206002d46733a9dfa248a8718bdcd..0f5135838aacaa75764fc9a79248eed2e67cf634 100644 (file)
--- a/Resources/Prototypes/Entities/Clothing/Belt/belts.yml
+++ b/Resources/Prototypes/Entities/Clothing/Belt/belts.yml
@@ -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
@@ -427,7 +503,7 @@
           tags:
           - CaptainSabre
   - type: Appearance
- 
+
 # Belts without visualizers
 
 - type: entity

diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/condiments.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/condiments.yml
index 69e96e2981dbbb1dd11d2c5bfddae59851d761b8..5ae992319a359e7b61602c13ee38e0c80045401d 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/condiments.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/condiments.yml
@@ -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
@@ -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
@@ -53,6 +55,9 @@
   - type: PhysicalComposition
     materialComposition:
       Plastic: 50
+  - type: Tag
+    tags:
+      - Packet
 
 - type: entity
   parent: BaseFoodCondimentPacket
@@ -444,6 +449,9 @@
       visible: true
   - type: Icon
     state: bottle-enzyme
+  - type: Tag
+    tags:
+      - Enzyme
 
 - type: entity
   parent: BaseFoodCondimentBottle
@@ -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
@@ -599,6 +609,9 @@
     state: shaker-salt
   - type: Icon
     state: shaker-salt
+  - type: Tag
+    tags:
+      - SaltShaker
 
 - type: entity
   parent: BaseFoodShaker
@@ -616,3 +629,6 @@
     state: shaker-pepper
   - type: Icon
     state: shaker-pepper
+  - type: Tag
+    tags:
+      - PepperShaker

diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/skewer.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/skewer.yml
index 1f16cbd66edbc8f1affc445fd6211bd175a36cca..4cbd975a081c6032f71da19750125e3fd6149f96 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/skewer.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/skewer.yml
@@ -45,6 +45,7 @@
   - type: Tag
     tags:
     - Trash
+    - Skewer
 
 # Custom Kebab Example
 

diff --git a/Resources/Prototypes/Entities/Objects/Devices/mousetrap.yml b/Resources/Prototypes/Entities/Objects/Devices/mousetrap.yml
index b5fc3b8cff87ef102d52d6d780781a5461084af8..440bc4dd8a8d8b56dfab2e6e971a6a292b9e20ab 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Devices/mousetrap.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/mousetrap.yml
@@ -66,4 +66,4 @@
   description: Useful for catching rodents sneaking into your kitchen.
   components:
     - type: Mousetrap
-      isActive: true
\ No newline at end of file
+      isActive: true

diff --git a/Resources/Prototypes/Entities/Objects/Tools/tools.yml b/Resources/Prototypes/Entities/Objects/Tools/tools.yml
index 9eeefa29b39193962c3843ca2334d0ef13d67284..c173eb7e7616448bc813ff412bd773524e179678 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Tools/tools.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/tools.yml
@@ -545,3 +545,6 @@
   - type: PhysicalComposition
     materialComposition:
       Wood: 100
+  - type: Tag
+    tags:
+    - RollingPin

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/knife.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/knife.yml
index 2bb1cfdd2ba587983f16dbdb06ed421d8b7e5fab..3c7c1a7865e5e55c14d39ce1d851d1684b85c1b1 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/knife.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/knife.yml
@@ -36,6 +36,7 @@
   - type: Tag
     tags:
     - Knife
+    - KitchenKnife
   - type: Sprite
     sprite: Objects/Weapons/Melee/kitchen_knife.rsi
     state: icon
@@ -54,6 +55,7 @@
   - type: Tag
     tags:
     - Knife
+    - Cleaver
   - type: Sprite
     sprite: Objects/Weapons/Melee/cleaver.rsi
     state: butch

diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/chef.yml b/Resources/Prototypes/Roles/Jobs/Civilian/chef.yml
index 22532b071f8fd682424ab458eaf2d2d72f082217..6af0753d0326c37e81ebef2ff7e14228f5d2212b 100644 (file)
--- a/Resources/Prototypes/Roles/Jobs/Civilian/chef.yml
+++ b/Resources/Prototypes/Roles/Jobs/Civilian/chef.yml
@@ -29,6 +29,7 @@
     id: ChefPDA
     ears: ClothingHeadsetService
     outerClothing: ClothingOuterApronChef
+    belt: ClothingBeltChefFilled
   innerClothingSkirt: ClothingUniformJumpskirtChef
   satchel: ClothingBackpackSatchelFilled
   duffelbag: ClothingBackpackDuffelFilled

diff --git a/Resources/Prototypes/tags.yml b/Resources/Prototypes/tags.yml
index 5be37f243db20df6b16c86016b8317fbe6777669..a8e8ef148816199876bdf70a1cb352deadc7a25a 100644 (file)
--- a/Resources/Prototypes/tags.yml
+++ b/Resources/Prototypes/tags.yml
@@ -302,6 +302,9 @@
 - type: Tag
   id: CigPack
 
+- type: Tag
+  id: Cleaver
+
 - type: Tag
   id: ClothMade
 
@@ -461,6 +464,9 @@
 - type: Tag
   id: EmitterBolt
 
+- type: Tag
+  id: Enzyme
+
 - type: Tag
   id: ExplosivePassable
 
@@ -671,6 +677,9 @@
 - type: Tag
   id: KeyedInstrument
 
+- type: Tag
+  id: KitchenKnife
+
 - type: Tag
   id: Knife
 
@@ -809,6 +818,9 @@
 - type: Tag
   id: Ore
 
+- type: Tag
+  id: Packet
+
 - type: Tag
   id: Payload # for grenade/bomb crafting
 
@@ -818,6 +830,9 @@
 - type: Tag
   id: Pancake
 
+- type: Tag
+  id: PepperShaker
+
 - type: Tag
   id: PercussionInstrument
 
@@ -939,6 +954,12 @@
 - type: Tag
   id: RollingPaper
 
+- type: Tag
+  id: RollingPin
+
+- type: Tag
+  id: SaltShaker
+
 - type: Tag
   id: SalvageExperiment
 
@@ -975,6 +996,9 @@
 - type: Tag
   id: SkeletonMotorcycleKeys
 
+- type: Tag
+  id: Skewer
+
 - type: Tag
   id: SmallAIChip
 
@@ -1153,4 +1177,4 @@
   id: MindShield
 
 - type: Tag
-  id:  boots
\ No newline at end of file
+  id:  boots

diff --git a/Resources/Textures/Clothing/Belt/belt_overlay.rsi/bbqsauce.png b/Resources/Textures/Clothing/Belt/belt_overlay.rsi/bbqsauce.png
new file mode 100644 (file)
index 0000000..6f5c4e6
Binary files /dev/null and b/Resources/Textures/Clothing/Belt/belt_overlay.rsi/bbqsauce.png differ

diff --git a/Resources/Textures/Clothing/Belt/belt_overlay.rsi/cleaver.png b/Resources/Textures/Clothing/Belt/belt_overlay.rsi/cleaver.png
new file mode 100644 (file)
index 0000000..4fac92e
Binary files /dev/null and b/Resources/Textures/Clothing/Belt/belt_overlay.rsi/cleaver.png differ

diff --git a/Resources/Textures/Clothing/Belt/belt_overlay.rsi/coldsauce.png b/Resources/Textures/Clothing/Belt/belt_overlay.rsi/coldsauce.png
new file mode 100644 (file)
index 0000000..6a449da
Binary files /dev/null and b/Resources/Textures/Clothing/Belt/belt_overlay.rsi/coldsauce.png differ

diff --git a/Resources/Textures/Clothing/Belt/belt_overlay.rsi/enzyme.png b/Resources/Textures/Clothing/Belt/belt_overlay.rsi/enzyme.png
new file mode 100644 (file)
index 0000000..9b11bcf
Binary files /dev/null and b/Resources/Textures/Clothing/Belt/belt_overlay.rsi/enzyme.png differ

diff --git a/Resources/Textures/Clothing/Belt/belt_overlay.rsi/hotsauce.png b/Resources/Textures/Clothing/Belt/belt_overlay.rsi/hotsauce.png
new file mode 100644 (file)
index 0000000..f95a4db
Binary files /dev/null and b/Resources/Textures/Clothing/Belt/belt_overlay.rsi/hotsauce.png differ

diff --git a/Resources/Textures/Clothing/Belt/belt_overlay.rsi/ketchup.png b/Resources/Textures/Clothing/Belt/belt_overlay.rsi/ketchup.png
new file mode 100644 (file)
index 0000000..6236b1b
Binary files /dev/null and b/Resources/Textures/Clothing/Belt/belt_overlay.rsi/ketchup.png differ

diff --git a/Resources/Textures/Clothing/Belt/belt_overlay.rsi/kitchenknife.png b/Resources/Textures/Clothing/Belt/belt_overlay.rsi/kitchenknife.png
new file mode 100644 (file)
index 0000000..f71d195
Binary files /dev/null and b/Resources/Textures/Clothing/Belt/belt_overlay.rsi/kitchenknife.png differ

diff --git a/Resources/Textures/Clothing/Belt/belt_overlay.rsi/meta.json b/Resources/Textures/Clothing/Belt/belt_overlay.rsi/meta.json
index 18b282d9dfa39b4d9dd17b61a7bf9af700cf3dc1..3f3418b36c1ac3deebb4f6fc4b92cd4da30ef651 100644 (file)
--- a/Resources/Textures/Clothing/Belt/belt_overlay.rsi/meta.json
+++ b/Resources/Textures/Clothing/Belt/belt_overlay.rsi/meta.json
@@ -7,12 +7,21 @@
     "y": 32
   },
   "states": [
+    {
+      "name": "bbqsauce"
+    },
     {
       "name": "bottle"
     },
     {
       "name": "bottle_spray"
     },
+    {
+      "name": "cleaver"
+    },
+    {
+      "name": "coldsauce"
+    },
     {
       "name": "crowbar"
     },
@@ -40,6 +49,9 @@
     {
       "name": "drill"
     },
+    {
+      "name": "enzyme"
+    },
     {
       "name": "flashbang"
     },
@@ -49,6 +61,9 @@
     {
       "name": "hoe"
     },
+    {
+      "name": "hotsauce"
+    },
     {
       "name": "hydro"
     },
@@ -58,15 +73,30 @@
     {
       "name": "jaws"
     },
+    {
+      "name": "ketchup"
+    },
+    {
+      "name": "kitchenknife"
+    },
     {
       "name": "multitool"
     },
+    {
+      "name": "peppershaker"
+    },
     {
       "name": "pill"
     },
     {
       "name": "plantbgone"
     },
+    {
+      "name": "rollingpin"
+    },
+    {
+      "name": "saltshaker"
+    },
     {
       "name": "screwdriver"
     },

diff --git a/Resources/Textures/Clothing/Belt/belt_overlay.rsi/peppershaker.png b/Resources/Textures/Clothing/Belt/belt_overlay.rsi/peppershaker.png
new file mode 100644 (file)
index 0000000..ac7d871
Binary files /dev/null and b/Resources/Textures/Clothing/Belt/belt_overlay.rsi/peppershaker.png differ

diff --git a/Resources/Textures/Clothing/Belt/belt_overlay.rsi/rollingpin.png b/Resources/Textures/Clothing/Belt/belt_overlay.rsi/rollingpin.png
new file mode 100644 (file)
index 0000000..1f83771
Binary files /dev/null and b/Resources/Textures/Clothing/Belt/belt_overlay.rsi/rollingpin.png differ

diff --git a/Resources/Textures/Clothing/Belt/belt_overlay.rsi/saltshaker.png b/Resources/Textures/Clothing/Belt/belt_overlay.rsi/saltshaker.png
new file mode 100644 (file)
index 0000000..18ea49b
Binary files /dev/null and b/Resources/Textures/Clothing/Belt/belt_overlay.rsi/saltshaker.png differ

diff --git a/Resources/Textures/Clothing/Belt/chef.rsi/equipped-BELT.png b/Resources/Textures/Clothing/Belt/chef.rsi/equipped-BELT.png
new file mode 100644 (file)
index 0000000..916953d
Binary files /dev/null and b/Resources/Textures/Clothing/Belt/chef.rsi/equipped-BELT.png differ

diff --git a/Resources/Textures/Clothing/Belt/chef.rsi/icon.png b/Resources/Textures/Clothing/Belt/chef.rsi/icon.png
new file mode 100644 (file)
index 0000000..874b2e9
Binary files /dev/null and b/Resources/Textures/Clothing/Belt/chef.rsi/icon.png differ

diff --git a/Resources/Textures/Clothing/Belt/chef.rsi/inhand-left.png b/Resources/Textures/Clothing/Belt/chef.rsi/inhand-left.png
new file mode 100644 (file)
index 0000000..cd357bd
Binary files /dev/null and b/Resources/Textures/Clothing/Belt/chef.rsi/inhand-left.png differ

diff --git a/Resources/Textures/Clothing/Belt/chef.rsi/inhand-right.png b/Resources/Textures/Clothing/Belt/chef.rsi/inhand-right.png
new file mode 100644 (file)
index 0000000..22218fd
Binary files /dev/null and b/Resources/Textures/Clothing/Belt/chef.rsi/inhand-right.png differ

diff --git a/Resources/Textures/Clothing/Belt/chef.rsi/meta.json b/Resources/Textures/Clothing/Belt/chef.rsi/meta.json
new file mode 100644 (file)
index 0000000..c50efa5
--- /dev/null
+++ b/Resources/Textures/Clothing/Belt/chef.rsi/meta.json
@@ -0,0 +1,26 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Base taken from tgstation at commit https://github.com/tgstation/tgstation/commit/3fd95ab2a061459c881eeab6dbecaae5a8884f0a altered by Velcroboy",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "equipped-BELT",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}