Rob Nelson db21525feb SAY HELO TO DNA2, N3X15'S AWFUL FUCKING RECODE OF DNA ...

Conflicts:
	baystation12.dme
	code/game/gamemodes/setupgame.dm
	code/game/objects/items/weapons/dna_injector.dm
	code/modules/mob/living/carbon/human/human.dm
	code/modules/mob/living/carbon/human/human_defines.dm
	code/modules/mob/new_player/new_player.dm

2014-01-20 00:43:19 -05:00

..

analyser.dm

Expansion of every "icon = ''" path.

2013-09-01 21:53:36 +01:00

antibodies.dm

Virus2 Refactoring, Part I - Machinery.

2013-06-08 17:36:12 +04:00

biohazard destroyer.dm

Expansion of every "icon = ''" path.

2013-09-01 21:53:36 +01:00

centrifuge.dm

Fixes for virology machinery.

2013-08-06 11:59:50 +01:00

curer.dm

Fixed runtime in blood transfer.

2013-06-09 16:30:22 +04:00

disease2.dm

Vampire commit 2

2013-12-14 05:19:54 -05:00

diseasesplicer.dm

Expansion of every "icon = ''" path.

2013-09-01 21:53:36 +01:00

dishincubator.dm

Expansion of every "icon = ''" path.

2013-09-01 21:53:36 +01:00

effect.dm

SAY HELO TO DNA2, N3X15'S AWFUL FUCKING RECODE OF DNA

2014-01-20 00:43:19 -05:00

helpers.dm

Code Fixes

2013-11-04 19:47:34 -05:00

isolator.dm

poop syndrome in disease and disease2

2013-09-25 06:48:59 -04:00

items_devices.dm

Pretty much all new click code

2013-10-12 14:44:36 -04:00