Merge pull request #619 from KillianKirilenko/kk-boozetraits

["FEATURE"] Alcohol (In)Tolerance Traits

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								// YW ADDITION: Strength multiplier for ethanol-derived reagents
 	var/vision_flags = SEE_SELF								// Same flags as glasses.
 
 	// Death vars.

code/modules/mob/living/carbon/human/species/station/traits_vr/negative.dm

@@ -90,6 +90,14 @@
 	cost = -3
 	var_changes = list("burn_mod" = 1.4)
 
+//YW ADDITIONS START
+/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 = -1
+	var_changes = list("alcohol_tolerance" = 3)
+//YW ADDITIONS END
+
 /datum/trait/conductive
 	name = "Conductive"
 	desc = "Increases your susceptibility to electric shocks by 25%"

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"

code/modules/mob/living/carbon/human/species/station/traits_vr/positive.dm

@@ -130,6 +130,21 @@
 	cost = 3
 	var_changes = list("burn_mod" = 0.6)
 
+//YW ADDITIONS START
+	
+/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 = 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 = 2
+	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%"

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)