Skip to content

Commit

Permalink
Update custom drinks (#96)
Browse files Browse the repository at this point in the history
## Mirror of PR #993: [Update custom
drinks](DeltaV-Station/Delta-v#993) from <img
src="https://avatars.githubusercontent.com/u/131613340?v=4"
alt="DeltaV-Station" width="22"/>
[DeltaV-Station](https://github.com/DeltaV-Station)/[Delta-v](https://github.com/DeltaV-Station/Delta-v)

<aside>PR opened by <img
src="https://avatars.githubusercontent.com/u/9823203?v=4" width="16"/><a
href="https://github.com/FluffiestFloof"> FluffiestFloof</a> at
2024-03-21 21:36:52 UTC</aside>
<aside>PR merged by <img
src="https://avatars.githubusercontent.com/u/9823203?v=4" width="16"/><a
href="https://github.com/FluffiestFloof"> FluffiestFloof</a> at
2024-04-04 17:06:01 UTC</aside>
<sup>

`be0d84458adc156a7f2bcb6305a7d6dbb5042c10`

</sup>

---

PR changed 0 files with 0 additions and 0 deletions.

The PR had the following labels:
- Changes: YML
- Changes: Localization
- Changes: Sprite


---

<details open="true"><summary><h1>Original Body</h1></summary>

> <!-- Please read these guidelines before opening your PR:
https://docs.spacestation14.io/en/getting-started/pr-guideline -->
> <!-- The text between the arrows are comments - they will not be
visible on your PR. -->
> 
> ## About the PR
> <!-- What did you change in this PR? -->
> Gives all the DeltaV and Nyano drinks new empty and fill sprites.
> Fun.
> 
> ## Why / Balance
> <!-- Why was it changed? Link any discussions or issues here. Please
discuss how this would affect game balance. -->
> Looks better.
> 
> ## Technical details
> <!-- If this is a code change, summarize at high level how your new
code works. This makes it easier to review. -->
> Fixes #985 
> 
> ## Media
> <!-- 
> PRs which make ingame changes (adding clothing, items, new features,
etc) are required to have media attached that showcase the changes.
> Small fixes/refactors are exempt.
> Any media may be used in SS14 progress reports, with clear credit
given.
> 
> If you're unsure whether your PR will require media, ask a maintainer.
> 
> Check the box below to confirm that you have in fact seen this (put an
X in the brackets, like [X]):
> -->
> 
> - [ ] I have added screenshots/videos to this PR showcasing its
changes ingame, **or** this PR does not require an ingame showcase
> 
> ## Breaking changes
> <!--
> List any breaking changes, including namespace, public
class/method/field changes, prototype renames; and provide instructions
for fixing them. This will be pasted in #codebase-changes.
> -->
> 
> **Changelog**
> <!--
> Make players aware of new features and changes that could affect how
they play the game by adding a Changelog entry. Please read the
Changelog guidelines located at:
https://docs.spacestation14.io/en/getting-started/pr-guideline#changelog
> -->
> 
> 🆑
> - fix: Fixed our custom drinks not having different fill levels.


</details>

Co-authored-by: Fluffiest Floofers <[email protected]>
Co-authored-by: VMSolidus <[email protected]>
  • Loading branch information
3 people committed May 12, 2024
1 parent 71299f6 commit 6465a43
Show file tree
Hide file tree
Showing 147 changed files with 595 additions and 188 deletions.
2 changes: 1 addition & 1 deletion Resources/Locale/en-US/deltav/flavors/flavor-profiles.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -25,5 +25,5 @@ flavor-complex-lemondrop = refreshingly tart
flavor-complex-greengrass = like a holiday in the sun
flavor-complex-daiquiri = fashionable
flavor-complex-arsonistsbrew = like ash and flame
flavor-complex-dulleavene = ominous
flavor-complex-healthcodeviolation = ominous
flavor-complex-pumpkin = like pumpkin
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
- type: entity
parent: DrinkGlassBase
parent: DrinkGlass
id: DrinkHealthViolationGlass
name: health code violation
suffix: health code violation
description: Allegedly it's a cocktail. The warning cone motif seems apt.
components:
- type: SolutionContainerManager
Expand All @@ -11,13 +11,14 @@
reagents:
- ReagentId: HealthViolation
Quantity: 30
- type: Sprite
sprite: DeltaV/Objects/Consumable/Drinks/dulleavene.rsi
- type: Icon
sprite: DeltaV/Objects/Consumable/Drinks/healthcodeviolation.rsi
state: icon

- type: entity
parent: DrinkGlassBase
parent: DrinkGlass
id: DrinkGunmetalGlass
name: gunmetal glass
suffix: gunmetal
description: A cloudy mix of rum, cream, and... is that welding fuel? Probably tasty.
components:
- type: SolutionContainerManager
Expand All @@ -27,13 +28,14 @@
reagents:
- ReagentId: Gunmetal
Quantity: 30
- type: Sprite
- type: Icon
sprite: DeltaV/Objects/Consumable/Drinks/gunmetal.rsi
state: icon

- type: entity
parent: DrinkGlassBase
parent: DrinkGlass
id: DrinkLemonDropGlass
name: lemon drop
suffix: lemon drop
description: A martini glass filled with a translucent mix of refreshing lemony goodness.
components:
- type: SolutionContainerManager
Expand All @@ -43,13 +45,14 @@
reagents:
- ReagentId: LemonDrop
Quantity: 30
- type: Sprite
- type: Icon
sprite: DeltaV/Objects/Consumable/Drinks/lemondrop.rsi
state: icon

- type: entity
parent: DrinkGlassBase
parent: DrinkGlass
id: DrinkGreenGrassGlass
name: green grass
suffix: green grass
description: An odd green cocktail, topped with oranges, ice, and a plastic straw. Curious.
components:
- type: SolutionContainerManager
Expand All @@ -59,13 +62,14 @@
reagents:
- ReagentId: GreenGrass
Quantity: 30
- type: Sprite
- type: Icon
sprite: DeltaV/Objects/Consumable/Drinks/greengrass.rsi
state: icon

- type: entity
parent: DrinkGlassBase
parent: DrinkGlass
id: DrinkDaiquiriGlass
name: classic daiquiri
suffix: classic daiquiri
description: Rum, lime, and simple syrup. Such class, such refinement.
components:
- type: SolutionContainerManager
Expand All @@ -75,13 +79,14 @@
reagents:
- ReagentId: Daiquiri
Quantity: 30
- type: Sprite
- type: Icon
sprite: DeltaV/Objects/Consumable/Drinks/daiquiri.rsi
state: icon

- type: entity
parent: DrinkGlassBase
parent: DrinkGlass
id: DrinkArsonistsBrewGlass
name: arsonist's brew
suffix: arsonist's brew
description: It's probably not concerning that it's glowing faintly. Or bubbling. Or smoking. No, not at all.
components:
- type: SolutionContainerManager
Expand All @@ -91,13 +96,14 @@
reagents:
- ReagentId: ArsonistsBrew
Quantity: 30
- type: Sprite
- type: Icon
sprite: DeltaV/Objects/Consumable/Drinks/arsonist.rsi
state: icon

- type: entity
parent: DrinkGlassBase
parent: DrinkGlass
id: DrinkKvassGlass
name: kvass glass
suffix: kvass
description: A cool refreshing drink with a taste of socialism.
components:
- type: SolutionContainerManager
Expand All @@ -107,13 +113,14 @@
reagents:
- ReagentId: Kvass
Quantity: 30
- type: Sprite
sprite: Objects/Consumable/Drinks/kvass.rsi
- type: Icon
sprite: DeltaV/Objects/Consumable/Drinks/kvass.rsi
state: icon

- type: entity
parent: DrinkGlassBase
parent: DrinkGlass
id: DrinkMothamphetamineGlass
name: mothamphetamine
suffix: mothamphetamine
description: A strangely... Fuzzy drink. It has a chaotic aura.
components:
- type: SolutionContainerManager
Expand All @@ -123,5 +130,6 @@
reagents:
- ReagentId: Mothamphetamine
Quantity: 30
- type: Sprite
- type: Icon
sprite: DeltaV/Objects/Consumable/Drinks/mothamphetamine.rsi
state: icon
4 changes: 2 additions & 2 deletions Resources/Prototypes/DeltaV/Flavors/flavors.yml
Original file line number Diff line number Diff line change
Expand Up @@ -87,9 +87,9 @@

#Delta V
- type: flavor
id: dulleavene
id: healthcodeviolation
flavorType: Complex
description: flavor-complex-dulleavene
description: flavor-complex-healthcodeviolation

- type: flavor
id: gunmetal
Expand Down
44 changes: 33 additions & 11 deletions Resources/Prototypes/DeltaV/Reagents/Consumable/Drink/drinks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,14 @@
parent: BaseDrink
desc: reagent-desc-healthviolation
physicalDesc: reagent-physical-desc-strong-smelling
flavor: dulleavene
flavor: healthcodeviolation
color: "#ff7f00"
metamorphicSprite:
sprite: DeltaV/Objects/Consumable/Drinks/dulleavene.rsi
state: icon
sprite: DeltaV/Objects/Consumable/Drinks/healthcodeviolation.rsi
state: icon_empty
metamorphicMaxFillLevels: 5
metamorphicFillBaseName: fill-
metamorphicChangeColor: false
metabolisms:
Drink:
effects:
Expand Down Expand Up @@ -41,7 +44,10 @@
color: "#994422"
metamorphicSprite:
sprite: DeltaV/Objects/Consumable/Drinks/gunmetal.rsi
state: icon
state: icon_empty
metamorphicMaxFillLevels: 5
metamorphicFillBaseName: fill-
metamorphicChangeColor: false
metabolisms:
Drink:
effects:
Expand All @@ -67,7 +73,9 @@
color: "#fff789"
metamorphicSprite:
sprite: DeltaV/Objects/Consumable/Drinks/lemondrop.rsi
state: icon
state: icon_empty
metamorphicMaxFillLevels: 3
metamorphicFillBaseName: fill-
metabolisms:
Drink:
effects:
Expand All @@ -87,7 +95,9 @@
color: "#66aa55"
metamorphicSprite:
sprite: DeltaV/Objects/Consumable/Drinks/greengrass.rsi
state: icon
state: icon_empty
metamorphicMaxFillLevels: 5
metamorphicFillBaseName: fill-
metabolisms:
Drink:
effects:
Expand All @@ -107,7 +117,10 @@
color: "#ddffdd"
metamorphicSprite:
sprite: DeltaV/Objects/Consumable/Drinks/daiquiri.rsi
state: icon
state: icon_empty
metamorphicMaxFillLevels: 3
metamorphicFillBaseName: fill-
metamorphicChangeColor: false
metabolisms:
Drink:
effects:
Expand All @@ -127,7 +140,10 @@
color: "#fff789"
metamorphicSprite:
sprite: DeltaV/Objects/Consumable/Drinks/arsonist.rsi
state: icon
state: icon_empty
metamorphicMaxFillLevels: 4
metamorphicFillBaseName: fill-
metamorphicChangeColor: false
metabolisms:
Drink:
effects:
Expand Down Expand Up @@ -158,8 +174,11 @@
flavor: bread
color: "#381600"
metamorphicSprite:
sprite: Objects/Consumable/Drinks/kvass.rsi
state: icon
sprite: DeltaV/Objects/Consumable/Drinks/kvass.rsi
state: icon_empty
metamorphicMaxFillLevels: 4
metamorphicFillBaseName: fill-
metamorphicChangeColor: false

- type: reagent
id: Mothamphetamine
Expand All @@ -171,7 +190,10 @@
color: "#2fa1ef"
metamorphicSprite:
sprite: DeltaV/Objects/Consumable/Drinks/mothamphetamine.rsi
state: icon
state: icon_empty
metamorphicMaxFillLevels: 4
metamorphicFillBaseName: fill-
metamorphicChangeColor: false
metabolisms:
Drink:
effects:
Expand Down
Loading

0 comments on commit 6465a43

Please sign in to comment.