diff --git a/Resources/Locale/en-US/_DV/flavors/flavor-profiles.ftl b/Resources/Locale/en-US/_DV/flavors/flavor-profiles.ftl index 2a02820a360..814e7b1d4c0 100644 --- a/Resources/Locale/en-US/_DV/flavors/flavor-profiles.ftl +++ b/Resources/Locale/en-US/_DV/flavors/flavor-profiles.ftl @@ -29,6 +29,7 @@ flavor-complex-candy-strawberry = like strawberries flavor-complex-candy-bubblegum = like bubble gum flavor-complex-double-ice-cream = like ice cream, twice flavor-complex-drgibbbloodred = like severe malpractice +flavor-complex-lemon-lime-bitters = like an Aussie dessert ## Delta-V additional drink flavors flavor-complex-absinthe-deltav = like green death diff --git a/Resources/Locale/en-US/_DV/reagents/meta/consumable/drink/alcohol.ftl b/Resources/Locale/en-US/_DV/reagents/meta/consumable/drink/alcohol.ftl new file mode 100644 index 00000000000..d7b4bebcaa7 --- /dev/null +++ b/Resources/Locale/en-US/_DV/reagents/meta/consumable/drink/alcohol.ftl @@ -0,0 +1,2 @@ +reagent-name-angobitters = angobitters +reagent-desc-angobitters = An herbal bitters making use of angostura bark, often used to flavor drinks. diff --git a/Resources/Locale/en-US/_DV/reagents/meta/consumable/drink/drinks.ftl b/Resources/Locale/en-US/_DV/reagents/meta/consumable/drink/drinks.ftl index e57a5a1e520..3d6616101ba 100644 --- a/Resources/Locale/en-US/_DV/reagents/meta/consumable/drink/drinks.ftl +++ b/Resources/Locale/en-US/_DV/reagents/meta/consumable/drink/drinks.ftl @@ -24,3 +24,6 @@ reagent-desc-mothamphetamine = A strangely... fuzzy drink. It has a chaotic aura reagent-name-double-ice-cream = Double Ice Cream reagent-desc-double-ice-cream = Ice cream, but now with even more ice cream on top. It doesn't get any sweeter than this! + +reagent-name-lemon-lime-bitters = lemon lime bitters +reagent-desc-lemon-lime-bitters = Western Australians love this shit. diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/boozeomat.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/boozeomat.yml index f2d592a25da..303f23437f4 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/boozeomat.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/boozeomat.yml @@ -47,6 +47,7 @@ DrinkSakeBottleFull: 3 DrinkBeerCan: 5 DrinkWineCan: 5 + DrinkAngobittersBottleFull: 3 # DeltaV - Angostura Bitters Bottle contrabandInventory: EthanolChemistryBottle: 3 DrinkBottleOfNothingFull: 1 diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/drinks_bottles.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/drinks_bottles.yml index ea5d4cdb89d..133f16fb5ca 100644 --- a/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/drinks_bottles.yml +++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/drinks_bottles.yml @@ -35,6 +35,7 @@ - DrinkAleBottleFull - DrinkAleBottleFullGrowler - DrinkChampagneBottleFull + - DrinkAngobittersBottleFull # DeltaV chance: 0.8 offset: 0.0 #rare diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/drinks_glass.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/drinks_glass.yml index 5167613cbe7..5bf275bf985 100644 --- a/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/drinks_glass.yml +++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/drinks_glass.yml @@ -107,6 +107,7 @@ - DrinkShakeWhite - DrinkTheMartinez - DrinkMoonshineGlass + - LemonLimeBittersGlass # DeltaV chance: 0.8 offset: 0.0 #rare diff --git a/Resources/Prototypes/_DV/Catalog/VendingMachines/Inventories/unlockedboozeomat.yml b/Resources/Prototypes/_DV/Catalog/VendingMachines/Inventories/unlockedboozeomat.yml index 0e5017ac871..b2393fe9dbe 100644 --- a/Resources/Prototypes/_DV/Catalog/VendingMachines/Inventories/unlockedboozeomat.yml +++ b/Resources/Prototypes/_DV/Catalog/VendingMachines/Inventories/unlockedboozeomat.yml @@ -34,4 +34,5 @@ DrinkSpaceUpBottleFull: 3 DrinkTonicWaterCan: 8 DrinkVermouthBottleFull: 4 + DrinkAngobittersBottleFull: 3 #emaggedInventory: diff --git a/Resources/Prototypes/_DV/Entities/Objects/Consumable/Drinks/drinks.yml b/Resources/Prototypes/_DV/Entities/Objects/Consumable/Drinks/drinks.yml index 37062a5cce0..ad09b82862b 100644 --- a/Resources/Prototypes/_DV/Entities/Objects/Consumable/Drinks/drinks.yml +++ b/Resources/Prototypes/_DV/Entities/Objects/Consumable/Drinks/drinks.yml @@ -149,3 +149,19 @@ - type: Icon sprite: _DV/Objects/Consumable/Drinks/doubleicecreamglass.rsi state: icon + +- type: entity + parent: DrinkGlass + id: LemonLimeBittersGlass + suffix: lemon lime bitters + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 30 + reagents: + - ReagentId: LemonLimeBitters + Quantity: 30 + - type: Icon + sprite: _DV/Objects/Consumable/Drinks/lemonlimebitters.rsi + state: icon diff --git a/Resources/Prototypes/_DV/Entities/Objects/Consumable/Drinks/drinks_bottles.yml b/Resources/Prototypes/_DV/Entities/Objects/Consumable/Drinks/drinks_bottles.yml new file mode 100644 index 00000000000..9c791ef6ef3 --- /dev/null +++ b/Resources/Prototypes/_DV/Entities/Objects/Consumable/Drinks/drinks_bottles.yml @@ -0,0 +1,17 @@ +- type: entity + parent: [DrinkBottleVisualsOpenable, DrinkBottleGlassBaseFull] + id: DrinkAngobittersBottleFull + name: angobitters bottle + description: Commonly used for mixed drinks, not drunk neat. + components: + - type: SolutionContainerManager + solutions: + drink: + reagents: + - ReagentId: Angobitters + Quantity: 50 + - type: Label + currentLabel: reagent-name-angobitters + - type: Sprite + sprite: _DV/Objects/Consumable/Drinks/angobitters.rsi + - type: Sealable diff --git a/Resources/Prototypes/_DV/Flavors/flavors.yml b/Resources/Prototypes/_DV/Flavors/flavors.yml index 143128dae3a..b251aefaee4 100644 --- a/Resources/Prototypes/_DV/Flavors/flavors.yml +++ b/Resources/Prototypes/_DV/Flavors/flavors.yml @@ -177,6 +177,11 @@ flavorType: Complex description: flavor-complex-drgibbbloodred +- type: flavor + id: lemonlimebitters + flavorType: Complex + description: flavor-complex-lemon-lime-bitters + # this is prefixed with "candy" to avoid clashes with potential future strawberries upstream - type: flavor id: candystrawberry @@ -192,3 +197,4 @@ id: doubleicecream flavorType: Complex description: flavor-complex-double-ice-cream + diff --git a/Resources/Prototypes/_DV/Reagents/Consumable/Drink/alcohol.yml b/Resources/Prototypes/_DV/Reagents/Consumable/Drink/alcohol.yml new file mode 100644 index 00000000000..133a560f825 --- /dev/null +++ b/Resources/Prototypes/_DV/Reagents/Consumable/Drink/alcohol.yml @@ -0,0 +1,17 @@ +- type: reagent + id: Angobitters + name: reagent-name-angobitters + parent: BaseAlcohol + desc: reagent-desc-angobitters + physicalDesc: reagent-physical-desc-strong-smelling + flavor: alcohol + color: "#331002" + recognizable: true + metabolisms: + Drink: + effects: + - !type:SatiateThirst + factor: 1 + - !type:AdjustReagent + reagent: Ethanol + amount: 0.3 diff --git a/Resources/Prototypes/_DV/Reagents/Consumable/Drink/drinks.yml b/Resources/Prototypes/_DV/Reagents/Consumable/Drink/drinks.yml index dc250ad6a2c..497394c37a2 100644 --- a/Resources/Prototypes/_DV/Reagents/Consumable/Drink/drinks.yml +++ b/Resources/Prototypes/_DV/Reagents/Consumable/Drink/drinks.yml @@ -221,3 +221,27 @@ metamorphicFillBaseName: fill- metamorphicChangeColor: false fizziness: 0.4 + +- type: reagent + id: LemonLimeBitters + name: reagent-name-lemon-lime-bitters + parent: BaseDrink + desc: reagent-desc-lemon-lime-bitters + physicalDesc: reagent-physical-desc-fizzy + flavor: lemonlimebitters + color: "#ffa37e" + metamorphicSprite: + sprite: _DV/Objects/Consumable/Drinks/lemonlimebitters.rsi + state: icon_empty + metamorphicMaxFillLevels: 4 + metamorphicFillBaseName: fill- + metamorphicChangeColor: false + fizziness: 0.2 + metabolisms: + Drink: + effects: + - !type:SatiateThirst + factor: 2 + - !type:AdjustReagent + reagent: Ethanol + amount: 0.3 diff --git a/Resources/Prototypes/_DV/Recipes/Reactions/drinks.yml b/Resources/Prototypes/_DV/Recipes/Reactions/drinks.yml index 3dcdca271b8..8004181b545 100644 --- a/Resources/Prototypes/_DV/Recipes/Reactions/drinks.yml +++ b/Resources/Prototypes/_DV/Recipes/Reactions/drinks.yml @@ -99,7 +99,7 @@ BlueCuracao: amount: 1 products: - Mothamphetamine: 3 + Mothamphetamine: 3 - type: reaction id: DoubleIceCream @@ -124,3 +124,17 @@ amount: 1 products: DrGibbBloodRed: 6 + +- type: reaction + id: LemonLimeBitters + reactants: + Lemonade: + amount: 5 + JuiceLime: + amount: 2 + Sugar: + amount: 2 + Angobitters: + amount: 1 + products: + LemonLimeBitters: 10 diff --git a/Resources/Textures/_DV/Objects/Consumable/Drinks/angobitters.rsi/icon.png b/Resources/Textures/_DV/Objects/Consumable/Drinks/angobitters.rsi/icon.png new file mode 100644 index 00000000000..1bbd2559bde Binary files /dev/null and b/Resources/Textures/_DV/Objects/Consumable/Drinks/angobitters.rsi/icon.png differ diff --git a/Resources/Textures/_DV/Objects/Consumable/Drinks/angobitters.rsi/icon_open.png b/Resources/Textures/_DV/Objects/Consumable/Drinks/angobitters.rsi/icon_open.png new file mode 100644 index 00000000000..befb76c19d9 Binary files /dev/null and b/Resources/Textures/_DV/Objects/Consumable/Drinks/angobitters.rsi/icon_open.png differ diff --git a/Resources/Textures/_DV/Objects/Consumable/Drinks/angobitters.rsi/meta.json b/Resources/Textures/_DV/Objects/Consumable/Drinks/angobitters.rsi/meta.json new file mode 100644 index 00000000000..d5d4bd40a8b --- /dev/null +++ b/Resources/Textures/_DV/Objects/Consumable/Drinks/angobitters.rsi/meta.json @@ -0,0 +1,17 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by BlitzTheSquishy & JustAnOrange", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "icon_open" + } + ] +} diff --git a/Resources/Textures/_DV/Objects/Consumable/Drinks/lemonlimebitters.rsi/fill-1.png b/Resources/Textures/_DV/Objects/Consumable/Drinks/lemonlimebitters.rsi/fill-1.png new file mode 100644 index 00000000000..6cfa18b61c7 Binary files /dev/null and b/Resources/Textures/_DV/Objects/Consumable/Drinks/lemonlimebitters.rsi/fill-1.png differ diff --git a/Resources/Textures/_DV/Objects/Consumable/Drinks/lemonlimebitters.rsi/fill-2.png b/Resources/Textures/_DV/Objects/Consumable/Drinks/lemonlimebitters.rsi/fill-2.png new file mode 100644 index 00000000000..6c77e327468 Binary files /dev/null and b/Resources/Textures/_DV/Objects/Consumable/Drinks/lemonlimebitters.rsi/fill-2.png differ diff --git a/Resources/Textures/_DV/Objects/Consumable/Drinks/lemonlimebitters.rsi/fill-3.png b/Resources/Textures/_DV/Objects/Consumable/Drinks/lemonlimebitters.rsi/fill-3.png new file mode 100644 index 00000000000..660461ce09b Binary files /dev/null and b/Resources/Textures/_DV/Objects/Consumable/Drinks/lemonlimebitters.rsi/fill-3.png differ diff --git a/Resources/Textures/_DV/Objects/Consumable/Drinks/lemonlimebitters.rsi/fill-4.png b/Resources/Textures/_DV/Objects/Consumable/Drinks/lemonlimebitters.rsi/fill-4.png new file mode 100644 index 00000000000..0826fcf7343 Binary files /dev/null and b/Resources/Textures/_DV/Objects/Consumable/Drinks/lemonlimebitters.rsi/fill-4.png differ diff --git a/Resources/Textures/_DV/Objects/Consumable/Drinks/lemonlimebitters.rsi/icon.png b/Resources/Textures/_DV/Objects/Consumable/Drinks/lemonlimebitters.rsi/icon.png new file mode 100644 index 00000000000..aa0a0cb90f4 Binary files /dev/null and b/Resources/Textures/_DV/Objects/Consumable/Drinks/lemonlimebitters.rsi/icon.png differ diff --git a/Resources/Textures/_DV/Objects/Consumable/Drinks/lemonlimebitters.rsi/icon_empty.png b/Resources/Textures/_DV/Objects/Consumable/Drinks/lemonlimebitters.rsi/icon_empty.png new file mode 100644 index 00000000000..517a6dcab0b Binary files /dev/null and b/Resources/Textures/_DV/Objects/Consumable/Drinks/lemonlimebitters.rsi/icon_empty.png differ diff --git a/Resources/Textures/_DV/Objects/Consumable/Drinks/lemonlimebitters.rsi/meta.json b/Resources/Textures/_DV/Objects/Consumable/Drinks/lemonlimebitters.rsi/meta.json new file mode 100644 index 00000000000..38f93875710 --- /dev/null +++ b/Resources/Textures/_DV/Objects/Consumable/Drinks/lemonlimebitters.rsi/meta.json @@ -0,0 +1,29 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by BlitzTheSquishy", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "icon_empty" + }, + { + "name": "fill-1" + }, + { + "name": "fill-2" + }, + { + "name": "fill-3" + }, + { + "name": "fill-4" + } + ] +}