PsiOmegaDelta 5fbe0819b7 Merge remote-tracking branch 'upstream/dev' into 150722-TagPairs ...

Conflicts:
	code/game/machinery/Sleeper.dm

2015-08-17 13:05:58 +02:00

..

genes

Base Life-addition()

2015-06-13 13:36:08 +02:00

dna2_domutcheck.dm

…

dna2_helpers.dm

Should fix the head and hair issues from the organ rewrite.

2015-04-03 05:41:33 -07:00

dna2.dm

Refactored gibbing and slipping for carbon mobs, entirely removed mutantrace var. This commit is only partial, following commits are contiguous to it (lol this is atomic right)

2014-12-23 17:38:05 +10:30

dna_modifier.dm

Merge remote-tracking branch 'upstream/dev' into 150722-TagPairs

2015-08-17 13:05:58 +02:00

dna.dm

…