mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2026-08-21 20:27:42 +01:00
Species Alcohol Mod Cleanup
This commit is contained in:
Casey
@@ -102,12 +102,14 @@
|
||||
var/flash_mod = 1 // Stun from blindness modifier (flashes and flashbangs)
|
||||
var/flash_burn = 0 // how much damage to take from being flashed if light hypersensitive
|
||||
var/sound_mod = 1 // Multiplier to the effective *range* of flashbangs. a flashbang's bang hits an entire screen radius, with some falloff.
|
||||
var/chem_strength_heal = 1 // Multiplier to most beneficial chem strength
|
||||
var/chem_strength_pain = 1 // Multiplier to painkiller strength (could be used in a negative trait to simulate long-term addiction reducing effects, etc.)
|
||||
var/chem_strength_tox = 1 // Multiplier to toxic chem strength (inc. chloral/sopo/mindbreaker/etc. thresholds)
|
||||
|
||||
var/chem_strength_heal = 1 // Multiplier to most beneficial chem strength
|
||||
var/chem_strength_pain = 1 // Multiplier to painkiller strength (could be used in a negative trait to simulate long-term addiction reducing effects, etc.)
|
||||
var/chem_strength_tox = 1 // Multiplier to toxic chem strength (inc. chloral/sopo/mindbreaker/etc. thresholds)
|
||||
var/chem_strength_alcohol = 1 // Multiplier to alcohol strength; 0.5 = half, 0 = no effect at all, 2 = double, etc.
|
||||
|
||||
var/chemOD_threshold = 1 // Multiplier to overdose threshold; lower = easier overdosing
|
||||
var/chemOD_mod = 1 // Damage modifier for overdose; higher = more damage from ODs
|
||||
var/alcohol_mod = 1 // Multiplier to alcohol strength; 0.5 = half, 0 = no effect at all, 2 = double, etc.
|
||||
var/pain_mod = 1 // Multiplier to pain effects; 0.5 = half, 0 = no effect (equal to NO_PAIN, really), 2 = double, etc.
|
||||
var/stun_mod = 1 // Multiplier to stun effects; 0.5 = half, - = no effect (immune), 2 = double, etc.
|
||||
var/weaken_mod = 1 // Multiplier to weakness effects; 0.5 = half, - = no effect (immune), 2 = double, etc.
|
||||
|
||||
@@ -60,6 +60,8 @@ var/datum/species/shapeshifter/promethean/prometheans
|
||||
oxy_mod = 0
|
||||
flash_mod = 0.5 //No centralized, lensed eyes.
|
||||
item_slowdown_mod = 1.33
|
||||
|
||||
chem_strength_alcohol = 2
|
||||
|
||||
cloning_modifier = /datum/modifier/cloning_sickness/promethean
|
||||
|
||||
|
||||
@@ -71,6 +71,7 @@
|
||||
name_language = LANGUAGE_UNATHI
|
||||
species_language = LANGUAGE_UNATHI
|
||||
health_hud_intensity = 2.5
|
||||
chem_strength_alcohol = 0.75
|
||||
|
||||
min_age = 32
|
||||
max_age = 260
|
||||
@@ -198,6 +199,7 @@
|
||||
name_language = LANGUAGE_SIIK
|
||||
species_language = LANGUAGE_SIIK
|
||||
health_hud_intensity = 2.5
|
||||
chem_strength_alcohol = 1.25
|
||||
|
||||
min_age = 18
|
||||
max_age = 110
|
||||
@@ -304,6 +306,7 @@
|
||||
species_language = LANGUAGE_SKRELLIAN
|
||||
assisted_langs = list(LANGUAGE_EAL, LANGUAGE_TERMINUS, LANGUAGE_ROOTLOCAL, LANGUAGE_ROOTGLOBAL, LANGUAGE_VOX)
|
||||
health_hud_intensity = 2
|
||||
chem_strength_alcohol = 5
|
||||
|
||||
water_movement = -3
|
||||
|
||||
@@ -519,6 +522,7 @@
|
||||
show_ssd = "completely quiescent"
|
||||
health_hud_intensity = 2.5
|
||||
item_slowdown_mod = 0.1
|
||||
chem_strength_alcohol = 0
|
||||
|
||||
num_alternate_languages = 3
|
||||
name_language = LANGUAGE_ROOTLOCAL
|
||||
|
||||
@@ -410,45 +410,53 @@
|
||||
// Alcohol Traits Start Here, from negative to positive.
|
||||
/datum/trait/neutral/alcohol_intolerance_advanced
|
||||
name = "Liver of Air"
|
||||
desc = "The only way you can hold a drink is if it's in your own two hands, and even then you'd best not inhale too deeply near it. Drinks are three times as strong."
|
||||
desc = "The only way you can hold a drink is if it's in your own two hands, and even then you'd best not inhale too deeply near it. Alcohol hits you three times as hard as they do other people."
|
||||
cost = 0
|
||||
custom_only = FALSE
|
||||
var_changes = list("alcohol_mod" = 3) // 300% as effective if alcohol_mod is set to 1. If it's not 1 in species.dm, update this!
|
||||
var_changes = list("chem_strength_alcohol" = 3)
|
||||
|
||||
/datum/trait/neutral/alcohol_intolerance_basic
|
||||
name = "Liver of Lilies"
|
||||
desc = "You have a hard time with alcohol. Maybe you just never took to it, or maybe it doesn't agree with you... either way, drinks are twice as strong."
|
||||
desc = "You have a hard time with alcohol. Maybe you just never took to it, or maybe it doesn't agree with your system... either way, alcohol hits you twice as hard."
|
||||
cost = 0
|
||||
custom_only = FALSE
|
||||
var_changes = list("alcohol_mod" = 2) // 200% as effective if alcohol_mod is set to 1. If it's not 1 in species.dm, update this!
|
||||
var_changes = list("chem_strength_alcohol" = 2)
|
||||
|
||||
/datum/trait/neutral/alcohol_intolerance_slight
|
||||
name = "Liver of Tulips"
|
||||
desc = "You have a slight struggle with alcohol. Drinks are one and a half times stronger."
|
||||
desc = "You are what some might call 'a bit of a lightweight', but you can still keep your drinks down... most of the time. Alcohol hits you fifty percent harder."
|
||||
cost = 0
|
||||
custom_only = FALSE
|
||||
var_changes = list("alcohol_mod" = 1.5) // 150% as effective if alcohol_mod is set to 1. If it's not 1 in species.dm, update this!
|
||||
var_changes = list("chem_strength_alcohol" = 1.5)
|
||||
|
||||
/datum/trait/neutral/alcohol_tolerance_reset
|
||||
name = "Liver of Unremarkableness"
|
||||
desc = "This trait exists to reset alcohol (in)tolerance for non-custom species to baseline normal. It can only be taken by Skrell, Tajara, Unathi, Diona, and Prometheans, as it would have no effect on other species."
|
||||
cost = 0
|
||||
custom_only = FALSE
|
||||
var_changes = list("chem_strength_alcohol" = 1)
|
||||
allowed_species = list(SPECIES_SKRELL,SPECIES_TAJ,SPECIES_UNATHI,SPECIES_DIONA,SPECIES_PROMETHEAN)
|
||||
|
||||
/datum/trait/neutral/alcohol_tolerance_basic
|
||||
name = "Liver of Iron"
|
||||
desc = "You can hold drinks much better than those lily-livered land-lubbers! Arr! Drinks are only three-quarters as strong."
|
||||
desc = "You can hold drinks much better than those lily-livered land-lubbers! Arr! Alcohol's effects on you are reduced by about a quarter."
|
||||
cost = 0
|
||||
custom_only = FALSE
|
||||
var_changes = list("alcohol_mod" = 0.75) // 75% as effective if alcohol_mod is set to 1. If it's not 1 in species.dm, update this!
|
||||
var_changes = list("chem_strength_alcohol" = 0.75)
|
||||
|
||||
/datum/trait/neutral/alcohol_tolerance_advanced
|
||||
name = "Liver of Steel"
|
||||
desc = "Drinks tremble before your might! You can hold your alcohol twice as well as those blue-bellied barnacle boilers! Drinks are only half as strong."
|
||||
desc = "Drinks tremble before your might! You can hold your alcohol twice as well as those blue-bellied barnacle boilers! Alcohol has just half the effect on you as it does on others."
|
||||
cost = 0
|
||||
custom_only = FALSE
|
||||
var_changes = list("alcohol_mod" = 0.5) // 50% as effective if alcohol_mod is set to 1. If it's not 1 in species.dm, update this!
|
||||
var_changes = list("chem_strength_alcohol" = 0.5)
|
||||
|
||||
/datum/trait/neutral/alcohol_immunity
|
||||
name = "Liver of Durasteel"
|
||||
desc = "You've drunk so much that most booze doesn't even faze you. It takes something like a Pan-Galactic or a pint of Deathbell for you to even get slightly buzzed."
|
||||
cost = 0
|
||||
custom_only = FALSE
|
||||
var_changes = list("alcohol_mod" = 0.25) // 25% as effective if alcohol_mod is set to 1. If it's not 1 in species.dm, update this!
|
||||
var_changes = list("chem_strength_alcohol" = 0.25)
|
||||
// Alcohol Traits End Here.
|
||||
|
||||
/datum/trait/neutral/colorblind/mono
|
||||
|
||||
@@ -112,18 +112,19 @@
|
||||
L.adjust_fire_stacks(amount / 15)
|
||||
|
||||
/datum/reagent/ethanol/affect_blood(var/mob/living/carbon/M, var/alien, var/removed) //This used to do just toxin. That's boring. Let's make this FUN.
|
||||
if(issmall(M)) removed *= 2
|
||||
var/strength_mod = 3 * M.species.alcohol_mod //Alcohol is 3x stronger when injected into the veins.
|
||||
if(alien == IS_SKRELL)
|
||||
strength_mod *= 5
|
||||
if(alien == IS_TAJARA)
|
||||
strength_mod *= 1.25
|
||||
if(alien == IS_UNATHI)
|
||||
strength_mod *= 0.75
|
||||
if(alien == IS_DIONA)
|
||||
strength_mod = 0
|
||||
if(issmall(M))
|
||||
removed *= 2
|
||||
|
||||
if(alien == IS_SLIME)
|
||||
<<<<<<< HEAD
|
||||
strength_mod *= 2 // VOREStation Edit - M.adjustToxLoss(removed)
|
||||
=======
|
||||
M.adjustToxLoss(removed) //Sterilizing, if only by a little bit. Also already doubled above.
|
||||
|
||||
var/strength_mod = 3 * M.species.chem_strength_alcohol //Alcohol is 3x stronger when injected into the veins.
|
||||
if(!strength_mod)
|
||||
return
|
||||
>>>>>>> 118097ed4c... Merge pull request #14061 from KillianKirilenko/8823-fixed
|
||||
|
||||
M.add_chemical_effect(CE_ALCOHOL, 1)
|
||||
var/effective_dose = dose * strength_mod * (1 + volume/60) //drinking a LOT will make you go down faster
|
||||
@@ -156,36 +157,32 @@
|
||||
M.hallucination = max(M.hallucination, halluci*3)
|
||||
|
||||
/datum/reagent/ethanol/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed)
|
||||
if(issmall(M)) removed *= 2
|
||||
|
||||
if(issmall(M))
|
||||
removed *= 2
|
||||
|
||||
if(!(M.species.allergens & allergen_type)) //assuming it doesn't cause a horrible reaction, we get the nutrition effects
|
||||
M.adjust_nutrition(nutriment_factor * removed)
|
||||
var/strength_mod = 1 * M.species.alcohol_mod
|
||||
if(alien == IS_SKRELL)
|
||||
strength_mod *= 5
|
||||
if(alien == IS_TAJARA)
|
||||
strength_mod *= 1.25
|
||||
if(alien == IS_UNATHI)
|
||||
strength_mod *= 0.75
|
||||
if(alien == IS_DIONA)
|
||||
strength_mod = 0
|
||||
if(alien == IS_SLIME)
|
||||
strength_mod *= 2 // VOREStation Edit - M.adjustToxLoss(removed * 2)
|
||||
|
||||
var/effective_dose = dose * M.species.chem_strength_alcohol
|
||||
if(!effective_dose)
|
||||
return
|
||||
|
||||
M.add_chemical_effect(CE_ALCOHOL, 1)
|
||||
|
||||
if(dose * strength_mod >= strength) // Early warning
|
||||
if(effective_dose >= strength) // Early warning
|
||||
M.make_dizzy(6) // It is decreased at the speed of 3 per tick
|
||||
if(dose * strength_mod >= strength * 2) // Slurring
|
||||
if(effective_dose >= strength * 2) // Slurring
|
||||
M.slurring = max(M.slurring, 30)
|
||||
if(dose * strength_mod >= strength * 3) // Confusion - walking in random directions
|
||||
if(effective_dose >= strength * 3) // Confusion - walking in random directions
|
||||
M.Confuse(20)
|
||||
if(dose * strength_mod >= strength * 4) // Blurry vision
|
||||
if(effective_dose >= strength * 4) // Blurry vision
|
||||
M.eye_blurry = max(M.eye_blurry, 10)
|
||||
if(dose * strength_mod >= strength * 5) // Drowsyness - periodically falling asleep
|
||||
if(effective_dose >= strength * 5) // Drowsyness - periodically falling asleep
|
||||
M.drowsyness = max(M.drowsyness, 20)
|
||||
if(dose * strength_mod >= strength * 6) // Toxic dose
|
||||
if(effective_dose >= strength * 6) // Toxic dose
|
||||
M.add_chemical_effect(CE_ALCOHOL_TOXIC, toxicity)
|
||||
if(dose * strength_mod >= strength * 7) // Pass out
|
||||
if(effective_dose >= strength * 7) // Pass out
|
||||
M.Paralyse(20)
|
||||
M.Sleeping(30)
|
||||
|
||||
|
||||
Reference in New Issue
Block a user