From 7d8f4e93a4a98b1cd5eab04e9e67fd7b105aff47 Mon Sep 17 00:00:00 2001 From: Killian <49700375+KillianKirilenko@users.noreply.github.com> Date: Thu, 27 Feb 2020 10:07:44 +0000 Subject: [PATCH 1/3] CHEERS! --- .../living/carbon/human/species/species.dm | 1 + .../species/station/traits_vr/negative.dm | 14 +++++++++++++ .../species/station/traits_vr/positive.dm | 20 +++++++++++++++++++ .../Chemistry-Reagents-Dispenser.dm | 4 ++-- 4 files changed, 37 insertions(+), 2 deletions(-) diff --git a/code/modules/mob/living/carbon/human/species/species.dm b/code/modules/mob/living/carbon/human/species/species.dm index 67c429e833..bcea8c096f 100644 --- a/code/modules/mob/living/carbon/human/species/species.dm +++ b/code/modules/mob/living/carbon/human/species/species.dm @@ -90,6 +90,7 @@ var/flash_burn = 0 // how much damage to take from being flashed if light hypersensitive var/sound_mod = 1 // Stun from sounds, I.E. flashbangs. var/chemOD_mod = 1 // Damage modifier for overdose + var/alcohol_tolerance = 1 // Strength multiplier for ethanol-derived reagents var/vision_flags = SEE_SELF // Same flags as glasses. // Death vars. diff --git a/code/modules/mob/living/carbon/human/species/station/traits_vr/negative.dm b/code/modules/mob/living/carbon/human/species/station/traits_vr/negative.dm index 5c91c43489..5c163774d5 100644 --- a/code/modules/mob/living/carbon/human/species/station/traits_vr/negative.dm +++ b/code/modules/mob/living/carbon/human/species/station/traits_vr/negative.dm @@ -90,6 +90,20 @@ cost = -3 var_changes = list("burn_mod" = 1.4) +//YW ADDITIONS START +/datum/trait/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 hit twice as hard." + cost = -1 + var_changes = list("alcohol_tolerance" = 2) + +/datum/trait/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 hit thrice as hard." + cost = -2 + var_changes = list("alcohol_tolerance" = 3) +//YW ADDITIONS END + /datum/trait/conductive name = "Conductive" desc = "Increases your susceptibility to electric shocks by 25%" diff --git a/code/modules/mob/living/carbon/human/species/station/traits_vr/positive.dm b/code/modules/mob/living/carbon/human/species/station/traits_vr/positive.dm index 8fb5054860..3251e2fba3 100644 --- a/code/modules/mob/living/carbon/human/species/station/traits_vr/positive.dm +++ b/code/modules/mob/living/carbon/human/species/station/traits_vr/positive.dm @@ -130,6 +130,26 @@ cost = 3 var_changes = list("burn_mod" = 0.6) +//YW ADDITIONS START +/datum/trait/alcohol_tolerance_basic + name = "Liver of Iron" + desc = "You can hold drinks much better than those lily-livered land-lubbers! Arr!" + cost = 1 + var_changes = list("alcohol_tolerance" = 0.75) + +/datum/trait/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!" + cost = 2 + var_changes = list("alcohol_tolerance" = 0.5) + +/datum/trait/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 = 3 + var_changes = list("alcohol_tolerance" = 0.25) +//YW ADDITIONS END + /datum/trait/photoresistant name = "Photoresistance" desc = "Decreases stun duration from flashes and other light-based stuns and disabilities by 25%" diff --git a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Dispenser.dm b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Dispenser.dm index 2e63ffcd8c..0d9b4ee8c1 100644 --- a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Dispenser.dm +++ b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Dispenser.dm @@ -94,7 +94,7 @@ /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 //Alcohol is 3x stronger when injected into the veins. + var/strength_mod = 3 //YW EDIT: multiply by inherent tolerance first, I don't want to strip out the following block yet if(alien == IS_SKRELL) strength_mod *= 5 if(alien == IS_TAJARA) @@ -139,7 +139,7 @@ /datum/reagent/ethanol/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed) if(issmall(M)) removed *= 2 M.nutrition += nutriment_factor * removed - var/strength_mod = 1 + var/strength_mod = 1 * M.species.alcohol_tolerance //YW EDIT: multiply by inherent tolerance first, I don't want to strip out the following block yet if(alien == IS_SKRELL) strength_mod *= 5 if(alien == IS_TAJARA) From f89a32e1421a40f9449b85b737c5c2f8c7faa597 Mon Sep 17 00:00:00 2001 From: Killian <49700375+KillianKirilenko@users.noreply.github.com> Date: Thu, 27 Feb 2020 10:36:11 +0000 Subject: [PATCH 2/3] fixed missing edit tag on new var --- code/modules/mob/living/carbon/human/species/species.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/carbon/human/species/species.dm b/code/modules/mob/living/carbon/human/species/species.dm index bcea8c096f..36cb1cd4ca 100644 --- a/code/modules/mob/living/carbon/human/species/species.dm +++ b/code/modules/mob/living/carbon/human/species/species.dm @@ -90,7 +90,7 @@ var/flash_burn = 0 // how much damage to take from being flashed if light hypersensitive var/sound_mod = 1 // Stun from sounds, I.E. flashbangs. var/chemOD_mod = 1 // Damage modifier for overdose - var/alcohol_tolerance = 1 // Strength multiplier for ethanol-derived reagents + var/alcohol_tolerance = 1 // YW ADDITION: Strength multiplier for ethanol-derived reagents var/vision_flags = SEE_SELF // Same flags as glasses. // Death vars. From 981d867d3dfb4f42d563de2332569b0a5845b3c4 Mon Sep 17 00:00:00 2001 From: Killian <49700375+KillianKirilenko@users.noreply.github.com> Date: Fri, 28 Feb 2020 00:04:59 +0000 Subject: [PATCH 3/3] Tier reorganization lowest tiers made neutral, costs reduced by 1pt each for remaining positive/negative --- .../human/species/station/traits_vr/negative.dm | 8 +------- .../human/species/station/traits_vr/neutral.dm | 12 ++++++++++++ .../human/species/station/traits_vr/positive.dm | 9 ++------- 3 files changed, 15 insertions(+), 14 deletions(-) diff --git a/code/modules/mob/living/carbon/human/species/station/traits_vr/negative.dm b/code/modules/mob/living/carbon/human/species/station/traits_vr/negative.dm index 5c163774d5..9119d9302a 100644 --- a/code/modules/mob/living/carbon/human/species/station/traits_vr/negative.dm +++ b/code/modules/mob/living/carbon/human/species/station/traits_vr/negative.dm @@ -91,16 +91,10 @@ var_changes = list("burn_mod" = 1.4) //YW ADDITIONS START -/datum/trait/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 hit twice as hard." - cost = -1 - var_changes = list("alcohol_tolerance" = 2) - /datum/trait/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 hit thrice as hard." - cost = -2 + cost = -1 var_changes = list("alcohol_tolerance" = 3) //YW ADDITIONS END diff --git a/code/modules/mob/living/carbon/human/species/station/traits_vr/neutral.dm b/code/modules/mob/living/carbon/human/species/station/traits_vr/neutral.dm index d067d94655..43dd13f6c0 100644 --- a/code/modules/mob/living/carbon/human/species/station/traits_vr/neutral.dm +++ b/code/modules/mob/living/carbon/human/species/station/traits_vr/neutral.dm @@ -27,6 +27,18 @@ excludes = list(/datum/trait/cold_blood, /datum/trait/extreme_cold_blood) // YW Addition +/datum/trait/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 hit twice as hard." + cost = 0 + var_changes = list("alcohol_tolerance" = 2) + +/datum/trait/alcohol_tolerance_basic + name = "Liver of Iron" + desc = "You can hold drinks much better than those lily-livered land-lubbers! Arr!" + cost = 0 + var_changes = list("alcohol_tolerance" = 0.75) + /* /datum/trait/cryogenic name = "Cryogenic Metabolism" diff --git a/code/modules/mob/living/carbon/human/species/station/traits_vr/positive.dm b/code/modules/mob/living/carbon/human/species/station/traits_vr/positive.dm index 3251e2fba3..210720658d 100644 --- a/code/modules/mob/living/carbon/human/species/station/traits_vr/positive.dm +++ b/code/modules/mob/living/carbon/human/species/station/traits_vr/positive.dm @@ -131,22 +131,17 @@ var_changes = list("burn_mod" = 0.6) //YW ADDITIONS START -/datum/trait/alcohol_tolerance_basic - name = "Liver of Iron" - desc = "You can hold drinks much better than those lily-livered land-lubbers! Arr!" - cost = 1 - var_changes = list("alcohol_tolerance" = 0.75) /datum/trait/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!" - cost = 2 + cost = 1 var_changes = list("alcohol_tolerance" = 0.5) /datum/trait/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 = 3 + cost = 2 var_changes = list("alcohol_tolerance" = 0.25) //YW ADDITIONS END