Skip to content

Commit

Permalink
Cooking hotfixes (discordia-space#8473)
Browse files Browse the repository at this point in the history
* Spaghetti typo

Someone somewhere spelt it "spagetti". This is fixed.

* Fix appliance quality modifiers

Didn't realize one used incorrect part identification, resulting in -2 QUALITY_MOD for the Grill, and 0 due to not rounding or dividing for the stove.

* Fix Roach Egg, Remove Problematic recipes

Roach egg and clothing items lack food quality. Gave food_quality to roach egg, removed clothing/body part related recipes for now.

* Update cooking_containers.dm

I hate integration test

* plantname bad

Fix modified or mutant plants being added as produce to food.

* Fix erisian recipes

Just throw me off the bus.

* Update meat.dm

INTEGRATION PLEASE

* Update roach.dm
  • Loading branch information
Mycah142 authored Apr 13, 2024
1 parent 8343bc5 commit b63f1c2
Show file tree
Hide file tree
Showing 9 changed files with 25 additions and 18 deletions.
3 changes: 2 additions & 1 deletion code/game/objects/effects/roaches.dm
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
w_class = ITEM_SIZE_TINY
health = 5
var/amount_grown = 0
var/food_quality = 1 //So it can be boiled

/obj/item/roach_egg/afterattack(obj/O as obj, mob/user as mob, proximity)
if(istype(O,/obj/machinery/microwave))
Expand Down Expand Up @@ -61,7 +62,7 @@

. = ..()

/obj/item/roach_egg/Process()
/obj/item/roach_egg/Process()
if (isturf(src.loc) || istype(src.loc, /obj/structure/closet) || istype(src.loc, /obj/item/organ/external)) // suppresses hatching when not in a suitable loc
if(amount_grown >= 100)
var/obj/item/organ/external/O
Expand Down
8 changes: 4 additions & 4 deletions code/modules/cooking_with_jane/cooking_appliances/grill.dm
Original file line number Diff line number Diff line change
Expand Up @@ -69,10 +69,10 @@
/obj/machinery/cooking_with_jane/grill/RefreshParts()
..()

var/man_rating = 0
for(var/obj/item/stock_parts/manipulator/M in component_parts)
man_rating += M.rating
quality_mod = man_rating - 2
var/las_rating = 0
for(var/obj/item/stock_parts/micro_laser/M in component_parts)
las_rating += M.rating
quality_mod = round(las_rating/2)

var/bin_rating = 0
for(var/obj/item/stock_parts/matter_bin/M in component_parts)
Expand Down
2 changes: 1 addition & 1 deletion code/modules/cooking_with_jane/cooking_appliances/stove.dm
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
var/man_rating = 0
for(var/obj/item/stock_parts/manipulator/M in component_parts)
man_rating += M.rating
quality_mod = man_rating - 2
quality_mod = round(man_rating/2)

//Process how a specific stove is interacting with material
/obj/machinery/cooking_with_jane/stove/proc/cook_checkin(var/input)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
description_info = "Can be emptied of physical food with alt-click."
var/shortname
var/place_verb = "into"
var/appliancetype //string beans
var/appliancetype //string
w_class = ITEM_SIZE_SMALL
volume = 240 //Don't make recipes using reagents in larger quantities than this amount; they won't work.
var/datum/cooking_with_jane/recipe_tracker/tracker = null //To be populated the first time the plate is interacted with.
Expand Down
16 changes: 8 additions & 8 deletions code/modules/cooking_with_jane/recipes/recipe.dm
Original file line number Diff line number Diff line change
Expand Up @@ -669,7 +669,7 @@
list(CWJ_ADD_ITEM, /obj/item/reagent_containers/food/snacks/meat/human)
)

/datum/cooking_with_jane/recipe/brainburger
/*/datum/cooking_with_jane/recipe/brainburger //Currently nonfunctional as base body parts do not have food_quality\
cooking_container = CUTTING_BOARD
product_type = /obj/item/reagent_containers/food/snacks/brainburger
Expand All @@ -687,7 +687,7 @@
list(CWJ_ADD_ITEM, /obj/item/organ/internal/vital/brain)
)
/datum/cooking_with_jane/recipe/roburger
/datum/cooking_with_jane/recipe/roburger //Currently nonfunctional as base body parts do not have food_quality
cooking_container = CUTTING_BOARD
product_type = /obj/item/reagent_containers/food/snacks/roburger
Expand All @@ -704,7 +704,7 @@
list(CWJ_ADD_ITEM_OPTIONAL, /obj/item/reagent_containers/food/snacks/cheesewedge, qmod=0.5),
list(CWJ_ADD_ITEM, /obj/item/robot_parts/head)
)

*/
/datum/cooking_with_jane/recipe/xenoburger
cooking_container = CUTTING_BOARD
product_type = /obj/item/reagent_containers/food/snacks/xenoburger
Expand Down Expand Up @@ -759,7 +759,7 @@
list(CWJ_ADD_ITEM, /obj/item/reagent_containers/food/snacks/tofu)
)

