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

Bacchus' blessing! #2491

Merged
merged 5 commits into from
Jan 21, 2025
Merged
Show file tree
Hide file tree
Changes from 2 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 @@ -6,4 +6,7 @@ ent-DrinkFrench75Glass = { ent-DrinkGlass }
.desc = { ent-DrinkGlass.desc }
ent-DrinkEggnogGlass = { ent-DrinkGlass }
.suffix = гоголь-моголь
.desc = { ent-DrinkGlass.desc }
ent-DrinkBacchusGlass = { ent-DrinkGlass }
.suffix = благославение бахуса
.desc = { ent-DrinkGlass.desc }
4 changes: 3 additions & 1 deletion Resources/Locale/ru-RU/ss220/reagents/meta/drinks.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,6 @@ reagent-desc-eggnog = Взять сыру яичку и кокнуть в кру
reagent-name-champagnesponsor = элитное шампанское
reagent-desc-champagnesponsor = Элитный вид шампанского.
reagent-name-ReaperSauce = соус "Тёмный жнец"
reagent-desc-ReaperSauce = Этот соус оправдывает своё название. Используйте в блюдах на свой страх и риск.
reagent-desc-ReaperSauce = Этот соус оправдывает своё название. Используйте в блюдах на свой страх и риск.
TryHardo7 marked this conversation as resolved.
Show resolved Hide resolved
reagent-name-bacchus = Благословение Бахуса
reagent-desc-bacchus = Ты был предупреждён.
Original file line number Diff line number Diff line change
Expand Up @@ -126,4 +126,5 @@
- DrinkShakeRobo
- DrinkHoochGlass
- DrinkBeepskySmashGlass
- DrinkBacchusGlass #SS220 Bacchus' Blessing
rareChance: 0.05
Original file line number Diff line number Diff line change
Expand Up @@ -78,4 +78,20 @@
Quantity: 30
- type: Icon
sprite: SS220/Objects/Consumable/Drinks/eggnog.rsi
state: icon

- type: entity
parent: DrinkGlass
id: DrinkBacchusGlass
suffix: Bacchus
components:
- type: SolutionContainerManager
solutions:
drink:
maxVol: 30
reagents:
- ReagentId: Bacchus
Quantity: 30
- type: Icon
sprite: SS220/Objects/Consumable/Drinks/bacchus_blessing.rsi
state: icon
5 changes: 5 additions & 0 deletions Resources/Prototypes/SS220/Flavors/flavors.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,3 +47,8 @@
id: HolyMoly
flavorType: Base
description: божественно

- type: flavor
id: Bacchus
flavorType: Complex
description: как смерть и камни
Kirus59 marked this conversation as resolved.
Show resolved Hide resolved
47 changes: 46 additions & 1 deletion Resources/Prototypes/SS220/Reagents/Consumable/Drink/alcohol.yml
Original file line number Diff line number Diff line change
Expand Up @@ -80,4 +80,49 @@
- !type:AdjustReagent
reagent: Ethanol
amount: 0.12
fizziness: 0.15
fizziness: 0.15

#Bacchus' Blessing

- type: reagent
id: Bacchus
name: reagent-name-bacchus
parent: BaseAlcohol
desc: reagent-desc-bacchus
physicalDesc: reagent-physical-desc-strong-smelling
flavor: Bacchus
color: "#8B4513"
metamorphicSprite:
sprite: SS220/Objects/Consumable/Drinks/bacchus_blessing.rsi
state: icon_empty
metamorphicMaxFillLevels: 3
metamorphicFillBaseName: fill-
metamorphicChangeColor: false
metabolisms:
Drink:
effects:
- !type:SatiateThirst
factor: 1
- !type:AdjustReagent
reagent: Ethanol
Kirus59 marked this conversation as resolved.
Show resolved Hide resolved
amount: 1.5
- !type:Jitter
conditions:
- !type:ReagentThreshold
min: 1
- !type:Drunk
boozePower: 100
Kirus59 marked this conversation as resolved.
Show resolved Hide resolved
conditions:
- !type:ReagentThreshold
min: 1
- !type:HealthChange
conditions:
- !type:ReagentThreshold
min: 1
- !type:OrganType
type: Dwarf #dwarfs dont care
shouldHave: false
damage:
types:
Poison: 2
fizziness: 0.2
18 changes: 17 additions & 1 deletion Resources/Prototypes/SS220/Recipes/Reactions/drinks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -86,4 +86,20 @@
Blood:
amount: 1
products:
ReaperSauce: 4
ReaperSauce: 4

- type: reaction
id: Bacchus
requiredMixerCategories:
- Shake
reactants:
ManlyDorf:
amount: 1
Moonshine:
amount: 1
Absinthe:
amount: 1
SyndicateBomb:
amount: 1
products:
Bacchus: 4
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,55 @@
{
"version": 1,
"size":
{
"x": 32,
"y": 32
},
"license": "EULA/CLA with a hosting restriction, full text: https://raw.githubusercontent.com/SerbiaStrong-220/space-station-14/master/CLA.txt",
"copyright": "Made by Earl Pluto for SS220",
"states":
[
{
"name": "icon"
},
{
"name": "icon_empty"
},
{
"name": "fill-1",
"delays":
[
[
0.4,
0.4,
0.4,
0.4
]
]
},
{
"name": "fill-2",
"delays":
[
[
0.4,
0.4,
0.4,
0.4
]
]
},
{
"name": "fill-3",
"delays":
[
[
0.4,
0.4,
0.4,
0.4
]
]
}
]
}
Loading