From de425c85a59a63a99dfdbc2c8666bfd786380c1a Mon Sep 17 00:00:00 2001 From: Fansana Date: Thu, 8 Aug 2024 21:19:52 +0200 Subject: [PATCH 1/3] add icecream --- .../en-US/Floof/flavors/flavor-profiles.ftl | 5 + .../Prototypes/Body/Organs/reptilian.yml | 1 + .../Consumable/Food/Containers/bowl.yml | 59 ++++ .../Objects/Consumable/Food/icecream.yml | 305 ++++++++++++++++++ .../Prototypes/Floof/Flavors/flavors.yml | 25 ++ .../Floof/Recipes/Cooking/meal_recipes.yml | 112 +++++++ Resources/Prototypes/tags.yml | 3 + .../Food/icecream.rsi/blooddrop.png | Bin 0 -> 926 bytes .../Consumable/Food/icecream.rsi/bowl.png | Bin 0 -> 295 bytes .../Consumable/Food/icecream.rsi/caramel.png | Bin 0 -> 1002 bytes .../Consumable/Food/icecream.rsi/coffee.png | Bin 0 -> 922 bytes .../Consumable/Food/icecream.rsi/fill-1.png | Bin 0 -> 119 bytes .../Consumable/Food/icecream.rsi/fill-2.png | Bin 0 -> 130 bytes .../Consumable/Food/icecream.rsi/fill-3.png | Bin 0 -> 133 bytes .../Consumable/Food/icecream.rsi/fill-4.png | Bin 0 -> 151 bytes .../Consumable/Food/icecream.rsi/fill-5.png | Bin 0 -> 146 bytes .../Consumable/Food/icecream.rsi/greentea.png | Bin 0 -> 889 bytes .../Consumable/Food/icecream.rsi/lemon.png | Bin 0 -> 921 bytes .../Consumable/Food/icecream.rsi/meta.json | 62 ++++ .../Consumable/Food/icecream.rsi/orange.png | Bin 0 -> 825 bytes .../Consumable/Food/icecream.rsi/plate.png | Bin 0 -> 302 bytes .../Consumable/Food/icecream.rsi/rainbow.png | Bin 0 -> 1030 bytes .../Food/icecream.rsi/saltedcaramel.png | Bin 0 -> 1037 bytes .../Food/icecream.rsi/spaghetti.png | Bin 0 -> 980 bytes .../Food/icecream.rsi/strawberry.png | Bin 0 -> 1050 bytes 25 files changed, 572 insertions(+) create mode 100644 Resources/Prototypes/Floof/Entities/Objects/Consumable/Food/Containers/bowl.yml create mode 100644 Resources/Prototypes/Floof/Entities/Objects/Consumable/Food/icecream.yml create mode 100644 Resources/Prototypes/Floof/Recipes/Cooking/meal_recipes.yml create mode 100644 Resources/Textures/Floof/Objects/Consumable/Food/icecream.rsi/blooddrop.png create mode 100644 Resources/Textures/Floof/Objects/Consumable/Food/icecream.rsi/bowl.png create mode 100644 Resources/Textures/Floof/Objects/Consumable/Food/icecream.rsi/caramel.png create mode 100644 Resources/Textures/Floof/Objects/Consumable/Food/icecream.rsi/coffee.png create mode 100644 Resources/Textures/Floof/Objects/Consumable/Food/icecream.rsi/fill-1.png create mode 100644 Resources/Textures/Floof/Objects/Consumable/Food/icecream.rsi/fill-2.png create mode 100644 Resources/Textures/Floof/Objects/Consumable/Food/icecream.rsi/fill-3.png create mode 100644 Resources/Textures/Floof/Objects/Consumable/Food/icecream.rsi/fill-4.png create mode 100644 Resources/Textures/Floof/Objects/Consumable/Food/icecream.rsi/fill-5.png create mode 100644 Resources/Textures/Floof/Objects/Consumable/Food/icecream.rsi/greentea.png create mode 100644 Resources/Textures/Floof/Objects/Consumable/Food/icecream.rsi/lemon.png create mode 100644 Resources/Textures/Floof/Objects/Consumable/Food/icecream.rsi/meta.json create mode 100644 Resources/Textures/Floof/Objects/Consumable/Food/icecream.rsi/orange.png create mode 100644 Resources/Textures/Floof/Objects/Consumable/Food/icecream.rsi/plate.png create mode 100644 Resources/Textures/Floof/Objects/Consumable/Food/icecream.rsi/rainbow.png create mode 100644 Resources/Textures/Floof/Objects/Consumable/Food/icecream.rsi/saltedcaramel.png create mode 100644 Resources/Textures/Floof/Objects/Consumable/Food/icecream.rsi/spaghetti.png create mode 100644 Resources/Textures/Floof/Objects/Consumable/Food/icecream.rsi/strawberry.png diff --git a/Resources/Locale/en-US/Floof/flavors/flavor-profiles.ftl b/Resources/Locale/en-US/Floof/flavors/flavor-profiles.ftl index 882ac2b8e1b..34bbf1bdd9e 100644 --- a/Resources/Locale/en-US/Floof/flavors/flavor-profiles.ftl +++ b/Resources/Locale/en-US/Floof/flavors/flavor-profiles.ftl @@ -35,3 +35,8 @@ flavor-complex-voltage = like drinking an alcoholic battery flavor-complex-watermelonginjizz = bubbly and fruity flavor-complex-whiskeysour = sour and like molasses flavor-complex-yeolhandy = like oranges and solitude +flavor-complex-blooddrop = crimson lust +flavor-complex-strawberry = strawberry +flavor-complex-whitechocolatechip = like white chocolate chips +flavor-complex-caramel = caramel +flavor-complex-vanilla = vanilla diff --git a/Resources/Prototypes/Body/Organs/reptilian.yml b/Resources/Prototypes/Body/Organs/reptilian.yml index f8423582cc2..3e8a7e7280f 100644 --- a/Resources/Prototypes/Body/Organs/reptilian.yml +++ b/Resources/Prototypes/Body/Organs/reptilian.yml @@ -6,6 +6,7 @@ - type: Stomach specialDigestible: tags: + - IceCream #Floofstation - Fruit - ReptilianFood - Meat diff --git a/Resources/Prototypes/Floof/Entities/Objects/Consumable/Food/Containers/bowl.yml b/Resources/Prototypes/Floof/Entities/Objects/Consumable/Food/Containers/bowl.yml new file mode 100644 index 00000000000..5b86eceb35e --- /dev/null +++ b/Resources/Prototypes/Floof/Entities/Objects/Consumable/Food/Containers/bowl.yml @@ -0,0 +1,59 @@ +# Bowls + +- type: entity + name: bowl + parent: ReagentContainerBase + id: IceCreamBowl + description: A simple glass bowl, used for ice cream. + components: + - type: Item + - type: SolutionContainerManager + solutions: + food: + maxVol: 50 # enough to make cheese in. + - type: Sprite + sprite: Floof/Objects/Consumable/Food/icecream.rsi + layers: + - state: bowl + - map: ["enum.SolutionContainerLayers.Fill"] + state: fill-1 + visible: false + - type: DamageOnLand + damage: + types: + Blunt: 5 + - type: DamageOtherOnHit + damage: + types: + Blunt: 5 + - type: Appearance + - type: SolutionContainerVisuals + maxFillLevels: 5 + fillBaseName: fill- + - type: SolutionTransfer + canChangeTransferAmount: true + - type: UserInterface + interfaces: + - key: enum.TransferAmountUiKey.Key + type: TransferAmountBoundUserInterface + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 5 + behaviors: + - !type:PlaySoundBehavior + sound: + collection: GlassBreak + - !type:SpillBehavior { } + - !type:SpawnEntitiesBehavior + spawn: + ShardGlass: + min: 1 + max: 2 + - !type:DoActsBehavior + acts: [ "Destruction" ] + - type: Tag + tags: + - Trash + diff --git a/Resources/Prototypes/Floof/Entities/Objects/Consumable/Food/icecream.yml b/Resources/Prototypes/Floof/Entities/Objects/Consumable/Food/icecream.yml new file mode 100644 index 00000000000..a58ba1aa10d --- /dev/null +++ b/Resources/Prototypes/Floof/Entities/Objects/Consumable/Food/icecream.yml @@ -0,0 +1,305 @@ +- type: entity + parent: FoodBase + id: IceCreamBowlBase + abstract: true + components: + - type: Item + - type: Food + trash: IceCreamBowl + utensil: Spoon + - type: SolutionContainerManager + solutions: + food: + maxVol: 50 + reagents: + - ReagentId: IceCream + Quantity: 30 + - type: Sprite + sprite: Floof/Objects/Consumable/Food/icecream.rsi + layers: + - state: bowl + - type: DamageOnLand + damage: + types: + Blunt: 5 + - type: DamageOtherOnHit + damage: + types: + Blunt: 5 + - type: Spillable + solution: food + # ice cream weapon! + - type: MeleeWeapon + soundNoDamage: + path: "/Audio/Effects/Fluids/splat.ogg" + damage: + types: + Blunt: 0 + - type: Damageable + damageContainer: Inorganic + - type: Tag + tags: + - IceCream + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 5 + behaviors: + - !type:PlaySoundBehavior + sound: + collection: GlassBreak + params: + volume: -8 + - !type:SpillBehavior { } + - !type:SpawnEntitiesBehavior + spawn: + FoodBowlBigTrash: + min: 1 + max: 1 + - !type:DoActsBehavior + acts: [ "Destruction" ] + +- type: entity + name: blood drop + parent: IceCreamBowlBase + id: IceCreamBloodDrop + description: Deep, dark delight with a crimson finish. + components: + - type: FlavorProfile + flavors: + - blooddrop + - type: Sprite + sprite: Floof/Objects/Consumable/Food/icecream.rsi + layers: + - state: blooddrop + - type: SolutionContainerManager + solutions: + food: + maxVol: 50 + reagents: + - ReagentId: IceCream + Quantity: 15 + - ReagentId: Nutriment + Quantity: 5 + - ReagentId: Pomelustine + Quantity: 10 + +- type: entity + name: caramel ice cream + parent: IceCreamBowlBase + id: IceCreamCaramel + description: Buttery caramel swirled into creamy perfection. + components: + - type: FlavorProfile + flavors: + - creamy + - caramel + - type: Sprite + sprite: Floof/Objects/Consumable/Food/icecream.rsi + layers: + - state: caramel + - type: SolutionContainerManager + solutions: + food: + maxVol: 50 + reagents: + - ReagentId: IceCream + Quantity: 15 + - ReagentId: Nutriment + Quantity: 15 + +- type: entity + name: coffee ice cream + parent: IceCreamBowlBase + id: IceCreamCoffee + description: Silky ice cream with deep, aromatic coffee essence. + components: + - type: FlavorProfile + flavors: + - coffee + - type: Sprite + sprite: Floof/Objects/Consumable/Food/icecream.rsi + layers: + - state: coffee + - type: SolutionContainerManager + solutions: + food: + maxVol: 50 + reagents: + - ReagentId: IceCream + Quantity: 15 + - ReagentId: Nutriment + Quantity: 15 + +- type: entity + name: greentea ice cream + parent: IceCreamBowlBase + id: IceCreamGreenTea + description: Mildly sweet with the authentic taste of green tea. + components: + - type: FlavorProfile + flavors: + - sweet + - tea + - type: Sprite + sprite: Floof/Objects/Consumable/Food/icecream.rsi + layers: + - state: greentea + - type: SolutionContainerManager + solutions: + food: + maxVol: 50 + reagents: + - ReagentId: IceCream + Quantity: 15 + - ReagentId: Nutriment + Quantity: 15 + +- type: entity + name: lemon ice cream + parent: IceCreamBowlBase + id: IceCreamLemon + description: Sweet delight with a burst of citrusy freshness. + components: + - type: FlavorProfile + flavors: + - sweet + - sour + - type: Sprite + sprite: Floof/Objects/Consumable/Food/icecream.rsi + layers: + - state: lemon + - type: SolutionContainerManager + solutions: + food: + maxVol: 50 + reagents: + - ReagentId: IceCream + Quantity: 15 + - ReagentId: Nutriment + Quantity: 15 + +- type: entity + name: orange ice cream + parent: IceCreamBowlBase + id: IceCreamOrange + description: Deliciously creamy with a juicy, orange twist. + components: + - type: FlavorProfile + flavors: + - sweet + - orange + - type: Sprite + sprite: Floof/Objects/Consumable/Food/icecream.rsi + layers: + - state: orange + - type: SolutionContainerManager + solutions: + food: + maxVol: 50 + reagents: + - ReagentId: IceCream + Quantity: 15 + - ReagentId: Nutriment + Quantity: 15 + +- type: entity + name: Rainbow ice cream + parent: IceCreamBowlBase + id: IceCreamRainbow + description: Colorful layers of sweet, fruity goodness in every bite. + components: + - type: FlavorProfile + flavors: + - sweet + - orange + - grape + - sour + - type: Sprite + sprite: Floof/Objects/Consumable/Food/icecream.rsi + layers: + - state: rainbow + - type: SolutionContainerManager + solutions: + food: + maxVol: 50 + reagents: + - ReagentId: IceCream + Quantity: 15 + - ReagentId: Nutriment + Quantity: 15 + +- type: entity + name: salted caramel ice cream + parent: IceCreamBowlBase + id: IceCreamSaltedCaramel + description: Rich, buttery caramel with a perfect hint of sea salt. + components: + - type: FlavorProfile + flavors: + - salty + - caramel + - creamy + - type: Sprite + sprite: Floof/Objects/Consumable/Food/icecream.rsi + layers: + - state: saltedcaramel + - type: SolutionContainerManager + solutions: + food: + maxVol: 50 + reagents: + - ReagentId: IceCream + Quantity: 15 + - ReagentId: Nutriment + Quantity: 15 + + +- type: entity + name: spaghetti ice cream + parent: IceCreamBowlBase + id: IceCreamSpaghetti + description: spaghetti vanilla ice cream topped with sweet strawberry sauce with a dusting of white chocolate. + components: + - type: FlavorProfile + flavors: + - whitechocolatechip + - vanilla + - strawberry + - type: Sprite + sprite: Floof/Objects/Consumable/Food/icecream.rsi + layers: + - state: spaghetti + - type: SolutionContainerManager + solutions: + food: + maxVol: 50 + reagents: + - ReagentId: IceCream + Quantity: 15 + - ReagentId: Nutriment + Quantity: 15 + +- type: entity + name: strawberry ice cream + parent: IceCreamBowlBase + id: IceCreamStrawberry + description: Velvety ice cream loaded with delightful bits of fresh strawberries. + components: + - type: FlavorProfile + flavors: + - strawberry + - type: Sprite + sprite: Floof/Objects/Consumable/Food/icecream.rsi + layers: + - state: strawberry + - type: SolutionContainerManager + solutions: + food: + maxVol: 50 + reagents: + - ReagentId: IceCream + Quantity: 15 + - ReagentId: Nutriment + Quantity: 15 diff --git a/Resources/Prototypes/Floof/Flavors/flavors.yml b/Resources/Prototypes/Floof/Flavors/flavors.yml index b1f18078b17..19a39c5f20f 100644 --- a/Resources/Prototypes/Floof/Flavors/flavors.yml +++ b/Resources/Prototypes/Floof/Flavors/flavors.yml @@ -188,3 +188,28 @@ id: yeolhandy flavorType: Complex description: flavor-complex-yeolhandy + +- type: flavor + id: blooddrop + flavorType: Complex + description: flavor-complex-blooddrop + +- type: flavor + id: strawberry + flavorType: Complex + description: flavor-complex-strawberry + +- type: flavor + id: whitechocolatechip + flavorType: Complex + description: flavor-complex-whitechocolatechip + +- type: flavor + id: caramel + flavorType: Complex + description: flavor-complex-caramel + +- type: flavor + id: vanilla + flavorType: Complex + description: flavor-complex-vanilla diff --git a/Resources/Prototypes/Floof/Recipes/Cooking/meal_recipes.yml b/Resources/Prototypes/Floof/Recipes/Cooking/meal_recipes.yml new file mode 100644 index 00000000000..24220e690f6 --- /dev/null +++ b/Resources/Prototypes/Floof/Recipes/Cooking/meal_recipes.yml @@ -0,0 +1,112 @@ +- type: microwaveMealRecipe + id: RecipeIceCreamBloodDrop + name: blood drop ice cream recipe + result: IceCreamBloodDrop + time: 5 + reagents: + IceCream: 15 + JuicePomegranate: 15 + solids: + IceCreamBowl: 1 + +- type: microwaveMealRecipe + id: RecipeIceCreamCaramel + name: caramel ice cream recipe + result: IceCreamCaramel + time: 5 + reagents: + IceCream: 15 + Sugar: 15 + solids: + IceCreamBowl: 1 + +- type: microwaveMealRecipe + id: RecipeIceCreamCoffee + name: coffee ice cream recipe + result: IceCreamCoffee + time: 5 + reagents: + IceCream: 15 + Coffee: 15 + solids: + IceCreamBowl: 1 + +- type: microwaveMealRecipe + id: RecipeIceCreamGreenTea + name: green tea ice cream recipe + result: IceCreamGreenTea + time: 5 + reagents: + IceCream: 15 + GreenTea: 15 + solids: + IceCreamBowl: 1 + +- type: microwaveMealRecipe + id: RecipeIceCreamLemon + name: lemon tea ice cream recipe + result: IceCreamLemon + reagents: + IceCream: 15 + JuiceLemon: 15 + solids: + IceCreamBowl: 1 + +- type: microwaveMealRecipe + id: RecipeIceCreamOrange + name: orange ice cream recipe + result: IceCreamOrange + time: 5 + reagents: + IceCream: 15 + JuiceOrange: 15 + solids: + IceCreamBowl: 1 + +- type: microwaveMealRecipe + id: RecipeIceCreamRainbow + name: rainbow ice cream recipe + result: IceCreamRainbow + time: 5 + reagents: + IceCream: 15 + JuiceGrape: 5 + JuiceLemon: 5 + JuiceOrange: 5 + solids: + IceCreamBowl: 1 + +- type: microwaveMealRecipe + id: RecipeIceCreamSaltedCaramel + name: salted caramel ice cream recipe + result: IceCreamSaltedCaramel + time: 5 + reagents: + IceCream: 15 + Sugar: 10 + TableSalt: 5 + solids: + IceCreamBowl: 1 + +- type: microwaveMealRecipe + id: RecipeIceCreamSpaghetti + name: spaghetti ice cream recipe + result: IceCreamSpaghetti + time: 5 + reagents: + IceCream: 15 + Sugar: 10 + Ketchup: 5 + solids: + IceCreamBowl: 1 + +- type: microwaveMealRecipe + id: RecipeIceCreamStrawberry + name: strawberry ice cream recipe + result: IceCreamStrawberry + time: 5 + reagents: + IceCream: 15 + Ketchup: 15 + solids: + IceCreamBowl: 1 diff --git a/Resources/Prototypes/tags.yml b/Resources/Prototypes/tags.yml index 9b0ad51cfb6..f0de473f3c7 100644 --- a/Resources/Prototypes/tags.yml +++ b/Resources/Prototypes/tags.yml @@ -743,6 +743,9 @@ - type: Tag id: Ice +- type: Tag + id: IceCream + - type: Tag id: Igniter diff --git a/Resources/Textures/Floof/Objects/Consumable/Food/icecream.rsi/blooddrop.png b/Resources/Textures/Floof/Objects/Consumable/Food/icecream.rsi/blooddrop.png new file mode 100644 index 0000000000000000000000000000000000000000..d0ace7d0b8db99ac36af0221ef690adca6cc2281 GIT binary patch literal 926 zcmV;P17ZA$P)YAX9X8WNB|8RBvx=!KdMT0009i zNklnks7q9j8ZAiQ( zfDc@^NuU%3-gF!SRaSvDpnGJ5Ykhs}I&p&0(NPIw8p`{wYob6zgdL89QDsq;E-SwC z_;JR@#v<03#sM62U2PGe9ash)tMZ!TP*P%h9(v^xea|7vI^uyCDDoS27s}l1Ys1eGw?w_N^imR4D;!XU4&sxjPrT+dJw8 z0LZ4|iIGf(&pq$S_^()i5>U3^SJsA(8-LytH&Prp9NSZO2GY~{*|}6aaXFJ=)bmgv zugU_jrb-bos>B_KR^X8;iCc@=e-p17U?h{_i~aj)0v1&HU6oa1D2osiVGB?Ia;kV? z0BjW@?fZ;-9)GBEUlpTDM1;*EIKW@36o9TU0Je$H@B0jS9uHN?8N(*WA!f&Z6<_S1FM3fBc-m*?J355}&3Hk1FT zatN*kqWU3tzBsi))Z@T2<%Kx#pZYiaA7CTpZ%7yS&@Kv)cK`qY07*qoM6N<$g7!tA AzW@LL literal 0 HcmV?d00001 diff --git a/Resources/Textures/Floof/Objects/Consumable/Food/icecream.rsi/bowl.png b/Resources/Textures/Floof/Objects/Consumable/Food/icecream.rsi/bowl.png new file mode 100644 index 0000000000000000000000000000000000000000..25a21025c317dfedc21a46e7922a5695455f4a3f GIT binary patch literal 295 zcmV+?0oeYDP)Px#;Ymb6R9J=Wl|c@IFc3vQ#*IlmhijtOVcSz63-lChxekUk=YV}(2&QSIGlLQ} znU@ek(lW0z?G#WHMNxho=N$5;@0@dxJkuPCgc^`HeFwk-sD$noKy^Ls53xa8$q$Rv z)MYzlLXjvN<~Zr<*>gyN%h5zr`0iY823A8PP_{!>q^ACwz#9CAz_^(tC!ykQUUmk2 z31T0xgNpLN1rIN#MG}ijFc;`m8K@E{${i6cbhER$mb3r>002ovPDHLkV1i}!bGrZl literal 0 HcmV?d00001 diff --git a/Resources/Textures/Floof/Objects/Consumable/Food/icecream.rsi/caramel.png b/Resources/Textures/Floof/Objects/Consumable/Food/icecream.rsi/caramel.png new file mode 100644 index 0000000000000000000000000000000000000000..6b29d30506986887ffc5428c80e704d32c952d3d GIT binary patch literal 1002 zcmVYAX9X8WNB|8RBvx=!KdMT000AZ zNkl7&RyV!M`oL1|$PTPyQtG!T4nJ5*8479B1D2&ab zpo8HqlwG-1oM`7n(RC_A7&4Wqn<$9gkQNygJ5%g7yR=!8oTO>eCg(Kgc(cOL3%ev$ zls=dLo8O23^DYd-;NKi#8L$la&jK>agkiVYF-azJvsosue8-wiyTpgrsE7#XLnNH`3-0a!=D`{K7JW{u$gsj zd+@Gm5@iQulnFyqCG7SJ!Y5k^K6aYunVmS+ck|o#$8k6uG_<{lZ|x?A-)UvT{y|YT z!1Pqi5GD<4g^lnBZQR#&0aewQiu^+4^rPe~wFDY>uy#uiV;{HEu=^Zlhqruy-pgrY z-@Pg$@3qtT^ab>Jfq};Gx2Kr9bP(0m%=(U_M8EFlfoINR7zT%aHiut%$XQ=9;H9C= zuRSYca(~PZfMI|TVCXveYyy2ghh%YJb$Sp&5YH3#Rv_XHEG%5sv1dk9@nm4>0Jk4Z0DFBYSuz(m7WIY~ zYIhP|(u?SJNHM`B0d9rwIkeH)|ME|nCvTNc6oV*s3jQ2Uv4~PS@R#wAbYS^k@V^86 Y0gP|$(7f?~nE(I)07*qoM6N<$g6gl+!~g&Q literal 0 HcmV?d00001 diff --git a/Resources/Textures/Floof/Objects/Consumable/Food/icecream.rsi/coffee.png b/Resources/Textures/Floof/Objects/Consumable/Food/icecream.rsi/coffee.png new file mode 100644 index 0000000000000000000000000000000000000000..a54a649a2900acc0bb617e9a03d5d458cee0f3e7 GIT binary patch literal 922 zcmV;L17-Y)P)YAX9X8WNB|8RBvx=!KdMT0009e zNklqY2AZ7qr-RIyU9 z#4cD5*jaMFdHUBoVsRis(ga!X~rXot;1XdN30jdvM*|SdhLj zm-ij!_nGINcitJ%T5~O%TnDTdVE?U3&sKB3ozG=m01s@o^+rc{^T$N437`lV>^HAM zv>V89G);o(6Ipp-&uO%z20K>$FlR$B!X z)j0m?Oz!}rBSSjRa~#LPvaHp+URqj0L@1ZbD5X}<&$5iMkIwZDaAfj(EvFw^EqO8T z3kwVQzK`QLh{&3;?8sDQd|Pl^*MOtbwF^H#d3$*COJ@;bO;9V(K?GSj0Q82<6P00+d`5w={xaVZvoY3?+BGrjGp<7*B;x&@AFl}QZ$kb z0ZOi7(+xgp5);QU{U>L72e=Y(?7b<*9=?xX{)h-XhyK7L@Dz@1VHiTST5W6nceEKD zovvMYdf;-12nTlGi|;Bnlsz0}p)8XqirSw0jsZ*0-5I|4&gYEo*+J4WXr>vhJY%5G z#h}%8={w$zix(3>_26A$Gt0U0)J&!5`#0fTeGy#==_I%-z)JWN$Ls0r>0X(8V$`5dZ)H07*qoM6N<$g8g2wkpKVy literal 0 HcmV?d00001 diff --git a/Resources/Textures/Floof/Objects/Consumable/Food/icecream.rsi/fill-1.png b/Resources/Textures/Floof/Objects/Consumable/Food/icecream.rsi/fill-1.png new file mode 100644 index 0000000000000000000000000000000000000000..e284f691901098d162317e026f619e89d7cb4674 GIT binary patch literal 119 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}hMq2tArY-_ zFC64#P!M1~=>6aI_3`ZwUb@fFOkiHg#LzIm_vx~U=U$l2kTJg6WelFKelF{r5}E+;jVby7 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Floof/Objects/Consumable/Food/icecream.rsi/fill-3.png b/Resources/Textures/Floof/Objects/Consumable/Food/icecream.rsi/fill-3.png new file mode 100644 index 0000000000000000000000000000000000000000..8c38f5f02e6a0e1ae53596dab1cd8ff8ae1de618 GIT binary patch literal 133 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}_MR?|ArY-_ zFIn>eRk=7``+YxBD*JI$r&xa0rWz*}pc1KPmre#OeQ6f3$!P7P%eiwE=fx-NV6J(3 dOqj`m>8zLZw~J4X{R66F@O1TaS?83{1OTd6EW!W) literal 0 HcmV?d00001 diff --git a/Resources/Textures/Floof/Objects/Consumable/Food/icecream.rsi/fill-4.png b/Resources/Textures/Floof/Objects/Consumable/Food/icecream.rsi/fill-4.png new file mode 100644 index 0000000000000000000000000000000000000000..98b3eee6c3f6f14789f07f919daba21794bfb1df GIT binary patch literal 151 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}fu1goArY-_ zFB@_(C<-_SroXR$ej{R?MPQ1+zt_Et$=M7H3nJdgOj>e(1BbPKZ9>^g6N|`a#ZLJP x8cb)s;hST4Yjy0@f_kT)!ZH^F?lK>^ZI!S_g0;nO%VD7544$rjF6*2UngBzTG(`Xa literal 0 HcmV?d00001 diff --git a/Resources/Textures/Floof/Objects/Consumable/Food/icecream.rsi/fill-5.png b/Resources/Textures/Floof/Objects/Consumable/Food/icecream.rsi/fill-5.png new file mode 100644 index 0000000000000000000000000000000000000000..6f922f31b5c5e8528ece9951d1be59b4ecf2a7b0 GIT binary patch literal 146 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}KAtX)ArY-_ zuNZPMDDXH3zW)1OMm#-NMDtMn=4%a0)-o~#=-lC+v_(cD@vM*hJ=+?oCDzXI3Ji>E sPNmF#5VEm`e@gv9QQxbU41aPNmUu~UZhjZG5@;@ir>mdKI;Vst0I>Qm5dZ)H literal 0 HcmV?d00001 diff --git a/Resources/Textures/Floof/Objects/Consumable/Food/icecream.rsi/greentea.png b/Resources/Textures/Floof/Objects/Consumable/Food/icecream.rsi/greentea.png new file mode 100644 index 0000000000000000000000000000000000000000..80113ca18585793f0112034acd5e1e57cc9a5292 GIT binary patch literal 889 zcmV-<1BU#GP)YAX9X8WNB|8RBvx=!KdMT00097 zNkl$gfX$LtlDZ+liL*DvRtUEw_)ghU2 zq2M8JPl>QU?}wmu0X!)TN~6u7^J))FSPWge$*~)~Fy(+9fK@@>o{AnIgis#M+^=j( zw2{5i1Hai|RbYPxiUAZnSgatwn_Qn7xbyoDQdJaE=_Hz_1K|5Uhx^WeU0GWB_l*UA zE5MV&pajqj9VsQHd5hEs2>=fDo@V6wx2UQL5*)|n$kr3lWng&jv8+|A#M|O1iUL3o z1X#rq2tg{7LesSH`D(RFHkpeKaOq`1cJIzFt#G-?nxr^eWK%MMVZ>o&I0*ye9r=r$ z$&XtG^pDyT-R;BXv)RrybG2FxAp~OS^aEh~dOoT9=E2R+dGPnqHzFDWeEQ*tnMx<= zF!u4v9Si3c?J_Y%MNtHru7~5!qJ!(W(E$KH-!*D>ZaK6H0AS5qsJez>#1XNjEI8#w ze*7bw2WS~kNBkEc2m-8mi_De`F(n2-*(!7AuY=LlKppVeN6*ddw%jT}wOYmZ0#r>w zQ?;-Vtp%H(rap-laH{>Osl_$wS&%h}=lOW9OFENYbqW@W3*4K|MGNTKK4cngakATT zymH3yeV?*jCbKyc?tQ&5UB~0$KgXg4oZR}zRCSG9`*B{De#W-Sq%-Mo-@~F@u<>1& z!Pyhh0ahZ8?(AaBeu1JY;jOsx0xHfG8#;bXy^Q)t?TNm9!i*^~#=T$H%$JHK?oJQQVtM%MW)RJ8!Rx_k7ST!u*0c@D!24gb{~h38#%a^gd+n!@ P00000NkvXXu0mjf&~&B? literal 0 HcmV?d00001 diff --git a/Resources/Textures/Floof/Objects/Consumable/Food/icecream.rsi/lemon.png b/Resources/Textures/Floof/Objects/Consumable/Food/icecream.rsi/lemon.png new file mode 100644 index 0000000000000000000000000000000000000000..bec611a2f2bf03e08d3adb627c652198fa29dc0c GIT binary patch literal 921 zcmV;K17`e*P)YAX9X8WNB|8RBvx=!KdMT0009d zNkl^~REx5V88Y-S}Rr;~ns71Rmv=Jti?8xS`arD~Kw7!chg z@^7MXAqn1vgx}r~(KA2@q5Ac&qjcs`P;$wjjOcj35(EJw`a(}x=ozrJ{<+jNjjVMT zv_di%UdL(GQB@VgFd#ZVd_de>lmMze1~SBHR55dh0C1WcnASLGhj+7~h%bf*kj^C; z$1&PS0o2i*r~aMh_8LM6vQ`07V|%o9XgxK&BD}D?Dc`hf$rJ9XTw1r5F-;SpPk_+& z%tcHu=PK_%X-*6bm@Ye4r^c7;xj&x0ZLZVt5JDh?2B^u2^hG7FOZ$yO-|^Af@jD{+ z1(<$h!A@t7f>wlR9Yh+?h}u_BRTZITAa&$#nENxX>kbDnQ*KpKihtmp;-_OG`#Sgw zARYjv0K&p+Tqd1Pql^@jI{}FQyu$3Yrz-#h18AI7-dmYpnJLX55!u(kUj$)+$b<4A zgf&`?b+V&JckhMJ`H8bD&kUyqy4&z>=^I4e; zZ~d~b0D-$*=3MpIzJvD+=+;6e|2(nt11WP7fT+Dp z7={Ev!1>yV{|?Yabo*1|OE$o{>aj|9te4;eeG%=2^b>d>z)tYfGf$ZFXD>Ui>^<37XC+`d1!00000NkvXXu0mjf>)5Ne literal 0 HcmV?d00001 diff --git a/Resources/Textures/Floof/Objects/Consumable/Food/icecream.rsi/meta.json b/Resources/Textures/Floof/Objects/Consumable/Food/icecream.rsi/meta.json new file mode 100644 index 00000000000..0076ea35a82 --- /dev/null +++ b/Resources/Textures/Floof/Objects/Consumable/Food/icecream.rsi/meta.json @@ -0,0 +1,62 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "dakodrago, Fills created by Fansana", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "bowl" + }, + { + "name": "fill-1" + }, + { + "name": "fill-2" + }, + { + "name": "fill-3" + }, + { + "name": "fill-4" + }, + { + "name": "fill-5" + }, + { + "name": "blooddrop" + }, + { + "name": "caramel" + }, + { + "name": "coffee" + }, + { + "name": "greentea" + }, + { + "name": "lemon" + }, + { + "name": "orange" + }, + { + "name": "plate" + }, + { + "name": "rainbow" + }, + { + "name": "saltedcaramel" + }, + { + "name": "spaghetti" + }, + { + "name": "strawberry" + } + ] +} diff --git a/Resources/Textures/Floof/Objects/Consumable/Food/icecream.rsi/orange.png b/Resources/Textures/Floof/Objects/Consumable/Food/icecream.rsi/orange.png new file mode 100644 index 0000000000000000000000000000000000000000..4782708c6ee3e516623a4c6b89ef4dc1e82e9957 GIT binary patch literal 825 zcmV-91IGM`P)YAX9X8WNB|8RBvx=!KdMT0008S zNklF|9KiAKo1I;EZ8ldk6H0V5w;&Lrf({)Es!PWX(k;Cgq7-HLCqvf= zf)42=iXggmOo|S5s-#O`ib_#nEoteFtIqDcUx)QyN!0!;2;XgfkD1@+{oaq6c}hh1 zmqTp;{tJNJ5?pzR)f-oT6=1gng^E3^f!N!O5LpB4!JhPukGoh4u$o^MwgUE}s~(h* zS_!NH=(?k9KG|JZ!0f~Gq6{x6P_6@7!}wF&szaa@hE-1RL|gv1z#i-obPB$VAtgJ| z^D`*dK?OqSg;@|m1xhdiArOsq?1IW0U}e8WVC)Ih9YGdmkq@ts@;cBdls5o|iSh+d z9v{~6i}?dwfALWozuik;EZQ(V0d@@W6roFN!0@C2DF;<#f#D&#?d({~gYA2*-nf$! z;L?yi(mHiBG7xH54Z0492D1nejlzJX^-g8l@@Xg?UL%?kja_;4eM z=L4&gqR|U+jHOlMCK1PmnMqijrElNu@%95HyK)8qv`*cO{1RY#!AU@38d;2kXs*@w zzjF>ripi@L^ItmPMlgQ^`Fuf3}2GNL{OvklL z-_EYW0%S1`U*Ci2hhQb5Q{W~+yJL(0Ms*s{9!;m$u!o)w_=Q(vU`a1)6;4alagP!>j%XQlkn za7W<)0Bu9@QPW-U1DuQ9s1oI&x3YP3c|McmS^p8)EkUE_)a3BmSf+_{0xZ3ro7(nS zcROC&rgJV!GMSL z!jpG0Rt?%W4Q(vlVooxa@V);SoYPt-g zbM)1IMm3WZt0fgPm<0|WK5nij7RYyCih{XIo_B%M8J8m;Z-!5ou$XsmYDY=N>Su-G zF;kLF_LulA_^TJEerIc9f!~h&l;>?KD|v;}8t)#-Ph)U1WN>9LQ%st8FjhNP0B9Xw eYJ_K+uP=iZkj(+L|5ET|5X;lm&t;ucLK6TIdSa#k literal 0 HcmV?d00001 diff --git a/Resources/Textures/Floof/Objects/Consumable/Food/icecream.rsi/rainbow.png b/Resources/Textures/Floof/Objects/Consumable/Food/icecream.rsi/rainbow.png new file mode 100644 index 0000000000000000000000000000000000000000..f89a0320eef883f00a20a113509fb7fbcdf053ec GIT binary patch literal 1030 zcmV+h1o``kP)YAX9X8WNB|8RBvx=!KdMT000A# zNklKT3=3)wMe>(w1YC#D#Z)I+t3T0&Sl`n zL>yyl(YE3SQ(V;rh6S-G2#OcG@Wz)hvEtSjOPrdrI#=5s*QHI`yfiP(dAw)`f`T?l zCrF>m=ehWO_&tRWz&0RXz)Gz%@$nV$-P4ZPLs~E{=wL1uaqPGyfYGDc zZ=a68xZ~*kr_g&FF~cE-noahidmORY;+6v53s*KRH_Qf)n|m!997 z2K4jnMaL0~Nksv?e(nd+Hhc_AwUINDEN8PME3(LLiPBn?Wu=7H$sl31lEJ3uv1Em& zswb~}`Ng|CM~)oM6a?rQi-)>S_>2qBodOk*ASVfg1ahfN4oFK9IZCi7L6u!o>9wSB zdHQR-M&~aBtcM*`z{Dqhga=YCiHNK)vSuTudWcg;CR5K^+K#l4Ba1~# z^P|)Kt=c^W0|2@{_Zi;(0VclkBb*RX6fVhjW;3NEdq9F20kpUgaZexa0o@gE9*yu@C za@8y^+>UHj;9jlT2$#^V3*?L-(%)Wuz(;Z=11%>xc)i^nk5I$dC(RF zY7&I7i1Zh+2W}#Q=@*PM-dFK|6C@W;Vw+9jUR3ccR-i2i%3@+u;hVkE1X~Q) zKun3unhl`l#N?fdCGq>qEmJqwHxr)si|An6o3iWeXMXzg+-8Fd0&E=5`+B{O;l7D@ z_r~s0Hm(@&>o#gH2?qr07*qoM6N<$f~$w< A%m4rY literal 0 HcmV?d00001 diff --git a/Resources/Textures/Floof/Objects/Consumable/Food/icecream.rsi/saltedcaramel.png b/Resources/Textures/Floof/Objects/Consumable/Food/icecream.rsi/saltedcaramel.png new file mode 100644 index 0000000000000000000000000000000000000000..41b6affbd2a5087719ff1c30f2c92abbae6ead74 GIT binary patch literal 1037 zcmV+o1oHcdP)YAX9X8WNB|8RBvx=!KdMT000A+ zNkl>4&@!?R&rT0zZ|)b$_Mswsi%Xy>Y%aZ4KXKx zLJJSCa#Qt42P2&=)IW0yrs52A9b`1zkIl1;CF`HSIln;^9iT_Ua!>1O+79;-JhBnr zrsE8Ev@mbgYh3*P6G}@VgFU{-y)_3c%?e3m6%=F%Iz2#om@u2$XurHMRZbVCSvlTA9-a*>MaBiO>&(dppq+5iE8mRm+?4EW8s% zg?Kd0yF>OMz^nlUM0;&gvpf8x6DbTig&sc5P~QpidKi5?P2HNu@h*D|MU{*vb@qnl z6=x3=0IyajHHXKKkR$EmjprMJ<)<+E7$8lj#_HF1v~g*x`?A ziekg*a}oLZ6hmh}Cpvru9Cg%Gd6DB62yAG_Tv|yy5o6zwySRYu6~mgzR7Sbi&A`b6 zM9+VNp107jp%uH;LgZX0p4*#HT#HFfWH}ToGN9EP(p1%otHRIO&)SHD2B}%PmW8V~ zW3~tq7rsU2QWE#RSmmiEFB9iuZ=y!NS~)gwN_(em!I+!LtHf3*WkX zMcL7}d-bQUO}{@A#7vjqkKxP|F`EYdH2#qWZoa?a{~qu=kA(x@bLf(n00000NkvXX Hu0mjf3$oyb literal 0 HcmV?d00001 diff --git a/Resources/Textures/Floof/Objects/Consumable/Food/icecream.rsi/spaghetti.png b/Resources/Textures/Floof/Objects/Consumable/Food/icecream.rsi/spaghetti.png new file mode 100644 index 0000000000000000000000000000000000000000..6c76da1c33016d19ef76d06c0932b1a3c88d8573 GIT binary patch literal 980 zcmV;_11tQAP)YAX9X8WNB|8RBvx=!KdMT000AD zNklDunz(mO2UGGVn_t7V$5E{conPh?_{Xk%g-kp#sdW)kDO z4-k0RqA$ki121H19EOO@4I!I?iP=;XBaE$}l6D(^=4RFnwt>G+b~u_Xtcd@T z{*wE2?)m*bx##ygxk5_GzZoJ6$O5u}EZ~0$*smxOpg;)1QnE817ylTbO;zPDKwL^@ zcbb76H;Kpy@PVqz2`N#9KmjJD9=v%SI|`8Y7Fp8U%$H@)q5^k+ zy&v0c8sB-IM(^Cm*yvAGR+OVCW;$2+SRakvTEM3ki*%oPhk*xnu=a8*xn>jHXL}g& z?d4}F*?g&$3m1OCTk0hcI7j7%m;X9oPj@5)P+6_JEBaeV{FaobO16lH`VSKd2D!sg z%o*=C#--$uzyWMFjp^wbg29kT}iw4XVO+`JxgVlQ1!&iNTY!76jO{ZL%0CmI1FdB0J$jLEqM1P#JZ{NadRnfF1L?Tg6 z-m{g$j~mI)Uy0485sk)KX3IlL$-yH3ETZp*M=%Ew1VriqV5?}m>wMKtoG0F(xafBB zv?WZ>%*if`2*8k1M$^`fyXwdng22hKn)yC^CS!Q5Cp@W!1Q>ti-Rs`fc5f#sC2=4D zXu!ok&b}$5FYAX9X8WNB|8RBvx=!KdMT000A} zNklgwHQYb+-uN z^GnwSAW4!k?t3p)SmYv4RS6&dnv&Y}B+@D3kqFCs-e9ib3jz%7eqE?(L9u5kilmTE zCXqDh@rFILTNRsi`Z3Pxmo>d6Le? zT|;dZMXRy~05qNbK=(ZH46*LLh;*9#l{X%+zaoX|Ky)~S% zsn)A&wA-@Y1Fe0=z{`_|^@6GmBzr!`<}SK6U?#Xabb-j|7|v805l^74yb;rBqrLKl z!M_Wi7oa6_P%o^mh2G=WN^V+2e)y3@)IbJ`@46jFkqenL6B7~MDR0azpgH`dZdYv- zRBgaK)J4)TFhU`sqd}J4T8g_&2g?M@Bp42{tD-5lfaik;bf?`;VRbE{_ZSJoAaLv( zJRT2A%I`$Vq`@+|)PII6!62R6e7OZY7wFb)ibCz>8>?hs6bnZ6hRBpmJnw41$%q{(O~#Gd=M&nbM~ zmr-kWCa%g1^+w1?`LTV U-!pmgCIA2c07*qoM6N<$g1*n`q5uE@ literal 0 HcmV?d00001 From e437c5c7062ba95614f3b5df0017606e4fb89bf0 Mon Sep 17 00:00:00 2001 From: Fansana Date: Thu, 8 Aug 2024 21:52:01 +0200 Subject: [PATCH 2/3] remove duplicate flavor --- Resources/Locale/en-US/Floof/flavors/flavor-profiles.ftl | 1 - Resources/Prototypes/Floof/Flavors/flavors.yml | 4 ---- 2 files changed, 5 deletions(-) diff --git a/Resources/Locale/en-US/Floof/flavors/flavor-profiles.ftl b/Resources/Locale/en-US/Floof/flavors/flavor-profiles.ftl index 34bbf1bdd9e..c05a77cd4cf 100644 --- a/Resources/Locale/en-US/Floof/flavors/flavor-profiles.ftl +++ b/Resources/Locale/en-US/Floof/flavors/flavor-profiles.ftl @@ -39,4 +39,3 @@ flavor-complex-blooddrop = crimson lust flavor-complex-strawberry = strawberry flavor-complex-whitechocolatechip = like white chocolate chips flavor-complex-caramel = caramel -flavor-complex-vanilla = vanilla diff --git a/Resources/Prototypes/Floof/Flavors/flavors.yml b/Resources/Prototypes/Floof/Flavors/flavors.yml index 19a39c5f20f..4ead5008e05 100644 --- a/Resources/Prototypes/Floof/Flavors/flavors.yml +++ b/Resources/Prototypes/Floof/Flavors/flavors.yml @@ -209,7 +209,3 @@ flavorType: Complex description: flavor-complex-caramel -- type: flavor - id: vanilla - flavorType: Complex - description: flavor-complex-vanilla From 478a7759d16ca798b9247d72c738b0c8818eadb5 Mon Sep 17 00:00:00 2001 From: Fansana Date: Thu, 8 Aug 2024 21:58:08 +0200 Subject: [PATCH 3/3] add bowl to vendor --- .../Catalog/VendingMachines/Inventories/dinnerware.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/dinnerware.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/dinnerware.yml index 0b9a73aa6e6..bb16892fb02 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/dinnerware.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/dinnerware.yml @@ -14,6 +14,7 @@ DrinkGlass: 5 Beaker: 5 LargeBeaker: 5 + IceCreamBowl: 10 # Floofstation DrinkMug: 5 DrinkMugBlack: 2 DrinkMugBlue: 2