Bringing over my decals#1

willowzeta wants to merge 2 commits intofunky-station:masterfunky-station/forky-station:masterfrom

willowzeta:funky-decalswillowzeta/worky-wation:funky-decalsCopy head branch name to clipboard