Erthilo 3b61ba850f Merge branch 'master' of git://github.com/Baystation12/Baystation12 into dev ...

Conflicts:
	baystation12.dme
	code/modules/projectiles/ammunition/bullets.dm

2013-09-02 23:32:33 +01: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

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

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

Merge pull request #3572 from Baystation12/master

2013-08-22 23:01:15 -07:00

helpers.dm

Changes way viruses are stored in mobs.

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

isolator.dm

Expansion of every "icon = ''" path.

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

items_devices.dm

Expansion of every "icon = ''" path.

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