From 1e0af20375625985041d9e9b708b7eeff3e0c22f Mon Sep 17 00:00:00 2001 From: GenericDM <34109002+GenericDM@users.noreply.github.com> Date: Thu, 7 Dec 2023 17:24:11 -0800 Subject: [PATCH] licorice (#2573) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ## About The Pull Request renames licorice ice cream ## Why It's Good For The Game regardless of if it's a reference to a real brand or not, i doubt it was added to /tg/ in good faith. regardless, the company would not have survived the night of fire, and making it vague prevents people from making cheap jokes ## Changelog 🆑 tweak: renames licorice ice cream /🆑 --- .../food_and_drinks/food/snacks_frozen.dm | 6 +++--- .../recipes/tablecraft/recipes_frozen.dm | 6 +++--- icons/obj/food/frozen_treats.dmi | Bin 3747 -> 3742 bytes 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/code/modules/food_and_drinks/food/snacks_frozen.dm b/code/modules/food_and_drinks/food/snacks_frozen.dm index 95ef84ae5cb7..dfbed9ba9112 100644 --- a/code/modules/food_and_drinks/food/snacks_frozen.dm +++ b/code/modules/food_and_drinks/food/snacks_frozen.dm @@ -262,9 +262,9 @@ bonus_reagents = list(/datum/reagent/consumable/hot_coco = 4, /datum/reagent/consumable/cream = 2, /datum/reagent/consumable/vanilla = 3, /datum/reagent/consumable/sugar = 2) overlay_state = "jumbo" -/obj/item/reagent_containers/food/snacks/popsicle/nogga_black - name = "nogga black" - desc = "A salty licorice icecream recently reintroduced due to all the records of the controversy being lost to time. Those who cannot remember the past are doomed to repeat it." +/obj/item/reagent_containers/food/snacks/popsicle/licorice + name = "licorice icecream" + desc = "A salty licorice icecream." list_reagents = list(/datum/reagent/consumable/nutriment = 4, /datum/reagent/consumable/sodiumchloride = 1, /datum/reagent/consumable/cream = 2, /datum/reagent/consumable/vanilla = 1, /datum/reagent/consumable/sugar = 4) bonus_reagents = list(/datum/reagent/consumable/nutriment = 4, /datum/reagent/consumable/sodiumchloride = 1, /datum/reagent/consumable/cream = 2, /datum/reagent/consumable/vanilla = 1, /datum/reagent/consumable/sugar = 4) tastes = list("salty liquorice") diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_frozen.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_frozen.dm index 588eb863fbd7..92647559d9cd 100644 --- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_frozen.dm +++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_frozen.dm @@ -296,8 +296,8 @@ result = /obj/item/reagent_containers/food/snacks/popsicle/jumbo subcategory = CAT_ICE -/datum/crafting_recipe/food/nogga_black - name = "Nogga black" +/datum/crafting_recipe/food/licorice + name = "Licorice icecream" reqs = list( /obj/item/popsicle_stick = 1, /datum/reagent/consumable/blumpkinjuice = 4, //natural source of ammonium chloride @@ -307,5 +307,5 @@ /datum/reagent/consumable/vanilla = 2, /datum/reagent/consumable/sugar = 2 ) - result = /obj/item/reagent_containers/food/snacks/popsicle/nogga_black + result = /obj/item/reagent_containers/food/snacks/popsicle/licorice subcategory = CAT_ICE diff --git a/icons/obj/food/frozen_treats.dmi b/icons/obj/food/frozen_treats.dmi index 453bfaf277b735737af4a04857677fe67e85584f..389949dcfa0810c4a36cba503cc228e5c83a9558 100644 GIT binary patch delta 352 zcmV-m0iXV(9iAPql>&cAdQ@0+L}hbha%pgMX>V=-0C=30mBDVqAPhjy$yY?}eOlXH zcbQsEJ*>Y_xx`6W0V6|-y00Hfq+T&MKu`GDvSHhOoxabP?)Ypr`WxA(S5 zx{p)d9QJK9p&qBWZbF2JdAS)3Jctd3a1CnHHofMM&v$JzFj#+F*Du;@hv2DcvYHIXHIqIBryM-?X9f5Py*MLD@(3i+0N+PJGs@xpuq8k ymNj2!+0>I?iyop@_e%U4$|D&W((*b>Cx6?WF307g{0CbbALG}OVxqI_1Gox;!K7>e delta 357 zcmV-r0h<1v9ittvl>&cFdQ@0+L}hbha%pgMX>V=-0C=30)xBhdIEF?X%7%R{HcsAXVw)^JdUb_-{VUuKqZGUas}&>r&m3gCygB6Y`&DWJt?SE!_on_4#^Qewx43q$FEnp9KE1<^#A2 De}S`~