PsiOmega 7ab57a4917 Merge remote-tracking branch 'upstream/dev-freeze' into dev ...

Conflicts:
	code/game/objects/items/weapons/storage/fancy.dm
	code/modules/mob/living/carbon/human/life.dm

2015-03-20 08:44:52 +01:00

..

food

Fixes #8378

2015-03-17 19:20:33 +10:30

glass

Merge pull request #8054 from mwerezak/chembottles

2015-02-05 23:05:45 +10:30

blood_pack.dm

Cargo can now order empty blood packs.

2014-11-30 16:45:52 +01:00

borghydro.dm

Removes FPRINT and TABLEPASS flags

2015-01-23 22:27:32 +03:00

dropper.dm

Adds drying racks and updates pipes

2015-01-16 02:57:59 +03:00

food.dm

Changes grid logic to be slightly less convoluted, clamp position to inside the object's icon

2015-02-26 18:46:10 +00:00

glass.dm

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

2015-03-16 21:21:56 +00:00

hypospray.dm

Removes FPRINT and TABLEPASS flags

2015-01-23 22:27:32 +03:00

pill.dm

Adds a health section in the uplink.

2015-02-10 21:29:29 +01:00

robodropper.dm

…

spray.dm

Readded icon for water flower.

2015-02-16 22:18:12 +10:30

syringes.dm

Rewrites syringe and dart guns

2015-02-13 01:34:35 -05:00