From cc85b2fe1dc09f29dc9f5ae20188d9571f4b9425 Mon Sep 17 00:00:00 2001 From: DGamerL <108773801+DGamerL@users.noreply.github.com> Date: Wed, 17 Apr 2024 06:21:35 +0200 Subject: [PATCH] Removes toxin and carpotoxin when you make recipes with spider meat/eggs and carp fillet respectively. Also removes ether from tofurkey and some morphine from bear meat (#25069) * Removes toxic stuff from foods * Nah 3u is better * Boiled spider legs! * Funny review --- .../food_and_drinks/food/foods/meat.dm | 2 +- .../food_and_drinks/food/foods/misc_food.dm | 2 +- .../food_and_drinks/recipes/recipes_grill.dm | 6 ++++ .../recipes/recipes_microwave.dm | 31 +++++++++++++++++++ .../simple_animal/hostile/giant_spider.dm | 2 +- 5 files changed, 40 insertions(+), 3 deletions(-) diff --git a/code/modules/food_and_drinks/food/foods/meat.dm b/code/modules/food_and_drinks/food/foods/meat.dm index 5cc637ba2d6..783cbdd7f41 100644 --- a/code/modules/food_and_drinks/food/foods/meat.dm +++ b/code/modules/food_and_drinks/food/foods/meat.dm @@ -124,7 +124,7 @@ icon_state = "bearmeat" filling_color = "#DB0000" bitesize = 3 - list_reagents = list("protein" = 12, "morphine" = 5, "vitamin" = 2) + list_reagents = list("protein" = 12, "morphine" = 3, "vitamin" = 2) tastes = list("meat" = 1, "salmon" = 1) /obj/item/food/snacks/monstermeat/xenomeat diff --git a/code/modules/food_and_drinks/food/foods/misc_food.dm b/code/modules/food_and_drinks/food/foods/misc_food.dm index d9189b03aa3..a65b1bcf3fa 100644 --- a/code/modules/food_and_drinks/food/foods/misc_food.dm +++ b/code/modules/food_and_drinks/food/foods/misc_food.dm @@ -59,7 +59,7 @@ icon_state = "tofurkey" filling_color = "#FFFEE0" bitesize = 3 - list_reagents = list("nutriment" = 12, "ether" = 3) + list_reagents = list("nutriment" = 12) tastes = list("tofu" = 1) goal_difficulty = FOOD_GOAL_NORMAL diff --git a/code/modules/food_and_drinks/recipes/recipes_grill.dm b/code/modules/food_and_drinks/recipes/recipes_grill.dm index a126d5964d2..e0a1569f330 100644 --- a/code/modules/food_and_drinks/recipes/recipes_grill.dm +++ b/code/modules/food_and_drinks/recipes/recipes_grill.dm @@ -92,6 +92,7 @@ /datum/recipe/grill/fishfingers/make_food(obj/container) var/obj/item/food/snacks/fishfingers/being_cooked = ..() being_cooked.reagents.del_reagent("egg") + being_cooked.reagents.del_reagent("carpotoxin") return being_cooked /datum/recipe/grill/cutlet @@ -159,6 +160,11 @@ ) result = /obj/item/food/snacks/picoss_kabob +/datum/recipe/grill/picoss_kabob/make_food(obj/container) + var/obj/item/food/snacks/picoss_kabob/being_cooked = ..() + being_cooked.reagents.del_reagent("carpotoxin") + return being_cooked + /datum/recipe/grill/sushi_Tamago reagents = list("sake" = 5) items = list( diff --git a/code/modules/food_and_drinks/recipes/recipes_microwave.dm b/code/modules/food_and_drinks/recipes/recipes_microwave.dm index d7001eecb0e..ccbb8df2ea3 100644 --- a/code/modules/food_and_drinks/recipes/recipes_microwave.dm +++ b/code/modules/food_and_drinks/recipes/recipes_microwave.dm @@ -126,6 +126,11 @@ ) result = /obj/item/food/snacks/fishburger +/datum/recipe/microwave/fishburger/make_food(obj/container) + var/obj/item/food/snacks/fishburger/being_cooked = ..() + being_cooked.reagents.del_reagent("carpotoxin") + return being_cooked + /datum/recipe/microwave/tofuburger items = list( /obj/item/food/snacks/bun, @@ -300,6 +305,11 @@ ) result = /obj/item/food/snacks/cubancarp +/datum/recipe/microwave/cubancarp/make_food(obj/container) + var/obj/item/food/snacks/cubancarp/being_cooked = ..() + being_cooked.reagents.del_reagent("carpotoxin") + return being_cooked + /datum/recipe/microwave/popcorn items = list( /obj/item/food/snacks/grown/corn @@ -425,6 +435,11 @@ ) result = /obj/item/food/snacks/fishandchips +/datum/recipe/microwave/fishandchips/make_food(obj/container) + var/obj/item/food/snacks/fishandchips/being_cooked = ..() + being_cooked.reagents.del_reagent("carpotoxin") + return being_cooked + /datum/recipe/microwave/sandwich items = list( /obj/item/food/snacks/meatsteak, @@ -1396,6 +1411,11 @@ ) result = /obj/item/food/snacks/boiledspiderleg +/datum/recipe/microwave/boiledspiderleg/make_food(obj/container) + var/obj/item/food/snacks/boiledspiderleg/being_cooked = ..() + being_cooked.reagents.del_reagent("toxin") + return being_cooked + /datum/recipe/microwave/spidereggsham reagents = list("sodiumchloride" = 1) items = list( @@ -1404,6 +1424,11 @@ ) result = /obj/item/food/snacks/spidereggsham +/datum/recipe/microwave/spidereggsham/make_food(obj/container) + var/obj/item/food/snacks/spidereggsham/being_cooked = ..() + being_cooked.reagents.del_reagent("toxin") + return being_cooked + /datum/recipe/microwave/sashimi reagents = list("soysauce" = 5) items = list( @@ -1412,6 +1437,12 @@ ) result = /obj/item/food/snacks/sashimi +/datum/recipe/microwave/sashimi/make_food(obj/container) + var/obj/item/food/snacks/sashimi/being_cooked = ..() + being_cooked.reagents.del_reagent("carpotoxin") + being_cooked.reagents.del_reagent("toxin") + return being_cooked + /datum/recipe/microwave/mashedtaters reagents = list("gravy" = 5) items = list( diff --git a/code/modules/mob/living/simple_animal/hostile/giant_spider.dm b/code/modules/mob/living/simple_animal/hostile/giant_spider.dm index daba2b30db1..02a22268efe 100644 --- a/code/modules/mob/living/simple_animal/hostile/giant_spider.dm +++ b/code/modules/mob/living/simple_animal/hostile/giant_spider.dm @@ -65,7 +65,7 @@ icon_state = "nurse" icon_living = "nurse" icon_dead = "nurse_dead" - butcher_results = list(/obj/item/food/snacks/monstermeat/spidermeat= 2, /obj/item/food/snacks/monstermeat/spiderleg= 8, /obj/item/food/snacks/monstermeat/spidereggs= 4) + butcher_results = list(/obj/item/food/snacks/monstermeat/spidermeat = 2, /obj/item/food/snacks/monstermeat/spiderleg = 8, /obj/item/food/snacks/monstermeat/spidereggs = 4) maxHealth = 40 health = 40