Evan Nydahl 36da5ec848 Resolved many merge conflicts

2021-12-03 13:55:32 -06:00

..

ItemScripts

Resolved many merge conflicts

2021-12-03 13:55:32 -06:00

ObsoleteItems

Gate created and player tagged correctly

2021-12-03 13:17:12 -06:00

Resources

Gate created and player tagged correctly

2021-12-03 13:17:12 -06:00

InventoryManager.cs

Gate created and player tagged correctly

2021-12-03 13:17:12 -06:00

InventoryManager.cs.meta

Gate created and player tagged correctly

2021-12-03 13:17:12 -06:00

Item.cs

Gate created and player tagged correctly

2021-12-03 13:17:12 -06:00

Item.cs.meta

Gate created and player tagged correctly

2021-12-03 13:17:12 -06:00

ItemScripts.meta

Gate created and player tagged correctly

2021-12-03 13:17:12 -06:00

ObsoleteItems.meta

Gate created and player tagged correctly

2021-12-03 13:17:12 -06:00

Resources.meta

Gate created and player tagged correctly

2021-12-03 13:17:12 -06:00

SpecialItem.cs

Gate created and player tagged correctly

2021-12-03 13:17:12 -06:00

SpecialItem.cs.meta

Gate created and player tagged correctly

2021-12-03 13:17:12 -06:00