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/supply/supply_packs/pack_miscellaneous.dm
+4 -4
View File
@@ -48,8 +48,8 @@
/datum/supply_packs/misc/religious_supplies
name = "Religious Supplies Crate"
contains = list(/obj/item/reagent_containers/food/drinks/bottle/holywater,
/obj/item/reagent_containers/food/drinks/bottle/holywater,
contains = list(/obj/item/reagent_containers/drinks/bottle/holywater,
/obj/item/reagent_containers/drinks/bottle/holywater,
/obj/item/storage/bible/booze,
/obj/item/storage/bible/booze,
/obj/item/clothing/suit/hooded/chaplain_hoodie,
@@ -240,8 +240,8 @@
/obj/item/clothing/mask/gas/mime,
/obj/item/clothing/head/beret,
/obj/item/clothing/suit/suspenders,
/obj/item/reagent_containers/food/drinks/bottle/bottleofnothing,
/obj/item/reagent_containers/food/drinks/bottle/bottleofbanana
/obj/item/reagent_containers/drinks/bottle/bottleofnothing,
/obj/item/reagent_containers/drinks/bottle/bottleofbanana
)
cost = 250
containertype = /obj/structure/closet/crate/secure
code/modules/supply/supply_packs/pack_organic.dm
+45 -45
View File
@@ -7,22 +7,22 @@
/datum/supply_packs/organic/food
name = "Food Crate"
contains = list(/obj/item/reagent_containers/food/condiment/flour,
/obj/item/reagent_containers/food/condiment/rice,
/obj/item/reagent_containers/food/condiment/milk,
/obj/item/reagent_containers/food/condiment/soymilk,
/obj/item/reagent_containers/food/condiment/saltshaker,
/obj/item/reagent_containers/food/condiment/peppermill,
contains = list(/obj/item/reagent_containers/condiment/flour,
/obj/item/reagent_containers/condiment/rice,
/obj/item/reagent_containers/condiment/milk,
/obj/item/reagent_containers/condiment/soymilk,
/obj/item/reagent_containers/condiment/saltshaker,
/obj/item/reagent_containers/condiment/peppermill,
/obj/item/kitchen/rollingpin,
/obj/item/storage/fancy/egg_box,
/obj/item/mixing_bowl,
/obj/item/mixing_bowl,
/obj/item/reagent_containers/food/condiment/enzyme,
/obj/item/reagent_containers/food/condiment/sugar,
/obj/item/reagent_containers/food/snacks/meat/monkey,
/obj/item/reagent_containers/food/snacks/grown/banana,
/obj/item/reagent_containers/food/snacks/grown/banana,
/obj/item/reagent_containers/food/snacks/grown/banana)
/obj/item/reagent_containers/condiment/enzyme,
/obj/item/reagent_containers/condiment/sugar,
/obj/item/food/snacks/meat/monkey,
/obj/item/food/snacks/grown/banana,
/obj/item/food/snacks/grown/banana,
/obj/item/food/snacks/grown/banana)
cost = 250
containername = "food crate"
announce_beacons = list("Kitchen" = list("Kitchen"))
@@ -39,18 +39,18 @@
/datum/supply_packs/misc/randomised/ingredients // its a bit hacky...
num_contained = 25
contains = list(/obj/item/reagent_containers/food/snacks/grown/wheat,
/obj/item/reagent_containers/food/snacks/grown/tomato,
/obj/item/reagent_containers/food/snacks/grown/potato,
/obj/item/reagent_containers/food/snacks/grown/carrot,
/obj/item/reagent_containers/food/snacks/grown/pumpkin,
/obj/item/reagent_containers/food/snacks/grown/chili,
/obj/item/reagent_containers/food/snacks/grown/cocoapod,
/obj/item/reagent_containers/food/snacks/grown/corn,
/obj/item/reagent_containers/food/snacks/grown/eggplant,
/obj/item/reagent_containers/food/snacks/grown/apple,
/obj/item/reagent_containers/food/snacks/grown/banana,
/obj/item/reagent_containers/food/snacks/grown/cherries)
contains = list(/obj/item/food/snacks/grown/wheat,
/obj/item/food/snacks/grown/tomato,
/obj/item/food/snacks/grown/potato,
/obj/item/food/snacks/grown/carrot,
/obj/item/food/snacks/grown/pumpkin,
/obj/item/food/snacks/grown/chili,
/obj/item/food/snacks/grown/cocoapod,
/obj/item/food/snacks/grown/corn,
/obj/item/food/snacks/grown/eggplant,
/obj/item/food/snacks/grown/apple,
/obj/item/food/snacks/grown/banana,
/obj/item/food/snacks/grown/cherries)
name = "Ingredient Crate"
cost = 300
containername = "ingredient crate"
@@ -60,18 +60,18 @@
/datum/supply_packs/organic/condiments
name = "Condiment Crate"
contains = list(/obj/item/reagent_containers/food/condiment/ketchup,
/obj/item/reagent_containers/food/condiment/bbqsauce,
/obj/item/reagent_containers/food/condiment/soysauce,
/obj/item/reagent_containers/food/condiment/mayonnaise,
/obj/item/reagent_containers/food/condiment/cherryjelly,
/obj/item/reagent_containers/food/condiment/peanutbutter,
/obj/item/reagent_containers/food/condiment/honey,
/obj/item/reagent_containers/food/condiment/oliveoil,
/obj/item/reagent_containers/food/condiment/frostoil,
/obj/item/reagent_containers/food/condiment/capsaicin,
/obj/item/reagent_containers/food/condiment/wasabi,
/obj/item/reagent_containers/food/condiment/vinegar)
contains = list(/obj/item/reagent_containers/condiment/ketchup,
/obj/item/reagent_containers/condiment/bbqsauce,
/obj/item/reagent_containers/condiment/soysauce,
/obj/item/reagent_containers/condiment/mayonnaise,
/obj/item/reagent_containers/condiment/cherryjelly,
/obj/item/reagent_containers/condiment/peanutbutter,
/obj/item/reagent_containers/condiment/honey,
/obj/item/reagent_containers/condiment/oliveoil,
/obj/item/reagent_containers/condiment/frostoil,
/obj/item/reagent_containers/condiment/capsaicin,
/obj/item/reagent_containers/condiment/wasabi,
/obj/item/reagent_containers/condiment/vinegar)
cost = 300
containername = "condiment crate"
@@ -115,15 +115,15 @@
/datum/supply_packs/organic/party
name = "Party Equipment Crate"
contains = list(/obj/item/storage/box/drinkingglasses,
/obj/item/reagent_containers/food/drinks/shaker,
/obj/item/reagent_containers/food/drinks/bottle/patron,
/obj/item/reagent_containers/food/drinks/bottle/goldschlager,
/obj/item/reagent_containers/food/drinks/cans/ale,
/obj/item/reagent_containers/food/drinks/cans/ale,
/obj/item/reagent_containers/food/drinks/cans/beer,
/obj/item/reagent_containers/food/drinks/cans/beer,
/obj/item/reagent_containers/food/drinks/cans/beer,
/obj/item/reagent_containers/food/drinks/cans/beer,
/obj/item/reagent_containers/drinks/shaker,
/obj/item/reagent_containers/drinks/bottle/patron,
/obj/item/reagent_containers/drinks/bottle/goldschlager,
/obj/item/reagent_containers/drinks/cans/ale,
/obj/item/reagent_containers/drinks/cans/ale,
/obj/item/reagent_containers/drinks/cans/beer,
/obj/item/reagent_containers/drinks/cans/beer,
/obj/item/reagent_containers/drinks/cans/beer,
/obj/item/reagent_containers/drinks/cans/beer,
/obj/item/grenade/confetti,
/obj/item/grenade/confetti)
cost = 250
code/modules/supply/supply_packs/pack_science.dm
+1 -1
View File
@@ -107,7 +107,7 @@
/datum/supply_packs/science/oil
name = "Oil Tank Crate"
contains = list(/obj/structure/reagent_dispensers/oil,
/obj/item/reagent_containers/food/drinks/oilcan)
/obj/item/reagent_containers/drinks/oilcan)
cost = 150
containertype = /obj/structure/largecrate
containername = "oil tank crate"