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

..

Cleanable

Adds Destroys.

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

posters

Adds 7 new posters.

2015-03-06 21:14:32 -06:00

cleanable.dm

Updates bots to be mobs. Several changes.

2015-04-26 15:30:11 +03:00

contraband.dm

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

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

crayon.dm

All the relevant examine changes.

2014-11-05 12:44:23 +01:00

misc.dm

All the relevant examine changes.

2014-11-05 12:44:23 +01:00

remains.dm

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

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

warning_stripes.dm

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

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