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

Added New Drinks, Edited Filesystem #39

Merged
merged 6 commits into from
Jul 22, 2024
Merged
Show file tree
Hide file tree
Changes from 4 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
13 changes: 13 additions & 0 deletions Resources/Locale/en-US/Floof/flavors/flavor-profiles.ftl
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
flavor-complex-anisette = like sweet anise
flavor-complex-blueballer = like fruit and unrequited love
flavor-complex-demonseed = metallic, sweet, and smooth
flavor-complex-doublecreamblaster = creamy and sweet
flavor-complex-emeraldswinger = fruity and colorful
flavor-complex-mariejulep = minty and spicy
flavor-complex-orgasmonthebeach = like a tart infection
flavor-complex-pompassion = fruity and like candy
flavor-complex-redrocket = incredibly sweet, like a rocket pop
flavor-complex-semenbomb = bitter and oleogustus
flavor-complex-semenhemorrhage = clumpy and sweet
flavor-complex-watermelonginjizz = bubbly and fruity
flavor-complex-yeolhandy = like oranges and solitude
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
reagent-name-anisette = anisette
reagent-desc-anisette = Liquor made of anise and sugar, typically used as a sweeter form of absinthe.

reagent-name-blueballer = blue baller
reagent-desc-blueballer = For those love-shy workers.

reagent-name-demonseed = demon seed
reagent-desc-demonseed = Tastes like an actual demon's nethers.

reagent-name-doublecreamblaster = double cream blaster
reagent-desc-doublecreamblaster = For twice the creaminess and twice the fun.

reagent-name-emeraldswinger = emerald swinger
reagent-desc-emeraldswinger = A colorful cocktail, perfect for the platter at a sex party.

reagent-name-mariejulep = marie julep
reagent-desc-mariejulep = A minty, sweet cocktail. For those who can't stomach their absinthe.

reagent-name-orgasmonthebeach = orgasm on the beach
reagent-desc-orgasmonthebeach = A classic drink that tickles the pudendal nerve.

reagent-name-pompassion = pom passion
reagent-desc-pompassion = An incredibly fruity drink, the smell so strong it could be a perfume.

reagent-name-redrocket = red rocket
reagent-desc-redrocket = A sugary drink that would be very sought after in an apocalypse. Favored by canines.

reagent-name-semenbomb = semen bomb
reagent-desc-semenbomb = A drink that will make one feel like they have a full stomach, one way or another.

reagent-name-semenhemorrhage = semen hemorrhage
reagent-desc-semenhemorrhage = A succubi spin on a classic spooky shot.

reagent-name-watermelonginjizz = watermelon gin jizz
reagent-desc-watermelonginjizz = Perfect for a luncheon on a warm sunny afternoon.

reagent-name-yeolhandy = ye ol handy
reagent-desc-yeolhandy = The loner's choice, cold as their bed.
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,14 @@
DrinkShaker: 5
CustomDrinkJug: 2 #to allow for custom drinks in the soda/booze dispensers
DrinkAbsintheBottleFull: 2
DrinkAnisetteBottleFull: 2 # Floofstation
DrinkAleBottleFull: 5
DrinkBeerBottleFull: 5
DrinkBlueCuracaoBottleFull: 2
DrinkCognacBottleFull: 4
DrinkColaBottleFull: 4
DrinkCreamCarton: 5
DrinkCumBottleFull: 1 # Floofstation
DrinkGinBottleFull: 3
DrinkGildlagerBottleFull: 2 #if champagne gets less because its premium, then gildlager should match this and have two
DrinkGrenadineBottleFull: 2
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
#small item
prototypes:
- DrinkAbsintheBottleFull
- DrinkAnisetteBottleFull # Floofstation
- DrinkBlueCuracaoBottleFull
- DrinkCognacBottleFull
- DrinkGrenadineBottleFull
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
- DrinkBeerglass
- DrinkBerryJuice
- DrinkBlackRussianGlass
- DrinkBlueBallerGlass # Floofstaion
- DrinkBlueCuracaoGlass
- DrinkBloodyMaryGlass
- DrinkBooger
Expand Down Expand Up @@ -66,9 +67,12 @@
- DrinkMilkshake
- DrinkMojito
- DrinkNTCahors
- DrinkOrgasmOnTheBeachGlass # Floofstation
- DrinkPatronGlass
- DrinkPomPassionGlass # Floofstation
- DrinkPoscaGlass
- DrinkRedMeadGlass
- DrinkRedRocketGlass # Floofstation
- DrinkRewriter
- DrinkRootBeerFloatGlass
- DrinkRumGlass
Expand All @@ -85,10 +89,12 @@
- DrinkVodkaMartiniGlass
- DrinkVodkaTonicGlass
- DrinkWatermelonJuice
- DrinkWatermelonGinJizzGlass # Floofstaion
- DrinkWhiskeyColaGlass
- DrinkWhiskeySodaGlass
- DrinkWhiteRussianGlass
- DrinkWineGlass
- DrinkYeOlHandyGlass
- DrinkShakeBlue
- DrinkShakeWhite
- DrinkTheMartinez
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,192 @@
- type: entity
parent: DrinkGlass
id: DrinkBlueBallerGlass
suffix: blue baller
components:
- type: SolutionContainerManager
solutions:
drink:
maxVol: 30
reagents:
- ReagentId: BlueBaller
Quantity: 30
- type: Icon
sprite: Floof/Objects/Consumable/Drinks/blueballer.rsi
state: icon

