diff --git a/Resources/Locale/en-US/_Harmony/flavors/flavor-profiles.ftl b/Resources/Locale/en-US/_Harmony/flavors/flavor-profiles.ftl new file mode 100644 index 000000000000..005c237ead00 --- /dev/null +++ b/Resources/Locale/en-US/_Harmony/flavors/flavor-profiles.ftl @@ -0,0 +1,2 @@ +#Starset Sarsaparilla Flavor +flavor-complex-themojave = like the Mojave desert diff --git a/Resources/Locale/en-US/_Harmony/reagents/meta/consumable/drink/soda.ftl b/Resources/Locale/en-US/_Harmony/reagents/meta/consumable/drink/soda.ftl index 1f51ddabe5f8..c33b086892dc 100644 --- a/Resources/Locale/en-US/_Harmony/reagents/meta/consumable/drink/soda.ftl +++ b/Resources/Locale/en-US/_Harmony/reagents/meta/consumable/drink/soda.ftl @@ -1,2 +1,5 @@ reagent-name-sunset-soda = sunset soda reagent-desc-sunset-soda = Smells like diesel fumes at dusk. + +reagent-name-starset-sarsaparilla = starset sarsaparilla +reagent-desc-starset-sarsaparilla = Preferred by those who wish for a nuclear winter. diff --git a/Resources/Prototypes/_Harmony/Entities/Objects/Consumable/Drinks/drinks.yml b/Resources/Prototypes/_Harmony/Entities/Objects/Consumable/Drinks/drinks.yml index 05223108a8cb..241e0935aefc 100644 --- a/Resources/Prototypes/_Harmony/Entities/Objects/Consumable/Drinks/drinks.yml +++ b/Resources/Prototypes/_Harmony/Entities/Objects/Consumable/Drinks/drinks.yml @@ -46,3 +46,19 @@ - type: Icon sprite: _Harmony/Objects/Consumable/Drinks/sunset-soda.rsi state: icon + +- type: entity + parent: DrinkGlass + id: DrinkStarsetSarsaparillaGlass + suffix: starset sarsaparilla + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 30 + reagents: + - ReagentId: StarsetSarsaparilla + Quantity: 30 + - type: Icon + sprite: _Harmony/Objects/Consumable/Drinks/starset-sarsaparilla.rsi + state: icon diff --git a/Resources/Prototypes/_Harmony/Flavors/flavors.yml b/Resources/Prototypes/_Harmony/Flavors/flavors.yml new file mode 100644 index 000000000000..667e60cf55a9 --- /dev/null +++ b/Resources/Prototypes/_Harmony/Flavors/flavors.yml @@ -0,0 +1,4 @@ +- type: flavor + id: themojave + flavorType: Complex + description: flavor-complex-themojave diff --git a/Resources/Prototypes/_Harmony/Reagents/Consumable/Drink/soda.yml b/Resources/Prototypes/_Harmony/Reagents/Consumable/Drink/soda.yml index e9d419020d00..0ed388959550 100644 --- a/Resources/Prototypes/_Harmony/Reagents/Consumable/Drink/soda.yml +++ b/Resources/Prototypes/_Harmony/Reagents/Consumable/Drink/soda.yml @@ -12,3 +12,18 @@ metamorphicMaxFillLevels: 6 metamorphicFillBaseName: fill- metamorphicChangeColor: false + +- type: reagent + id: StarsetSarsaparilla + name: reagent-name-starset-sarsaparilla + parent: BaseSoda + desc: reagent-desc-starset-sarsaparilla + physicalDesc: reagent-physical-desc-fizzy + flavor: themojave + color: "#2a1704" + metamorphicSprite: + sprite: _Harmony/Objects/Consumable/Drinks/starset-sarsaparilla.rsi + state: icon_empty + metamorphicMaxFillLevels: 4 + metamorphicFillBaseName: fill- + metamorphicChangeColor: false diff --git a/Resources/Prototypes/_Harmony/Recipes/Reactions/drinks.yml b/Resources/Prototypes/_Harmony/Recipes/Reactions/drinks.yml index 14b1b9fb454b..45849446be64 100644 --- a/Resources/Prototypes/_Harmony/Recipes/Reactions/drinks.yml +++ b/Resources/Prototypes/_Harmony/Recipes/Reactions/drinks.yml @@ -20,6 +20,18 @@ products: EspressoMartini: 2 +- type: reaction + id: StarsetSarsaparilla + reactants: + SolDry: + amount: 2 + Cola: + amount: 2 + JuiceLemon: + amount: 1 + products: + StarsetSarsaparilla: 5 + - type: reaction id: SunsetSoda reactants: diff --git a/Resources/Textures/_Harmony/Objects/Consumable/Drinks/starset-sarsaparilla.rsi/fill-1.png b/Resources/Textures/_Harmony/Objects/Consumable/Drinks/starset-sarsaparilla.rsi/fill-1.png new file mode 100644 index 000000000000..96b1a16798e2 Binary files /dev/null and b/Resources/Textures/_Harmony/Objects/Consumable/Drinks/starset-sarsaparilla.rsi/fill-1.png differ diff --git a/Resources/Textures/_Harmony/Objects/Consumable/Drinks/starset-sarsaparilla.rsi/fill-2.png b/Resources/Textures/_Harmony/Objects/Consumable/Drinks/starset-sarsaparilla.rsi/fill-2.png new file mode 100644 index 000000000000..9e7a2bbef35f Binary files /dev/null and b/Resources/Textures/_Harmony/Objects/Consumable/Drinks/starset-sarsaparilla.rsi/fill-2.png differ diff --git a/Resources/Textures/_Harmony/Objects/Consumable/Drinks/starset-sarsaparilla.rsi/fill-3.png b/Resources/Textures/_Harmony/Objects/Consumable/Drinks/starset-sarsaparilla.rsi/fill-3.png new file mode 100644 index 000000000000..25a9f2fc3818 Binary files /dev/null and b/Resources/Textures/_Harmony/Objects/Consumable/Drinks/starset-sarsaparilla.rsi/fill-3.png differ diff --git a/Resources/Textures/_Harmony/Objects/Consumable/Drinks/starset-sarsaparilla.rsi/fill-4.png b/Resources/Textures/_Harmony/Objects/Consumable/Drinks/starset-sarsaparilla.rsi/fill-4.png new file mode 100644 index 000000000000..2fe0bb9da915 Binary files /dev/null and b/Resources/Textures/_Harmony/Objects/Consumable/Drinks/starset-sarsaparilla.rsi/fill-4.png differ diff --git a/Resources/Textures/_Harmony/Objects/Consumable/Drinks/starset-sarsaparilla.rsi/icon.png b/Resources/Textures/_Harmony/Objects/Consumable/Drinks/starset-sarsaparilla.rsi/icon.png new file mode 100644 index 000000000000..62c2a22aafe0 Binary files /dev/null and b/Resources/Textures/_Harmony/Objects/Consumable/Drinks/starset-sarsaparilla.rsi/icon.png differ diff --git a/Resources/Textures/_Harmony/Objects/Consumable/Drinks/starset-sarsaparilla.rsi/icon_empty.png b/Resources/Textures/_Harmony/Objects/Consumable/Drinks/starset-sarsaparilla.rsi/icon_empty.png new file mode 100644 index 000000000000..4313b471def9 Binary files /dev/null and b/Resources/Textures/_Harmony/Objects/Consumable/Drinks/starset-sarsaparilla.rsi/icon_empty.png differ diff --git a/Resources/Textures/_Harmony/Objects/Consumable/Drinks/starset-sarsaparilla.rsi/meta.json b/Resources/Textures/_Harmony/Objects/Consumable/Drinks/starset-sarsaparilla.rsi/meta.json new file mode 100644 index 000000000000..9f6074d67643 --- /dev/null +++ b/Resources/Textures/_Harmony/Objects/Consumable/Drinks/starset-sarsaparilla.rsi/meta.json @@ -0,0 +1,31 @@ +{ + "version": 1, + "size": + { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "2024 SteroidsOnSteroids https://github.com/SteroidsOnSteroids", + "states": + [ + { + "name": "icon" + }, + { + "name": "icon_empty" + }, + { + "name": "fill-1" + }, + { + "name": "fill-2" + }, + { + "name": "fill-3" + }, + { + "name": "fill-4" + } + ] +}