cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-20 11:34:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

Pizza Overhaul 2022 (#18278)

Browse Source 
* 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:
PacifistDalek
2022-07-31 18:23:32 -04:00
committed by GitHub
parent 459c780bb6
commit f3035edb6f
12 changed files with 262 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/reagents/chemistry/recipes/slime_extracts.dm
+9 -1
View File
@@ -150,10 +150,18 @@
var/list/blocked = list(/obj/item/reagent_containers/food/snacks,
/obj/item/reagent_containers/food/snacks/breadslice,
/obj/item/reagent_containers/food/snacks/sliceable,
/obj/item/reagent_containers/food/snacks/margheritaslice,
/obj/item/reagent_containers/food/snacks/margheritapizzaslice,
/obj/item/reagent_containers/food/snacks/meatpizzaslice,
/obj/item/reagent_containers/food/snacks/mushroompizzaslice,
/obj/item/reagent_containers/food/snacks/vegetablepizzaslice,
/obj/item/reagent_containers/food/snacks/cheesepizzaslice,
/obj/item/reagent_containers/food/snacks/garlicpizzaslice,
/obj/item/reagent_containers/food/snacks/donkpocketpizzaslice,
/obj/item/reagent_containers/food/snacks/dankpizzaslice,
/obj/item/reagent_containers/food/snacks/macpizzaslice,
/obj/item/reagent_containers/food/snacks/firecrackerpizzaslice,
/obj/item/reagent_containers/food/snacks/pestopizzaslice,
/obj/item/reagent_containers/food/snacks/pepperonipizzaslice,
/obj/item/reagent_containers/food/snacks/meat,
/obj/item/reagent_containers/food/snacks/meat/slab,
/obj/item/reagent_containers/food/snacks/grown,