PsiOmegaDelta 12078c48e9 Merge remote-tracking branch 'upstream/dev-freeze' into dev ...

Conflicts:
	code/__defines/mobs.dm
	code/game/asteroid.dm
	code/modules/mob/living/carbon/human/human.dm
	code/modules/mob/living/silicon/robot/robot_modules.dm
	code/modules/mob/new_player/preferences_setup.dm
	code/modules/recycling/disposal.dm

2015-12-13 10:47:33 +01:00

..

aoe_turf

Removed turf_animation for now, ported vg hasproximity optimisation. Rewrite and refactor of how turfs handle icon updates, edge smoothing and

2015-08-16 06:05:21 -07:00

general

Limits the number of runes to one per turf.

2015-10-19 12:49:32 +02:00

targeted

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

2015-12-13 10:47:33 +01:00

artifacts.dm

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

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

construct_spells.dm

Removed turf_animation for now, ported vg hasproximity optimisation. Rewrite and refactor of how turfs handle icon updates, edge smoothing and

2015-08-16 06:05:21 -07:00

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

qdel/Destroy entries.

2015-07-21 14:22:01 +02:00