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.

Sign up for GitHub

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

Jump to bottom

Alcohol Ethanol Content Fix #911

Merged
merged 10 commits into from
Sep 12, 2024
Merged

Alcohol Ethanol Content Fix #911

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
9cae125
Ethanol Content Fixed to be More Realistic
SleepyScarecrow Sep 11, 2024
3bed229
Merge remote-tracking branch 'upstream/master' into Alcohol-Change
SleepyScarecrow Sep 11, 2024
fc0f972
tripled ethanol OD rates
SleepyScarecrow Sep 11, 2024
2ce5731
Merge branch 'master' into Alcohol-Change
SleepyScarecrow Sep 11, 2024
0161fdf
Delta-V Drinks Redone
SleepyScarecrow Sep 11, 2024
f3f7c19
Merge branch 'Alcohol-Change' of https://github.com/SleepyScarecrow/E…
SleepyScarecrow Sep 11, 2024
521ada7
Merge branch 'master' into Alcohol-Change
SleepyScarecrow Sep 11, 2024
9cbedc3
Merge branch 'master' into Alcohol-Change
SleepyScarecrow Sep 11, 2024
a32ef79
Linter Fix
SleepyScarecrow Sep 11, 2024
65773a6
Merge branch 'Alcohol-Change' of https://github.com/SleepyScarecrow/E…
SleepyScarecrow Sep 11, 2024
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
22 changes: 15 additions & 7 deletions Resources/Prototypes/DeltaV/Reagents/Consumable/Drink/drinks.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
factor: 2
- !type:AdjustReagent
reagent: Ethanol
amount: 0.3
amount: 0.336
- !type:PopupMessage
conditions:
- !type:ReagentThreshold
Expand Down Expand Up @@ -55,7 +55,7 @@
factor: 2
- !type:AdjustReagent
reagent: Ethanol
amount: 0.20
amount: 0.133
Poison:
effects:
- !type:HealthChange
Expand Down Expand Up @@ -83,7 +83,7 @@
factor: 2
- !type:AdjustReagent
reagent: Ethanol
amount: 0.15
amount: 0.16

- type: reagent
id: GreenGrass
Expand All @@ -105,7 +105,7 @@
factor: 2
- !type:AdjustReagent
reagent: Ethanol
amount: 0.05
amount: 0.083

- type: reagent
id: Daiquiri
Expand All @@ -128,7 +128,7 @@
factor: 2
- !type:AdjustReagent
reagent: Ethanol
amount: 0.25
amount: 0.3

- type: reagent
id: ArsonistsBrew
Expand All @@ -151,7 +151,7 @@
factor: 2
- !type:AdjustReagent
reagent: Ethanol
amount: 0.30
amount: 0.08
Poison:
effects:
- !type:HealthChange
Expand Down Expand Up @@ -179,6 +179,14 @@
metamorphicMaxFillLevels: 4
metamorphicFillBaseName: fill-
metamorphicChangeColor: false
metabolisms:
Drink:
effects:
- !type:SatiateThirst
factor: 2
- !type:AdjustReagent
reagent: Ethanol
amount: 0.015

- type: reagent
id: Mothamphetamine
Expand All @@ -201,7 +209,7 @@
factor: 2
- !type:AdjustReagent
reagent: Ethanol
amount: 0.25
amount: 0.126
Poison:
effects:
- !type:Jitter
18 changes: 9 additions & 9 deletions Resources/Prototypes/Nyanotrasen/Reagents/Consumable/Drink/alcohol.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
factor: 2
- !type:AdjustReagent
reagent: Ethanol
amount: 0.07
amount: 0.15

- type: reagent
id: Soju
Expand All @@ -42,7 +42,7 @@
factor: 2
- !type:AdjustReagent
reagent: Ethanol
amount: 0.15
amount: 0.2

- type: reagent
id: OrangeCreamice
Expand All @@ -65,7 +65,7 @@
factor: 2
- !type:AdjustReagent
reagent: Ethanol
amount: 0.05
amount: 0.1

- type: reagent
id: Silverjack
Expand All @@ -88,7 +88,7 @@
factor: 2
- !type:AdjustReagent
reagent: Ethanol
amount: 0.0625
amount: 0.1375

- type: reagent
id: Brainbomb
Expand Down Expand Up @@ -118,7 +118,7 @@
factor: 2
- !type:AdjustReagent
reagent: Ethanol
amount: 0.085
amount: 0.13
- !type:AdjustReagent
reagent: THC
amount: 0.33
Expand Down Expand Up @@ -147,7 +147,7 @@
factor: 2
- !type:AdjustReagent
reagent: Ethanol
amount: 0.025
amount: 0.08

- type: reagent
id: CircusJuice
Expand All @@ -170,7 +170,7 @@
factor: 2
- !type:AdjustReagent
reagent: Ethanol
amount: 0.0625
amount: 0.12
- !type:Emote #It's very funny
emote: Laugh
probability: 0.15
Expand All @@ -196,7 +196,7 @@
factor: 2
- !type:AdjustReagent
reagent: Ethanol
amount: 0.065
amount: 0.1125
- !type:AdjustTemperature
amount: 75 # thermal energy, not temperature!

Expand All @@ -221,4 +221,4 @@
factor: 2
- !type:AdjustReagent
reagent: Ethanol
amount: 0.03
amount: 0.12
Loading
Loading