Erthilo 8e72965077 Merge branch 'master' of github.com:Baystation12/Baystation12 into TGUpdates ...

Conflicts:
	code/game/objects/items/weapons/cigs_lighters.dm
	code/game/objects/items/weapons/grenades.dm
	code/game/objects/items/weapons/implants/implant.dm
	code/game/objects/radio/headset.dm
	code/game/objects/radio/radio.dm
	code/modules/assembly/assembly.dm
	code/modules/assembly/holder.dm
	code/modules/clothing/glasses.dm
	code/modules/mob/living/silicon/robot/robot_modules.dm
	code/modules/paperwork/paper.dm
	code/modules/research/circuitprinter.dm
	code/modules/research/protolathe.dm
	icons/mob/suit.dmi

2012-05-31 15:09:35 +01:00

..

analyser.dm

TG update: Ammend to the last commit, a few files were left out.

2011-12-27 00:15:01 +02:00

antibodies.dm

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

2012-05-31 15:09:35 +01:00

base.dm

Disease changes.

2012-05-25 19:11:26 +02:00

biohazard destroyer.dm

TG update: Ammend to the last commit, a few files were left out.

2011-12-27 00:15:01 +02:00

cureimplanter.dm

TG: toxloss is now only referenced via procs. r2875

2012-03-26 23:23:46 +01:00

curer.dm

Fixed an issue with the cure research machine and a few other virus related glitches.

2012-01-05 17:39:33 -08:00

diseasesplicer.dm

disease splicer runtime fix

2012-02-29 13:23:26 +10:30

dishincubator.dm

TG update: Ammend to the last commit, a few files were left out.

2011-12-27 00:15:01 +02:00

isolator.dm

Fix for labeling virus dishes. Removed health analyzer from first-aid kit.

2012-03-15 21:46:11 +00:00

monkeydispensor.dm

TG update: Ammend to the last commit, a few files were left out.

2011-12-27 00:15:01 +02:00

Prob.dm

Just some general cleanup

2011-07-31 21:31:00 +00:00