xxalpha e0f2b93089 Merge remote-tracking branch 'upstream/master' into smoothballs ...

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

2015-07-09 02:40:21 +01:00

..

Chemistry-Reagents

Repathed carpet, and other shit I forgot.

2015-07-07 23:01:13 +01:00

Chemistry-Recipes

Merge pull request #10173 from Incoming5643/coding_stupid_shit_is_my_antidrug

2015-06-28 18:01:30 -05:00

reagent_containers

Merge pull request #10373 from kingofkosmos/beakerdrink

2015-07-08 13:06:15 +02:00

Chemistry-Colours.dm

Ports /vg/ chem weighted colour averaging

2015-05-12 23:55:35 +01:00

Chemistry-Holder.dm

Lots of work on acids, smoke, foam, reagents reaction() proc.

2015-06-22 00:35:24 +02:00

Chemistry-Machinery.dm

Merge pull request #9466 from Fayrik/TheNanoing

2015-06-22 14:24:20 +02:00

Chemistry-Readme.dm

Reorganizing the reagents files. Goon chems are no longer in separate files.

2015-04-16 22:07:24 +02:00

Chemistry-Reagents.dm

- Foam/moke lifetime is no longer affected by reagents volume.

2015-06-24 20:58:22 +02:00

Chemistry-Recipes.dm

JMP replaced with FLW, fixes and adds a bunch of key_name checks in adminlogging

2015-06-14 23:37:35 +10:00

reagent_containers.dm

More fixes and changelogs

2015-07-04 09:40:24 -06:00

reagent_dispenser.dm

Put drop_item() calls inside ifs. Replaced some drop_item() with unEquip(

2015-06-14 20:11:40 +01:00