mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-08-24 20:47:10 +01:00
Pizza Overhaul 2022 (#18278)
* wip * goodbye two pizzas * commit to pizza time * pizzaaaaaaaa * getting there * hopefully final * pizza * do you like me now CL? * Update code/modules/food_and_drinks/recipes/recipes_oven.dm Co-authored-by: Sirryan2002 <80364400+Sirryan2002@users.noreply.github.com> * fixing suggestions * Update paradise.dme * back on track * removing tablecrafting recipies, switch back to oven recipeis * remove unused raw pizza sprites * re-add KalevTait's suggestion * fix merge conflict * merge conflict fix i guess??? * i swear if this is still conflicted * fixing trailing newlines * moves parent calls Co-authored-by: Sirryan2002 <80364400+Sirryan2002@users.noreply.github.com>
This commit is contained in:
co-authored by
Sirryan2002
parent
459c780bb6
commit
f3035edb6f
@@ -21,7 +21,6 @@
|
||||
#define CAT_MISCFOOD "Misc. Food"
|
||||
#define CAT_PASTRY "Pastries"
|
||||
#define CAT_PIE "Pies"
|
||||
#define CAT_PIZZA "Pizzas"
|
||||
#define CAT_SALAD "Salads"
|
||||
#define CAT_SANDWICH "Sandwiches"
|
||||
#define CAT_SOUP "Soups"
|
||||
|
||||
Reference in New Issue
Block a user