From fa7a6f899c4f22def7f251426be35a2643cb4eee Mon Sep 17 00:00:00 2001
From: Bixkitts <72874643+Bixkitts@users.noreply.github.com>
Date: Sun, 6 Aug 2023 05:10:46 +0200
Subject: [PATCH] Added Candy Bowls for Waiting Lines (#18341)

---
 .../Objects/Consumable/Food/snacks.yml        |  12 ++++
 .../Entities/Objects/Misc/candy_bowl.yml      |  68 ++++++++++++++++++
 Resources/Prototypes/tags.yml                 |   4 ++
 .../Misc/candy_bowl.rsi/candy_bowl0.png       | Bin 0 -> 1238 bytes
 .../Misc/candy_bowl.rsi/candy_bowl1.png       | Bin 0 -> 1412 bytes
 .../Objects/Misc/candy_bowl.rsi/meta.json     |  17 +++++
 6 files changed, 101 insertions(+)
 create mode 100644 Resources/Prototypes/Entities/Objects/Misc/candy_bowl.yml
 create mode 100644 Resources/Textures/Objects/Misc/candy_bowl.rsi/candy_bowl0.png
 create mode 100644 Resources/Textures/Objects/Misc/candy_bowl.rsi/candy_bowl1.png
 create mode 100644 Resources/Textures/Objects/Misc/candy_bowl.rsi/meta.json

diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/snacks.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/snacks.yml
index 45d59c2877..4c60fee616 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/snacks.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/snacks.yml
@@ -6,6 +6,9 @@
   abstract: true
   components:
   - type: Food
+  - type: Tag
+    tags:
+      - FoodSnack
   - type: Sprite
     sprite: Objects/Consumable/Food/snacks.rsi
   - type: SolutionContainerManager
@@ -84,6 +87,9 @@
   - type: Item
     heldPrefix: chocolatebar
     size: 3
+  - type: Tag
+    tags:
+      - FoodSnack
   - type: SpawnItemsOnUse
     items:
       - id: FoodPacketChocolateTrash
@@ -295,6 +301,9 @@
   components:
   - type: Item
     size: 10
+  - type: Tag
+    tags:
+      - FoodSnack
   - type: Sprite
     sprite: Objects/Consumable/Food/snacks.rsi
     state: nutribrick
@@ -336,6 +345,9 @@
   - type: Sprite
     sprite: Objects/Consumable/Food/snacks.rsi
     state: mre-brownie
+  - type: Tag
+    tags:
+      - FoodSnack
   - type: SpawnItemsOnUse
     items:
       - id: FoodPacketMRETrash
diff --git a/Resources/Prototypes/Entities/Objects/Misc/candy_bowl.yml b/Resources/Prototypes/Entities/Objects/Misc/candy_bowl.yml
new file mode 100644
index 0000000000..94b459e00a
--- /dev/null
+++ b/Resources/Prototypes/Entities/Objects/Misc/candy_bowl.yml
@@ -0,0 +1,68 @@
+- type: entity
+  parent: BaseItem
+  id: CandyBowl
+  name: "candy bowl"
+  description: Grab as much as you can fit in your pockets!
+  components:
+  - type: Sprite
+    sprite: Objects/Misc/candy_bowl.rsi
+    noRot: true
+    drawdepth: SmallObjects
+    state: candy_bowl0
+  - type: Appearance
+  - type: Bin
+    maxItems: 100
+    whitelist:
+      components:
+        - Pill
+      tags:
+        - FoodSnack
+  - type: ContainerContainer
+    containers:
+      bin-container: !type:Container
+  - type: Damageable
+    damageContainer: Inorganic
+  - type: DamageOnLand
+    damage:
+      types:
+        Blunt: 5
+  - type: DamageOtherOnHit
+    damage:
+      types:
+        Blunt: 4
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 5
+      behaviors:
+      - !type:PlaySoundBehavior
+        sound:
+          collection: GlassBreak
+      - !type:SpawnEntitiesBehavior
+        spawn:
+          ShardGlass:
+            min: 1
+            max: 2
+      - !type:EmptyAllContainersBehaviour
+      - !type:DoActsBehavior
+        acts: [ "Destruction" ]
+  - type: Fixtures
+    fixtures:
+      fix1:
+        shape:
+          !type:PhysShapeAabb
+          bounds: "-0.10,-0.10,0.10,0.10"
+        density: 3
+        mask:
+          - TabletopMachineMask
+  - type: InteractionOutline
+  - type: ItemMapper
+    sprite: Objects/Misc/candy_bowl.rsi
+    mapLayers:
+      candy_bowl1:
+        whitelist:
+          components:
+          - Pill
+          tags:
+          - FoodSnack
diff --git a/Resources/Prototypes/tags.yml b/Resources/Prototypes/tags.yml
index 22e5677b31..7926027eb1 100644
--- a/Resources/Prototypes/tags.yml
+++ b/Resources/Prototypes/tags.yml
@@ -329,6 +329,9 @@
 - type: Tag
   id: Folder
 
+- type: Tag
+  id: FoodSnack
+
 - type: Tag
   id: FootstepSound
 
@@ -888,3 +891,4 @@
 
 - type: Tag
   id: ModularReceiver
+
diff --git a/Resources/Textures/Objects/Misc/candy_bowl.rsi/candy_bowl0.png b/Resources/Textures/Objects/Misc/candy_bowl.rsi/candy_bowl0.png
new file mode 100644
index 0000000000000000000000000000000000000000..97424c93406cf17670211c6bf568a1e48074b9b8
GIT binary patch
literal 1238
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz$r9IylHmNblJdl&R0hYC{G?O`
z&)mfH)S%SFl*+=BsWuD@%xak-5hW46K32*3xq68pHF_1f1wh>l3^w)^1&PVosU-?Y
zsp*+{wo31J?^jaDOtDo8H}y5}EpSfF$n>ZxN)4{^3rViZPPR-@vbR&PsjvbXkegbP
zs8ErclUHn2VXFi-*9yo63F|8<fR&VF+bTgE72zA8;GAESs$i;Ts+(+JWT;?nsb^?v
zYHn_%qhMrUXrgamsBdVjYiMa@Vq#@rpa2C*K--E^(yW49+@N*=dA3R!B_#z``ugSN
z<$C4Ddih1^`i7R4mih)p`bI{&Koz>hm3bwJ6}oxF$}kgLQj3#|G7CyF^YauyCMG83
zmzLNn0bL65LT&-v*t}wBFaZNhzap_f-%!s0<RzFwUtj!6b93RUi%Wu15$?rmaB)aw
zL8^XGYH@yPQ8F;%(v(3~6<9eJr6!i-7lq{K=fFZSAS1sdzc?emK*8A=9BK+0;hA|U
z`Q^o$U_HLRR-SpqC5d^-sh%#jN<dTeGBZ=G94#yiUCfLujhtK!3=Lgf9nG9voQ+H^
z4Gat{P0Sn(V0vBhlS^|`^GaZPQxJL`aq0ynhui|7%`T}$nPsUdZbkXI3Se(rW#V>=
zIZpGSdQ)(_#R8{ZeV}9XL6M6T*)Sns3IZ|VNf*e0C;rqtV2UpSCT$+se_I(C7~MQw
z978H@CH?vT-~O-zlUf@i+hRV6(gQ1)-DD3m=^Z$6q9eHQbl>iX?z6A?=Pmd!J?+M0
z6PCSCQjZ8Y6fx{-b=&0?!CU+LrS+WJr|*i})cp&rJ2co2=p0K`H0!><|Np5EU+$_K
z{Qfwbe?{8AA57&OyJ{r@1#BNbsCN=mj^^7W!BP;(_sx`@zo^3~Xby+x#yJ89q*!li
z>ou|N&HcI}sj_Fa;NiLL`4XSjxNy2Na?G)=ZaR48=={XzQ>SY@dS~^B<*_u2i|W$A
z9}2~N^0(b<I2syKU!M7|;2yxdXJ@_eJmCv(56@(4m}Wfh*5-*?)4DZQ8BdB4@++CX
z;D+FWgyZR!2b(xpK9%oFV6b{*A9O-siwK*}+Bp)AatFhOHVJ%UJ;AU*`N2A;vNQ2|
taXeoQydC+}wWa&Qj>AG}4l@H24+Gz^T>>0u{X0P=ji;-h%Q~loCIC<>rON;S

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Misc/candy_bowl.rsi/candy_bowl1.png b/Resources/Textures/Objects/Misc/candy_bowl.rsi/candy_bowl1.png
new file mode 100644
index 0000000000000000000000000000000000000000..c4ad0910a6674fc8b2743e08bebc3f27c638e15e
GIT binary patch
literal 1412
zcmaJ>e@qj19KBKkRY4)y2sN0Ubpw`^-d$;hJE(2x73sDjE6r@2S$g!YaKhb{yJIb6
z2*Zu(aH7e6U}U(Aj7gS=XqFgsX$?+A!(8Uv$`&^krUad{Dw}Kw-4!YBkFiVczCZHb
z`}}&jJr(7fQ&+BC2>?K<tqgZaD;RqfNzzwnYMPc7rD%1Dm7G`f6Fdc&Nv?_lZ46OO
zIVgf`tRJC@0YIKjJ6)p7{sQLV7!47_XabB+Vgo?2G2kOSwUh`}QPnhSP~ABdRDm>U
zP;J%QVY|;l)zD>4JXP6L?({U(dQehj+yoW}FiC)+L;?&jb*z8|45|fPOxnk;Ar-g)
z5o-;qM@hNt6`+OVDNwJ`=Xqc)0v4beM6WL>(5gW#jOZX3fsp(>1jTeZ42HqQM<qq$
zNiXKWOBZ8FCxfa+6nz*3`Tc&4KVQS~)ewTBC<JREtu{|W<Oz+eNCfg&VMAO2rvwjA
z`$U>!!I&aZ#Wjcqm6YkD5*Xi-EGsOwNop7rAbb#_fnz1bfp+`<Lm6fXEr<^4alZd4
zEI1o|6y%@;u7USRgY#~Ph4Nt*o+3n!cXC`^yo(hzoX80^oDZ~E7P<!JZlzh0^9#=|
zaO`%>#tI_AdMF!iP)RBpnkKOlRIAI!t!8bB6-E%NwZwuK;<y>X3t$vRwfZ<0=R6Gz
z#fot*`IuX>EH`Ec#wSI_DV~0nB1?IW0T;@~=;d=MTvl(9OD>-ax-1uxl7V8w{nxPL
zSCWHb+a>Ethb8k<tmJrJvUaPz{{{farfs;{8Tg^<VKizSHYH@Y%aVFmXEub6$V=CS
z+BBgH7j{?HU)p!d)iHW&P0vS>54_<CUE&wNQfJdlJTUZT>Ckho)aKc#qVDGFzYFa-
zTYN>kbCW~rbJY5c9X|)77bDZxa^Ts!ht?eN&d((H6+_LLFQyqL##>4<hSi<ljwhV>
zbY06kSNLNCXkfqP-Sh!@M7Cw>%aoSrd6~W+hRYCG!M@e?-Xy)EuQ%f;>B7dk)?*LU
zU9a4K{Q%K?TluiPtu0Zx%k<~l9Z~a45Rqq|U=Ac-RR109`6Lp3pV{l)q!@U~`^KeR
zSAj8b&<OUn-ZU5PI5QUgv1dMNoC@EHhJPDgn=tuRkNa!gpr@vumfgRN2b9}{K<18Y
z&O5{1JN!$|u%$g{>KqJwW-318O78nU_k4chPk&uLHZ$&QZ)wn`RGFH~`?jSN4V)$m
zch)`i9S}OWO8tEGd@`D#EX;asB(nd3qAM>t)=uoX(wMY@FelB<@owZ`xHjc-k5;>V
zM!EOnJEL=lBHbp(#<MpRY2#0(J&j!hUoJl`ckiqCCg0<(o&ZPE4;y#7Px60c4fmhR
zEj_+UMQ#p-!&!2<v1QJEvUw8g?qt!i)uHQM!R@Cr?}gRRjL3Sg-i?hDzS){S3A6%o
YVD!U`VEPmI=du5y&03BhEpfN~16~CRF8}}l

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Misc/candy_bowl.rsi/meta.json b/Resources/Textures/Objects/Misc/candy_bowl.rsi/meta.json
new file mode 100644
index 0000000000..2eeaef8169
--- /dev/null
+++ b/Resources/Textures/Objects/Misc/candy_bowl.rsi/meta.json
@@ -0,0 +1,17 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Made by Mercer~Bray#5324 (Discord) for SS14",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "candy_bowl0"
+    },
+    {
+      "name": "candy_bowl1"
+    }
+  ]
+}