From 24e6088dd718d9b85e390db4b4b1dfabd105d1c1 Mon Sep 17 00:00:00 2001 From: potato1234_x <79580518+potato1234x@users.noreply.github.com> Date: Sat, 29 Apr 2023 18:42:44 +1000 Subject: [PATCH] Salt & Pepper Shakers (#15808) --- .../Consumable/Food/Containers/condiments.yml | 100 ++++++++++++++++++ .../Consumable/Food/condiments.rsi/meta.json | 2 +- .../Food/condiments.rsi/shaker-empty.png | Bin 171 -> 293 bytes .../Food/condiments.rsi/shaker-pepper.png | Bin 212 -> 335 bytes .../Food/condiments.rsi/shaker-salt.png | Bin 216 -> 283 bytes 5 files changed, 101 insertions(+), 1 deletion(-) diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/condiments.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/condiments.yml index f7da7d9d64..642a9006f7 100644 --- 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 894c35f476..05b5ef2dc3 100644 --- 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 GIT binary patch delta 266 zcmV+l0rmc?0i^pFx=BPqR9Hu27zLwX6pVrq4;Y~|$zau*mH(kkFbE3?C)+HN!IUYJ zz?T2}_vb&14Wmf~WV_nh+yuqKqbJYMF9bjU6a}ylK#vYm0DlvdCK-JE!SFAupmf8P zTlY7B*id1T0oe|q79cC$W-nR!_w1R9{3=9ka;|NH_GzOpl Q00000NkvXXt^-0~f*VF>bN~PV delta 143 zcmV;A0C4}M0;>U#B!6;AL_t(oh3(TZ4uBvG1<>k*XXzn01qbFn-DRtBATj7*K8a1t ze+yw~OA81Q5k*_j`Z;I6?rW`3t`!MVRWGH8nMq&Mmi$HN4LpIdVA~sD%PDHLkV1l+rIr0Di 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 GIT binary patch delta 308 zcmV-40n7f>0nY-EB!2;OQb$4nuFf3k00004XF*Lt006O%3;baP00009a7bBm000id z000id0mpBsWB>pFAIEMgd8HfdK%mT2y3cx`vJb0000AKgfRSAL?d|RVBl8a)JV=&VOyp?N z*4F+X8XC&*=FJ-h7|p@S@t+8-7=Y{$K)3M6_a9`NMX>|O^*soX6$LO5W-RufM^cz< z%RzvwV1xOXMSz>(&xfyYnw)4LI|N{s`f2fzYXtcK6aoe^0x|zVG&D5+(>)h}ETy7Z mqhJ(_f>AIEMk-)nU;qH%b1ZK1Kt%HZ0000GZx^prw85kH?(j9#r85lP9bN@+X1@buyJR*x382Ao@Fyrz3 z6)8Z$4W2HJArbD$60D08M0%P8`6U*boJ_bnYwG`nJ_a1zoa(oACLNrjIr+e}|G&RK zx9{Oy?8%z4`_`>HEJqJ5RzH71pT&Vegmr^}LqA^-Lxu1ZHA$Pwzb~Jz4$qfxayoP% zXNAGZh8*?-2e#+mU!Y^vwD0BSc!q=Z68p;E->aV>5i(1~A&{e?#y^u|!qbL+dHci& z9wBA+33E$dSyu%%?b)~}g6WhD#A$&BTpkQOJPeu3L$#)7?Y|6kJcFmJpUXO@geCx2 Ck73II delta 188 zcmV;t07L(q0@wkNB!8btL_t(oh3(VL4FVw$1>lj@WUYlFsDdsihd!u*BFrY-xp8-I z7|CK*z3AIyP0af)3?#$P0767Wzji>^H^$U;KgI~nrH~}8b+y(?DMflap2zw@>KnKM zuM5uC8J-IgLU?Ro9e)eDg03!hJ-I9=?v6^e2(7}V3Y>;vOEo&aft<6Xlv;e5rWW7F q5b(?O-anPxIk)dGAR?mwAR;$SqeN9O!UGEc0000r -- 2.51.2