Jordie0608 b18cc7d54e Merge branch 'master' of https://github.com/tgstation/-tg-station into manidontevenknowwhatwentwrongwiththat ...

Conflicts:
	code/game/machinery/doors/airlock.dm
	code/game/objects/structures/door_assembly.dm
	code/game/objects/structures/false_walls.dm
	code/game/objects/structures/mineral_doors.dm
	code/modules/research/protolathe.dm
	icons/obj/doors/door_assembly.dmi

2014-04-11 02:51:07 +10:00

..

reagent_containers

Reverts my and Incoming's April Fools

2014-04-02 20:03:17 +02:00

Chemistry-Colours.dm

Reagents can now mix their alpha color.

2014-01-21 16:06:28 +00:00

Chemistry-Holder.dm

Merge branch 'master' of https://github.com/tgstation/-tg-station into warnstandardization

2014-04-08 14:29:58 +02:00

Chemistry-Machinery.dm

Wooden Walls

2014-04-01 18:03:02 +11:00

Chemistry-Readme.dm

- Reagent code reorganization commit 5 (Some big errors... Yeah, renaming files in explorer and expecting SVN to understand is a bad idea.)

2012-08-18 22:06:04 +00:00

Chemistry-Reagents.dm

Merge pull request #3248 from AnturK/nothinglikeasmellofplasmainthemorning

2014-04-03 20:43:17 +02:00

Chemistry-Recipes.dm

changes the aloe recipe to 1 irishcream + 1 watermelonjuice

2014-03-28 22:35:44 +01:00

grenade_launcher.dm

Items with throw_range over 7 reduced to throw_range 7. This does not affect players as there's no way to extend your vision range.

2014-02-17 15:44:07 -08:00

reagent_containers.dm

Initial Commit

2014-03-29 17:16:22 +01:00

reagent_dispenser.dm

Merge branch 'master' of https://github.com/tgstation/-tg-station into qdel

2014-03-02 21:39:27 -08:00

syringe_gun.dm

First pass at a qdel() garbage collection system for tgstation

2014-02-23 14:55:12 -08:00