diff --git a/Resources/Prototypes/DeltaV/Reagents/Consumable/Drink/drinks.yml b/Resources/Prototypes/DeltaV/Reagents/Consumable/Drink/drinks.yml index c568c1bc757..7fdc51f1de4 100644 --- a/Resources/Prototypes/DeltaV/Reagents/Consumable/Drink/drinks.yml +++ b/Resources/Prototypes/DeltaV/Reagents/Consumable/Drink/drinks.yml @@ -19,7 +19,7 @@ factor: 2 - !type:AdjustReagent reagent: Ethanol - amount: 0.3 + amount: 0.336 - !type:PopupMessage conditions: - !type:ReagentThreshold @@ -55,7 +55,7 @@ factor: 2 - !type:AdjustReagent reagent: Ethanol - amount: 0.20 + amount: 0.133 Poison: effects: - !type:HealthChange @@ -83,7 +83,7 @@ factor: 2 - !type:AdjustReagent reagent: Ethanol - amount: 0.15 + amount: 0.16 - type: reagent id: GreenGrass @@ -105,7 +105,7 @@ factor: 2 - !type:AdjustReagent reagent: Ethanol - amount: 0.05 + amount: 0.083 - type: reagent id: Daiquiri @@ -128,7 +128,7 @@ factor: 2 - !type:AdjustReagent reagent: Ethanol - amount: 0.25 + amount: 0.3 - type: reagent id: ArsonistsBrew @@ -151,7 +151,7 @@ factor: 2 - !type:AdjustReagent reagent: Ethanol - amount: 0.30 + amount: 0.08 Poison: effects: - !type:HealthChange @@ -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 @@ -201,7 +209,7 @@ factor: 2 - !type:AdjustReagent reagent: Ethanol - amount: 0.25 + amount: 0.126 Poison: effects: - !type:Jitter diff --git a/Resources/Prototypes/Nyanotrasen/Reagents/Consumable/Drink/alcohol.yml b/Resources/Prototypes/Nyanotrasen/Reagents/Consumable/Drink/alcohol.yml index 972fc08239e..19d49b913a5 100644 --- a/Resources/Prototypes/Nyanotrasen/Reagents/Consumable/Drink/alcohol.yml +++ b/Resources/Prototypes/Nyanotrasen/Reagents/Consumable/Drink/alcohol.yml @@ -19,7 +19,7 @@ factor: 2 - !type:AdjustReagent reagent: Ethanol - amount: 0.07 + amount: 0.15 - type: reagent id: Soju @@ -42,7 +42,7 @@ factor: 2 - !type:AdjustReagent reagent: Ethanol - amount: 0.15 + amount: 0.2 - type: reagent id: OrangeCreamice @@ -65,7 +65,7 @@ factor: 2 - !type:AdjustReagent reagent: Ethanol - amount: 0.05 + amount: 0.1 - type: reagent id: Silverjack @@ -88,7 +88,7 @@ factor: 2 - !type:AdjustReagent reagent: Ethanol - amount: 0.0625 + amount: 0.1375 - type: reagent id: Brainbomb @@ -118,7 +118,7 @@ factor: 2 - !type:AdjustReagent reagent: Ethanol - amount: 0.085 + amount: 0.13 - !type:AdjustReagent reagent: THC amount: 0.33 @@ -147,7 +147,7 @@ factor: 2 - !type:AdjustReagent reagent: Ethanol - amount: 0.025 + amount: 0.08 - type: reagent id: CircusJuice @@ -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 @@ -196,7 +196,7 @@ factor: 2 - !type:AdjustReagent reagent: Ethanol - amount: 0.065 + amount: 0.1125 - !type:AdjustTemperature amount: 75 # thermal energy, not temperature! @@ -221,4 +221,4 @@ factor: 2 - !type:AdjustReagent reagent: Ethanol - amount: 0.03 + amount: 0.12 diff --git a/Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml b/Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml index e31087c309e..d9e57d5b803 100644 --- a/Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml +++ b/Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml @@ -22,7 +22,7 @@ factor: 2 - !type:AdjustReagent reagent: Ethanol - amount: 0.3 + amount: 0.7 - type: reagent id: Ale @@ -77,7 +77,7 @@ factor: 2 - !type:AdjustReagent reagent: Ethanol - amount: 0.1 + amount: 0.25 - type: reagent id: BlueHawaiian @@ -97,7 +97,7 @@ factor: 2 - !type:AdjustReagent reagent: Ethanol - amount: 0.2 + amount: 0.154 - type: reagent id: Cognac @@ -121,7 +121,7 @@ factor: 2 - !type:AdjustReagent reagent: Ethanol - amount: 0.2 + amount: 0.4 - type: reagent id: DeadRum @@ -144,7 +144,7 @@ factor: 2 - !type:AdjustReagent reagent: Ethanol - amount: 0.2 + amount: 0.6 - type: reagent id: Ethanol @@ -163,7 +163,7 @@ - !type:HealthChange conditions: - !type:ReagentThreshold - min: 15 + min: 45 damage: types: Poison: 1 @@ -278,7 +278,7 @@ factor: 2 - !type:AdjustReagent reagent: Ethanol - amount: 0.2 + amount: 0.45 - type: reagent id: CoffeeLiqueur @@ -294,6 +294,13 @@ metamorphicMaxFillLevels: 3 metamorphicFillBaseName: fill- metamorphicChangeColor: true + metabolisms: + Drink: + effects: + - !type:AdjustReagent + reagent: Ethanol + amount: 0.20 + - type: reagent id: MelonLiquor @@ -309,6 +316,12 @@ metamorphicMaxFillLevels: 5 metamorphicFillBaseName: fill- metamorphicChangeColor: true + metabolisms: + Drink: + effects: + - !type:AdjustReagent + reagent: Ethanol + amount: 0.20 - type: reagent id: NTCahors @@ -324,6 +337,12 @@ metamorphicMaxFillLevels: 5 metamorphicFillBaseName: fill- metamorphicChangeColor: true + metabolisms: + Drink: + effects: + - !type:AdjustReagent + reagent: Ethanol + amount: 0.17 - type: reagent id: PoisonWine @@ -346,7 +365,7 @@ factor: 2 - !type:AdjustReagent reagent: Ethanol - amount: 0.05 + amount: 0.11 Poison: effects: - !type:HealthChange @@ -376,7 +395,7 @@ factor: 2 - !type:AdjustReagent reagent: Ethanol - amount: 0.2 + amount: 0.40 ##Commented out in favor of Nyano sake/soju #- type: reagent @@ -409,7 +428,7 @@ factor: 2 - !type:AdjustReagent reagent: Ethanol - amount: 0.2 + amount: 0.40 - type: reagent id: Vermouth @@ -425,6 +444,12 @@ metamorphicMaxFillLevels: 4 metamorphicFillBaseName: fill- metamorphicChangeColor: false + metabolisms: + Drink: + effects: + - !type:AdjustReagent + reagent: Ethanol + amount: 0.16 - type: reagent id: Vodka @@ -448,7 +473,7 @@ factor: 2 - !type:AdjustReagent reagent: Ethanol - amount: 0.2 + amount: 0.40 - type: reagent id: Whiskey @@ -472,7 +497,7 @@ factor: 2 - !type:AdjustReagent reagent: Ethanol - amount: 0.2 + amount: 0.40 - type: reagent id: Wine @@ -489,6 +514,14 @@ metamorphicMaxFillLevels: 5 metamorphicFillBaseName: fill- metamorphicChangeColor: true + metabolisms: + Drink: + effects: + - !type:SatiateThirst + factor: 2 + - !type:AdjustReagent + reagent: Ethanol + amount: 0.11 - type: reagent id: Champagne @@ -512,7 +545,7 @@ factor: 3 - !type:AdjustReagent reagent: Ethanol - amount: 0.3 + amount: 0.12 # Mixed Alcohol @@ -530,6 +563,14 @@ metamorphicMaxFillLevels: 5 metamorphicFillBaseName: fill- metamorphicChangeColor: false + metabolisms: + Drink: + effects: + - !type:SatiateThirst + factor: 1 + - !type:AdjustReagent + reagent: Ethanol + amount: 0.073 - type: reagent id: AlliesCocktail @@ -545,6 +586,14 @@ metamorphicMaxFillLevels: 4 metamorphicFillBaseName: fill- metamorphicChangeColor: false + metabolisms: + Drink: + effects: + - !type:SatiateThirst + factor: 2 + - !type:AdjustReagent + reagent: Ethanol + amount: 0.37 - type: reagent id: Aloe @@ -575,6 +624,14 @@ metamorphicMaxFillLevels: 5 metamorphicFillBaseName: fill- metamorphicChangeColor: false + metabolisms: + Drink: + effects: + - !type:SatiateThirst + factor: 2 + - !type:AdjustReagent + reagent: Ethanol + amount: 0.204 - type: reagent id: Andalusia @@ -590,6 +647,14 @@ metamorphicMaxFillLevels: 4 metamorphicFillBaseName: fill- metamorphicChangeColor: false + metabolisms: + Drink: + effects: + - !type:SatiateThirst + factor: 2 + - !type:AdjustReagent + reagent: Ethanol + amount: 0.27 - type: reagent id: Antifreeze @@ -612,7 +677,7 @@ factor: 2 - !type:AdjustReagent reagent: Ethanol - amount: 0.15 + amount: 0.2 - type: reagent id: AtomicBomb @@ -635,7 +700,7 @@ factor: 2 - !type:AdjustReagent reagent: Ethanol - amount: 0.15 + amount: 0.254 - !type:AdjustReagent reagent: Uranium amount: 0.05 @@ -661,7 +726,7 @@ factor: 2 - !type:AdjustReagent reagent: Ethanol - amount: 0.15 + amount: 0.28 - type: reagent id: BahamaMama @@ -677,6 +742,14 @@ metamorphicMaxFillLevels: 5 metamorphicFillBaseName: fill- metamorphicChangeColor: true + metabolisms: + Drink: + effects: + - !type:SatiateThirst + factor: 2 + - !type:AdjustReagent + reagent: Ethanol + amount: 0.11 - type: reagent id: BananaHonk @@ -707,6 +780,14 @@ metamorphicMaxFillLevels: 3 metamorphicFillBaseName: fill- metamorphicChangeColor: true + metabolisms: + Drink: + effects: + - !type:SatiateThirst + factor: 2 + - !type:AdjustReagent + reagent: Ethanol + amount: 0.05 - type: reagent id: BeepskySmash @@ -729,7 +810,7 @@ factor: 2 - !type:AdjustReagent reagent: Ethanol - amount: 0.15 + amount: 0.13 - type: reagent id: BlackRussian @@ -752,7 +833,7 @@ factor: 2 - !type:AdjustReagent reagent: Ethanol - amount: 0.2 + amount: 0.33 - type: reagent id: BloodyMary @@ -768,6 +849,14 @@ metamorphicMaxFillLevels: 5 metamorphicFillBaseName: fill- metamorphicChangeColor: true + metabolisms: + Drink: + effects: + - !type:SatiateThirst + factor: 2 + - !type:AdjustReagent + reagent: Ethanol + amount: 0.13 - type: reagent id: Booger @@ -783,6 +872,14 @@ metamorphicMaxFillLevels: 5 metamorphicFillBaseName: fill- metamorphicChangeColor: true + metabolisms: + Drink: + effects: + - !type:SatiateThirst + factor: 2 + - !type:AdjustReagent + reagent: Ethanol + amount: 0.08 - type: reagent id: BraveBull @@ -805,7 +902,7 @@ factor: 2 - !type:AdjustReagent reagent: Ethanol - amount: 0.2 + amount: 0.33 - type: reagent id: CoconutRum @@ -825,7 +922,7 @@ factor: 2 - !type:AdjustReagent reagent: Ethanol - amount: 0.2 + amount: 0.26 - type: reagent id: Cosmopolitan @@ -845,7 +942,7 @@ factor: 2 - !type:AdjustReagent reagent: Ethanol - amount: 0.15 + amount: 0.13 - type: reagent id: CubaLibre @@ -868,7 +965,7 @@ factor: 2 - !type:AdjustReagent reagent: Ethanol - amount: 0.07 + amount: 0.13 - type: reagent id: DemonsBlood @@ -884,6 +981,14 @@ metamorphicMaxFillLevels: 4 metamorphicFillBaseName: fill- metamorphicChangeColor: true + metabolisms: + Drink: + effects: + - !type:SatiateThirst + factor: 2 + - !type:AdjustReagent + reagent: Ethanol + amount: 0.10 - type: reagent id: DevilsKiss @@ -899,6 +1004,14 @@ metamorphicMaxFillLevels: 3 metamorphicFillBaseName: fill- metamorphicChangeColor: true + metabolisms: + Drink: + effects: + - !type:SatiateThirst + factor: 2 + - !type:AdjustReagent + reagent: Ethanol + amount: 0.20 - type: reagent id: DoctorsDelight @@ -921,9 +1034,6 @@ factor: 2 - !type:SatiateHunger factor: -2 - - !type:AdjustReagent - reagent: Ethanol - amount: 0.05 Medicine: effects: - !type:HealthChange @@ -955,7 +1065,7 @@ factor: 2 - !type:AdjustReagent reagent: Ethanol - amount: 0.15 + amount: 0.225 - type: reagent id: ErikaSurprise @@ -971,6 +1081,14 @@ metamorphicMaxFillLevels: 5 metamorphicFillBaseName: fill- metamorphicChangeColor: true + metabolisms: + Drink: + effects: + - !type:SatiateThirst + factor: 2 + - !type:AdjustReagent + reagent: Ethanol + amount: 0.02 - type: reagent id: GargleBlaster @@ -993,7 +1111,7 @@ factor: 2 - !type:AdjustReagent reagent: Ethanol - amount: 0.2 + amount: 0.32 - type: reagent id: GinFizz @@ -1016,7 +1134,7 @@ factor: 2 - !type:AdjustReagent reagent: Ethanol - amount: 0.07 + amount: 0.15 - type: reagent id: GinTonic @@ -1039,7 +1157,7 @@ factor: 2 - !type:AdjustReagent reagent: Ethanol - amount: 0.07 + amount: 0.15 - type: reagent id: Gildlager @@ -1062,7 +1180,7 @@ factor: 2 - !type:AdjustReagent reagent: Ethanol - amount: 0.2 + amount: 0.363 - type: reagent id: Grog @@ -1078,6 +1196,14 @@ metamorphicMaxFillLevels: 5 metamorphicFillBaseName: fill- metamorphicChangeColor: true + metabolisms: + Drink: + effects: + - !type:SatiateThirst + factor: 2 + - !type:AdjustReagent + reagent: Ethanol + amount: 0.10 - type: reagent id: HippiesDelight @@ -1093,6 +1219,14 @@ metamorphicMaxFillLevels: 6 metamorphicFillBaseName: fill- metamorphicChangeColor: false + metabolisms: + Drink: + effects: + - !type:SatiateThirst + factor: 2 + - !type:AdjustReagent + reagent: Ethanol + amount: 0.16 - type: reagent id: Hooch @@ -1102,6 +1236,14 @@ physicalDesc: reagent-physical-desc-strong-smelling flavor: alcohol color: "#664e00" + metabolisms: + Drink: + effects: + - !type:SatiateThirst + factor: 2 + - !type:AdjustReagent + reagent: Ethanol + amount: 0.50 - type: reagent id: IcedBeer @@ -1139,7 +1281,7 @@ factor: 2 - !type:AdjustReagent reagent: Ethanol - amount: 0.15 + amount: 0.16 - type: reagent id: IrishCream @@ -1162,7 +1304,7 @@ factor: 2 - !type:AdjustReagent reagent: Ethanol - amount: 0.2 + amount: 0.266 - type: reagent id: IrishCoffee @@ -1185,7 +1327,7 @@ factor: 2 - !type:AdjustReagent reagent: Ethanol - amount: 0.15 + amount: 0.133 - type: reagent id: LongIslandIcedTea @@ -1208,7 +1350,7 @@ factor: 2 - !type:AdjustReagent reagent: Ethanol - amount: 0.15 + amount: 0.273 - type: reagent id: Manhattan @@ -1224,6 +1366,14 @@ metamorphicMaxFillLevels: 3 metamorphicFillBaseName: fill- metamorphicChangeColor: false + metabolisms: + Drink: + effects: + - !type:SatiateThirst + factor: 2 + - !type:AdjustReagent + reagent: Ethanol + amount: 0.32 - type: reagent id: ManhattanProject @@ -1239,6 +1389,14 @@ metamorphicMaxFillLevels: 3 metamorphicFillBaseName: fill- metamorphicChangeColor: false + metabolisms: + Drink: + effects: + - !type:SatiateThirst + factor: 2 + - !type:AdjustReagent + reagent: Ethanol + amount: 0.363 - type: reagent id: ManlyDorf @@ -1291,7 +1449,7 @@ factor: 2 - !type:AdjustReagent reagent: Ethanol - amount: 0.15 + amount: 0.353 - type: reagent id: Mead @@ -1322,6 +1480,14 @@ metamorphicMaxFillLevels: 6 metamorphicFillBaseName: fill- metamorphicChangeColor: false + metabolisms: + Drink: + effects: + - !type:SatiateThirst + factor: 2 + - !type:AdjustReagent + reagent: Ethanol + amount: 0.10 - type: reagent id: Moonshine @@ -1338,7 +1504,7 @@ factor: 2 - !type:AdjustReagent reagent: Ethanol - amount: 0.25 + amount: 0.40 - type: reagent id: Neurotoxin @@ -1361,7 +1527,7 @@ factor: 2 - !type:AdjustReagent reagent: Ethanol - amount: 0.25 + amount: 0.16 Poison: effects: - !type:HealthChange @@ -1387,7 +1553,7 @@ factor: 2 - !type:AdjustReagent reagent: Ethanol - amount: 0.2 + amount: 0.04 - type: reagent id: Patron @@ -1410,7 +1576,7 @@ factor: 2 - !type:AdjustReagent reagent: Ethanol - amount: 0.2 + amount: 0.50 - type: reagent id: RedMead @@ -1438,6 +1604,14 @@ metamorphicSprite: sprite: Objects/Consumable/Drinks/pinacolada.rsi state: icon + metabolisms: + Drink: + effects: + - !type:SatiateThirst + factor: 2 + - !type:AdjustReagent + reagent: Ethanol + amount: 0.06 - type: reagent id: Sbiten @@ -1453,6 +1627,14 @@ metamorphicMaxFillLevels: 5 metamorphicFillBaseName: fill- metamorphicChangeColor: true + metabolisms: + Drink: + effects: + - !type:SatiateThirst + factor: 2 + - !type:AdjustReagent + reagent: Ethanol + amount: 0.2 - type: reagent id: ScrewdriverCocktail @@ -1475,7 +1657,7 @@ factor: 2 - !type:AdjustReagent reagent: Ethanol - amount: 0.07 + amount: 0.13 - type: reagent id: CogChamp @@ -1501,7 +1683,7 @@ factor: 2 - !type:AdjustReagent reagent: Ethanol - amount: 0.15 + amount: 0.176 - type: reagent id: Silencer @@ -1540,6 +1722,14 @@ metamorphicMaxFillLevels: 5 metamorphicFillBaseName: fill- metamorphicChangeColor: false + metabolisms: + Drink: + effects: + - !type:SatiateThirst + factor: 2 + - !type:AdjustReagent + reagent: Ethanol + amount: 0.23 - type: reagent id: SnowWhite @@ -1555,6 +1745,14 @@ metamorphicMaxFillLevels: 6 metamorphicFillBaseName: fill- metamorphicChangeColor: true + metabolisms: + Drink: + effects: + - !type:SatiateThirst + factor: 2 + - !type:AdjustReagent + reagent: Ethanol + amount: 0.03 - type: reagent id: SuiDream @@ -1570,6 +1768,14 @@ metamorphicMaxFillLevels: 5 metamorphicFillBaseName: fill- metamorphicChangeColor: false + metabolisms: + Drink: + effects: + - !type:SatiateThirst + factor: 2 + - !type:AdjustReagent + reagent: Ethanol + amount: 0.13 - type: reagent id: SyndicateBomb @@ -1585,6 +1791,14 @@ metamorphicMaxFillLevels: 6 metamorphicFillBaseName: fill- metamorphicChangeColor: true + metabolisms: + Drink: + effects: + - !type:SatiateThirst + factor: 2 + - !type:AdjustReagent + reagent: Ethanol + amount: 0.095 - type: reagent id: TequilaSunrise @@ -1607,7 +1821,7 @@ factor: 2 - !type:AdjustReagent reagent: Ethanol - amount: 0.15 + amount: 0.26 - type: reagent id: TheMartinez @@ -1623,6 +1837,14 @@ metamorphicMaxFillLevels: 3 metamorphicFillBaseName: fill- metamorphicChangeColor: false + metabolisms: + Drink: + effects: + - !type:SatiateThirst + factor: 2 + - !type:AdjustReagent + reagent: Ethanol + amount: 0.13 - type: reagent id: ThreeMileIsland @@ -1645,7 +1867,7 @@ factor: 2 - !type:AdjustReagent reagent: Ethanol - amount: 0.15 + amount: 0.273 - !type:AdjustReagent reagent: Uranium amount: 0.05 @@ -1664,6 +1886,14 @@ metamorphicMaxFillLevels: 4 metamorphicFillBaseName: fill- metamorphicChangeColor: false + metabolisms: + Drink: + effects: + - !type:SatiateThirst + factor: 2 + - !type:AdjustReagent + reagent: Ethanol + amount: 0.112 - type: reagent id: VodkaMartini @@ -1686,7 +1916,7 @@ factor: 2 - !type:AdjustReagent reagent: Ethanol - amount: 0.15 + amount: 0.32 - type: reagent id: VodkaTonic @@ -1709,7 +1939,7 @@ factor: 2 - !type:AdjustReagent reagent: Ethanol - amount: 0.07 + amount: 0.13 - type: reagent id: WhiskeyCola @@ -1732,7 +1962,7 @@ factor: 2 - !type:AdjustReagent reagent: Ethanol - amount: 0.07 + amount: 0.013 - type: reagent id: WhiskeySoda @@ -1755,7 +1985,7 @@ factor: 2 - !type:AdjustReagent reagent: Ethanol - amount: 0.07 + amount: 0.13 - type: reagent id: WhiteGilgamesh @@ -1772,7 +2002,7 @@ factor: 1 - !type:AdjustReagent reagent: Ethanol - amount: 0.15 + amount: 0.04 - type: reagent id: WhiteRussian @@ -1795,4 +2025,4 @@ factor: 2 - !type:AdjustReagent reagent: Ethanol - amount: 0.15 + amount: 0.33 diff --git a/Resources/Prototypes/Recipes/Reactions/drinks.yml b/Resources/Prototypes/Recipes/Reactions/drinks.yml index c810ebb0ce5..812cded972f 100644 --- a/Resources/Prototypes/Recipes/Reactions/drinks.yml +++ b/Resources/Prototypes/Recipes/Reactions/drinks.yml @@ -857,7 +857,7 @@ LemonLime: amount: 1 products: - SnowWhite: 3 + SnowWhite: 2 - type: reaction id: SoyLatte