Ccomp5950 98fba3b6b0 Merge branch 'master' of github.com:Baystation12/Baystation12 into dev ...

Conflicts:
	code/modules/mining/machine_processing.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/living/silicon/ai/ai.dm
	code/modules/virus2/helpers.dm

2014-03-18 19:44:19 -05:00

..

analyser.dm

Effeciency Project: APC / Machinery power usage.

2014-03-08 03:42:44 -06: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

Effeciency Project: APC / Machinery power usage.

2014-03-08 03:42:44 -06:00

curer.dm

Fixed runtime in blood transfer.

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

disease2.dm

Code effeciency project: HUD items rewrite

2014-03-10 21:59:58 -05:00

diseasesplicer.dm

Splicing virus changes it's unique ID.

2014-03-12 18:39:51 +04:00

dishincubator.dm

Expansion of every "icon = ''" path.

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

effect.dm

Changed sneezing to spread viruses like cough, but only in front of the mob.

2014-03-10 17:12:50 +04:00

helpers.dm

Merge branch 'master' of github.com:Baystation12/Baystation12 into dev

2014-03-18 19:44:19 -05:00

isolator.dm

Expansion of every "icon = ''" path.

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

items_devices.dm

Massive click code rework by SuperSayu, ported from TG.

2013-10-08 20:27:39 +01:00