Janitor trashbag upgrade + FANCY ANIMATIONS (#3058)

Browse Source

* Janitor trashbag upgrade + FANCY ANIMATIONS

* Review, Bug fixes and Sounds
- Fixed hand-pickup animation playing if the entity originated from inside a container (e.g. bag on the ground) or from inside ourselves (e.g. something in our own inventory)

* Fix/Change. Just log if AnimateEntityPickup is called with an entity that has no SpriteComponent.

* More explicit log message. Error log.

* Merge. Fix.

...

This commit is contained in:

Remie Richards

2021-02-03 22:07:13 +00:00

committed by GitHub

parent 861271ea44

commit d45835e863

21 changed files with 309 additions and 23 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/Trash/trashbag.rsi/icon-0.png → Resources/Textures/Objects/Specific/Janitorial/trashbag.rsi/icon-0.png

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

0

Resources/Textures/Objects/Consumable/Trash/trashbag.rsi/icon-1.png → Resources/Textures/Objects/Specific/Janitorial/trashbag.rsi/icon-1.png

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

0

Resources/Textures/Objects/Consumable/Trash/trashbag.rsi/icon-2.png → Resources/Textures/Objects/Specific/Janitorial/trashbag.rsi/icon-2.png

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

0

Resources/Textures/Objects/Consumable/Trash/trashbag.rsi/icon-3.png → Resources/Textures/Objects/Specific/Janitorial/trashbag.rsi/icon-3.png

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

0

Resources/Textures/Objects/Consumable/Trash/trashbag.rsi/icon.png → Resources/Textures/Objects/Specific/Janitorial/trashbag.rsi/icon.png

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

0

Resources/Textures/Objects/Consumable/Trash/trashbag.rsi/meta.json → Resources/Textures/Objects/Specific/Janitorial/trashbag.rsi/meta.json