From 62d11475131e651dcccd727113ec6c80fb2f0216 Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Mon, 6 Mar 2023 20:34:25 +0100 Subject: [PATCH] [MIRROR] Fixes bread dog butchering producing error bread and adds some warnings to bread that shouldn't appear in-game. [MDB IGNORE] (#19695) * Fixes bread dog butchering producing error bread and adds some warnings to bread that shouldn't appear in-game. (#73783) ## About The Pull Request Fixes https://github.com/tgstation/tgstation/issues/73765 Also adds some warnings and description to bread/breadslice so you can more easily notice that something is wrong. Not much to discuss i think. ## Why It's Good For The Game You can get normal bread from butchering bread dog. And potentially less issues with bread in future. ## Changelog :cl: fix: fixed butchering bread dog spawning error bread. /:cl: --------- Co-authored-by: Jacquerel * Fixes bread dog butchering producing error bread and adds some warnings to bread that shouldn't appear in-game. --------- Co-authored-by: Helg2 <93882977+Helg2@users.noreply.github.com> Co-authored-by: Jacquerel --- code/game/objects/items/food/bread.dm | 6 ++++++ code/modules/mob/living/basic/pets/dog.dm | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/code/game/objects/items/food/bread.dm b/code/game/objects/items/food/bread.dm index 27d32e79b73..f41cae14ad3 100644 --- a/code/game/objects/items/food/bread.dm +++ b/code/game/objects/items/food/bread.dm @@ -1,5 +1,8 @@ +/// Abstract parent object for bread items. Should not be made obtainable in game. /obj/item/food/bread + name = "bread?" + desc = "You shouldn't see this, call the coders." icon = 'icons/obj/food/burgerbread.dmi' max_volume = 80 tastes = list("bread" = 10) @@ -20,7 +23,10 @@ AddElement(/datum/element/processable, TOOL_KNIFE, slice_type, yield, 3 SECONDS, table_required = TRUE, screentip_verb = "Slice") AddElement(/datum/element/processable, TOOL_SAW, slice_type, yield, 4 SECONDS, table_required = TRUE, screentip_verb = "Slice") +// Abstract parent object for sliced bread items. Should not be made obtainable in game. /obj/item/food/breadslice + name = "breadslice?" + desc = "You shouldn't see this, call the coders." icon = 'icons/obj/food/burgerbread.dmi' foodtypes = GRAIN food_flags = FOOD_FINGER_FOOD diff --git a/code/modules/mob/living/basic/pets/dog.dm b/code/modules/mob/living/basic/pets/dog.dm index 9cb5a6ae0b4..b7151a9a6bf 100644 --- a/code/modules/mob/living/basic/pets/dog.dm +++ b/code/modules/mob/living/basic/pets/dog.dm @@ -794,7 +794,7 @@ GLOBAL_LIST_INIT(strippable_corgi_items, create_strippable_list(list( maxHealth = 50 gender = NEUTER damage_coeff = list(BRUTE = 3, BURN = 3, TOX = 1, CLONE = 1, STAMINA = 0, OXY = 1) - butcher_results = list(/obj/item/organ/internal/brain = 1, /obj/item/organ/internal/heart = 1, /obj/item/food/breadslice = 3, \ + butcher_results = list(/obj/item/organ/internal/brain = 1, /obj/item/organ/internal/heart = 1, /obj/item/food/breadslice/plain = 3, \ /obj/item/food/meat/slab = 2) response_harm_continuous = "takes a bite out of" response_harm_simple = "take a bite out of"