PsiOmega 807e7bf954 Merge remote-tracking branch 'upstream/master' into dev-freeze ...

Conflicts:
	code/modules/mob/living/carbon/human/life.dm
	code/modules/spells/artifacts.dm

2015-09-27 13:36:56 +02:00

..

aoe_turf

Merge remote-tracking branch 'upstream/dev-freeze' into dev

2015-08-11 18:47:05 +01:00

general

…

targeted

Merge remote-tracking branch 'upstream/dev-freeze' into dev

2015-08-11 18:47:05 +01:00

artifacts.dm

Merge remote-tracking branch 'upstream/master' into dev-freeze

2015-09-27 13:36:56 +02:00

construct_spells.dm

…

no_clothes.dm

…

spell_code.dm

Misc.

2015-08-11 17:33:03 +02:00

spell_projectile.dm

Fixes #10410. Fixes #10411.

2015-08-11 13:36:56 +02:00

spellbook.dm

Merge remote-tracking branch 'upstream/master' into dev-freeze

2015-08-14 08:34:42 +02:00

spells.dm

…