Arokha Sieyes d100c30821 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into novearlysync ...

# Conflicts:
#	html/changelogs/.all_changelog.yml
#	icons/mob/hud.dmi
#	maps/polaris-1.dmm

Fake conflicts from a merge error previously. No real conflicts.

2016-11-04 15:42:32 -04:00

..

assistance

Polaris Sync October 9th (#633)

2016-10-09 18:55:29 -04:00

devices

Polaris Sync October 9th (#633)

2016-10-09 18:55:29 -04:00

spells

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into novearlysync

2016-11-04 15:42:32 -04:00

catalog.dm

Another Big Technomancer PR

2016-10-22 11:51:12 -04:00

clothing.dm

Late September Sync (#579)

2016-09-24 14:12:43 -04:00

core_obj.dm

Another Big Technomancer PR

2016-10-22 11:51:12 -04:00

equipment.dm

Another Big Technomancer PR

2016-10-22 11:51:12 -04:00

instability.dm

Polaris Sync October 9th (#633)

2016-10-09 18:55:29 -04:00

presets.dm

Does even more work.

2016-06-23 05:21:04 -04:00

spell_objs_helpers.dm

Another Big Technomancer PR

2016-10-22 11:51:12 -04:00

spell_objs.dm

Another Big Technomancer PR

2016-10-22 11:51:12 -04:00

technomancer.dm

Polaris Sync October 9th (#633)

2016-10-09 18:55:29 -04:00