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

..

decals

Merge branch 'dev' into ofBotsAndMobs

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

spawners

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

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

aliens.dm

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

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

bump_teleporter.dm

Adds Destroys.

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

chemsmoke.dm

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

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

effect_system.dm

Adds Destroys.

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

explosion_particles.dm

Another pass at WIP folder

2015-02-03 12:14:13 +03:00

gibs.dm

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

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

glowshroom.dm

Renamed some files, did some path replacements

2015-02-04 10:48:18 +10:30

landmarks.dm

Adds Destroys.

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

manifest.dm

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

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

mines.dm

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

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

misc.dm

…

overlays.dm

Adds Destroys.

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

portals.dm

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

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

spiders.dm

Adds Destroys.

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

step_triggers.dm

refactor 'dir = ' into 'set_dir()'

2014-12-01 13:44:02 +00:00