PsiOmegaDelta 2c8c9df9d2 Merge remote-tracking branch 'upstream/dev-freeze' into dev ...

Conflicts:
	html/changelogs/.all_changelog.yml

2015-06-02 13:35:02 +02:00

..

food

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

2015-05-26 08:35:32 +02:00

glass

Updates chemistry colors

2015-04-28 09:23:39 +03:00

blood_pack.dm

Cargo can now order empty blood packs.

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

borghydro.dm

Removes redundant surgery for brain and eye repair, now covered by organ repair in general.

2015-05-25 14:49:57 +09:30

dropper.dm

Chemistry commit

2015-03-25 19:09:10 +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 branch 'dev' into ofChemistryAndStuff

2015-05-15 11:28:05 +03:00

hypospray.dm

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

2015-06-02 13:35:02 +02:00

pill.dm

Removed IS_SYNTHETIC and REGENERATES_LIMBS flags.

2015-05-25 14:49:07 +09:30

spray.dm

Merge branch 'dev' into ofResearchAndPrototypes

2015-05-20 11:50:28 +03:00

syringes.dm

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

2015-05-30 16:11:57 +02:00