Mloc 503302dae5 Merge branch 'master' of github.com:Baystation12/Baystation12 into dev-freeze ...

Conflicts:
	code/game/objects/items/weapons/implants/implant.dm
	code/modules/reagents/Chemistry-Machinery.dm

2013-11-24 23:37:09 +00:00

..

amorph

Cleaned the fuck out of smoke.

2013-11-05 02:57:23 +04:00

MedicalSideEffects.dm

Caches side effect types to a global list, less loops on addition.

2013-11-08 03:18:25 +04:00

meme.dm

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

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