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

..

effects

Merge branch 'dev' into ofBotsAndMobs

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

items

Merge branch 'dev' into ofBotsAndMobs

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

random

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

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

structures

Merge pull request #8875 from PsiOmegaDelta/TheSummoning

2015-04-26 22:14:07 +09:30

buckling.dm

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

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

empulse.dm

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

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

explosion_recursive.dm

…

explosion.dm

Wireless Wires Bug Removal

2015-01-01 17:20:21 +01:00

items.dm

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

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

objs.dm

Refactors NanoUI interaction (again)

2015-04-10 11:19:38 +02:00

structures.dm

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

2015-04-24 17:13:37 +02:00

weapons.dm

…