- type: entity
parent: DrinkGlass
id: DrinkDemonSeedGlass
suffix: demon seed
components:
- type: SolutionContainerManager
solutions:
drink:
maxVol: 30
reagents:
- ReagentId: DemonSeed
Quantity: 30
- type: Icon
sprite: Floof/Objects/Consumable/Drinks/demonseed.rsi
state: icon

- type: entity
parent: DrinkGlass
id: DrinkDoubleCreamBlasterGlass
suffix: double cream blaster
components:
- type: SolutionContainerManager
solutions:
drink:
maxVol: 30
reagents:
- ReagentId: DoubleCreamBlaster
Quantity: 30
- type: Icon
sprite: Floof/Objects/Consumable/Drinks/doublecreamblaster.rsi
state: icon

- type: entity
parent: DrinkGlass
id: DrinkEmeraldSwingerGlass
suffix: emerald swinger
components:
- type: SolutionContainerManager
solutions:
drink:
maxVol: 30
reagents:
- ReagentId: EmeraldSwinger
Quantity: 30
- type: Icon
sprite: Floof/Objects/Consumable/Drinks/emeraldswinger.rsi
state: icon

- type: entity
parent: DrinkGlass
id: DrinkMarieJulepGlass
suffix: marie julep
components:
- type: SolutionContainerManager
solutions:
drink:
maxVol: 30
reagents:
- ReagentId: MarieJulep
Quantity: 30
- type: Icon
sprite: Floof/Objects/Consumable/Drinks/mariejulep.rsi
state: icon

- type: entity
parent: DrinkGlass
id: DrinkOrgasmOnTheBeachGlass
suffix: orgasm on the beach
components:
- type: SolutionContainerManager
solutions:
drink:
maxVol: 30
reagents:
- ReagentId: OrgasmOnTheBeach
Quantity: 30
- type: Icon
sprite: Floof/Objects/Consumable/Drinks/orgasmonthebeach.rsi
state: icon

- type: entity
parent: DrinkGlass
id: DrinkPomPassionGlass
suffix: pom passion
components:
- type: SolutionContainerManager
solutions:
drink:
maxVol: 30
reagents:
- ReagentId: PomPassion
Quantity: 30
- type: Icon
sprite: Floof/Objects/Consumable/Drinks/pompassion.rsi
state: icon

- type: entity
parent: DrinkGlass
id: DrinkRedRocketGlass
suffix: red rocket
components:
- type: SolutionContainerManager
solutions:
drink:
maxVol: 30
reagents:
- ReagentId: RedRocket
Quantity: 30
- type: Icon
sprite: Floof/Objects/Consumable/Drinks/redrocket.rsi
state: icon

- type: entity
parent: DrinkGlass
id: DrinkSemenBombGlass
suffix: semen bomb
components:
- type: SolutionContainerManager
solutions:
drink:
maxVol: 30
reagents:
- ReagentId: SemenBomb
Quantity: 30
- type: Icon
sprite: Floof/Objects/Consumable/Drinks/semenbomb.rsi
state: icon

- type: entity
parent: DrinkGlass
id: DrinkSemenHemorrhageGlass
suffix: semen hemorrhage
components:
- type: SolutionContainerManager
solutions:
drink:
maxVol: 30
reagents:
- ReagentId: SemenHemorrhage
Quantity: 30
- type: Icon
sprite: Floof/Objects/Consumable/Drinks/semenhemorrhage.rsi
state: icon

- type: entity
parent: DrinkGlass
id: DrinkWatermelonGinJizzGlass
suffix: watermelon gin jizz
components:
- type: SolutionContainerManager
solutions:
drink:
maxVol: 30
reagents:
- ReagentId: WatermelonGinJizz
Quantity: 30
- type: Icon
sprite: Floof/Objects/Consumable/Drinks/watermelonginjizz.rsi
state: icon

- type: entity
parent: DrinkGlass
id: DrinkYeOlHandyGlass
suffix: ye' ol' handy
components:
- type: SolutionContainerManager
solutions:
drink:
maxVol: 30
reagents:
- ReagentId: YeOlHandy
Quantity: 30
- type: Icon
sprite: Floof/Objects/Consumable/Drinks/yeolhandy.rsi
state: icon

Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
- type: entity
parent: [DrinkBottleVisualsOpenable, DrinkBottleGlassBaseFull]
id: DrinkAnisetteBottleFull
name: anisette bottle
description: Liquor made of anise and sugar, typically used as a sweeter form of absinthe.
components:
- type: SolutionContainerManager
solutions:
drink:
reagents:
- ReagentId: Anisette
Quantity: 100
- type: Label
currentLabel: anisette
- type: Sprite
sprite: Floof/Objects/Consumable/Drinks/anisettebottle.rsi
- type: Sealable

- type: entity
parent: [DrinkBottleVisualsOpenable, DrinkBottleGlassBaseFull]
id: DrinkCumBottleFull
name: bottle'o'cum
description: Straight nard nectar. Ethically sourced.
components:
- type: SolutionContainerManager
solutions:
drink:
reagents:
- ReagentId: Cum
Quantity: 100
- type: Label
currentLabel: bottle'o'cum
- type: Sprite
sprite: Floof/Objects/Consumable/Drinks/bottleocum.rsi
- type: Sealable
Loading
Loading