Chinsky 7f4388c5a3 Cleaned the fuck out of smoke. ...

Conflicts:
	code/ATMOSPHERICS/pipes.dm
	code/game/objects/effects/effect_system.dm
	code/modules/mob/living/carbon/monkey/life.dm
	code/modules/organs/organ_external.dm

2014-04-03 18:18:04 +02:00

..

amorph

Cleaned the fuck out of smoke.

2014-04-03 18:18:04 +02:00

MedicalSideEffects.dm

Organ lag fixes

2013-11-08 09:50:34 -05:00

meme.dm

Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into guntest

2013-01-31 14:26:58 -08:00