diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml index bc0a111d35..2282246702 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml @@ -284,8 +284,8 @@ - type: entity parent: DrinkGlassBase - id: DrinkBarefootHonkGlass - name: bareroot glass + id: DrinkBarefootGlass + name: barefoot glass description: Barefoot and pregnant. components: - type: SolutionContainerManager diff --git a/Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml b/Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml index 25963b690f..60ed8ab44c 100644 --- a/Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml +++ b/Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml @@ -531,6 +531,34 @@ desc: Turn up for days. physicalDesc: bubbly color: "#9400D3" + metabolisms: + Drink: + effects: + - !type:SatiateThirst + factor: -5 + Poison: + effects: + - !type:Electrocute + probability: 0.10 + - !type:HealthChange + damage: + types: + Poison: 2 + Medicine: + effects: + - !type:HealthChange + damage: + types: + Radiation: -1 + Narcotic: + effects: + - !type:MovespeedModifier + walkSpeedModifier: 1.05 + sprintSpeedModifier: 1.05 + - !type:GenericStatusEffect + key: Stutter + component: StutteringAccent + - !type:Jitter - type: reagent id: LeanShine @@ -539,6 +567,34 @@ desc: Lean mixed with moonshine. Turn up for months. physicalDesc: bubbly color: "#9d5fb8" + metabolisms: + Drink: + effects: + - !type:SatiateThirst + factor: -5 + Poison: + effects: + - !type:Electrocute + probability: 0.15 + - !type:HealthChange + damage: + types: + Poison: 3 + Medicine: + effects: + - !type:HealthChange + damage: + types: + Radiation: -2 + Narcotic: + effects: + - !type:MovespeedModifier + walkSpeedModifier: 1.10 + sprintSpeedModifier: 1.10 + - !type:GenericStatusEffect + key: Stutter + component: StutteringAccent + - !type:Jitter - type: reagent id: LongIslandIcedTea diff --git a/Resources/Prototypes/Recipes/Reactions/drinks.yml b/Resources/Prototypes/Recipes/Reactions/drinks.yml index 9f2e82d685..e05247003d 100644 --- a/Resources/Prototypes/Recipes/Reactions/drinks.yml +++ b/Resources/Prototypes/Recipes/Reactions/drinks.yml @@ -316,6 +316,16 @@ products: IrishCream: 3 +- type: reaction + id: Lean + reactants: + FourteenLoko: + amount: 2 + WeldingFuel: + amount: 1 + products: + Lean: 3 + - type: reaction id: LeanShine reactants: