Chinsky be95e54e43 Merge branch 'master' into dev ...

Conflicts:
	code/defines/obj/weapon.dm
	code/modules/mob/living/carbon/species.dm
	code/modules/mob/living/silicon/say.dm
	icons/mob/uniform.dmi
	maps/tgstation2.dmm

2014-06-17 16:16:44 +04:00

..

reagent_containers

Merge branch 'master' into dev

2014-06-17 16:16:44 +04:00

Chemistry-Colours.dm

…

Chemistry-Holder.dm

Changes most viable, used entries of plasma with phoron.

2014-04-10 05:05:04 -07:00

Chemistry-Machinery.dm

Refactored material definitions a little bit, removed all bananium from the codebase.

2014-06-08 00:40:34 +09:30

Chemistry-Readme.dm

…

Chemistry-Reagents-Antidepressants.dm

…

Chemistry-Reagents.dm

Painkillers leave body correctly

2014-06-05 18:09:18 +10:00

Chemistry-Recipes.dm

Replaces get_turf_loc() with get_turf()

2014-06-10 13:43:11 -04:00

dartgun.dm

…

grenade_launcher.dm

Rewrote autolathe, changed all m_amt and g_amt to a list called 'matter'. Updated RCD vars in view of this.

2014-06-11 01:14:38 +09:30

reagent_containers.dm

A first pass at more realistic w_class values

2014-04-03 17:54:06 -04:00

reagent_dispenser.dm

Adjusted fuel spread

2014-04-17 21:19:05 -04:00

syringe_gun.dm

Rewrote autolathe, changed all m_amt and g_amt to a list called 'matter'. Updated RCD vars in view of this.

2014-06-11 01:14:38 +09:30