Add kitchen knife & sliceable foods (#2891)

Browse Source

* sliceable food, kitchen knives

* sprite fixes, sounds

* add to vendor

* address reviews

* address reviews

* stereo -> mono

* fix wrong amount of nutriment being removed

* oops im dumb

* meta.json

* fix merge

* probably fix test

* remove all instances of [ComponentReference(typeof(IAfterInteract))]

Co-authored-by: cyclowns <cyclowns@protonmail.ch>

...

This commit is contained in:

mirrorcult

2021-01-06 18:48:08 -07:00

committed by GitHub

parent a7c4571075

commit 7977992e5a

63 changed files with 597 additions and 301 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

0

Resources/Textures/Objects/Consumable/FoodContainers/apple_cake.rsi/icon.png → Resources/Textures/Objects/Consumable/Food/apple_cake.rsi/icon.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 945 B After Width:  |  Height:  |  Size: 945 B

0

Resources/Textures/Objects/Consumable/FoodContainers/apple_cake.rsi/meta.json → Resources/Textures/Objects/Consumable/Food/apple_cake.rsi/meta.json

0

Resources/Textures/Objects/Consumable/FoodContainers/bananabread.rsi/icon.png → Resources/Textures/Objects/Consumable/Food/bananabread.rsi/icon.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 767 B After Width:  |  Height:  |  Size: 767 B

0

Resources/Textures/Objects/Consumable/FoodContainers/bananabread.rsi/meta.json → Resources/Textures/Objects/Consumable/Food/bananabread.rsi/meta.json

0

Resources/Textures/Objects/Consumable/FoodContainers/birthdaycake.rsi/icon.png → Resources/Textures/Objects/Consumable/Food/birthdaycake.rsi/icon.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 668 B After Width:  |  Height:  |  Size: 668 B

0

Resources/Textures/Objects/Consumable/FoodContainers/birthdaycake.rsi/meta.json → Resources/Textures/Objects/Consumable/Food/birthdaycake.rsi/meta.json

0

Resources/Textures/Objects/Consumable/FoodContainers/braincake.rsi/icon.png → Resources/Textures/Objects/Consumable/Food/braincake.rsi/icon.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 1.3 KiB After Width:  |  Height:  |  Size: 1.3 KiB

0

Resources/Textures/Objects/Consumable/FoodContainers/braincake.rsi/meta.json → Resources/Textures/Objects/Consumable/Food/braincake.rsi/meta.json

0

Resources/Textures/Objects/Consumable/FoodContainers/bread.rsi/icon.png → Resources/Textures/Objects/Consumable/Food/bread.rsi/icon.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 736 B After Width:  |  Height:  |  Size: 736 B

0

Resources/Textures/Objects/Consumable/FoodContainers/bread.rsi/meta.json → Resources/Textures/Objects/Consumable/Food/bread.rsi/meta.json

0

Resources/Textures/Objects/Consumable/FoodContainers/carrotcake.rsi/icon.png → Resources/Textures/Objects/Consumable/Food/carrotcake.rsi/icon.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 919 B After Width:  |  Height:  |  Size: 919 B

0

Resources/Textures/Objects/Consumable/FoodContainers/carrotcake.rsi/meta.json → Resources/Textures/Objects/Consumable/Food/carrotcake.rsi/meta.json

0

Resources/Textures/Objects/Consumable/FoodContainers/cheesecake.rsi/icon.png → Resources/Textures/Objects/Consumable/Food/cheesecake.rsi/icon.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 904 B After Width:  |  Height:  |  Size: 904 B

0

Resources/Textures/Objects/Consumable/FoodContainers/cheesecake.rsi/meta.json → Resources/Textures/Objects/Consumable/Food/cheesecake.rsi/meta.json

0

Resources/Textures/Objects/Consumable/FoodContainers/cheesewheel.rsi/icon.png → Resources/Textures/Objects/Consumable/Food/cheesewheel.rsi/icon.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 646 B After Width:  |  Height:  |  Size: 646 B

0

Resources/Textures/Objects/Consumable/FoodContainers/cheesewheel.rsi/meta.json → Resources/Textures/Objects/Consumable/Food/cheesewheel.rsi/meta.json

0

Resources/Textures/Objects/Consumable/FoodContainers/chocolatecake.rsi/icon.png → Resources/Textures/Objects/Consumable/Food/chocolatecake.rsi/icon.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 755 B After Width:  |  Height:  |  Size: 755 B

0

Resources/Textures/Objects/Consumable/FoodContainers/chocolatecake.rsi/meta.json → Resources/Textures/Objects/Consumable/Food/chocolatecake.rsi/meta.json

0

Resources/Textures/Objects/Consumable/FoodContainers/creamcheesebread.rsi/icon.png → Resources/Textures/Objects/Consumable/Food/creamcheesebread.rsi/icon.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 917 B After Width:  |  Height:  |  Size: 917 B

0

Resources/Textures/Objects/Consumable/FoodContainers/creamcheesebread.rsi/meta.json → Resources/Textures/Objects/Consumable/Food/creamcheesebread.rsi/meta.json

0

Resources/Textures/Objects/Consumable/FoodContainers/lemoncake.rsi/icon.png → Resources/Textures/Objects/Consumable/Food/lemoncake.rsi/icon.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 923 B After Width:  |  Height:  |  Size: 923 B

0

Resources/Textures/Objects/Consumable/FoodContainers/lemoncake.rsi/meta.json → Resources/Textures/Objects/Consumable/Food/lemoncake.rsi/meta.json

0

Resources/Textures/Objects/Consumable/FoodContainers/limecake.rsi/icon.png → Resources/Textures/Objects/Consumable/Food/limecake.rsi/icon.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 947 B After Width:  |  Height:  |  Size: 947 B

0

Resources/Textures/Objects/Consumable/FoodContainers/limecake.rsi/meta.json → Resources/Textures/Objects/Consumable/Food/limecake.rsi/meta.json

0

Resources/Textures/Objects/Consumable/FoodContainers/meatbread.rsi/icon.png → Resources/Textures/Objects/Consumable/Food/meatbread.rsi/icon.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 1009 B After Width:  |  Height:  |  Size: 1009 B

0

Resources/Textures/Objects/Consumable/FoodContainers/meatbread.rsi/meta.json → Resources/Textures/Objects/Consumable/Food/meatbread.rsi/meta.json

0

Resources/Textures/Objects/Consumable/FoodContainers/meatpizza.rsi/icon.png → Resources/Textures/Objects/Consumable/Food/meatpizza.rsi/icon.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 906 B After Width:  |  Height:  |  Size: 906 B

0

Resources/Textures/Objects/Consumable/FoodContainers/meatpizza.rsi/meta.json → Resources/Textures/Objects/Consumable/Food/meatpizza.rsi/meta.json

0

Resources/Textures/Objects/Consumable/FoodContainers/mushroompizza.rsi/icon.png → Resources/Textures/Objects/Consumable/Food/mushroompizza.rsi/icon.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 767 B After Width:  |  Height:  |  Size: 767 B

0

Resources/Textures/Objects/Consumable/FoodContainers/mushroompizza.rsi/meta.json → Resources/Textures/Objects/Consumable/Food/mushroompizza.rsi/meta.json

0

Resources/Textures/Objects/Consumable/FoodContainers/orangecake.rsi/icon.png → Resources/Textures/Objects/Consumable/Food/orangecake.rsi/icon.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 887 B After Width:  |  Height:  |  Size: 887 B

0

Resources/Textures/Objects/Consumable/FoodContainers/orangecake.rsi/meta.json → Resources/Textures/Objects/Consumable/Food/orangecake.rsi/meta.json

0

Resources/Textures/Objects/Consumable/FoodContainers/pizzamargherita.rsi/icon.png → Resources/Textures/Objects/Consumable/Food/pizzamargherita.rsi/icon.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 721 B After Width:  |  Height:  |  Size: 721 B

0

Resources/Textures/Objects/Consumable/FoodContainers/pizzamargherita.rsi/meta.json → Resources/Textures/Objects/Consumable/Food/pizzamargherita.rsi/meta.json

0

Resources/Textures/Objects/Consumable/FoodContainers/plaincake.rsi/icon.png → Resources/Textures/Objects/Consumable/Food/plaincake.rsi/icon.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 974 B After Width:  |  Height:  |  Size: 974 B

0

Resources/Textures/Objects/Consumable/FoodContainers/plaincake.rsi/meta.json → Resources/Textures/Objects/Consumable/Food/plaincake.rsi/meta.json

0

Resources/Textures/Objects/Consumable/FoodContainers/pumpkinpie.rsi/icon.png → Resources/Textures/Objects/Consumable/Food/pumpkinpie.rsi/icon.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 785 B After Width:  |  Height:  |  Size: 785 B

0

Resources/Textures/Objects/Consumable/FoodContainers/pumpkinpie.rsi/inhand-left.png → Resources/Textures/Objects/Consumable/Food/pumpkinpie.rsi/inhand-left.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 347 B After Width:  |  Height:  |  Size: 347 B

0

Resources/Textures/Objects/Consumable/FoodContainers/pumpkinpie.rsi/inhand-right.png → Resources/Textures/Objects/Consumable/Food/pumpkinpie.rsi/inhand-right.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 340 B After Width:  |  Height:  |  Size: 340 B

0

Resources/Textures/Objects/Consumable/FoodContainers/pumpkinpie.rsi/meta.json → Resources/Textures/Objects/Consumable/Food/pumpkinpie.rsi/meta.json

0

Resources/Textures/Objects/Consumable/FoodContainers/tofubread.rsi/icon.png → Resources/Textures/Objects/Consumable/Food/tofubread.rsi/icon.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 949 B After Width:  |  Height:  |  Size: 949 B

0

Resources/Textures/Objects/Consumable/FoodContainers/tofubread.rsi/meta.json → Resources/Textures/Objects/Consumable/Food/tofubread.rsi/meta.json

0

Resources/Textures/Objects/Consumable/FoodContainers/vegetablepizza.rsi/icon.png → Resources/Textures/Objects/Consumable/Food/vegetablepizza.rsi/icon.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 892 B After Width:  |  Height:  |  Size: 892 B

0

Resources/Textures/Objects/Consumable/FoodContainers/vegetablepizza.rsi/meta.json → Resources/Textures/Objects/Consumable/Food/vegetablepizza.rsi/meta.json

0

Resources/Textures/Objects/Consumable/FoodContainers/xenomeatbread.rsi/icon.png → Resources/Textures/Objects/Consumable/Food/xenomeatbread.rsi/icon.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 1012 B After Width:  |  Height:  |  Size: 1012 B

0

Resources/Textures/Objects/Consumable/FoodContainers/xenomeatbread.rsi/meta.json → Resources/Textures/Objects/Consumable/Food/xenomeatbread.rsi/meta.json