Krausus f816b8672d Resolves merge conflicts ...

Conflicts:
	code/game/machinery/computer/communications.dm

2015-08-18 04:14:14 -04:00

..

newchem

Turn dionas into simple animals

2015-08-17 02:19:29 +02:00

reagent_containers

Consolidate ?/FLW links under key_name_admin

2015-08-17 00:13:53 +02: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

Fixes various runtimes

2015-08-18 02:53:23 -04:00

Chemistry-Readme.dm

…

Chemistry-Reagents.dm

Chemistry Tweaks

2015-08-08 19:59:31 -04: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

Explosion Rework

2015-06-20 04:13:55 -04:00

syringe_gun.dm

The Great Del() Cull of 2015

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