Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Drink effects pt1 #7692

Draft
wants to merge 13 commits into
base: master
Choose a base branch
from
Draft

Drink effects pt1 #7692

Changes from 10 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
db4b0ec
Adds a 0.1 speed boost to Devil's Kiss drink if player body temperatu…
nullAurelian Oct 7, 2022
98dd577
adds effect to demon's blood drink of 10% burn resistance if body tem…
nullAurelian Oct 7, 2022
4fe4adb
Adds a sanity gain effect to Aloe if drinker has burn damage
nullAurelian Oct 7, 2022
7a0761c
Merge branch 'master' into drink_effects-pt1
nullAurelian Oct 7, 2022
f9f99ab
Merge branch 'master' into drink_effects-pt1
nullAurelian Oct 11, 2022
2b1d6cb
Redo Aloe, add Amasec grants TGH for characters with Gunslinger perk
nullAurelian Oct 11, 2022
fdb41cd
Change Devil's Kiss and Demon's Blood triggers
nullAurelian Oct 11, 2022
2a71c77
Hooch grants bonus Toughness IF character is alcoholic
nullAurelian Oct 11, 2022
f515c14
Hooch grants minor pain relief if Alcoholic
nullAurelian Oct 11, 2022
ec3f2e7
Change Beepsky Smash
nullAurelian Oct 11, 2022
52127fc
Changes to hooch, amasec and beepsky smash
nullAurelian Oct 11, 2022
f74e136
remove comparison comment
nullAurelian Oct 11, 2022
fa5e0ee
Singulo effect
nullAurelian Oct 11, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 34 additions & 1 deletion code/modules/reagents/reagents/food-Drinks.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1578,6 +1578,11 @@
glass_center_of_mass = list("x"=17, "y"=8)
taste_tag = list(TASTE_SWEET,TASTE_SLIMEY)

/datum/reagent/alcohol/aloe/apply_sanity_effect(mob/living/carbon/human/H, effect_multiplier)
if(H.getFireLoss() > 0)
effect_multiplier *= 2
..()

/datum/reagent/alcohol/amasec
name = "Amasec"
id = "amasec"
Expand All @@ -1595,6 +1600,11 @@
glass_center_of_mass = list("x"=16, "y"=9)
taste_tag = list(TASTE_SALTY,TASTE_DRY)

/datum/reagent/alcohol/amasec/affect_ingest(mob/living/carbon/M, alien, effect_multiplier)
. = ..()
if(M.stats.getPerk(PERK_GUNSLINGER))
M.stats.addTempStat(STAT_TGH, STAT_LEVEL_BASIC*effect_multiplier, STIM_TIME, "Amasec") //Improves Toughness by ~15 if Gunslinger
null-Aurelian marked this conversation as resolved.
Show resolved Hide resolved

/datum/reagent/alcohol/andalusia
name = "Andalusia"
id = "andalusia"
Expand Down Expand Up @@ -1733,7 +1743,10 @@

/datum/reagent/alcohol/beepsky_smash/affect_ingest(mob/living/carbon/M, alien, effect_multiplier)
..()
M.Stun(2)
if(M.stats.getPerk(PERK_SURVIVOR))
M.stats.addTempStat(STAT_ROB, STAT_LEVEL_BASIC * effect_multiplier, STIM_TIME, "BEEPSKY SMASH") //SMASH
null-Aurelian marked this conversation as resolved.
Show resolved Hide resolved
else
M.Stun(2) //Or get smashed

/datum/reagent/alcohol/bilk
name = "Bilk"
Expand Down Expand Up @@ -1878,6 +1891,11 @@
glass_center_of_mass = list("x"=16, "y"=2)
taste_tag = list(TASTE_SPICY,TASTE_DRY)

/datum/reagent/alcohol/demonsblood/affect_ingest(mob/living/carbon/M, alien, effect_multiplier)
. = ..()
if(M.bodytemperature > 311) //Temperature for uncomfortable body temperature
M.species.burn_mod += 0.1

/datum/reagent/alcohol/devilskiss
name = "Devils Kiss"
id = "devilskiss"
Expand All @@ -1894,6 +1912,11 @@
glass_center_of_mass = list("x"=16, "y"=8)
taste_tag = list(TASTE_BITTER,TASTE_DRY,TASTE_SLIMEY)

/datum/reagent/alcohol/devilskiss/affect_ingest(mob/living/carbon/M, alien, effect_multiplier)
. = ..()
if(M.on_fire) //On fire because devil
M.add_chemical_effect(CE_SPEEDBOOST, 0.1) //No actual downsides outside massive body temp so the effect is weak, 1/6 of hyperzine

/datum/reagent/alcohol/driestmartini
name = "Driest Martini"
id = "driestmartini"
Expand Down Expand Up @@ -2070,6 +2093,11 @@
glass_desc = "You've really hit rock bottom now... your liver packed its bags and left last night."
taste_tag = list(TASTE_BITTER,TASTE_DRY)

/datum/reagent/alcohol/hooch/affect_ingest(mob/living/carbon/M, alien, effect_multiplier)
. = ..()
if(M.stats.getPerk(PERK_ALCOHOLIC))
M.add_chemical_effect(CE_PAINKILLER, 15) //Acts as Inaprovaline painkiller if alcoholic
Copy link
Member

@SirRichardFrancis SirRichardFrancis Oct 11, 2022 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Alcohol already provides painkiller effect, depending on it's strength.
With formula of max(35 - (strength / 2), 1)) and strength of hooch of 1, we'll get 34.5 painkiller effect.
This adds 15 on top, to a whooping 49.4, 0.6 short of being as good as a tramadol.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I see, I didn't realize that. Changed effect to heal OxyLoss at -0.3, half strength of Tricord. I didn't have any other ideas for what the effect could be, so this is kinda a placeholder until someone gets an actually good idea.


/datum/reagent/alcohol/iced_beer
name = "Iced Beer"
id = "iced_beer"
Expand Down Expand Up @@ -2250,6 +2278,11 @@
glass_desc = "You've really hit rock bottom now... your liver packed its bags and left last night."
taste_tag = list(TASTE_BITTER,TASTE_STRONG)

/datum/reagent/alcohol/moonshine/affect_ingest(mob/living/carbon/M, alien, effect_multiplier)
. = ..()
if(M.stats.getPerk(PERK_ALCOHOLIC))
M.heal_organ_damage(0.3 * effect_multiplier, 0.3 * effect_multiplier) //Slowly heals brute and burn like tricord

/datum/reagent/alcohol/neurotoxin
name = "Neurotoxin"
id = "neurotoxin"
Expand Down