Incoming 917370a608 Jay Owen demands that this pull be merged. ...

Crush a can for Jay Owen.

He has leukemia, please crush a can for Jay Owen.

His only wish is to see a can crushed live in our game.

Sprites by Nienhaus

Conflicts:
	code/game/objects/items/trash.dm
	code/modules/reagents/reagent_containers/food/drinks.dm
	icons/obj/janitor.dmi

2014-02-16 05:42:55 -05:00

..

reagent_containers

Jay Owen demands that this pull be merged.

2014-02-16 05:42:55 -05:00

Chemistry-Colours.dm

Updated Chemistry Colors

2014-01-19 21:16:18 -05:00

Chemistry-Holder.dm

Added some limited support for alien reagent reactions.

2014-02-02 00:44:44 -05:00

Chemistry-Machinery.dm

Various Tweaks and Fixes

2014-02-02 06:27:13 -05:00

Chemistry-Readme.dm

…

Chemistry-Reagents-Antidepressants.dm

Mining fixes as it was annoying as fuck. Also a random object with nothing in it removed.

2014-01-09 20:56:38 -05:00

Chemistry-Reagents.dm

Various Tweaks and Fixes

2014-02-02 06:27:13 -05:00

Chemistry-Recipes.dm

Golem runes use a different method for signing up.

2014-02-01 21:28:17 -05:00

dartgun.dm

Adding checks for LAssailant everywhere whee

2013-12-23 04:57:44 -05: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

Added a garbage collector implementation based on rumors from Goon and proc references in released gooncode.

2014-01-29 23:45:21 -05:00

syringe_gun.dm

Adding checks for LAssailant everywhere whee

2013-12-23 04:57:44 -05:00