shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

just makes alcohol toxic rather than drunk-inducing

Browse Source
This commit is contained in:
Putnam
2019-12-24 23:53:33 -08:00
parent 7bf504247b
commit 0b1b249eba
1 changed files with 3 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/reagents/chemistry/reagents/alcohol_reagents.dm
+3 -9
View File
@@ -36,7 +36,9 @@ All effects don't start immediately, but rather get worse over time; the rate is
*/
/datum/reagent/consumable/ethanol/on_mob_life(mob/living/carbon/C)
if(C.drunkenness < volume * boozepwr * ALCOHOL_THRESHOLD_MODIFIER)
if(HAS_TRAIT(L, TRAIT_NO_ALCOHOL))
C.adjustToxLoss((boozepwr/25)*REM,forced = TRUE)
else if(C.drunkenness < volume * boozepwr * ALCOHOL_THRESHOLD_MODIFIER)
var/booze_power = boozepwr
if(HAS_TRAIT(C, TRAIT_ALCOHOL_TOLERANCE)) //we're an accomplished drinker
booze_power *= 0.7
@@ -77,14 +79,6 @@ All effects don't start immediately, but rather get worse over time; the rate is
// +10% success propability on each step, useful while operating in less-than-perfect conditions
return ..()
/datum/reagent/consumable/ethanol/on_mob_add(mob/living/L,amount)
if(HAS_TRAIT(L, TRAIT_NO_ALCOHOL) && boozepwr > 0)
if(iscarbon(L))
var/mob/living/carbon/C = L
C.vomit()
L.reagents.remove_all_type(/datum/reagent/consumable/ethanol, amount*4, 0, 1)
return ..()
/datum/reagent/consumable/ethanol/beer
name = "Beer"
id = "beer"