PsiOmega 83a09faf07 Merge remote-tracking branch 'upstream/dev-freeze' into dev ...

Conflicts:
	code/modules/mob/living/carbon/brain/MMI.dm
	code/modules/projectiles/guns/launcher/crossbow.dm
	code/modules/projectiles/guns/launcher/pneumatic.dm

2015-05-16 22:38:01 +02:00

..

brain_item.dm

Adds Destroys.

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

brain.dm

Adds Destroys.

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

death.dm

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

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

emote.dm

…

life.dm

Chemistry commit

2015-03-25 19:09:10 +03:00

login.dm

…

MMI.dm

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

2015-05-16 22:38:01 +02:00

posibrain.dm

Changed steel material name to a define.

2015-05-12 13:08:41 +09:30

robot.dm

Robots can now be rebuilt after destruction.

2014-11-27 08:58:29 +01:00

say.dm

sanitize() refactor: fourth pass

2015-04-03 00:40:57 +03:00