From 1f03fa7a87631805897a730048cbdde72bd0d262 Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Sat, 21 Oct 2023 21:13:22 +0200 Subject: [PATCH] [MIRROR] Cooked meat no longer spreads blood around. [MDB IGNORE] (#24492) * Cooked meat no longer spreads blood around. (#79124) ## About The Pull Request See the title. ## Why It's Good For The Game Someone pointed it out on #78743. I'd like to consider this a fix, even though carlarc has actually set blood decals for cooked xeno and killer tomato meat toos, because meat generally loses blood as it gets griddled, and doneness really isn't a feature yet. ## Changelog :cl: fix: Cooked meat no longer spreads blood around as if it weren't cooked. /:cl: * Cooked meat no longer spreads blood around. --------- Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com> --- code/game/objects/items/food/meatslab.dm | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/code/game/objects/items/food/meatslab.dm b/code/game/objects/items/food/meatslab.dm index 9959f20db7c..c6b7d8110e7 100644 --- a/code/game/objects/items/food/meatslab.dm +++ b/code/game/objects/items/food/meatslab.dm @@ -26,7 +26,6 @@ diseases = null,\ ) - /obj/item/food/meat/slab name = "meat" desc = "A slab of meat." @@ -380,6 +379,7 @@ tastes = list("bacon" = 1) foodtypes = MEAT | BREAKFAST crafting_complexity = FOOD_COMPLEXITY_1 + blood_decal_type = null /obj/item/food/meat/slab/gondola name = "gondola meat" @@ -442,6 +442,7 @@ tastes = list("crab" = 1) foodtypes = SEAFOOD crafting_complexity = FOOD_COMPLEXITY_1 + blood_decal_type = null /obj/item/food/meat/slab/chicken name = "chicken meat" @@ -500,6 +501,7 @@ foodtypes = MEAT tastes = list("meat" = 1) crafting_complexity = FOOD_COMPLEXITY_1 + blood_decal_type = null /obj/item/food/meat/steak/Initialize(mapload) . = ..() @@ -544,12 +546,10 @@ /obj/item/food/meat/steak/xeno name = "xeno steak" tastes = list("meat" = 1, "acid" = 1) - blood_decal_type = /obj/effect/decal/cleanable/xenoblood /obj/item/food/meat/steak/spider name = "spider steak" tastes = list("cobwebs" = 1) - blood_decal_type = /obj/effect/decal/cleanable/insectguts /obj/item/food/meat/steak/goliath name = "goliath steak" @@ -720,6 +720,7 @@ tastes = list("meat" = 1) foodtypes = MEAT crafting_complexity = FOOD_COMPLEXITY_1 + blood_decal_type = null /obj/item/food/meat/cutlet/Initialize(mapload) . = ..() @@ -756,7 +757,6 @@ name = "killer tomato cutlet" tastes = list("tomato" = 1) foodtypes = FRUIT - blood_decal_type = /obj/effect/decal/cleanable/food/tomato_smudge /obj/item/food/meat/cutlet/bear name = "bear cutlet" @@ -765,12 +765,10 @@ /obj/item/food/meat/cutlet/xeno name = "xeno cutlet" tastes = list("meat" = 1, "acid" = 1) - blood_decal_type = /obj/effect/decal/cleanable/xenoblood /obj/item/food/meat/cutlet/spider name = "spider cutlet" tastes = list("cobwebs" = 1) - blood_decal_type = /obj/effect/decal/cleanable/insectguts /obj/item/food/meat/cutlet/gondola name = "gondola cutlet"