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

Merge pull request #12022 from Ghommie/Ghommie-cit711

Browse Source 
organ/on_life tweaks.
This commit is contained in:
Lin
2020-04-29 01:15:02 +00:00
committed by GitHub
parent 64a5831a28 8440b48a9a
commit 19f89ed1ba
17 changed files with 164 additions and 155 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/surgery/organs/liver.dm
+15 -16
View File
@@ -25,25 +25,24 @@
var/cachedmoveCalc = 1
/obj/item/organ/liver/on_life()
var/mob/living/carbon/C = owner
. = ..()
if(!.)//can't process reagents with a failing liver
return
if(istype(C))
if(!(organ_flags & ORGAN_FAILING))//can't process reagents with a failing liver
if(filterToxins && !HAS_TRAIT(owner, TRAIT_TOXINLOVER))
//handle liver toxin filtration
for(var/datum/reagent/toxin/T in owner.reagents.reagent_list)
var/thisamount = owner.reagents.get_reagent_amount(T.type)
if (thisamount && thisamount <= toxTolerance)
owner.reagents.remove_reagent(T.type, 1)
else
damage += (thisamount*toxLethality)
if(filterToxins && !HAS_TRAIT(owner, TRAIT_TOXINLOVER))
//handle liver toxin filtration
for(var/datum/reagent/toxin/T in C.reagents.reagent_list)
var/thisamount = C.reagents.get_reagent_amount(T.type)
if (thisamount && thisamount <= toxTolerance)
C.reagents.remove_reagent(T.type, 1)
else
damage += (thisamount*toxLethality)
//metabolize reagents
owner.reagents.metabolize(owner, can_overdose=TRUE)
//metabolize reagents
C.reagents.metabolize(C, can_overdose=TRUE)
if(damage > 10 && prob(damage/3))//the higher the damage the higher the probability
to_chat(C, "<span class='warning'>You feel a dull pain in your abdomen.</span>")
if(damage > 10 && prob(damage/3))//the higher the damage the higher the probability
to_chat(owner, "<span class='warning'>You feel a dull pain in your abdomen.</span>")
/obj/item/organ/liver/prepare_eat()
var/obj/S = ..()