Arokha Sieyes 055c998f82 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-sync ...

# Conflicts:
#	code/modules/integrated_electronics/subtypes/reagents.dm
#	code/modules/mob/living/carbon/human/species/station/station.dm
#	code/modules/organs/organ_external.dm
#	code/modules/ventcrawl/ventcrawl.dm
#	html/changelogs/.all_changelog.yml

2017-04-25 15:04:54 -04:00

..

assistance

Technomancer changes

2016-11-17 20:11:21 -06:00

devices

Does tons of stuff, see PR for details.

2017-01-25 19:31:21 -05:00

spells

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-sync

2017-04-25 15:04:54 -04:00

catalog.dm

Technomancer changes

2016-11-17 20:11:21 -06:00

clothing.dm

Late September Sync (#579)

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

core_obj.dm

Technomancer changes

2016-11-17 20:11:21 -06:00

equipment.dm

Another Big Technomancer PR

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

instability.dm

Reworks empulse and emp_act

2017-03-05 12:22:45 -06:00

presets.dm

Does even more work.

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

spell_objs_helpers.dm

Ports a large chunk of the map datum system that europa/bay uses.

2017-02-27 07:36:41 -05:00

spell_objs.dm

Technomancer changes

2016-11-17 20:11:21 -06:00

technomancer.dm

Polaris Sync October 9th (#633)

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