Leshana b5cf8383f6 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into vplk-sync-2018-04-14 ...

# Conflicts:
#	code/game/machinery/jukebox.dm
#	code/modules/economy/lorenews.dm
#	code/modules/mob/living/carbon/human/update_icons.dm

2018-04-15 14:19:36 -04:00

..

aoe_turf

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into vplk-sync-2018-04-14

2018-04-15 14:19:36 -04:00

general

…

targeted

Constructs 2.0 - Living Stone (#5040)

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

artifacts.dm

…

construct_spells.dm

Constructs 2.0 - Living Stone (#5040)

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

no_clothes.dm

…

spell_code.dm

It's CentCOM not CentCOMM

2017-07-21 04:29:39 -04:00

spell_projectile.dm

Removes the datum pool, as it is not performant.

2017-05-04 01:58:33 -04:00

spellbook.dm

Adds Modifier System, Changes Some Ling Stuff

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

spells.dm

…