Merge pull request #3183 from Anewbe/overdose_boogaloo

Overdose is more dangerous, Bicaridine works again
This commit is contained in:
MagmaRam
2017-03-30 21:00:44 -05:00
committed by GitHub
7 changed files with 81 additions and 12 deletions
+2 -3
View File
@@ -699,10 +699,9 @@ Note that amputating the affected organ does in fact remove the infection from t
if(W.internal && owner.bodytemperature >= 170)
var/bicardose = owner.reagents.get_reagent_amount("bicaridine")
var/inaprovaline = owner.reagents.get_reagent_amount("inaprovaline")
if(!(W.can_autoheal() || (bicardose && inaprovaline))) //bicaridine and inaprovaline stop internal wounds from growing bigger with time, unless it is so small that it is already healing
var/myeldose = owner.reagents.get_reagent_amount("myelamine")
if(!(W.can_autoheal() || (bicardose && inaprovaline) || myeldose)) //bicaridine and inaprovaline stop internal wounds from growing bigger with time, unless it is so small that it is already healing
W.open_wound(0.1 * wound_update_accuracy)
if(bicardose >= 30) //overdose of bicaridine begins healing IB
W.damage = max(0, W.damage - 0.2)
owner.vessel.remove_reagent("blood", wound_update_accuracy * W.damage/40) //line should possibly be moved to handle_blood, so all the bleeding stuff is in one place.
if(prob(1 * wound_update_accuracy))