Mloc-Hibernia e3a8d5eb43 Merge remote-tracking branch 'upstream/master' into dev ...

Signed-off-by: Mloc-Hibernia <colmohici@gmail.com>

Conflicts:
	code/game/objects/effects/spawners/bombspawner.dm

2014-05-11 13:19:09 +00:00

..

food

Merge remote-tracking branch 'upstream/master' into dev

2014-05-05 22:22:01 +01: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

Fixes #3993

2014-05-10 10:26:05 +09:30

dropper.dm

A first pass at more realistic w_class values

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

food.dm

Reintroducing the dough-based cooking system.

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

glass.dm

Added bucket lid sprite and functionality

2014-04-22 01:57:01 -07:00

hypospray.dm

Fixes reagent and throw logging.

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

pill.dm

Lousy goddamn indentation.

2014-05-03 21:09:55 +09:30

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

Fixes #3993

2014-05-10 10:26:05 +09:30