From a3e65cdfdf2f243a635e317c7adb60287892bfc0 Mon Sep 17 00:00:00 2001 From: SmArtKar <44720187+SmArtKar@users.noreply.github.com> Date: Thu, 11 Jul 2024 03:22:50 +0300 Subject: [PATCH] Fixes meat producing copious amounts of blood (#84820) ## About The Pull Request Closes #83665 blood_walk component's amount of blood is actually the amount of tiles on which the component will leave blood. This makes steaks roughly consistent with the meat material, as previously they had copious 400 tiles of blood. Since by default blood decals hold 50 blood, this translates to... 20 thousand units of blood. Does same for the meatpack which copypasted code from the steak from the looks of it. ## Why It's Good For The Game 400 tiles is a nonsensical amount of blood for a single steak, and this is clearly an oversight. Maintainers are welcome to relabel this as balance if required. ## Changelog :cl: fix: Steaks and meatpacks no longer have an absurd amount of blood stored inside of them. /:cl: --- code/game/objects/items/food/meatslab.dm | 4 ++-- code/game/objects/items/storage/backpack.dm | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/code/game/objects/items/food/meatslab.dm b/code/game/objects/items/food/meatslab.dm index 7816fb0e83a..a5fe073e56f 100644 --- a/code/game/objects/items/food/meatslab.dm +++ b/code/game/objects/items/food/meatslab.dm @@ -16,12 +16,12 @@ /datum/component/blood_walk,\ blood_type = blood_decal_type,\ blood_spawn_chance = 45,\ - max_blood = custom_materials[custom_materials[1]],\ + max_blood = custom_materials[custom_materials[1]] / SHEET_MATERIAL_AMOUNT,\ ) AddComponent( /datum/component/bloody_spreader,\ - blood_left = custom_materials[custom_materials[1]],\ + blood_left = custom_materials[custom_materials[1]] / SHEET_MATERIAL_AMOUNT,\ blood_dna = list("meaty DNA" = "MT-"),\ diseases = null,\ ) diff --git a/code/game/objects/items/storage/backpack.dm b/code/game/objects/items/storage/backpack.dm index d2d4297fdc6..5ae6e8d9fa6 100644 --- a/code/game/objects/items/storage/backpack.dm +++ b/code/game/objects/items/storage/backpack.dm @@ -277,11 +277,11 @@ /datum/component/blood_walk,\ blood_type = /obj/effect/decal/cleanable/blood,\ blood_spawn_chance = 15,\ - max_blood = 300,\ + max_blood = custom_materials[custom_materials[1]] / SHEET_MATERIAL_AMOUNT,\ ) AddComponent( /datum/component/bloody_spreader,\ - blood_left = INFINITY,\ + blood_left = custom_materials[custom_materials[1]] / SHEET_MATERIAL_AMOUNT,\ blood_dna = list("MEAT DNA" = "MT+"),\ diseases = null,\ )