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

..

antagonist

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

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

area

Merge pull request #8855 from comma/soundenv

2015-04-23 17:04:30 +09:30

dna

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

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

gamemodes

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

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

jobs

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

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

machinery

Merge branch 'dev' into ofBotsAndMobs

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

magic

…

mecha

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

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

objects

Merge branch 'dev' into ofBotsAndMobs

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

turfs

Adds Destroys.

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

vehicles

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

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

verbs

Merge pull request #8380 from volas/sanitize_procs

2015-03-29 00:57:33 +10:30

asteroid.dm

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

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

atoms_movable.dm

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

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

atoms.dm

Adds Destroys.

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

json.dm

…

periodic_news.dm

…

response_team.dm

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

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

shuttle_engines.dm

…

skincmd.dm

…

smoothwall.dm

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

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

socket_talk.dm

…

sound.dm

Areas can now set their sound environments. Default is still 2 (room). For now only hallways and asteroid areas have different ones (hallway and stoneroom respectively)

2015-03-23 03:31:22 +03:00

supplyshuttle.dm

Adds Destroys.

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