Salt & Pepper Shakers (#15808)

diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/condiments.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/condiments.yml
index f7da7d9d6484637b6165b2daa59098cedcd6643a..642a9006f73ea278def26fb465423d19f89ddb49 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/condiments.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/condiments.yml
@@ -491,6 +491,106 @@
     sprite: Objects/Consumable/Food/condiments.rsi
     state: bottle-ketchup
 
+# Shakers
+
+- type: entity
+  parent: BaseItem
+  id: BaseFoodShaker
+  abstract: true
+  name: empty shaker
+  description: A shaker used to store and dispense spices.
+  components:
+  - type: Drink
+    solution: food
+    isOpen: true
+  - type: RefillableSolution
+    solution: food
+  - type: DrainableSolution
+    solution: food
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 20
+  - type: SolutionTransfer
+    canChangeTransferAmount: true
+    minTransferAmount: 5
+    maxTransferAmount: 20
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 5
+      behaviors:
+      - !type:PlaySoundBehavior
+        sound:
+          collection: GlassBreak
+      - !type:SpillBehavior { }
+      - !type:SpawnEntitiesBehavior
+        spawn:
+          ShardGlass:
+            min: 1
+            max: 1
+        transferForensics: true
+      - !type:DoActsBehavior
+        acts: [ "Destruction" ]
+  - type: Sprite
+    netsync: false
+    sprite: Objects/Consumable/Food/condiments.rsi
+    state: shaker-empty
+  - type: Appearance
+  - type: TrashOnEmpty
+    solution: food
+
+- type: entity
+  parent: BaseFoodShaker
+  id: FoodShakerEmpty
+  name: empty shaker
+  description: A shaker used to store and dispense spices.
+  components:
+  - type: Tag
+    tags:
+    - Trash
+
+- type: entity
+  parent: BaseFoodShaker
+  id: FoodShakerSalt
+  name: salt shaker
+  description: Salt. From space oceans, presumably.
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        reagents:
+        - ReagentId: TableSalt
+          Quantity: 20
+  
+  - type: Sprite
+    sprite: Objects/Consumable/Food/condiments.rsi
+    state: shaker-salt
+  - type: Icon
+    sprite: Objects/Consumable/Food/condiments.rsi
+    state: shaker-salt
+
+- type: entity
+  parent: BaseFoodShaker
+  id: FoodShakerPepper
+  name: pepper shaker
+  description: Often used to flavor food or make people sneeze.
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        reagents:
+        - ReagentId: Blackpepper
+          Quantity: 20
+  
+  - type: Sprite
+    sprite: Objects/Consumable/Food/condiments.rsi
+    state: shaker-pepper
+  - type: Icon
+    sprite: Objects/Consumable/Food/condiments.rsi
+    state: shaker-pepper
+
 # Small Bottles
 
 - type: entity

diff --git a/Resources/Textures/Objects/Consumable/Food/condiments.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/condiments.rsi/meta.json
index 894c35f47642c163a6e673e77bb27eb1b89d2e26..05b5ef2dc3dac0eecdc1e1676baab2a19e2365fa 100644 (file)
--- a/Resources/Textures/Objects/Consumable/Food/condiments.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Food/condiments.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation and baystation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24 and https://github.com/Baystation12/Baystation12/commit/a6067826de7fd8f698793f6d84e6c2f1f9b1f188",
+  "copyright": "Taken from tgstation and baystation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24 and https://github.com/Baystation12/Baystation12/commit/a6067826de7fd8f698793f6d84e6c2f1f9b1f188. Shaker sprites from tgstation at commit https://github.com/tgstation/tgstation/commit/7ec204f85ed34a3d9c9d09d51977f2ad610c481e",
   "size": {
     "x": 32,
     "y": 32

diff --git a/Resources/Textures/Objects/Consumable/Food/condiments.rsi/shaker-empty.png b/Resources/Textures/Objects/Consumable/Food/condiments.rsi/shaker-empty.png
index a120ece8c1f64d98d1dad54a1569c9719f6663f1..b6f0decc1a1a3d7ffd94402b641be911b899f006 100644 (file)
Binary files a/Resources/Textures/Objects/Consumable/Food/condiments.rsi/shaker-empty.png and b/Resources/Textures/Objects/Consumable/Food/condiments.rsi/shaker-empty.png differ

diff --git a/Resources/Textures/Objects/Consumable/Food/condiments.rsi/shaker-pepper.png b/Resources/Textures/Objects/Consumable/Food/condiments.rsi/shaker-pepper.png
index 2c11f860e33a4e9119614a23fe0b82df0b265f0f..8eb7cd991a47d31f21e6d353cf661d83e0d4b913 100644 (file)
Binary files a/Resources/Textures/Objects/Consumable/Food/condiments.rsi/shaker-pepper.png and b/Resources/Textures/Objects/Consumable/Food/condiments.rsi/shaker-pepper.png differ

diff --git a/Resources/Textures/Objects/Consumable/Food/condiments.rsi/shaker-salt.png b/Resources/Textures/Objects/Consumable/Food/condiments.rsi/shaker-salt.png
index 72dda4a246246982a87d2f662b3bfb8c70996ede..36fd5ce8d77c9d07327cc163f170b9696b659d9d 100644 (file)
Binary files a/Resources/Textures/Objects/Consumable/Food/condiments.rsi/shaker-salt.png and b/Resources/Textures/Objects/Consumable/Food/condiments.rsi/shaker-salt.png differ