Merge pull request #253 from Fox-McCloud/Antitox

Antitox
This commit is contained in:
Fox-McCloud
2015-02-04 23:05:13 -05:00
+3 -22
View File
@@ -316,30 +316,11 @@ datum
if(!M) M = holder.my_atom
if(!alien || alien != IS_DIONA)
M.drowsyness = max(M.drowsyness-2*REM, 0)
if(holder.has_reagent("toxin")) // this will do for now until we move over to new datums for toxins
holder.remove_reagent("toxin", 1*REM)
if(holder.has_reagent("stoxin"))
holder.remove_reagent("stoxin", 1*REM)
if(holder.has_reagent("plasma"))
holder.remove_reagent("plasma", 1*REM)
if(holder.has_reagent("sacid"))
holder.remove_reagent("sacid", 1*REM)
if(holder.has_reagent("pacid"))
holder.remove_reagent("pacid", 1*REM)
if(holder.has_reagent("cyanide"))
holder.remove_reagent("cyanide", 1*REM)
if(holder.has_reagent("amatoxin"))
holder.remove_reagent("amatoxin", 1*REM)
if(holder.has_reagent("chloralhydrate"))
holder.remove_reagent("chloralhydrate", 1*REM)
if(holder.has_reagent("carpotoxin"))
holder.remove_reagent("carpotoxin", 1*REM)
if(holder.has_reagent("zombiepowder"))
holder.remove_reagent("zombiepowder", 1*REM)
if(holder.has_reagent("mindbreaker"))
holder.remove_reagent("mindbreaker", 1*REM)
M.hallucination = max(0, M.hallucination - 5*REM)
M.adjustToxLoss(-2*REM)
for(var/datum/reagent/R in M.reagents.reagent_list)
if(R != src)
M.reagents.remove_reagent(R.id,0.5)
..()
return