Kelenius b7a628d53d Merge branch 'dev' into ofBotsAndMobs ...

Conflicts:
	code/game/machinery/bots/cleanbot.dm
	code/game/machinery/bots/ed209bot.dm
	code/game/machinery/bots/farmbot.dm
	code/game/machinery/bots/floorbot.dm
	code/game/machinery/bots/medbot.dm
	code/game/machinery/bots/secbot.dm
	code/game/objects/items/robot/robot_parts.dm

2015-04-26 17:18:20 +03:00

..

aoe_turf

Merge branch 'dev' into ofBotsAndMobs

2015-04-26 17:18:20 +03:00

general

…

targeted

Adds Destroys.

2015-04-24 17:11:14 +02:00

artifacts.dm

…

construct_spells.dm

…

no_clothes.dm

…

spell_code.dm

Updates the atom_pool, now datum_pool, to handle any datum object.

2015-04-24 09:59:05 +02:00

spell_projectile.dm

…

spellbook.dm

…

spells.dm

…