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

..

aoe_turf

Added vore capabilies to the new simple_animal system.

2017-03-22 19:32:19 -04:00

general

Revert 58ef59734f

2015-11-08 10:09:14 -05:00

targeted

Adds Modifier System, Changes Some Ling Stuff

2017-04-18 21:23:59 -04:00

artifacts.dm

…

construct_spells.dm

…

no_clothes.dm

…

spell_code.dm

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

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

spell_projectile.dm

…

spellbook.dm

Adds Modifier System, Changes Some Ling Stuff

2017-04-18 21:23:59 -04:00

spells.dm

…