GinjaNinja32 631ff21980 Merge remote-tracking branch 'upstream/dev-freeze' into dev ...

Conflicts:
	code/game/gamemodes/cult/runes.dm
	code/game/objects/items/weapons/implants/implantcase.dm
	code/game/objects/items/weapons/melee/energy.dm
	code/modules/mob/living/carbon/human/emote.dm
	code/modules/mob/living/carbon/human/human.dm
	code/modules/mob/living/carbon/human/human_attackhand.dm
	code/modules/mob/living/silicon/robot/drone/drone.dm
	code/modules/mob/living/silicon/robot/emote.dm
	code/modules/mob/living/silicon/robot/robot.dm
	code/modules/nano/modules/crew_monitor.dm
	code/modules/organs/organ_internal.dm

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

..

aoe_turf

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

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

general

Ports /vg/'s spell system for the sake of cult porting.

2015-04-09 20:08:06 +02:00

targeted

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

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

artifacts.dm

Makes file use user and not usr

2015-06-05 19:04:11 +01:00

construct_spells.dm

Ports /vg/'s spell system for the sake of cult porting.

2015-04-09 20:08:06 +02:00

no_clothes.dm

Ports /vg/'s spell system for the sake of cult porting.

2015-04-09 20:08:06 +02:00

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/dev-freeze' into dev

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

spells.dm

qdel/Destroy entries.

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