Mloc-Argent ee2e68960a Merge remote-tracking branch 'upstream/master' into dev-freeze ...

Signed-off-by: Mloc-Argent <colmohici@gmail.com>

Conflicts:
	code/game/machinery/cloning.dm
	code/modules/admin/admin_verbs.dm

2014-05-31 00:17:56 +01:00

..

genes

human: move organ generation into a species proc

2014-04-18 10:44:21 +01:00

dna2_domutcheck.dm

DNA2 Bug Fixes - Part 2 (CHERRY PICK)

2014-02-10 22:46:28 -06:00

dna2_helpers.dm

Initial commit containing all the necessary code files that allow Tajaran, Unathi, and Skrell to change both their hair and body color to match. NO MORE GREEN/GREY!

2014-04-27 01:00:16 -06:00

dna2.dm

Initial commit containing all the necessary code files that allow Tajaran, Unathi, and Skrell to change both their hair and body color to match. NO MORE GREEN/GREY!

2014-04-27 01:00:16 -06:00

dna_misc.dm

…

dna_modifier.dm

Merge pull request #5067 from zekesulastin/langauges-again

2014-05-26 23:17:52 +09:30

dna.dm

…