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

..

reagent_containers

Merge branch 'master' into dev

2013-11-04 10:46:13 +00:00

Chemistry-Colours.dm

…

Chemistry-Holder.dm

Overdose added. Most chemicals over 30 units now cause constant toxic damage. Alcohol tweaked, excessive alcohol is poisonous. Chemistry-Reagents reorganized. Side effects removed. All toxins moved to toxins parent.

2013-09-01 21:23:37 +01:00

Chemistry-Machinery.dm

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

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

Chemistry-Readme.dm

…

Chemistry-Reagents-Antidepressants.dm

Fixed paroxetine.

2013-02-25 18:40:42 +01:00

Chemistry-Reagents.dm

And fix so Space Cola shows up too.

2013-11-23 01:50:17 -06:00

Chemistry-Recipes.dm

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

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

dartgun.dm

Smallfix.

2013-10-17 04:00:33 +03:00

grenade_launcher.dm

…

reagent_containers.dm

…

reagent_dispenser.dm

Fuel tanks uses explode() proc.

2013-09-02 16:10:43 +01:00

syringe_gun.dm

Standardises logging. All attack logs now print in main logs. Added stripping and syringe logging. Added Jump commands to most attack logs.

2013-08-28 03:33:04 +01:00