6 commits

Author	SHA1	Message	Date
Logan	c9c38d74e1	Auto stash before merge of "master" and "origin/master"	2020-07-18 18:52:15 -05:00
Logan	48833be3b5	Rudimentary inventory system	2020-07-18 15:58:23 -05:00
Logan	44bca26d88	Color pallete changes	2020-07-18 12:21:05 -05:00
Logan	a3a1faa0ab	edited art	2020-07-18 11:02:40 -05:00
Logan	39157a605e	Retextured UI	2020-07-18 00:07:44 -05:00
Logan	4e42e3eb2c	UI works	2020-07-17 19:18:59 -05:00