From 307e261e72b54caae618c6602bfe046f83825bfd Mon Sep 17 00:00:00 2001 From: Arokha Sieyes Date: Fri, 3 Jun 2016 21:14:46 -0400 Subject: [PATCH] Synth gets hit by axe? Internal bleeding. That'sa-no-good. --- code/modules/mob/mob.dm | 2 +- code/modules/organs/organ_external.dm | 2 +- code/modules/surgery/implant.dm | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm index 7e9743f765..2b2317524d 100644 --- a/code/modules/mob/mob.dm +++ b/code/modules/mob/mob.dm @@ -899,7 +899,7 @@ mob/proc/yank_out_object() H.shock_stage+=20 affected.take_damage((selection.w_class * 3), 0, 0, 1, "Embedded object extraction") - if(prob(selection.w_class * 5)) //I'M SO ANEMIC I COULD JUST -DIE-. + if(prob(selection.w_class * 5) && (affected < ORGAN_ROBOT)) //I'M SO ANEMIC I COULD JUST -DIE-. var/datum/wound/internal_bleeding/I = new (min(selection.w_class * 5, 15)) affected.wounds += I H.custom_pain("Something tears wetly in your [affected] as [selection] is pulled free!", 1) diff --git a/code/modules/organs/organ_external.dm b/code/modules/organs/organ_external.dm index c084c06170..e177649e4a 100644 --- a/code/modules/organs/organ_external.dm +++ b/code/modules/organs/organ_external.dm @@ -461,7 +461,7 @@ This function completely restores a damaged organ to perfect condition. //moved this before the open_wound check so that having many small wounds for example doesn't somehow protect you from taking internal damage (because of the return) //Possibly trigger an internal wound, too. var/local_damage = brute_dam + burn_dam + damage - if(damage > 15 && type != BURN && local_damage > 30 && prob(damage) && (robotic < ORGAN_ROBOT)) + if((damage > 15) && (type != BURN) && (local_damage > 30) && prob(damage) && (robotic < ORGAN_ROBOT)) var/datum/wound/internal_bleeding/I = new (min(damage - 15, 15)) wounds += I owner.custom_pain("You feel something rip in your [name]!", 1) diff --git a/code/modules/surgery/implant.dm b/code/modules/surgery/implant.dm index 88df711b47..e97d09c833 100644 --- a/code/modules/surgery/implant.dm +++ b/code/modules/surgery/implant.dm @@ -128,7 +128,7 @@ user.visible_message("\blue [user] puts \the [tool] inside [target]'s [get_cavity(affected)] cavity.", \ "\blue You put \the [tool] inside [target]'s [get_cavity(affected)] cavity." ) - if (tool.w_class > get_max_wclass(affected)/2 && prob(50) && !(affected.robotic >= ORGAN_ROBOT)) + if (tool.w_class > get_max_wclass(affected)/2 && prob(50) && (affected.robotic < ORGAN_ROBOT)) user << "\red You tear some blood vessels trying to fit such a big object in this cavity." var/datum/wound/internal_bleeding/I = new (10) affected.wounds += I