From 130ca0c49c6ad8b29e49fe547ed463820b1ba1ff Mon Sep 17 00:00:00 2001 From: PatrickLeeJohnson <48314394+Ambassadoing@users.noreply.github.com> Date: Sun, 19 Jan 2025 16:14:42 +0300 Subject: [PATCH 1/3] Update food_righthand.dmi --- icons/mob/inhands/misc/food_righthand.dmi | Bin 3780 -> 8325 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/icons/mob/inhands/misc/food_righthand.dmi b/icons/mob/inhands/misc/food_righthand.dmi index 5f73729be80fb0e4a12f6f91fbf7a2cbd37bcc2a..c7e7036f5769c7ababa59893baccc0ffaa60b196 100644 GIT binary patch literal 8325 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 Date: Sun, 19 Jan 2025 16:31:27 +0300 Subject: [PATCH 2/3] hope this works --- code/modules/food_and_drinks/food/snacks_pastry.dm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/code/modules/food_and_drinks/food/snacks_pastry.dm b/code/modules/food_and_drinks/food/snacks_pastry.dm index 0cf0e3c2d6..fad13c4274 100644 --- a/code/modules/food_and_drinks/food/snacks_pastry.dm +++ b/code/modules/food_and_drinks/food/snacks_pastry.dm @@ -486,6 +486,7 @@ filling_color = "#CD853F" tastes = list("meat" = 2, "dough" = 2, "laziness" = 1) foodtype = GRAIN + use_gs_icon = TRUE var/list/cached_reagents_amount var/previous_typepath @@ -529,6 +530,7 @@ cooked_type = null tastes = list("meat" = 2, "dough" = 2, "laziness" = 1) foodtype = GRAIN | ANTITOXIC + use_gs_icon = TRUE /obj/item/reagent_containers/food/snacks/dankpocket name = "\improper Dank-pocket" From aa4fbf6aac9463c35311b904cc0c6663d52e4710 Mon Sep 17 00:00:00 2001 From: PatrickLeeJohnson <48314394+Ambassadoing@users.noreply.github.com> Date: Sun, 19 Jan 2025 16:50:45 +0300 Subject: [PATCH 3/3] moar fixes --- GainStation13/code/modules/food_and_drinks/food.dm | 1 + code/modules/food_and_drinks/food/snacks_pastry.dm | 3 +-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/GainStation13/code/modules/food_and_drinks/food.dm b/GainStation13/code/modules/food_and_drinks/food.dm index e83ae80a72..7e29620b36 100644 --- a/GainStation13/code/modules/food_and_drinks/food.dm +++ b/GainStation13/code/modules/food_and_drinks/food.dm @@ -3,6 +3,7 @@ /obj/item/reagent_containers/food/snacks/gbburrito name = "\improper GATO Gas Giant Burrito" + icon = 'Gainstation13/icons/obj/food/food.dmi' icon_state = "gbburrito" desc = "More than three pounds of beans, meat, and cheese wrapped in a greasy tortilla. It's piping hot." trash = null diff --git a/code/modules/food_and_drinks/food/snacks_pastry.dm b/code/modules/food_and_drinks/food/snacks_pastry.dm index fad13c4274..247b546a00 100644 --- a/code/modules/food_and_drinks/food/snacks_pastry.dm +++ b/code/modules/food_and_drinks/food/snacks_pastry.dm @@ -480,13 +480,13 @@ /obj/item/reagent_containers/food/snacks/donkpocket name = "\improper Donk-pocket" desc = "The food of choice for the seasoned traitor." + icon = 'Gainstation13/icons/obj/food/food.dmi' icon_state = "donkpocket" list_reagents = list(/datum/reagent/consumable/nutriment = 4) cooked_type = /obj/item/reagent_containers/food/snacks/donkpocket/warm filling_color = "#CD853F" tastes = list("meat" = 2, "dough" = 2, "laziness" = 1) foodtype = GRAIN - use_gs_icon = TRUE var/list/cached_reagents_amount var/previous_typepath @@ -530,7 +530,6 @@ cooked_type = null tastes = list("meat" = 2, "dough" = 2, "laziness" = 1) foodtype = GRAIN | ANTITOXIC - use_gs_icon = TRUE /obj/item/reagent_containers/food/snacks/dankpocket name = "\improper Dank-pocket"