From 12d8ca98859e4501917713aef5a97247d7475b99 Mon Sep 17 00:00:00 2001 From: Alberyk Date: Fri, 21 Aug 2020 09:41:41 -0300 Subject: [PATCH] Fixes the canned fatshouters meat having the wrong trash (#9731) --- code/game/objects/items/trash.dm | 3 +++ code/modules/reagents/reagent_containers/food/snacks.dm | 2 +- html/changelogs/alberyk-canfix.yml | 6 ++++++ 3 files changed, 10 insertions(+), 1 deletion(-) create mode 100644 html/changelogs/alberyk-canfix.yml diff --git a/code/game/objects/items/trash.dm b/code/game/objects/items/trash.dm index 4b4d9bbaf7a..22e8c3e1f18 100644 --- a/code/game/objects/items/trash.dm +++ b/code/game/objects/items/trash.dm @@ -148,6 +148,9 @@ . = ..() randpixel_xy() +/obj/item/trash/can/adhomian_can + icon_state = "can-used" + /obj/item/trash/tuna name = "\improper Tuna Snax" icon_state = "tuna" diff --git a/code/modules/reagents/reagent_containers/food/snacks.dm b/code/modules/reagents/reagent_containers/food/snacks.dm index d716a4d5842..d9a3f4b112c 100644 --- a/code/modules/reagents/reagent_containers/food/snacks.dm +++ b/code/modules/reagents/reagent_containers/food/snacks.dm @@ -4364,7 +4364,7 @@ desc = "A piece of salted fatshouter's meat stored inside a metal can." icon_state = "canned" bitesize = 2 - trash = /obj/item/trash/can + trash = /obj/item/trash/can/adhomian_can desc_fluff = "While the People's republic territory includes several different regional cultures, it is possible to find common culinary traditions among its population. \ Salt-cured Fatshouters's meat also has been introduced widely, facilitated by the recent advances in the livestock husbandry techniques." reagents_to_add = list(/datum/reagent/nutriment/protein = 5, /datum/reagent/sodiumchloride = 2) diff --git a/html/changelogs/alberyk-canfix.yml b/html/changelogs/alberyk-canfix.yml new file mode 100644 index 00000000000..59c2af66cb7 --- /dev/null +++ b/html/changelogs/alberyk-canfix.yml @@ -0,0 +1,6 @@ +author: Alberyk + +delete-after: True + +changes: + - bugfix: "Fixed the canned fatshouters meat's can having the wrong sprite after it was eaten."