igalanandZomgPonies 7940e3d6db Syntiflesh is defined twice, both as a food/snack and obj/item/weapon. The first one is edible while the second one is not. ...

This PR comments out the non-edible one and replaces any reference of it to the edible one.

Conflicts:
	code/defines/obj/weapon.dm
	maps/tgstation2.dmm

2014-07-13 09:07:36 -04:00

..

cereal_maker.dm

More work on nations, got most of the flag procs ready. Really missing the vassalage system.

2014-05-27 10:35:09 -04:00

customizables.dm

Final Nations patch before live testing. This is going to be painful.

2014-05-27 20:09:10 -04:00

deep_fryer.dm

More work on nations, got most of the flag procs ready. Really missing the vassalage system.

2014-05-27 10:35:09 -04:00

food_grill.dm

Fun mode re-enabled, you can now deep fry, cerealize, and etc. anything.

2014-05-03 21:16:04 -04:00

icecream_vat.dm

CIVILLIAN OVERHAUL UNO: Chef and the Kitchen

2014-05-03 21:15:41 -04:00

oven.dm

Fun mode re-enabled, you can now deep fry, cerealize, and etc. anything.

2014-05-03 21:16:04 -04:00

recipes_microwave.dm

Syntiflesh is defined twice, both as a food/snack and obj/item/weapon. The first one is edible while the second one is not.

2014-07-13 09:07:36 -04:00