Chinsky 5b168c8e4b Merge branch 'dev-freeze' into dev ...

Conflicts:
	icons/obj/ammo.dmi

2013-11-30 05:15:22 +04:00

..

reagent_containers

Adds tofurkey and stuffing food items

2013-11-28 03:45:13 -06: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

Merge branch 'dev-freeze' into dev

2013-11-30 05:15:22 +04:00

Chemistry-Recipes.dm

Sleeper Addition, Chemical Rebalance 2

2013-11-14 19:11:31 -05:00

dartgun.dm

Smallfix.

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

grenade_launcher.dm

…

reagent_containers.dm

Committing suomynonAyletamitlU's storage item standardisation commit: http://forums.nanotrasen.com/viewtopic.php?f=16&t=11746

2013-01-08 19:11:56 +00:00

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