From: Alpaccalypse <21291379+Alpaccalypse@users.noreply.github.com> Date: Fri, 30 May 2025 16:03:49 +0000 (+0100) Subject: Absinthe makes you mildly hallucinate (#34371) X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=0df4a2e243f07f08ca40e7fe705f14fd26974871;p=space-station-14.git Absinthe makes you mildly hallucinate (#34371) * Absinthe make you mildly hallucinate. Smaller glass volume, doesn't make you sick. * Reordered glass fill sprites to look more equal --- diff --git a/Resources/Locale/en-US/flavors/flavor-profiles.ftl b/Resources/Locale/en-US/flavors/flavor-profiles.ftl index da8c7ed622..69471502ef 100644 --- a/Resources/Locale/en-US/flavors/flavor-profiles.ftl +++ b/Resources/Locale/en-US/flavors/flavor-profiles.ftl @@ -287,7 +287,7 @@ flavor-complex-moscowmule = like vodka and ginger ale flavor-complex-thesunalsorises = like an absinthe daiquiri flavor-complex-whiskeysour = like whiskey and egg flavor-complex-zombiecocktail = like eating brains -flavor-complex-absinthe = like anise +flavor-complex-absinthe = like bitter anise flavor-complex-blue-curacao = like orange flowers flavor-complex-acidspit = like French battery acid flavor-complex-allies-cocktail = like medicinal tincture diff --git a/Resources/Locale/en-US/reagents/absinthe.ftl b/Resources/Locale/en-US/reagents/absinthe.ftl new file mode 100644 index 0000000000..78d97728af --- /dev/null +++ b/Resources/Locale/en-US/reagents/absinthe.ftl @@ -0,0 +1,4 @@ +### Messages that pop up when metabolizing absinthe. + +absinthe-effect-hear-voice = You hear a tiny voice. "Tee hee hee!" +absinthe-effect-feel-tulips = You feel tulips brush up against your legs. diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml index 89e70beded..aff0aa7a05 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml @@ -149,10 +149,10 @@ - type: SolutionContainerManager solutions: drink: - maxVol: 30 + maxVol: 20 reagents: - ReagentId: Absinthe - Quantity: 30 + Quantity: 20 - type: Icon sprite: Objects/Consumable/Drinks/absintheglass.rsi state: icon diff --git a/Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml b/Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml index bd55967c79..7294972e7e 100644 --- a/Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml +++ b/Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml @@ -12,17 +12,39 @@ metamorphicSprite: sprite: Objects/Consumable/Drinks/absintheglass.rsi state: icon_empty - metamorphicMaxFillLevels: 5 + metamorphicMaxFillLevels: 4 metamorphicFillBaseName: fill- metamorphicChangeColor: true metabolisms: Drink: effects: - - !type:SatiateThirst - factor: 2 - !type:AdjustReagent reagent: Ethanol amount: 0.3 + Narcotic: # The green fairy + metabolismRate : 0.01 + effects: + - !type:AdjustReagent + reagent: Ethanol + amount: 0.05 + - !type:GenericStatusEffect + conditions: + - !type:ReagentThreshold + min: 10 + key: SeeingRainbows + component: SeeingRainbows + type: Add + time: 5 + refresh: false + - !type:PopupMessage + type: Local + messages: + - absinthe-effect-hear-voice + - absinthe-effect-feel-tulips + probability: 0.02 + conditions: + - !type:ReagentThreshold + min: 10 - type: reagent id: Ale diff --git a/Resources/Textures/Objects/Consumable/Drinks/absintheglass.rsi/fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/absintheglass.rsi/fill-1.png index 3d0d47a0fc..004bb58c5d 100644 Binary files a/Resources/Textures/Objects/Consumable/Drinks/absintheglass.rsi/fill-1.png and b/Resources/Textures/Objects/Consumable/Drinks/absintheglass.rsi/fill-1.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/absintheglass.rsi/fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/absintheglass.rsi/fill-2.png index 004bb58c5d..fe29ffda1e 100644 Binary files a/Resources/Textures/Objects/Consumable/Drinks/absintheglass.rsi/fill-2.png and b/Resources/Textures/Objects/Consumable/Drinks/absintheglass.rsi/fill-2.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/absintheglass.rsi/fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/absintheglass.rsi/fill-3.png index fe29ffda1e..bd28cc2415 100644 Binary files a/Resources/Textures/Objects/Consumable/Drinks/absintheglass.rsi/fill-3.png and b/Resources/Textures/Objects/Consumable/Drinks/absintheglass.rsi/fill-3.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/absintheglass.rsi/fill-4.png b/Resources/Textures/Objects/Consumable/Drinks/absintheglass.rsi/fill-4.png index bd28cc2415..e1badfa312 100644 Binary files a/Resources/Textures/Objects/Consumable/Drinks/absintheglass.rsi/fill-4.png and b/Resources/Textures/Objects/Consumable/Drinks/absintheglass.rsi/fill-4.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/absintheglass.rsi/fill-5.png b/Resources/Textures/Objects/Consumable/Drinks/absintheglass.rsi/fill-5.png deleted file mode 100644 index e1badfa312..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Drinks/absintheglass.rsi/fill-5.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/absintheglass.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/absintheglass.rsi/meta.json index e5994967cd..20e933bb57 100644 --- a/Resources/Textures/Objects/Consumable/Drinks/absintheglass.rsi/meta.json +++ b/Resources/Textures/Objects/Consumable/Drinks/absintheglass.rsi/meta.json @@ -26,9 +26,6 @@ }, { "name": "fill-4" - }, - { - "name": "fill-5" } ] }