Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Lemon Lime and Bitters #570

Merged
merged 4 commits into from
Feb 22, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -25,3 +25,4 @@ flavor-complex-greengrass = like a holiday in the sun
flavor-complex-daiquiri = fashionable
flavor-complex-arsonistsbrew = like ash and flame
flavor-complex-healthcodeviolation = ominous
flavor-complex-lemon-lime-bitters = sweet, citrus, and bitter
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
reagent-name-angobitters = angostura bitters
reagent-desc-angobitters = An herbal bitters making use of angostura bark, often used to flavor drinks.
Original file line number Diff line number Diff line change
Expand Up @@ -21,3 +21,6 @@ reagent-desc-healthviolation = Allegedly it's a cocktail. The warning cone motif

reagent-name-mothamphetamine = mothamphetamine
reagent-desc-mothamphetamine = A strangely... fuzzy drink. It has a chaotic aura.

reagent-name-lemon-lime-bitters = lemon lime and bitters
reagent-desc-lemon-lime-bitters = A delightful mix of sweet citrus and bitters.
Original file line number Diff line number Diff line change
Expand Up @@ -48,5 +48,6 @@
DrinkSojuBottleFull: 2 # DeltaV - Soju bottle
DrinkBeerCan: 5
DrinkWineCan: 5
DrinkAngobittersBottleFull: 3 # DeltaV - Angostura Bitters Bottle
emaggedInventory:
DrinkPoisonWinebottleFull: 2
Original file line number Diff line number Diff line change
Expand Up @@ -133,3 +133,19 @@
- type: Icon
sprite: DeltaV/Objects/Consumable/Drinks/mothamphetamine.rsi
state: icon

- type: entity
parent: DrinkGlass
id: LemonLimeBittersGlass
suffix: lemon lime and bitters
components:
- type: SolutionContainerManager
solutions:
drink:
maxVol: 30
reagents:
- ReagentId: LemonLimeBitters
Quantity: 30
- type: Icon
sprite: DeltaV/Objects/Consumable/Drinks/lemonlimebitters.rsi
state: icon
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
- type: entity
parent: [DrinkBottleVisualsOpenable, DrinkBottleGlassBaseFull]
id: DrinkAngobittersBottleFull
name: angostura bitters 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: DeltaV/Objects/Consumable/Drinks/angobitters.rsi
- type: Sealable
5 changes: 5 additions & 0 deletions Resources/Prototypes/DeltaV/Flavors/flavors.yml
Original file line number Diff line number Diff line change
Expand Up @@ -115,3 +115,8 @@
id: arsonistsbrew
flavorType: Complex
description: flavor-complex-arsonistsbrew

- type: flavor
id: lemonlimebitters
flavorType: Complex
description: flavor-complex-lemon-lime-bitters
Original file line number Diff line number Diff line change
@@ -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
Original file line number Diff line number Diff line change
Expand Up @@ -213,3 +213,24 @@
Poison:
effects:
- !type:Jitter

- 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: DeltaV/Objects/Consumable/Drinks/lemonlimebitters.rsi
state: icon_empty
metamorphicMaxFillLevels: 4
metamorphicFillBaseName: fill-
metamorphicChangeColor: false
fizziness: 0.2
metabolisms:
Drink:
effects:
- !type:SatiateThirst
factor: 2
16 changes: 15 additions & 1 deletion Resources/Prototypes/DeltaV/Recipes/Reactions/drinks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -87,4 +87,18 @@
BlueCuracao:
amount: 1
products:
Mothamphetamine: 3
Mothamphetamine: 3

- type: reaction
id: LemonLimeBitters
reactants:
Lemonade:
amount: 5
JuiceLime:
amount: 2
Sugar:
amount: 2
Angobitters:
amount: 1
products:
LemonLimeBitters: 10
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
- DrinkBeerBottleFull
- DrinkAleBottleFull
- DrinkChampagneBottleFull
- DrinkAngobittersBottleFull # DeltaV
chance: 0.8
offset: 0.0
#rare
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,7 @@
- DrinkShakeWhite
- DrinkTheMartinez
- DrinkMoonshineGlass
- LemonLimeBittersGlass # DeltaV
chance: 0.8
offset: 0.0
#rare
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -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"
}
]
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -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"
}
]
}
Loading