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

Conflicts:
	_maps/map_files/tgstation.2.1.2.dmm (The map was deleted)
	code/game/objects/items/weapons/kitchen.dm (Someone fixed up tray attack code a little, whereas I moved trays to a subclass of bags and made the attack code very simple by comparison.  Went with my solution.)

2014-05-18 20:50:38 -04:00

..

reagent_containers

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

2014-05-18 20:50:38 -04:00

Chemistry-Colours.dm

…

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

meteorhit() is kill

2014-04-22 12:16:02 -05:00

Chemistry-Readme.dm

…

Chemistry-Reagents.dm

Merge branch 'master' into slimes

2014-05-18 21:38:25 +04:00

Chemistry-Recipes.dm

Added slime scanner

2014-05-01 14:51:26 +04: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