Erthilo b75d97a488 Merge branch 'master' of git://github.com/Baystation12/Baystation12 into dev ...

Conflicts:
	code/game/machinery/kitchen/gibber.dm
	code/modules/mob/living/carbon/human/inventory.dm
	code/modules/reagents/reagent_containers/hypospray.dm
	maps/tgstation2.dmm

2013-08-31 17:45:31 +01:00

..

reagent_containers

Merge branch 'master' of git://github.com/Baystation12/Baystation12 into dev

2013-08-31 17:45:31 +01:00

Chemistry-Colours.dm

…

Chemistry-Holder.dm

Fixes #3017

2013-06-09 19:54:43 +04:00

Chemistry-Machinery.dm

Added Nano UI Chemistry Dispenser.

2013-08-28 17:13:25 +01:00

Chemistry-Readme.dm

…

Chemistry-Reagents-Antidepressants.dm

Fixed paroxetine.

2013-02-25 18:40:42 +01:00

Chemistry-Reagents.dm

Merge pull request #3582 from alex-gh/add_rezadone

2013-08-24 09:56:26 -07:00

Chemistry-Recipes.dm

Ported Rezadone (Heals clone damage without cryo) from tg-station

2013-08-24 18:35:10 +02:00

dartgun.dm

Standardises logging. All attack logs now print in main logs. Added stripping and syringe logging. Added Jump commands to most attack logs.

2013-08-28 03:33:04 +01:00

grenade_launcher.dm

New lighting, it's essentially just the old DAL system with a queue.

2012-08-25 16:06:57 +00:00

reagent_containers.dm

Committing suomynonAyletamitlU's storage item standardisation commit: http://forums.nanotrasen.com/viewtopic.php?f=16&t=11746

2013-01-08 19:11:56 +00:00

reagent_dispenser.dm

Revert #3316 from BEF due to compile errors and (assumed) missing files.

2013-07-20 18:38:00 +01:00

syringe_gun.dm

Standardises logging. All attack logs now print in main logs. Added stripping and syringe logging. Added Jump commands to most attack logs.

2013-08-28 03:33:04 +01:00