From 19274dfda9f7007a2ff2cc99bad0158ce00729f4 Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Thu, 10 Aug 2023 14:10:36 +0200 Subject: [PATCH] [MIRROR] [NO GBP] Fixes custom ice cream [MDB IGNORE] (#22986) * [NO GBP] Fixes custom ice cream (#77477) ## About The Pull Request Defines a name for Korta milk custom ice creams because it was overriding the default custom ice cream recipe instead of adding it alongside as intended ## Why It's Good For The Game bug fix ## Changelog I don't think anybody actually noticed this enough to justify a new changelog lol * [NO GBP] Fixes custom ice cream --------- Co-authored-by: YakumoChen --- code/__DEFINES/food.dm | 1 + code/datums/components/food/ice_cream_holder.dm | 1 + 2 files changed, 2 insertions(+) diff --git a/code/__DEFINES/food.dm b/code/__DEFINES/food.dm index 0ca53bb2274..7c6a10644ad 100644 --- a/code/__DEFINES/food.dm +++ b/code/__DEFINES/food.dm @@ -186,6 +186,7 @@ DEFINE_BITFIELD(food_flags, list( #define ICE_CREAM_KORTA_VANILLA "korta vanilla" #define ICE_CREAM_MOB "mob" #define ICE_CREAM_CUSTOM "custom" +#define ICE_CREAM_KORTA_CUSTOM "korta custom" #define ICE_CREAM_BLAND "bland" #define DEFAULT_MAX_ICE_CREAM_SCOOPS 3 diff --git a/code/datums/components/food/ice_cream_holder.dm b/code/datums/components/food/ice_cream_holder.dm index 0cb15ece936..9e25c7cb4b4 100644 --- a/code/datums/components/food/ice_cream_holder.dm +++ b/code/datums/components/food/ice_cream_holder.dm @@ -342,6 +342,7 @@ GLOBAL_LIST_INIT_TYPED(ice_cream_flavours, /datum/ice_cream_flavour, init_ice_cr ingredients_text = "optional flavorings" /datum/ice_cream_flavour/custom/korta + name = ICE_CREAM_KORTA_CUSTOM desc = "filled with artisanal lizard-friendly icecream. Made with real $CUSTOM_NAME. Ain't that something." ingredients = list(/datum/reagent/consumable/korta_milk, /datum/reagent/consumable/ice) ingredients_text = "optional flavorings"