Rob Nelson dc60cc1726 DNA modifiers work now. ...

Conflicts:
	code/defines/obj/hydro.dm
	code/game/machinery/cloning.dm
	code/game/machinery/hydroponics.dm
	code/modules/mob/living/carbon/zombie/zombie.dm
	code/modules/mob/transform_procs.dm

2014-01-20 00:54:46 -05:00

..

obj

DNA modifiers work now.

2014-01-20 00:54:46 -05:00

procs

Merge branch 'incremental_tg' r5514 (11/1/2013) into bs12_with_tgport

2013-01-11 22:12:31 +10:00

obj.dm

Ninja / CentComm changes

2014-01-18 00:34:24 -05:00

vox_sounds.dm

Add "or" and "vampire(s)" to VOX.

2014-01-05 19:15:50 -05:00