GinjaNinja32 681a6d21ea Merge remote-tracking branch 'upstream/dev' into ! ...

Conflicts:
	code/modules/mob/hear_say.dm

2014-12-08 15:32:49 +00:00

..

brain_item.dm

All the relevant examine changes.

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

brain.dm

Fancy ghosts!

2013-10-06 16:10:47 +04:00

death.dm

Amendments to previous commit.

2014-12-08 03:29:03 +10:30

emote.dm

Allow all mobs to emote. Standardising emote proc.

2013-08-20 10:38:57 +01:00

life.dm

Fixes #5946 and cuts down on duplicate code across Life() procs.

2014-08-11 10:42:32 +02:00

login.dm

Fixes #5531

2014-07-14 12:41:10 +09:30

MMI.dm

Updates the posibrain path on map.

2014-11-27 09:12:42 +01:00

posibrain.dm

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

2014-11-30 10:47:36 +01:00

robot.dm

Robots can now be rebuilt after destruction.

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

say.dm

Noise emotes

2014-12-07 12:09:02 +00:00