cmdrunematti/Delta-v
1
0
Fork 0
mirror of https://github.com/DeltaV-Station/Delta-v.git synced 2026-09-29 15:47:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Namespace drink metabolites (#6486)

Browse Source 
* switched Silencer parent to BaseDrink to revert to pre-Metabolite behavior (non-alcoholic)

* Bring namespace drinks in line with upstream, using the new(-ish) Metabolites system in place of the AdjustReagent effect
This commit is contained in:
pixelStrife
2026-09-09 09:18:38 -05:00
committed by GitHub
parent 8bcddf4333
commit b6e018eb18
9 changed files with 219 additions and 289 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Resources/Prototypes/Nyanotrasen/Reagents/Consumable/Drink/alcohol.yml
+20 -57
View File
@@ -14,12 +14,8 @@
metamorphicChangeColor: false
metabolisms:
Digestion:
effects:
- !type:SatiateThirst
factor: 2
- !type:AdjustReagent
reagent: Ethanol
amount: 0.07
metabolites:
Ethanol: 0.14
- type: reagent
id: Soju
@@ -37,12 +33,8 @@
metamorphicChangeColor: false
metabolisms:
Digestion:
effects:
- !type:SatiateThirst
factor: 2
- !type:AdjustReagent
reagent: Ethanol
amount: 0.15
metabolites:
Ethanol: 0.14
- type: reagent
id: OrangeCreamice
@@ -60,12 +52,8 @@
metamorphicChangeColor: false
metabolisms:
Digestion:
effects:
- !type:SatiateThirst
factor: 2
- !type:AdjustReagent
reagent: Ethanol
amount: 0.05
metabolites:
Ethanol: 0.1
- type: reagent
id: Silverjack
@@ -83,12 +71,8 @@
metamorphicChangeColor: false
metabolisms:
Digestion:
effects:
- !type:SatiateThirst
factor: 2
- !type:AdjustReagent
reagent: Ethanol
amount: 0.0625
metabolites:
Ethanol: 0.125
- type: reagent
id: Brainbomb
@@ -106,6 +90,10 @@
metamorphicChangeColor: false
metabolisms:
Digestion:
metabolites:
Ethanol: 0.17
THC: 0.66
SpaceDrugs: 0.66
effects:
- !type:HealthChange
conditions:
@@ -115,17 +103,6 @@
damage:
types:
Caustic: 0.25
- !type:SatiateThirst
factor: 2
- !type:AdjustReagent
reagent: Ethanol
amount: 0.085
- !type:AdjustReagent
reagent: THC
amount: 0.33
- !type:AdjustReagent
reagent: SpaceDrugs
amount: 0.33
- type: reagent
id: ClownBlood
@@ -143,12 +120,8 @@
metamorphicChangeColor: false
metabolisms:
Digestion:
effects:
- !type:SatiateThirst
factor: 2
- !type:AdjustReagent
reagent: Ethanol
amount: 0.025
metabolites:
Ethanol: 0.05
- type: reagent
id: CircusJuice
@@ -166,12 +139,9 @@
metamorphicChangeColor: false
metabolisms:
Digestion:
metabolites:
Ethanol: 0.125
effects:
- !type:SatiateThirst
factor: 2
- !type:AdjustReagent
reagent: Ethanol
amount: 0.0625
- !type:Emote #It's very funny
emote: Laugh
probability: 0.15
@@ -192,12 +162,9 @@
metamorphicChangeColor: false
metabolisms:
Digestion:
metabolites:
Ethanol: 0.13
effects:
- !type:SatiateThirst
factor: 2
- !type:AdjustReagent
reagent: Ethanol
amount: 0.065
- !type:AdjustTemperature
amount: 75 # thermal energy, not temperature!
@@ -217,9 +184,5 @@
metamorphicChangeColor: false
metabolisms:
Digestion:
effects:
- !type:SatiateThirst
factor: 2
- !type:AdjustReagent
reagent: Ethanol
amount: 0.03
metabolites:
Ethanol: 0.06
Resources/Prototypes/Nyanotrasen/Reagents/Consumable/Drink/drinks.yml
+5 -20
View File
@@ -14,12 +14,8 @@
metamorphicChangeColor: false
metabolisms:
Digestion:
effects:
- !type:SatiateThirst
factor: 3
- !type:AdjustReagent
reagent: Radium
amount: 0.01
metabolites:
Radium: 0.02
- type: reagent
id: PinkDrink
@@ -35,11 +31,6 @@
metamorphicMaxFillLevels: 4
metamorphicFillBaseName: fill-
metamorphicChangeColor: false
metabolisms:
Digestion:
effects:
- !type:SatiateThirst
factor: 3
- type: reagent
id: BubbleTea
@@ -57,12 +48,6 @@
metamorphicChangeColor: false
metabolisms:
Digestion:
effects:
- !type:SatiateThirst
factor: 3
- !type:AdjustReagent
reagent: Sugar
amount: 0.2
- !type:AdjustReagent
reagent: Nutriment
amount: 0.1
metabolites:
Sugar: 0.4
Nutriment: 0.2
Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml
+1 -1
View File
@@ -1543,7 +1543,7 @@
- type: reagent
id: Silencer
name: reagent-name-silencer
parent: BaseAlcohol
parent: BaseDrink #Delta-V: drink was non-alcoholic before switch to Metabolites, components are all non-alcoholic
desc: reagent-desc-silencer
physicalDesc: reagent-physical-desc-nothing # DeltaV: Desc changed
flavor: silencer #Delta-V Flavor additions
Resources/Prototypes/_DEN/Reagents/Consumable/Drink/alcohol.yml
+139 -104
View File
@@ -14,12 +14,14 @@
metamorphicChangeColor: false
metabolisms:
Digestion:
effects:
- !type:SatiateThirst
factor: 2
- !type:AdjustReagent
reagent: Ethanol
amount: 0.2
metabolites: #Delta-V - swap AdjustReagent to metabolites for consistency, SatiateThirst is on parent now
Ethanol: 0.4
# effects:
# - !type:SatiateThirst
# factor: 2
# - !type:AdjustReagent
# reagent: Ethanol
# amount: 0.2
fizziness: 0.25
- type: reagent
@@ -38,12 +40,14 @@
metamorphicChangeColor: false
metabolisms:
Digestion:
effects:
- !type:SatiateThirst
factor: 2
- !type:AdjustReagent
reagent: Ethanol
amount: 0.1
metabolites: #Delta-V - swap AdjustReagent to metabolites for consistency, SatiateThirst is on parent now
Ethanol: 0.2
# effects:
# - !type:SatiateThirst
# factor: 2
# - !type:AdjustReagent
# reagent: Ethanol
# amount: 0.1
fizziness: 0.25
- type: reagent
@@ -62,12 +66,14 @@
metamorphicChangeColor: false
metabolisms:
Digestion:
effects:
- !type:SatiateThirst
factor: 2
- !type:AdjustReagent
reagent: Ethanol
amount: 0.1
metabolites: #Delta-V - swap AdjustReagent to metabolites for consistency, SatiateThirst is on parent now
Ethanol: 0.2
# effects:
# - !type:SatiateThirst
# factor: 2
# - !type:AdjustReagent
# reagent: Ethanol
# amount: 0.1
fizziness: 0.25
- type: reagent
@@ -86,12 +92,14 @@
metamorphicChangeColor: false
metabolisms:
Digestion:
effects:
- !type:SatiateThirst
factor: 2
- !type:AdjustReagent
reagent: Ethanol
amount: 0.12
metabolites: #Delta-V - swap AdjustReagent to metabolites for consistency, SatiateThirst is on parent now
Ethanol: 0.24
# effects:
# - !type:SatiateThirst
# factor: 2
# - !type:AdjustReagent
# reagent: Ethanol
# amount: 0.12
fizziness: 0.25
- type: reagent
@@ -110,15 +118,18 @@
metamorphicChangeColor: false
metabolisms:
Digestion:
effects:
- !type:SatiateThirst
factor: 2
- !type:AdjustReagent
reagent: Ethanol
amount: 0.15
- !type:AdjustReagent
reagent: LotophagoiOil
amount: 0.12
metabolites: #Delta-V - swap AdjustReagent to metabolites for consistency, SatiateThirst is on parent now
Ethanol: 0.3
LotophagoiOil: 0.24
# effects:
# - !type:SatiateThirst
# factor: 2
# - !type:AdjustReagent
# reagent: Ethanol
# amount: 0.15
# - !type:AdjustReagent
# reagent: LotophagoiOil
# amount: 0.12
fizziness: 0.25
- type: reagent
@@ -137,12 +148,14 @@
metamorphicChangeColor: false
metabolisms:
Digestion:
effects:
- !type:SatiateThirst
factor: 2
- !type:AdjustReagent
reagent: Ethanol
amount: 0.08
metabolites: #Delta-V - swap AdjustReagent to metabolites for consistency, SatiateThirst is on parent now
Ethanol: 0.16
# effects:
# - !type:SatiateThirst
# factor: 2
# - !type:AdjustReagent
# reagent: Ethanol
# amount: 0.08
fizziness: 0.25
- type: reagent
@@ -161,12 +174,14 @@
metamorphicChangeColor: false
metabolisms:
Digestion:
effects:
- !type:SatiateThirst
factor: 2
- !type:AdjustReagent
reagent: Ethanol
amount: 0.08
metabolites: #Delta-V - swap AdjustReagent to metabolites for consistency, SatiateThirst is on parent now
Ethanol: 0.16
# effects:
# - !type:SatiateThirst
# factor: 2
# - !type:AdjustReagent
# reagent: Ethanol
# amount: 0.08
fizziness: 0.25
- type: reagent
@@ -185,12 +200,14 @@
metamorphicChangeColor: false
metabolisms:
Digestion:
effects:
- !type:SatiateThirst
factor: 2
- !type:AdjustReagent
reagent: Ethanol
amount: 0.08
metabolites: #Delta-V - swap AdjustReagent to metabolites for consistency, SatiateThirst is on parent now
Ethanol: 0.16
# effects:
# - !type:SatiateThirst
# factor: 2
# - !type:AdjustReagent
# reagent: Ethanol
# amount: 0.08
fizziness: 0.25
@@ -211,12 +228,14 @@
metamorphicChangeColor: false
metabolisms:
Digestion:
effects:
- !type:SatiateThirst
factor: 2
- !type:AdjustReagent
reagent: Ethanol
amount: 0.08
metabolites: #Delta-V - swap AdjustReagent to metabolites for consistency, SatiateThirst is on parent now
Ethanol: 0.16
# effects:
# - !type:SatiateThirst
# factor: 2
# - !type:AdjustReagent
# reagent: Ethanol
# amount: 0.08
fizziness: 0.25
- type: reagent
@@ -235,12 +254,14 @@
metamorphicChangeColor: false
metabolisms:
Digestion:
effects:
- !type:SatiateThirst
factor: 2
- !type:AdjustReagent
reagent: Ethanol
amount: 0.15
metabolites: #Delta-V - swap AdjustReagent to metabolites for consistency, SatiateThirst is on parent now
Ethanol: 0.3
# effects:
# - !type:SatiateThirst
# factor: 2
# - !type:AdjustReagent
# reagent: Ethanol
# amount: 0.15
fizziness: 0.25
- type: reagent
@@ -259,12 +280,14 @@
metamorphicChangeColor: false
metabolisms:
Digestion:
metabolites: #Delta-V - swap AdjustReagent to metabolites for consistency, SatiateThirst is on parent now
Ethanol: 0.4
effects:
- !type:SatiateThirst
factor: 2
- !type:AdjustReagent
reagent: Ethanol
amount: 0.2
# - !type:SatiateThirst
# factor: 2
# - !type:AdjustReagent
# reagent: Ethanol
# amount: 0.2
- !type:GenericStatusEffect
key: KnockedDown
component: KnockedDown
@@ -297,12 +320,14 @@
metamorphicChangeColor: false
metabolisms:
Digestion:
effects:
- !type:SatiateThirst
factor: 2
- !type:AdjustReagent
reagent: Ethanol
amount: 0.12
metabolites: #Delta-V - swap AdjustReagent to metabolites for consistency, SatiateThirst is on parent now
Ethanol: 0.24
# effects:
# - !type:SatiateThirst
# factor: 2
# - !type:AdjustReagent
# reagent: Ethanol
# amount: 0.12
fizziness: 0.25
- type: reagent
@@ -321,12 +346,14 @@
metamorphicChangeColor: false
metabolisms:
Digestion:
effects:
- !type:SatiateThirst
factor: 2
- !type:AdjustReagent
reagent: Ethanol
amount: 0.08
metabolites: #Delta-V - swap AdjustReagent to metabolites for consistency, SatiateThirst is on parent now
Ethanol: 0.16
# effects:
# - !type:SatiateThirst
# factor: 2
# - !type:AdjustReagent
# reagent: Ethanol
# amount: 0.08
fizziness: 0.25
- type: reagent
@@ -345,12 +372,14 @@
metamorphicChangeColor: false
metabolisms:
Digestion:
effects:
- !type:SatiateThirst
factor: 2
- !type:AdjustReagent
reagent: Ethanol
amount: 0.1
metabolites: #Delta-V - swap AdjustReagent to metabolites for consistency, SatiateThirst is on parent now
Ethanol: 0.2
# effects:
# - !type:SatiateThirst
# factor: 2
# - !type:AdjustReagent
# reagent: Ethanol
# amount: 0.1
fizziness: 0.25
- type: reagent
@@ -369,12 +398,14 @@
metamorphicChangeColor: false
metabolisms:
Digestion:
effects:
- !type:SatiateThirst
factor: 2
- !type:AdjustReagent
reagent: Ethanol
amount: 0.12
metabolites: #Delta-V - swap AdjustReagent to metabolites for consistency, SatiateThirst is on parent now
Ethanol: 0.24
# effects:
# - !type:SatiateThirst
# factor: 2
# - !type:AdjustReagent
# reagent: Ethanol
# amount: 0.12
fizziness: 0.25
- type: reagent
@@ -393,12 +424,14 @@
metamorphicChangeColor: false
metabolisms:
Digestion:
effects:
- !type:SatiateThirst
factor: 2
- !type:AdjustReagent
reagent: Ethanol
amount: 0.1
metabolites: #Delta-V - swap AdjustReagent to metabolites for consistency, SatiateThirst is on parent now
Ethanol: 0.2
# effects:
# - !type:SatiateThirst
# factor: 2
# - !type:AdjustReagent
# reagent: Ethanol
# amount: 0.1
fizziness: 0.25
- type: reagent
@@ -417,10 +450,12 @@
metamorphicChangeColor: false
metabolisms:
Digestion:
effects:
- !type:SatiateThirst
factor: 2
- !type:AdjustReagent
reagent: Ethanol
amount: 0.1
metabolites: #Delta-V - swap AdjustReagent to metabolites for consistency, SatiateThirst is on parent now
Ethanol: 0.2
# effects:
# - !type:SatiateThirst
# factor: 2
# - !type:AdjustReagent
# reagent: Ethanol
# amount: 0.1
fizziness: 0.25
Resources/Prototypes/_DV/Reagents/Consumable/Drink/alcohol.yml
+14 -39
View File
@@ -9,12 +9,11 @@
recognizable: true
metabolisms:
Digestion:
metabolites:
Ethanol: 0.6
effects:
- !type:SatiateThirst
factor: 1
- !type:AdjustReagent
reagent: Ethanol
amount: 0.3
- type: reagent
id: OldFashioned
@@ -32,12 +31,8 @@
metamorphicChangeColor: false
metabolisms:
Digestion:
effects:
- !type:SatiateThirst
factor: 2
- !type:AdjustReagent
reagent: Ethanol
amount: 0.2
metabolites:
Ethanol: 0.4
- type: reagent
id: MnatsaCollins
@@ -55,12 +50,8 @@
metamorphicChangeColor: false
metabolisms:
Digestion:
effects:
- !type:SatiateThirst
factor: 2
- !type:AdjustReagent
reagent: Ethanol
amount: 0.07
metabolites:
Ethanol: 0.14
fizziness: 0.4
- type: reagent
@@ -79,12 +70,8 @@
metamorphicChangeColor: false
metabolisms:
Digestion:
effects:
- !type:SatiateThirst
factor: 2
- !type:AdjustReagent
reagent: Ethanol
amount: 0.07
metabolites:
Ethanol: 0.14
- type: reagent
id: FiveOClock
@@ -102,12 +89,8 @@
metamorphicChangeColor: false
metabolisms:
Digestion:
effects:
- !type:SatiateThirst
factor: 2
- !type:AdjustReagent
reagent: Ethanol
amount: 0.07
metabolites:
Ethanol: 0.14
- type: reagent
id: Mliko
@@ -125,12 +108,8 @@
metamorphicChangeColor: false
metabolisms:
Digestion:
effects:
- !type:SatiateThirst
factor: 1
- !type:AdjustReagent
reagent: Ethanol
amount: 0.02
metabolites:
Ethanol: 0.04
- type: reagent
id: Firebolt
@@ -148,9 +127,5 @@
metamorphicChangeColor: true
metabolisms:
Digestion:
effects:
- !type:SatiateThirst
factor: 2
- !type:AdjustReagent
reagent: Ethanol
amount: 0.2
metabolites:
Ethanol: 0.4
Resources/Prototypes/_DV/Reagents/Consumable/Drink/drinks.yml
+18 -41
View File
@@ -40,7 +40,7 @@
- type: reagent
id: HealthViolation
name: reagent-name-healthviolation
parent: BaseDrink
parent: BaseAlcohol
desc: reagent-desc-healthviolation
physicalDesc: reagent-physical-desc-strong-smelling
flavor: healthcodeviolation
@@ -53,12 +53,9 @@
metamorphicChangeColor: false
metabolisms:
Digestion:
metabolites:
Ethanol: 0.6
effects:
- !type:SatiateThirst
factor: 2
- !type:AdjustReagent
reagent: Ethanol
amount: 0.3
- !type:PopupMessage
conditions:
- !type:ReagentCondition
@@ -78,7 +75,7 @@
- type: reagent
id: Gunmetal #Credit to DinkusMcsplinkus for inspiring this drink. This could've also been called "Creamy Ignition"
name: reagent-name-gunmetal
parent: BaseDrink
parent: BaseAlcohol
desc: reagent-desc-gunmetal
physicalDesc: reagent-physical-desc-strong-smelling
flavor: gunmetal
@@ -91,12 +88,8 @@
metamorphicChangeColor: false
metabolisms:
Digestion:
effects:
- !type:SatiateThirst
factor: 2
- !type:AdjustReagent
reagent: Ethanol
amount: 0.20
metabolites:
Ethanol: 0.4
Bloodstream:
effects:
- !type:HealthChange
@@ -107,7 +100,7 @@
- type: reagent
id: LemonDrop
name: reagent-name-lemondrop
parent: BaseDrink
parent: BaseAlcohol
desc: reagent-desc-lemondrop
physicalDesc: reagent-physical-desc-lemony-fresh
flavor: lemondrop
@@ -119,17 +112,13 @@
metamorphicFillBaseName: fill-
metabolisms:
Digestion:
effects:
- !type:SatiateThirst
factor: 2
- !type:AdjustReagent
reagent: Ethanol
amount: 0.15
metabolites:
Ethanol: 0.3
- type: reagent
id: GreenGrass
name: reagent-name-greengrass
parent: BaseDrink
parent: BaseAlcohol
desc: reagent-desc-greengrass
physicalDesc: reagent-physical-desc-tangy
flavor: greengrass
@@ -141,17 +130,13 @@
metamorphicFillBaseName: fill-
metabolisms:
Digestion:
effects:
- !type:SatiateThirst
factor: 2
- !type:AdjustReagent
reagent: Ethanol
amount: 0.05
metabolites:
Ethanol: 0.1
- type: reagent
id: ArsonistsBrew
name: reagent-name-arsonistsbrew
parent: BaseDrink
parent: BaseAlcohol
desc: reagent-desc-arsonistsbrew
physicalDesc: reagent-physical-desc-volatile
flavor: arsonistsbrew
@@ -164,12 +149,8 @@
metamorphicChangeColor: false
metabolisms:
Digestion:
effects:
- !type:SatiateThirst
factor: 2
- !type:AdjustReagent
reagent: Ethanol
amount: 0.30
metabolites:
Ethanol: 0.6
Bloodstream:
effects:
- !type:HealthChange
@@ -201,7 +182,7 @@
- type: reagent
id: Mothamphetamine
name: reagent-name-mothamphetamine
parent: BaseDrink
parent: BaseAlcohol
desc: reagent-desc-mothamphetamine
physicalDesc: reagent-physical-desc-fuzzy
flavor: mothamphetamine #Delta-V Flavor additions
@@ -214,12 +195,8 @@
metamorphicChangeColor: false
metabolisms:
Digestion:
effects:
- !type:SatiateThirst
factor: 2
- !type:AdjustReagent
reagent: Ethanol
amount: 0.25
metabolites:
Ethanol: 0.5
Bloodstream:
effects:
- !type:Jitter
Resources/Prototypes/_DV/Reagents/Consumable/Drink/frozen_treats.yml
+10 -17
View File
@@ -134,10 +134,8 @@
recognizable: true
metabolisms:
Digestion:
effects:
- !type:AdjustReagent
reagent: Theobromine
amount: 0.05
metabolites:
Theobromine: 0.1
metamorphicSprite:
sprite: _DV/Objects/Consumable/Drinks/frozen_treats/icecream-chocolate.rsi
state: icon_empty
@@ -166,14 +164,13 @@
recognizable: true
metabolisms:
Digestion:
metabolites:
Theobromine: 0.1
effects:
- !type:ModifyStatusEffect
effectProto: StatusEffectDrowsiness
time: 2
type: Remove
- !type:AdjustReagent
reagent: Theobromine
amount: 0.05
metamorphicSprite:
sprite: _DV/Objects/Consumable/Drinks/frozen_treats/icecream-coffee.rsi
state: icon_empty
@@ -252,10 +249,8 @@
recognizable: true
metabolisms:
Digestion:
effects:
- !type:AdjustReagent
reagent: Theobromine
amount: 0.05
metabolites:
Theobromine: 0.1
metamorphicSprite:
sprite: _DV/Objects/Consumable/Drinks/frozen_treats/icecream-neapolitan.rsi
state: icon_empty
@@ -283,10 +278,9 @@
recognizable: true
metabolisms:
Digestion:
metabolites:
Theobromine: 0.1
effects:
- !type:AdjustReagent
reagent: Theobromine
amount: 0.05
- !type:SatiateThirst
factor: 2
- !type:HealthChange
@@ -312,6 +306,8 @@
recognizable: true
metabolisms:
Digestion:
metabolites:
Theobromine: 0.1
effects:
- !type:SatiateThirst
factor: 3
@@ -325,9 +321,6 @@
damage:
types:
Cold: .5
- !type:AdjustReagent
reagent: Theobromine
amount: 0.05
metamorphicSprite:
sprite: _DV/Objects/Consumable/Drinks/frozen_treats/icecream-tower.rsi
state: icon_empty
Resources/Prototypes/_DV/Reagents/Consumable/Drink/soda.yml
+2 -3
View File
@@ -8,6 +8,8 @@
color: "#570303"
metabolisms:
Digestion:
metabolites:
UncookedAnimalProteins: 0.1
effects:
- !type:SatiateThirst
factor: 2.0
@@ -15,6 +17,3 @@
- !type:MetabolizerTypeCondition
type: [ Human ]
inverted: true
- !type:AdjustReagent
reagent: UncookedAnimalProteins
amount: 0.05
Resources/Prototypes/_NF/Reagents/Consumables/Drink/drinks.yml
+10 -7
View File
@@ -8,18 +8,21 @@
color: "#a45c08"
metabolisms:
Digestion:
metabolites: # Delta-V: switch from AdjustReagent system to Metabolites for consistency
Theobromine: 0.1
Sugar: 0.4
effects:
- !type:SatiateThirst
factor: 2
- !type:AdjustReagent
reagent: Theobromine
amount: 0.05
- !type:AdjustReagent
reagent: Sugar
amount: 0.2
# - !type:AdjustReagent # Delta-V -See above
# reagent: Theobromine
# amount: 0.05
# - !type:AdjustReagent
# reagent: Sugar
# amount: 0.2
metamorphicSprite:
sprite: _NF/Objects/Consumable/Drinks/pumpkinspicelatte.rsi
state: icon_empty
metamorphicMaxFillLevels: 2
metamorphicFillBaseName: fill-
metamorphicChangeColor: false
metamorphicChangeColor: false