mwerezak 0d89717cf2 Merge remote-tracking branch 'upstream/dev' into gun-rewrite ...

Conflicts:
	code/modules/projectiles/ammunition/boxes.dm
	code/modules/projectiles/guns/projectile/pistol.dm

2015-02-13 01:57:19 -05:00

..

food

Merge remote-tracking branch 'upstream/dev' into gun-rewrite

2015-02-13 01:57:19 -05:00

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

Renames CoM into center_of_mass

2014-07-14 23:13:46 +02:00

glass.dm

Change beakers, bottles, syringes and vials to use /image and multiplicative blending

2015-02-03 15:23:48 +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

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

2015-02-01 17:39:19 +01:00

syringes.dm

Rewrites syringe and dart guns

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