Ccomp5950 56ef5c165c Merge branch 'master' of github.com:Baystation12/Baystation12 into dev-freeze ...

Conflicts:
	code/modules/reagents/reagent_containers/food/cans.dm

2014-03-28 18:46:04 -05:00

..

food

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

2014-03-28 18:46:04 -05:00

glass

Added lids for bottles and beakers.

2013-05-26 06:38:38 +04:00

blood_pack.dm

Replaced codersprite for bloodpack with new ones.

2013-01-03 03:40:36 +04:00

borghydro.dm

Expansion of every "icon = ''" path.

2013-09-01 21:53:36 +01:00

dropper.dm

Hypothetically adds proximity check to droppers.

2013-12-26 21:22:00 -07:00

food.dm

Reintroducing the dough-based cooking system.

2014-02-01 02:17:38 +01:00

glass.dm

Fixes biogenerator typo, improper beaker splashing, and allows glass beakers to refill botany trays

2014-03-16 21:16:31 -05:00

hypospray.dm

Fixes reagent and throw logging.

2013-08-30 00:38:10 +01:00

pill.dm

Ingested acid and mutagen will now react after the ten second delay.

2014-03-06 20:20:15 +08:00

robodropper.dm

Fixes reagent and throw logging.

2013-08-30 00:38:10 +01:00

spray.dm

Pepperspray safety.

2014-02-03 05:10:04 +03:00

syringes.dm

Removed a return.

2014-01-05 14:20:53 +10:30