Neerti 7a22829ee9 Revert "Replaces gaseous reagents with organic chemistry ones." ...

This reverts commit aa22f7307a.

Conflicts:
	code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Toxins.dm
	code/modules/reagents/Chemistry-Recipes.dm

2015-07-26 22:43:40 -04:00

..

admin

Merge remote-tracking branch 'upstream/dev-freeze' into dev

2015-07-26 10:21:36 +02:00

alarm

…

assembly

…

awaymissions

…

client

Merge remote-tracking branch 'upstream/dev-freeze' into dev

2015-07-14 08:21:12 +02:00

clothing

Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into 7/26/2015_bay_merge_2

2015-07-26 16:01:27 -04:00

customitems

Merge pull request #10046 from mwerezak/custom-item-icons

2015-07-09 20:52:38 +03:00

detectivework

…

economy

…

events

Merge remote-tracking branch 'upstream/dev-freeze' into dev

2015-07-14 08:21:12 +02:00

examine

…

ext_scripts

…

flufftext

…

food

…

games

…

genetics

…

ghosttrap

Fixes <span class='class>, makes Travis check it

2015-07-18 21:13:32 +01:00

holodeck

…

hydroponics

Revert "Replaces gaseous reagents with organic chemistry ones."

2015-07-26 22:43:40 -04:00

icon generation

…

library

…

lighting

Lighting: The sanicing

2015-07-21 15:58:39 +02:00

liquid

…

maps

…

materials

Merge remote-tracking branch 'upstream/dev-freeze' into dev

2015-07-09 08:45:49 +02:00

mining

Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into 7/16/2015_bay_merge_2

2015-07-16 22:46:53 -04:00

mob

Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into 7/26/2015_bay_merge_2

2015-07-26 16:01:27 -04:00

nano

Merge remote-tracking branch 'upstream/dev-freeze' into dev

2015-07-26 10:21:36 +02:00

organs

Merge remote-tracking branch 'upstream/dev-freeze' into dev

2015-07-11 10:58:49 +02:00

overmap

…

paperwork

…

power

Merge remote-tracking branch 'upstream/dev-freeze' into dev

2015-07-20 08:28:32 +02:00

projectiles

Merge with dev.

2015-07-15 16:20:39 +09:30

random_map

…

reagents

Revert "Replaces gaseous reagents with organic chemistry ones."

2015-07-26 22:43:40 -04:00

recycling

Merge remote-tracking branch 'upstream/master' into dev-freeze

2015-07-11 09:51:24 +02:00

research

Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into 7/26/2015_bay_merge_2

2015-07-26 16:01:27 -04:00

scripting

…

security levels

…

shieldgen

Merge remote-tracking branch 'upstream/dev-freeze' into dev

2015-07-06 18:33:09 +02:00

shuttles

Merge with dev.

2015-07-15 16:20:39 +09:30

spells

Fixes <span class='class>, makes Travis check it

2015-07-18 21:13:32 +01:00

supermatter

Merge with dev-freeze.

2015-07-02 19:04:01 +09:30

surgery

…

tables

Fixes #8161

2015-07-15 16:34:05 +03:00

vehicles

Merge remote-tracking branch 'upstream/dev-freeze' into dev

2015-07-11 10:58:49 +02:00

virus2

Merge remote-tracking branch 'upstream/dev-freeze' into dev

2015-07-11 10:58:49 +02:00

xgm

…