Lo6a4evskiy 2eeaec6168 Merge remote-tracking branch 'upstream/master' into Food_cart ...

Conflicts:
	_maps/map_files/TgStation/tgstation.2.1.3.dmm

2015-01-22 12:55:01 +04:00

..

Chemistry-Reagents

-capitalizes Ephedrine in sleepers

2015-01-20 23:21:11 -06:00

reagent_containers

-adds mannitol to braincake and brainburgers

2015-01-21 11:49:55 -06:00

Chemistry-Colours.dm

…

Chemistry-Goon-420BlazeIt.dm

Goon Chemistry: Addiction and Overdosing

2015-01-18 21:50:54 -08:00

Chemistry-Goon-Medicine.dm

fixes a single error w/ overdosing

2015-01-20 23:24:29 -06:00

Chemistry-Goon-Other.dm

whoops

2015-01-18 22:19:21 -08:00

Chemistry-Goon-Pyrotechnics.dm

final commit hopefully, adds some //s back

2015-01-20 23:34:02 -06:00

Chemistry-Goon-Readme.dm

Goon Chemistry Commit 3: Pyrotechnics and other changes

2015-01-11 08:49:09 -08:00

Chemistry-Goon-Toxins.dm

temporarily adds charcoal to the itching powder formula

2015-01-21 11:58:34 -06:00

Chemistry-Holder.dm

Goon Chemistry: Addiction and Overdosing

2015-01-18 21:50:54 -08:00

Chemistry-Machinery.dm

Goon Chemistry: Addiction and Overdosing

2015-01-18 21:50:54 -08:00

Chemistry-Readme.dm

…

Chemistry-Recipes.dm

-capitalizes Ephedrine in sleepers

2015-01-20 23:21:11 -06:00

grenade_launcher.dm

in order to help doctors keep up, since they now need a lot more to heal people, the nanomeds have been stocked with a lot of extra stuff.

2015-01-20 22:26:13 -06:00

reagent_containers.dm

Make reagent_container/New take a volume argument

2015-01-22 12:34:17 +04:00

reagent_dispenser.dm

fixes disabler beams exploding fuel tanks

2014-12-28 03:15:26 -08:00

syringe_gun.dm

Change examine() from an atom verb to a mob verb

2014-05-01 09:56:39 -07:00