PsiOmega 173f0527eb Merge remote-tracking branch 'upstream/master' into dev-freeze ...

Conflicts:
	code/modules/mob/living/carbon/human/life.dm
	code/modules/nano/nanomanager.dm
	code/modules/surgery/surgery.dm

2015-03-05 08:05:44 +01:00

..

dmm_suite.dm

Fixes #8334.

2015-03-02 11:42:40 +01:00

fromdmp.dm

…

reader.dm

* Made the preloader independant of the called New().

2014-12-23 23:47:30 +01:00

swapmaps.dm

…

writer.dm

…