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 Bitters #2464

Merged
merged 21 commits into from
Feb 18, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
1ab50b2
haha yeah
BlitzTheSquishy Dec 18, 2024
7b58180
Merge branch 'master' of https://github.com/BlitzTheSquishy/Delta-v i…
BlitzTheSquishy Feb 13, 2025
28dc9f7
merge conflict fix
BlitzTheSquishy Feb 13, 2025
5270226
DeltaV namespace is kill
BlitzTheSquishy Feb 13, 2025
5a10d1d
Flavours reorganized (also shifted blood red dr gibb to where it was …
BlitzTheSquishy Feb 13, 2025
9d30a6b
forgor this
BlitzTheSquishy Feb 13, 2025
eaa9826
Merge branch 'master' into LLB
BlitzTheSquishy Feb 13, 2025
2ac63ae
bottle
BlitzTheSquishy Feb 13, 2025
595ea0c
Merge branch 'LLB' of https://github.com/BlitzTheSquishy/Delta-v into…
BlitzTheSquishy Feb 13, 2025
03a53c4
drinks.yml
BlitzTheSquishy Feb 15, 2025
cfea008
Merge branch 'master' into LLB
BlitzTheSquishy Feb 17, 2025
dea4268
LLB sprites
BlitzTheSquishy Feb 17, 2025
d25ce0b
agnobitters sprite and change of unit count
BlitzTheSquishy Feb 17, 2025
dd7ae6f
Merge branch 'LLB' of https://github.com/BlitzTheSquishy/Delta-v into…
BlitzTheSquishy Feb 17, 2025
82a710a
fill fix
BlitzTheSquishy Feb 17, 2025
3a3ff54
Merge branch 'master' into LLB
BlitzTheSquishy Feb 17, 2025
98bf6af
added to spawners and vendors
BlitzTheSquishy Feb 17, 2025
40f4ca2
Merge branch 'LLB' of https://github.com/BlitzTheSquishy/Delta-v into…
BlitzTheSquishy Feb 17, 2025
0a35e8c
oopsies be fixed!
BlitzTheSquishy Feb 17, 2025
81ad408
thank you orange for making my sprites a bit less shit
BlitzTheSquishy Feb 17, 2025
b0544b5
Deltanedas review fix
BlitzTheSquishy Feb 17, 2025
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
1 change: 1 addition & 0 deletions Resources/Locale/en-US/_DV/flavors/flavor-profiles.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
reagent-name-angobitters = angobitters
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 @@ -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.
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@
DrinkSakeBottleFull: 3
DrinkBeerCan: 5
DrinkWineCan: 5
DrinkAngobittersBottleFull: 3 # DeltaV - Angostura Bitters Bottle
contrabandInventory:
EthanolChemistryBottle: 3
DrinkBottleOfNothingFull: 1
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@
- DrinkAleBottleFull
- DrinkAleBottleFullGrowler
- DrinkChampagneBottleFull
- DrinkAngobittersBottleFull # DeltaV
chance: 0.8
offset: 0.0
#rare
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,7 @@
- DrinkShakeWhite
- DrinkTheMartinez
- DrinkMoonshineGlass
- LemonLimeBittersGlass # DeltaV
chance: 0.8
offset: 0.0
#rare
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,4 +34,5 @@
DrinkSpaceUpBottleFull: 3
DrinkTonicWaterCan: 8
DrinkVermouthBottleFull: 4
DrinkAngobittersBottleFull: 3
#emaggedInventory:
Original file line number Diff line number Diff line change
Expand Up @@ -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
Original file line number Diff line number Diff line change
@@ -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
6 changes: 6 additions & 0 deletions Resources/Prototypes/_DV/Flavors/flavors.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -192,3 +197,4 @@
id: doubleicecream
flavorType: Complex
description: flavor-complex-double-ice-cream

17 changes: 17 additions & 0 deletions Resources/Prototypes/_DV/Reagents/Consumable/Drink/alcohol.yml
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
24 changes: 24 additions & 0 deletions Resources/Prototypes/_DV/Reagents/Consumable/Drink/drinks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
16 changes: 15 additions & 1 deletion Resources/Prototypes/_DV/Recipes/Reactions/drinks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@
BlueCuracao:
amount: 1
products:
Mothamphetamine: 3
Mothamphetamine: 3

- type: reaction
id: DoubleIceCream
Expand All @@ -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
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