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 0000000000..97424c9340 Binary files /dev/null and b/Resources/Textures/Objects/Misc/candy_bowl.rsi/candy_bowl0.png differ 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 0000000000..c4ad0910a6 Binary files /dev/null and b/Resources/Textures/Objects/Misc/candy_bowl.rsi/candy_bowl1.png differ 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" + } + ] +}