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

Merge pull request #6365 from Citadel-Station-13/upstream-merge-37032

Browse Source 
[MIRROR] Forcing the human liver to actually do its job v2
This commit is contained in:
deathride58
2018-04-11 21:28:25 +00:00
committed by GitHub
parent eebe38dc39 37fa91fbd2
commit 72dfdb0a63
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/surgery/organs/liver.dm
+9 -6
View File
@@ -28,13 +28,16 @@
if(filterToxins) if(filterToxins)
//handle liver toxin filtration //handle liver toxin filtration
var/toxamount var/toxamount
var/static/list/listOfToxinsInThisBitch = typesof(/datum/reagent/toxin) var/static/list/toxinstypecache = typecacheof(/datum/reagent/toxin)
for(var/datum/reagent/toxin/toxin in listOfToxinsInThisBitch) for(var/I in C.reagents.reagent_list)
toxamount += C.reagents.get_reagent_amount(initial(toxin.id)) var/datum/reagent/pickedreagent = I
if(is_type_in_typecache(pickedreagent, toxinstypecache))
toxamount += C.reagents.get_reagent_amount(initial(pickedreagent.id))
if(toxamount <= toxTolerance && toxamount > 0) if(toxamount <= toxTolerance && toxamount > 0)
for(var/datum/reagent/toxin/toxin in listOfToxinsInThisBitch) for(var/I in C.reagents.reagent_list)
C.reagents.remove_reagent(initial(toxin.id), 1) var/datum/reagent/pickedreagent = I
if(is_type_in_typecache(pickedreagent, toxinstypecache))
C.reagents.remove_reagent(initial(pickedreagent.id), 1)
else if(toxamount > toxTolerance) else if(toxamount > toxTolerance)
damage += toxamount*toxLethality damage += toxamount*toxLethality