Mloc-Argent 6a11ca32f8 Merge remote-tracking branch 'upstream/master' into dev

2014-05-05 22:22:01 +01:00

..

drinks

Changes all appropriate instances of toxins to phoron

2014-04-10 15:11:26 -07:00

snacks

Meat cutting fix

2014-03-03 02:26:04 -05:00

cans.dm

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

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

condiment.dm

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

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

drinks.dm

Lousy goddamn indentation.

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

sandwich.dm

Icon fixes, shards hidden in food will now lacerate random body parts because damage code is weird. Stop eating chocolate cake sandwich with your left food.

2014-01-11 02:47:12 +10:30

snacks.dm

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

2014-05-05 22:22:01 +01:00