cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-24 12:37:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

Makes food not a subtype of reagent holders (#23379)

Browse Source 
* I am suffering

* Alright this should be all now

* Fixes CI

* I hate the online merge resolver.

* This got lost in the merge master

* Updatepaths fixed + new added

* Contra review

* Fixes desserts

* Oops

* This should fix it

* Maybe?

* Attempt 3

* Missed conflict

* Update code/modules/reagents/chemistry/machinery/reagentgrinder.dm

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>

* Update code/modules/food_and_drinks/kitchen_machinery/kitchen_machine.dm

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>

* Update code/modules/food_and_drinks/food/foods/pizza.dm

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>

* Fixes grinders

* Adds comment

* Warrior review

* Warrior + Sirryan review

* Update code/modules/food_and_drinks/food_base.dm

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

---------

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
This commit is contained in:
DGamerL
2024-01-21 19:00:02 +00:00
committed by GitHub
co-authored by Ryan Henri215
parent 22fbd9aced
commit db578cdc6f
276 changed files with 10289 additions and 10287 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/crafting/recipes.dm
+9 -9
View File
@@ -31,19 +31,19 @@
reqs = list(/datum/reagent/fuel = 50,
/obj/item/stack/cable_coil = 1,
/obj/item/assembly/igniter = 1,
/obj/item/reagent_containers/food/drinks/cans = 1)
parts = list(/obj/item/reagent_containers/food/drinks/cans = 1)
/obj/item/reagent_containers/drinks/cans = 1)
parts = list(/obj/item/reagent_containers/drinks/cans = 1)
time = 15
category = CAT_WEAPONRY
subcategory = CAT_WEAPON
/datum/crafting_recipe/molotov
name = "Molotov"
result = list(/obj/item/reagent_containers/food/drinks/bottle/molotov)
result = list(/obj/item/reagent_containers/drinks/bottle/molotov)
reqs = list(/obj/item/reagent_containers/glass/rag = 1,
/obj/item/reagent_containers/food/drinks/bottle = 1)
blacklist = list(/obj/item/reagent_containers/food/drinks/bottle/molotov)
parts = list(/obj/item/reagent_containers/food/drinks/bottle = 1)
/obj/item/reagent_containers/drinks/bottle = 1)
blacklist = list(/obj/item/reagent_containers/drinks/bottle/molotov)
parts = list(/obj/item/reagent_containers/drinks/bottle = 1)
time = 40
category = CAT_WEAPONRY
subcategory = CAT_WEAPON
@@ -91,10 +91,10 @@
/datum/crafting_recipe/throwing_croissant
name = "Throwing croissant"
reqs = list(
/obj/item/reagent_containers/food/snacks/croissant = 1,
/obj/item/food/snacks/croissant = 1,
/obj/item/stack/rods = 1
)
result = list(/obj/item/reagent_containers/food/snacks/croissant/throwing)
result = list(/obj/item/food/snacks/croissant/throwing)
category = CAT_WEAPONRY
subcategory = CAT_WEAPON
always_available = FALSE
@@ -888,7 +888,7 @@
name = "Snowman"
result = list(/obj/structure/snowman/built)
reqs = list(/obj/item/snowball = 10,
/obj/item/reagent_containers/food/snacks/grown/carrot = 1,
/obj/item/food/snacks/grown/carrot = 1,
/obj/item/grown/log = 2)
time = 50
category = CAT_MISC