/datum/cooking_with_jane/recipe/clownburger
/*/datum/cooking_with_jane/recipe/clownburger //Currently nonfunctional as clothing do not have food_quality
cooking_container = CUTTING_BOARD
product_type = /obj/item/reagent_containers/food/snacks/clownburger
Expand All @@ -777,7 +777,7 @@
list(CWJ_ADD_ITEM, /obj/item/clothing/mask/gas/clown_hat)
)
/datum/cooking_with_jane/recipe/mimeburger
/datum/cooking_with_jane/recipe/mimeburger //Currently nonfunctional as clothing do not have food_quality
cooking_container = CUTTING_BOARD
product_type = /obj/item/reagent_containers/food/snacks/mimeburger
Expand All @@ -794,7 +794,7 @@
list(CWJ_ADD_ITEM_OPTIONAL, /obj/item/reagent_containers/food/snacks/cheesewedge, qmod=0.5),
list(CWJ_ADD_ITEM, /obj/item/clothing/head/beret)
)

*/
/datum/cooking_with_jane/recipe/bigbiteburger
cooking_container = CUTTING_BOARD
product_type = /obj/item/reagent_containers/food/snacks/bigbiteburger
Expand Down Expand Up @@ -989,7 +989,7 @@
list(CWJ_ADD_PRODUCE_OPTIONAL, "cabbage"),
list(CWJ_ADD_PRODUCE_OPTIONAL, "tomato"),
list(CWJ_ADD_REAGENT_OPTIONAL, "ketchup", 1),
list(CWJ_ADD_ITEM, /obj/item/reagent_containers/food/snacks/meat/roachmeat)
list(CWJ_ADD_ITEM, /obj/item/reagent_containers/food/snacks/meat/roachmeat/kampfer)
)

/datum/cooking_with_jane/recipe/seucheburger
Expand Down Expand Up @@ -1046,7 +1046,7 @@
list(CWJ_ADD_PRODUCE_OPTIONAL, "tomato"),
list(CWJ_ADD_REAGENT_OPTIONAL, "ketchup", 1),
list(CWJ_ADD_ITEM, /obj/item/reagent_containers/food/snacks/roach_egg),
list(CWJ_ADD_ITEM, /obj/item/reagent_containers/food/snacks/meat/roachmeat),
list(CWJ_ADD_ITEM, /obj/item/reagent_containers/food/snacks/meat/roachmeat/kampfer),
list(CWJ_ADD_ITEM, /obj/item/reagent_containers/food/snacks/meat/roachmeat/seuche),
list(CWJ_ADD_ITEM, /obj/item/reagent_containers/food/snacks/meat/roachmeat/panzer),
list(CWJ_ADD_ITEM, /obj/item/reagent_containers/food/snacks/meat/roachmeat/jager)
Expand Down
2 changes: 1 addition & 1 deletion code/modules/cooking_with_jane/step_types/add_produce.dm
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@

var/obj/item/reagent_containers/food/snacks/grown/added_produce = added_item

if(added_produce.plantname == required_produce_type)
if(added_produce.seed.kitchen_tag == required_produce_type)
return CWJ_CHECK_VALID

return CWJ_CHECK_INVALID
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
turns_per_move = 4
turns_since_move = 0

meat_type = /obj/item/reagent_containers/food/snacks/meat/roachmeat
meat_type = /obj/item/reagent_containers/food/snacks/meat/roachmeat/kampfer
meat_amount = 2

maxHealth = 10
Expand Down
8 changes: 7 additions & 1 deletion code/modules/reagents/reagent_containers/food/snacks/meat.dm
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,13 @@
slice_path = /obj/item/reagent_containers/food/snacks/rawbacon
slices_num = 4 // Since 2u protein each

/obj/item/reagent_containers/food/snacks/meat/roachmeat
/obj/item/reagent_containers/food/snacks/meat/roachmeat/ //Kampfer being "default" roachmeat caused recipe issues
name = "Roach meat"
desc = "A slab of sickly-green bubbling meat cut from an unnamed roach. You shouldn't be seeing this."
icon_state = "meat_xeno"
filling_color = "#E2FFDE"

/obj/item/reagent_containers/food/snacks/meat/roachmeat/kampfer
name = "Kampfer meat"
desc = "A slab of sickly-green bubbling meat cut from a kampfer roach. You swear you can see it still twitching occasionally. Delicious!"
icon_state = "meat_xeno"
Expand Down
Binary file modified icons/obj/food.dmi
Binary file not shown.

0 comments on commit b63f1c2

Please sign in to comment.