[MIRROR] Adds Ethereal Drinks [MDB IGNORE] (#21490)

* Adds Ethereal Drinks (#75487)

## About The Pull Request
Adds 3 new electric-themed drinks for ethereals. They count as food for
etherials, (not much, one glass is about equivelant to a plasma burger),
but humans can drink them as well, among other effects.
## Why It's Good For The Game
As an ethereal player, I do feel while our food is convenient, that we
miss out on the RP other species get from going to the bar. This allows
for etherials to order drinks from the bartender. All effects work on
all races, with the hunger satiation as the exception.
## Changelog
🆑
add: Voltaic Yellow Wine - New "base" drink, found in booze-o-mat. No
special effects besides acting as a weak ethereal food. Not very potent
in terms of alcohol.

add: Telepole - New mixed drink themed after thunderstorms, gives the
same shock-resist grey bull does. Made from 1 part Voltaic Wine, 1 Part
Sake, and 2 parts Dark & Stormy. Moderately potent.

add: Pod Tesla - New mixed drink, themed after the old removed tesla
engine (the singulo gets a cocktail, it should too!) Grants a brave -
bull phobia resist, and a stronger grey bull shock resist allowing you
to (temporarily) resist tesla arcs from reactive armor and the SM's
tesla coils. Gives a pleasant thought to whoever drank it, because this
thing is a pain to make. Made from 5 parts admiralty, 5 parts telepole,
and 3 parts brave bull. Highly potent.

qol: Unsure if this counts as QOL or balance, but the fact sol dry is in
3 different cocktails but the bartender has to buy 30u cans of it made
me feel it deserved being added to the soda dispenser.

image: Added graphics for the above drinks, shown below, from left to
right: Pod tesla, Voltaic Yellow wine, Telepole, Voltaic Wine (bottle)
<img width="171" alt="image"
src="https://github.com/tgstation/tgstation/assets/69398298/901b2f64-1723-44b6-8f78-ef21bd477d96">

/🆑

---------

Co-authored-by: Aki Ito <11748095+ExcessiveUseOfCobblestone@ users.noreply.github.com>

* Adds Ethereal Drinks

---------

Co-authored-by: KingkumaArt <69398298+KingkumaArt@users.noreply.github.com>
Co-authored-by: Aki Ito <11748095+ExcessiveUseOfCobblestone@ users.noreply.github.com>
This commit is contained in:
SkyratBot
2023-05-31 12:41:41 +02:00
committed by GitHub
parent 85664027d5
commit e67fe9ca0a
8 changed files with 115 additions and 0 deletions

View File

@@ -155,6 +155,7 @@
/obj/item/reagent_containers/cup/glass/bottle/sake = 5,
/obj/item/reagent_containers/cup/glass/bottle/grappa = 5,
/obj/item/reagent_containers/cup/glass/bottle/applejack = 5,
/obj/item/reagent_containers/cup/glass/bottle/wine_voltaic = 5,
/obj/item/reagent_containers/cup/bottle/ethanol = 2,
/obj/item/reagent_containers/cup/glass/bottle/fernet = 2,
/obj/item/reagent_containers/cup/glass/bottle/champagne = 2,

View File

@@ -570,3 +570,15 @@
/datum/chemical_reaction/drink/gin_garden
results = list(/datum/reagent/consumable/ethanol/gin_garden = 15)
required_reagents = list(/datum/reagent/consumable/limejuice = 1, /datum/reagent/consumable/sugar = 1, /datum/reagent/consumable/ethanol/gin = 3, /datum/reagent/consumable/cucumberjuice = 3, /datum/reagent/consumable/sol_dry = 5, /datum/reagent/consumable/ice = 2)
/datum/chemical_reaction/drink/telepole
results = list(/datum/reagent/consumable/ethanol/telepole = 5)
required_reagents = list(/datum/reagent/consumable/ethanol/wine_voltaic = 1, /datum/reagent/consumable/ethanol/dark_and_stormy = 2, /datum/reagent/consumable/ethanol/sake = 1)
mix_message = "You swear you saw a spark fly from the glass..."
/datum/chemical_reaction/drink/pod_tesla
results = list(/datum/reagent/consumable/ethanol/pod_tesla = 15)
required_reagents = list(/datum/reagent/consumable/ethanol/telepole = 5, /datum/reagent/consumable/ethanol/brave_bull = 3, /datum/reagent/consumable/ethanol/admiralty = 5)
mix_message = "Arcs of lightning fly from the mixture."
mix_sound = 'sound/weapons/zapbang.ogg'

View File

@@ -574,6 +574,7 @@
/datum/reagent/consumable/shamblers,
/datum/reagent/consumable/spacemountainwind,
/datum/reagent/consumable/sodawater,
/datum/reagent/consumable/sol_dry,
/datum/reagent/consumable/space_up,
/datum/reagent/consumable/sugar,
/datum/reagent/consumable/tea,

View File

@@ -3675,5 +3675,97 @@
doll.adjust_bodytemperature(-5 * REM * TEMPERATURE_DAMAGE_COEFFICIENT * seconds_per_tick, doll.get_body_temp_normal())
..()
/datum/reagent/consumable/ethanol/wine_voltaic
name = "Voltaic Yellow Wine"
description = "Electrically charged wine. Recharges etherials, but also nontoxic."
boozepwr = 30
color = "#FFAA00"
taste_description = "static with a hint of sweetness"
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/glass_style/drinking_glass/wine_voltaic
required_drink_type = /datum/reagent/consumable/ethanol/wine_voltaic
name = "Voltaic Yellow Wine"
desc = "Electrically charged wine. Recharges etherials, but also nontoxic."
icon = 'icons/obj/drinks/mixed_drinks.dmi'
icon_state = "wine_voltaic"
/datum/reagent/consumable/ethanol/wine_voltaic/expose_mob(mob/living/exposed_mob, methods=TOUCH, reac_volume) //can't be on life because of the way blood works.
. = ..()
if(!(methods & (INGEST|INJECT|PATCH)) || !iscarbon(exposed_mob))
return
var/mob/living/carbon/exposed_carbon = exposed_mob
var/obj/item/organ/internal/stomach/ethereal/stomach = exposed_carbon.get_organ_slot(ORGAN_SLOT_STOMACH)
if(istype(stomach))
stomach.adjust_charge(reac_volume * 3)
/datum/reagent/consumable/ethanol/telepole
name = "Telepole"
description = "A grounding rod in the form of a drink. Recharges etherials, and gives temporary shock resistance."
boozepwr = 50
color = "#b300ff"
quality = DRINK_NICE
taste_description = "the howling storm"
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/glass_style/drinking_glass/telepole
required_drink_type = /datum/reagent/consumable/ethanol/telepole
name = "Telepole"
desc = "A liquid grounding rod. Recharges etherials and grants temporary shock resistance."
icon = 'icons/obj/drinks/mixed_drinks.dmi'
icon_state = "telepole"
/datum/reagent/consumable/ethanol/telepole/on_mob_metabolize(mob/living/affected_mob)
. = ..()
ADD_TRAIT(affected_mob, TRAIT_SHOCKIMMUNE, type)
/datum/reagent/consumable/ethanol/telepole/on_mob_end_metabolize(mob/living/affected_mob)
REMOVE_TRAIT(affected_mob, TRAIT_SHOCKIMMUNE, type)
return ..()
/datum/reagent/consumable/ethanol/telepole/expose_mob(mob/living/exposed_mob, methods=TOUCH, reac_volume) //can't be on life because of the way blood works.
. = ..()
if(!(methods & (INGEST|INJECT|PATCH)) || !iscarbon(exposed_mob))
return
var/mob/living/carbon/exposed_carbon = exposed_mob
var/obj/item/organ/internal/stomach/ethereal/stomach = exposed_carbon.get_organ_slot(ORGAN_SLOT_STOMACH)
if(istype(stomach))
stomach.adjust_charge(reac_volume * 2)
/datum/reagent/consumable/ethanol/pod_tesla
name = "Pod Tesla"
description = "Ride the lightning! Recharges etherials, suppresses phobias, and gives strong temporary shock resistance."
boozepwr = 80
color = "#00fbff"
quality = DRINK_FANTASTIC
taste_description = "victory, with a hint of insanity"
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/glass_style/drinking_glass/pod_tesla
required_drink_type = /datum/reagent/consumable/ethanol/pod_tesla
name = "Pod Tesla"
desc = "Ride the lightning! Recharges etherials, suppresses phobias, and grants strong temporary shock resistance."
icon = 'icons/obj/drinks/mixed_drinks.dmi'
icon_state = "pod_tesla"
/datum/reagent/consumable/ethanol/pod_tesla/on_mob_metabolize(mob/living/affected_mob)
..()
affected_mob.add_traits(list(TRAIT_SHOCKIMMUNE,TRAIT_TESLA_SHOCKIMMUNE,TRAIT_FEARLESS), type)
/datum/reagent/consumable/ethanol/pod_tesla/on_mob_end_metabolize(mob/living/affected_mob)
affected_mob.remove_traits(list(TRAIT_SHOCKIMMUNE,TRAIT_TESLA_SHOCKIMMUNE,TRAIT_FEARLESS), type)
/datum/reagent/consumable/ethanol/pod_tesla/expose_mob(mob/living/exposed_mob, methods=TOUCH, reac_volume) //can't be on life because of the way blood works.
. = ..()
if(!(methods & (INGEST|INJECT|PATCH)) || !iscarbon(exposed_mob))
return
var/mob/living/carbon/exposed_carbon = exposed_mob
var/obj/item/organ/internal/stomach/ethereal/stomach = exposed_carbon.get_organ_slot(ORGAN_SLOT_STOMACH)
if(istype(stomach))
stomach.adjust_charge(reac_volume * 5)
#undef ALCOHOL_EXPONENT
#undef ALCOHOL_THRESHOLD_MODIFIER

View File

@@ -526,6 +526,14 @@
list_reagents = list(/datum/reagent/consumable/ethanol/applejack = 100)
drink_type = FRUIT
/obj/item/reagent_containers/cup/glass/bottle/wine_voltaic
name = "Voltaic Yellow Wine"
desc = "Electrically infused wine! Recharges etherials, safe for consumption."
custom_price = PAYCHECK_CREW
icon_state = "wine_voltaic_bottle"
list_reagents = list(/datum/reagent/consumable/ethanol/wine_voltaic = 100)
drink_type = FRUIT
/obj/item/reagent_containers/cup/glass/bottle/champagne
name = "Eau d' Dandy Brut Champagne"
desc = "Finely sourced from only the most pretentious French vineyards."

View File

@@ -12,6 +12,7 @@
"products" = list(
/obj/item/reagent_containers/cup/glass/bottle/curacao = 5,
/obj/item/reagent_containers/cup/glass/bottle/applejack = 5,
/obj/item/reagent_containers/cup/glass/bottle/wine_voltaic = 5,
/obj/item/reagent_containers/cup/glass/bottle/tequila = 5,
/obj/item/reagent_containers/cup/glass/bottle/rum = 5,
/obj/item/reagent_containers/cup/glass/bottle/cognac = 5,

Binary file not shown.

Before

Width:  |  Height:  |  Size: 21 KiB

After

Width:  |  Height:  |  Size: 22 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 66 KiB

After

Width:  |  Height:  |  Size: 69 KiB