Markolie be92097e3f Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into cargonia ...

Conflicts:
	code/game/supplyshuttle.dm

2015-08-25 00:46:32 +02:00

..

newchem

Life reaction log update

2015-08-24 19:53:42 +02:00

reagent_containers

Sushi Update

2015-08-23 00:22:31 -04:00

Chemistry-Colours.dm

Fixes colors runtiming. Oops.

2015-05-14 00:51:45 -04:00

Chemistry-Holder.dm

Replaces typesof with subtypesof where applicable

2015-08-03 11:04:28 -04:00

Chemistry-Machinery.dm

More buildables, some fixes, upgradable smartfridge

2015-08-21 20:06:23 -04:00

Chemistry-Readme.dm

…

Chemistry-Reagents.dm

Coffee fix, changeling revive fix

2015-08-18 18:33:58 +02:00

Chemistry-Recipes.dm

Replaces typesof with subtypesof where applicable

2015-08-03 11:04:28 -04:00

dartgun.dm

Consolidate ?/FLW links under key_name_admin

2015-08-17 00:13:53 +02:00

grenade_launcher.dm

Who needs cream pie logging anyways

2015-05-29 19:09:20 -04:00

reagent_containers.dm

Destroy Pass III

2015-07-08 03:39:52 -04:00

reagent_dispenser.dm

isNonCrewAntag() checks, key_name fixes

2015-08-20 17:25:55 +02:00

syringe_gun.dm

The Great Del() Cull of 2015

2015-07-09 02:48:34 -04:00