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

Conflicts:
	_maps/map_files/MiniStation/MiniStation.dmm
	_maps/map_files/MiniStation/z2.dmm
	code/game/objects/structures/crates_lockers/closets/secure/freezer.dm

2015-04-08 19:36:49 +02:00

..

Chemistry-Reagents

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

2015-04-08 19:36:49 +02:00

reagent_containers

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

2015-04-07 16:21:07 -07:00

Chemistry-Colours.dm

…

Chemistry-Goon-420BlazeIt.dm

Replaced prob(rand(A,B)) with prob((A+B)/2).

2015-03-21 19:12:16 +01:00

Chemistry-Goon-Medicine.dm

Replaced prob(rand(A,B)) with prob((A+B)/2).

2015-03-21 19:12:16 +01:00

Chemistry-Goon-Other.dm

Merge pull request #8427 from Cheridan/day3_collars

2015-03-22 19:37:12 +01:00

Chemistry-Goon-Pyrotechnics.dm

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

2015-04-07 16:21:07 -07:00

Chemistry-Goon-Readme.dm

Goon Chemistry Commit 3: Pyrotechnics and other changes

2015-01-11 08:49:09 -08:00

Chemistry-Goon-Toxins.dm

Merge pull request #8349 from MrPerson/qdel_reagents_hopefully

2015-03-23 08:55:11 -05:00

Chemistry-Holder.dm

moved process() to datum. made /datum/reagents/ process instead of the containers.

2015-04-07 17:13:59 -07:00

Chemistry-Machinery.dm

Adding the chemical reactions and recipes for the new recipes.

2015-04-04 19:29:12 +02:00

Chemistry-Readme.dm

…

Chemistry-Recipes.dm

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

2015-03-23 16:51:03 +01:00

grenade_launcher.dm

attackby() now has an argument containing the parameters of the click that called it. Items placed on tables now center their icon where the user clicked. this is NOT true for racks, since racks look organised in their sprite.

2015-02-19 13:02:43 +00:00

reagent_containers.dm

moved process() to datum. made /datum/reagents/ process instead of the containers.

2015-04-07 17:13:59 -07:00

reagent_dispenser.dm

Effect pooling

2015-03-24 11:44:49 -07:00

syringe_gun.dm

attackby() now has an argument containing the parameters of the click that called it. Items placed on tables now center their icon where the user clicked. this is NOT true for racks, since racks look organised in their sprite.

2015-02-19 13:02:43 +00:00