Markolie 0db6c7cb19 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into randomfixes ...

# Conflicts:
#	code/game/machinery/cryo.dm

2016-11-10 17:56:14 +01:00

..

genes

Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into randomfixes

2016-11-10 17:56:14 +01:00

dna2_domutcheck.dm

Fixes gene de-activation not always working, removes deprecated genetics define.

2016-08-18 14:41:20 -04:00

dna2_helpers.dm

More Conflict Resolution

2016-09-03 21:29:10 -04:00

dna2.dm

Conflict resolution again

2016-08-19 01:08:08 -04:00

dna_modifier.dm

Ports over the status effect unification

2016-10-23 15:45:35 -07:00