Cael Aislinn 6c46ceaf6d Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into xenoarchaeology ...

Conflicts:
	icons/obj/hydroponics.dmi

manual merge of conflicted icon file

Signed-off-by: Cael Aislinn <cael_aislinn@yahoo.com.au>

2014-06-19 10:05:27 +10:00

..

genes

human: move organ generation into a species proc

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

dna2_domutcheck.dm

adds new feature: cloning extinct animals and seeds from fossils found through xenoarchaeology, some minor tweaks to various other areas to make it work

2014-05-03 18:30:52 +10: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

…