Mloc-Argent 31d1307ed2 Merge branch 'master' into dev ...

Conflicts:
	code/modules/virus2/effect.dm

2013-08-20 21:57:01 +01:00

..

analyser.dm

Medical record viral DB now should list scanned virus2 stamms.

2013-06-28 23:57:16 +04:00

antibodies.dm

Virus2 Refactoring, Part I - Machinery.

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

biohazard destroyer.dm

Moved virus2 out of WIP folder.

2013-06-08 13:00:37 +04: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

PDAs can be used when buckled (and not in any other way restrained or stunned). Rejuvenate now completely heals a target or broken organs and viruses too.

2013-08-11 17:13:58 +01:00

diseasesplicer.dm

Fixes for virology machinery.

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

dishincubator.dm

Fixes for virology machinery.

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

effect.dm

Merge branch 'master' into dev

2013-08-20 21:57:01 +01:00

helpers.dm

Changes way viruses are stored in mobs.

2013-06-19 02:28:53 +04:00

isolator.dm

Changes way viruses are stored in mobs.

2013-06-19 02:28:53 +04:00

items_devices.dm

Fix for #3430.

2013-08-05 03:06:31 +03:00