Spades 1338225afa Resolves some merge conflicts

2019-01-05 16:29:19 -05:00

..

assistance

Merges AI Branch into Master

2018-12-01 00:06:38 -05:00

devices

Fixes 'varient'

2018-01-08 16:42:20 -05:00

spells

Resolves some merge conflicts

2019-01-05 16:29:19 -05:00

catalog.dm

…

clothing.dm

…

core_obj.dm

Merges AI Branch into Master

2018-12-01 00:06:38 -05:00

equipment.dm

…

instability.dm

Fixes Borg Lighting Conflicts

2017-09-15 21:21:27 -04:00

presets.dm

…

spell_objs_helpers.dm

Merges AI Branch into Master

2018-12-01 00:06:38 -05:00

spell_objs.dm

Constructs 2.0 - Living Stone (#5040)

2018-04-04 23:45:00 -07:00

technomancer.dm

…