DZD 29e70854e9 Fix merge conflicts ...

🖕 map conflicts over lines that weren't even edited by both upstream
and this branch.

2015-07-15 22:28:12 -04:00

..

candy_maker.dm

Z5 revert / compatibility,

2015-07-11 03:28:07 -04:00

cereal_maker.dm

rewrite for DF/CM and grill

2014-07-21 20:37:25 +01:00

cooker.dm

The Great Del() Cull of 2015

2015-07-09 02:48:34 -04:00

customizables.dm

Replaces Reamining Del()'s

2015-07-07 00:35:19 -04:00

deep_fryer.dm

rewrite for DF/CM and grill

2014-07-21 20:37:25 +01:00

food_grill.dm

rewrite for DF/CM and grill

2014-07-21 20:37:25 +01:00

grill_new.dm

Z5 revert / compatibility,

2015-07-11 03:28:07 -04:00

icecream_vat.dm

3/3 port done

2015-05-25 20:16:34 -04:00

oven_new.dm

Z5 revert / compatibility,

2015-07-11 03:28:07 -04:00

oven.dm

Adds a "params" parameter to attackby(), so it keeps track of pixel_x and pixel_y among other things

2015-02-22 22:12:11 +01:00

recipes_candy.dm

Kitchen Overhaul

2015-03-08 05:09:19 -04:00

recipes_grill.dm

Kitchen Overhaul

2015-03-08 05:09:19 -04:00

recipes_microwave.dm

Sort of compiles

2015-07-09 15:55:36 -04:00

recipes_oven.dm

Botany / Xenobotany Update

2015-05-09 06:00:24 -04:00