From 0dfa79b2de7e9884a5aecf3505f4929750528bf1 Mon Sep 17 00:00:00 2001 From: Robson Richards Date: Sat, 30 Nov 2013 00:47:01 +0000 Subject: [PATCH 1/9] Bugfixes Fixes the damage_converter.dm symptom trying to heal robotic limbs Adds some NEEDED sanity checks to attempt_initiate_surgery (certain human only procs were being called on monkeys/other mobs) --- .../advance/symptoms/damage_converter.dm | 25 ++++++++--- code/modules/surgery/helpers.dm | 15 ++++--- tgstation.dme | 42 ------------------- 3 files changed, 28 insertions(+), 54 deletions(-) diff --git a/code/datums/diseases/advance/symptoms/damage_converter.dm b/code/datums/diseases/advance/symptoms/damage_converter.dm index 95369ade024..6d7be3439b1 100644 --- a/code/datums/diseases/advance/symptoms/damage_converter.dm +++ b/code/datums/diseases/advance/symptoms/damage_converter.dm @@ -35,9 +35,22 @@ Bonus /datum/symptom/damage_converter/proc/Convert(var/mob/living/M) - if(M.getFireLoss() > 0 || M.getBruteLoss() > 0) - var/get_damage = rand(1, 2) - M.adjustFireLoss(-get_damage) - M.adjustBruteLoss(-get_damage) - M.adjustToxLoss(get_damage) - return 1 \ No newline at end of file + var/get_damage = rand(1, 2) + + if(istype(M, /mob/living/carbon/human)) //is it human? (thus augmentable) + var/mob/living/carbon/human/H = M + for(var/obj/item/organ/limb/affecting in H.organs) //Find limb + if(affecting.status == ORGAN_ORGANIC) //is it organic? + if(affecting.burn_dam > 0 || affecting.brute_dam > 0)// is it damaged? + affecting.heal_robotic_damage(0, get_damage) // 0 brute, get_damage burn + affecting.heal_robotic_damage(get_damage, 0) // get_damage brute, 0 burn + M.adjustToxLoss(get_damage) + return 1 + + else //Usual routine + if(M.getFireLoss() > 0 || M.getBruteLoss() > 0) + M.adjustFireLoss(-get_damage) + M.adjustBruteLoss(-get_damage) + M.adjustToxLoss(get_damage) + return 1 + diff --git a/code/modules/surgery/helpers.dm b/code/modules/surgery/helpers.dm index 23866878825..5c380a0d14c 100644 --- a/code/modules/surgery/helpers.dm +++ b/code/modules/surgery/helpers.dm @@ -13,14 +13,17 @@ if(S.target_must_be_fat && !(FAT in M.mutations)) continue - if(S.requires_organic_chest && M.getlimb(/obj/item/organ/limb/robot/chest)) //This a seperate case to below, see "***" in surgery.dm - RR - continue + if(istype(M, /mob/living/carbon/human)) + var/mob/living/carbon/human/H = M //So we can use get_organ and not some terriblly long Switch or something worse - RR - var/mob/living/carbon/human/H = M //So we can use get_organ and not some terriblly long Switch or something worse - RR - var/obj/item/organ/limb/affecting = H.get_organ(user.zone_sel.selecting) + if(S.requires_organic_chest && H.getlimb(/obj/item/organ/limb/robot/chest)) //This a seperate case to below, see "***" in surgery.dm - RR + continue - if(affecting.status == ORGAN_ROBOTIC) //Cannot operate on Robotic organs - RR - continue + + var/obj/item/organ/limb/affecting = H.get_organ(user.zone_sel.selecting) + + if(affecting.status == ORGAN_ROBOTIC) //Cannot operate on Robotic organs - RR + continue for(var/path in S.species) if(istype(M, path)) diff --git a/tgstation.dme b/tgstation.dme index 5bd8184b7dd..e37f31b61a0 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -6,48 +6,6 @@ // BEGIN_FILE_DIR #define FILE_DIR . -#define FILE_DIR "html" -#define FILE_DIR "icons" -#define FILE_DIR "icons/ass" -#define FILE_DIR "icons/effects" -#define FILE_DIR "icons/mecha" -#define FILE_DIR "icons/misc" -#define FILE_DIR "icons/mob" -#define FILE_DIR "icons/obj" -#define FILE_DIR "icons/obj/assemblies" -#define FILE_DIR "icons/obj/atmospherics" -#define FILE_DIR "icons/obj/clothing" -#define FILE_DIR "icons/obj/doors" -#define FILE_DIR "icons/obj/flora" -#define FILE_DIR "icons/obj/machines" -#define FILE_DIR "icons/obj/pipes" -#define FILE_DIR "icons/obj/power_cond" -#define FILE_DIR "icons/pda_icons" -#define FILE_DIR "icons/spideros_icons" -#define FILE_DIR "icons/stamp_icons" -#define FILE_DIR "icons/Testing" -#define FILE_DIR "icons/turf" -#define FILE_DIR "icons/vending_icons" -#define FILE_DIR "nano" -#define FILE_DIR "nano/images" -#define FILE_DIR "sound" -#define FILE_DIR "sound/AI" -#define FILE_DIR "sound/ambience" -#define FILE_DIR "sound/effects" -#define FILE_DIR "sound/hallucinations" -#define FILE_DIR "sound/items" -#define FILE_DIR "sound/machines" -#define FILE_DIR "sound/mecha" -#define FILE_DIR "sound/misc" -#define FILE_DIR "sound/piano" -#define FILE_DIR "sound/violin" -#define FILE_DIR "sound/voice" -#define FILE_DIR "sound/voice/complionator" -#define FILE_DIR "sound/vox_fem" -#define FILE_DIR "sound/weapons" -#define FILE_DIR "tools" -#define FILE_DIR "tools/AddToChangelog" -#define FILE_DIR "tools/AddToChangelog/AddToChangelog" // END_FILE_DIR // BEGIN_PREFERENCES From 69f71194675aa4f451e50a5c2e304135e9651b0c Mon Sep 17 00:00:00 2001 From: Robson Richards Date: Sat, 30 Nov 2013 13:28:40 +0000 Subject: [PATCH 2/9] Removes the DME, God damn silly error --- .../advance/symptoms/damage_converter.dm | 25 ++++++++++++++----- code/modules/surgery/helpers.dm | 15 ++++++----- 2 files changed, 28 insertions(+), 12 deletions(-) diff --git a/code/datums/diseases/advance/symptoms/damage_converter.dm b/code/datums/diseases/advance/symptoms/damage_converter.dm index 95369ade024..6d7be3439b1 100644 --- a/code/datums/diseases/advance/symptoms/damage_converter.dm +++ b/code/datums/diseases/advance/symptoms/damage_converter.dm @@ -35,9 +35,22 @@ Bonus /datum/symptom/damage_converter/proc/Convert(var/mob/living/M) - if(M.getFireLoss() > 0 || M.getBruteLoss() > 0) - var/get_damage = rand(1, 2) - M.adjustFireLoss(-get_damage) - M.adjustBruteLoss(-get_damage) - M.adjustToxLoss(get_damage) - return 1 \ No newline at end of file + var/get_damage = rand(1, 2) + + if(istype(M, /mob/living/carbon/human)) //is it human? (thus augmentable) + var/mob/living/carbon/human/H = M + for(var/obj/item/organ/limb/affecting in H.organs) //Find limb + if(affecting.status == ORGAN_ORGANIC) //is it organic? + if(affecting.burn_dam > 0 || affecting.brute_dam > 0)// is it damaged? + affecting.heal_robotic_damage(0, get_damage) // 0 brute, get_damage burn + affecting.heal_robotic_damage(get_damage, 0) // get_damage brute, 0 burn + M.adjustToxLoss(get_damage) + return 1 + + else //Usual routine + if(M.getFireLoss() > 0 || M.getBruteLoss() > 0) + M.adjustFireLoss(-get_damage) + M.adjustBruteLoss(-get_damage) + M.adjustToxLoss(get_damage) + return 1 + diff --git a/code/modules/surgery/helpers.dm b/code/modules/surgery/helpers.dm index 23866878825..5c380a0d14c 100644 --- a/code/modules/surgery/helpers.dm +++ b/code/modules/surgery/helpers.dm @@ -13,14 +13,17 @@ if(S.target_must_be_fat && !(FAT in M.mutations)) continue - if(S.requires_organic_chest && M.getlimb(/obj/item/organ/limb/robot/chest)) //This a seperate case to below, see "***" in surgery.dm - RR - continue + if(istype(M, /mob/living/carbon/human)) + var/mob/living/carbon/human/H = M //So we can use get_organ and not some terriblly long Switch or something worse - RR - var/mob/living/carbon/human/H = M //So we can use get_organ and not some terriblly long Switch or something worse - RR - var/obj/item/organ/limb/affecting = H.get_organ(user.zone_sel.selecting) + if(S.requires_organic_chest && H.getlimb(/obj/item/organ/limb/robot/chest)) //This a seperate case to below, see "***" in surgery.dm - RR + continue - if(affecting.status == ORGAN_ROBOTIC) //Cannot operate on Robotic organs - RR - continue + + var/obj/item/organ/limb/affecting = H.get_organ(user.zone_sel.selecting) + + if(affecting.status == ORGAN_ROBOTIC) //Cannot operate on Robotic organs - RR + continue for(var/path in S.species) if(istype(M, path)) From c7b7ee981f1f304d9d6978e263ded6e16e98c599 Mon Sep 17 00:00:00 2001 From: Robson Richards Date: Sat, 30 Nov 2013 13:46:38 +0000 Subject: [PATCH 3/9] Fixes the DME Please... --- tgstation.dme | 42 ------------------------------------------ 1 file changed, 42 deletions(-) diff --git a/tgstation.dme b/tgstation.dme index 5bd8184b7dd..e37f31b61a0 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -6,48 +6,6 @@ // BEGIN_FILE_DIR #define FILE_DIR . -#define FILE_DIR "html" -#define FILE_DIR "icons" -#define FILE_DIR "icons/ass" -#define FILE_DIR "icons/effects" -#define FILE_DIR "icons/mecha" -#define FILE_DIR "icons/misc" -#define FILE_DIR "icons/mob" -#define FILE_DIR "icons/obj" -#define FILE_DIR "icons/obj/assemblies" -#define FILE_DIR "icons/obj/atmospherics" -#define FILE_DIR "icons/obj/clothing" -#define FILE_DIR "icons/obj/doors" -#define FILE_DIR "icons/obj/flora" -#define FILE_DIR "icons/obj/machines" -#define FILE_DIR "icons/obj/pipes" -#define FILE_DIR "icons/obj/power_cond" -#define FILE_DIR "icons/pda_icons" -#define FILE_DIR "icons/spideros_icons" -#define FILE_DIR "icons/stamp_icons" -#define FILE_DIR "icons/Testing" -#define FILE_DIR "icons/turf" -#define FILE_DIR "icons/vending_icons" -#define FILE_DIR "nano" -#define FILE_DIR "nano/images" -#define FILE_DIR "sound" -#define FILE_DIR "sound/AI" -#define FILE_DIR "sound/ambience" -#define FILE_DIR "sound/effects" -#define FILE_DIR "sound/hallucinations" -#define FILE_DIR "sound/items" -#define FILE_DIR "sound/machines" -#define FILE_DIR "sound/mecha" -#define FILE_DIR "sound/misc" -#define FILE_DIR "sound/piano" -#define FILE_DIR "sound/violin" -#define FILE_DIR "sound/voice" -#define FILE_DIR "sound/voice/complionator" -#define FILE_DIR "sound/vox_fem" -#define FILE_DIR "sound/weapons" -#define FILE_DIR "tools" -#define FILE_DIR "tools/AddToChangelog" -#define FILE_DIR "tools/AddToChangelog/AddToChangelog" // END_FILE_DIR // BEGIN_PREFERENCES From 78d1c8c112ced3f1fed989b847f55e8bbd105b51 Mon Sep 17 00:00:00 2001 From: Robson Richards Date: Thu, 19 Dec 2013 19:49:10 +0000 Subject: [PATCH 4/9] Changes the heal proc to use get_damage twice instead of using the proc twice. - for Gia. --- code/datums/diseases/advance/symptoms/damage_converter.dm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/code/datums/diseases/advance/symptoms/damage_converter.dm b/code/datums/diseases/advance/symptoms/damage_converter.dm index 6d7be3439b1..8d34148ee7c 100644 --- a/code/datums/diseases/advance/symptoms/damage_converter.dm +++ b/code/datums/diseases/advance/symptoms/damage_converter.dm @@ -42,8 +42,7 @@ Bonus for(var/obj/item/organ/limb/affecting in H.organs) //Find limb if(affecting.status == ORGAN_ORGANIC) //is it organic? if(affecting.burn_dam > 0 || affecting.brute_dam > 0)// is it damaged? - affecting.heal_robotic_damage(0, get_damage) // 0 brute, get_damage burn - affecting.heal_robotic_damage(get_damage, 0) // get_damage brute, 0 burn + affecting.heal_robotic_damage(get_damage, get_damage) // get_damage brute, get_damage burn M.adjustToxLoss(get_damage) return 1 From 819bb9451d00aa7b92bc9266547034310349e164 Mon Sep 17 00:00:00 2001 From: Robson Richards Date: Sun, 29 Dec 2013 00:52:13 +0000 Subject: [PATCH 5/9] <3 Aranclanos, You always know what's best. --- .../advance/symptoms/damage_converter.dm | 23 ++++++++++--------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/code/datums/diseases/advance/symptoms/damage_converter.dm b/code/datums/diseases/advance/symptoms/damage_converter.dm index 8d34148ee7c..3414ebabc3c 100644 --- a/code/datums/diseases/advance/symptoms/damage_converter.dm +++ b/code/datums/diseases/advance/symptoms/damage_converter.dm @@ -37,19 +37,20 @@ Bonus var/get_damage = rand(1, 2) - if(istype(M, /mob/living/carbon/human)) //is it human? (thus augmentable) + if(istype(M, /mob/living/carbon/human)) var/mob/living/carbon/human/H = M - for(var/obj/item/organ/limb/affecting in H.organs) //Find limb - if(affecting.status == ORGAN_ORGANIC) //is it organic? - if(affecting.burn_dam > 0 || affecting.brute_dam > 0)// is it damaged? - affecting.heal_robotic_damage(get_damage, get_damage) // get_damage brute, get_damage burn - M.adjustToxLoss(get_damage) - return 1 - else //Usual routine - if(M.getFireLoss() > 0 || M.getBruteLoss() > 0) - M.adjustFireLoss(-get_damage) - M.adjustBruteLoss(-get_damage) + var/parts = H.get_damaged_organs(1,1) //1,1 because it needs inputs. + + for(var/obj/item/organ/limb/L in parts) + if(L.status == ORGAN_ROBOTIC) + L.heal_robotic_damage(get_damage, get_damage) + else + L.heal_damage(get_damage, get_damage) + M.adjustToxLoss(get_damage) return 1 + + + From 08ec9df96766f1e1e347f022394b91dc83e8af1a Mon Sep 17 00:00:00 2001 From: Robson Richards Date: Sun, 29 Dec 2013 02:25:12 +0000 Subject: [PATCH 6/9] Fixes it for Nonhuman mobs. --- .../datums/diseases/advance/symptoms/damage_converter.dm | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/code/datums/diseases/advance/symptoms/damage_converter.dm b/code/datums/diseases/advance/symptoms/damage_converter.dm index 3414ebabc3c..40d599fdf7e 100644 --- a/code/datums/diseases/advance/symptoms/damage_converter.dm +++ b/code/datums/diseases/advance/symptoms/damage_converter.dm @@ -48,8 +48,13 @@ Bonus else L.heal_damage(get_damage, get_damage) - M.adjustToxLoss(get_damage) - return 1 + else + if(M.getFireLoss() > 0 || M.getBruteLoss() > 0) + M.adjustFireLoss(-get_damage) + M.adjustBruteLoss(-get_damage) + + M.adjustToxLoss(get_damage) + return 1 From 53bfd06609f9bf0b1d6ecab7ece8d0a3ac0f4403 Mon Sep 17 00:00:00 2001 From: Robson Richards Date: Sun, 29 Dec 2013 16:12:32 +0000 Subject: [PATCH 7/9] Fixes #2180 - Augmented limb healing issues --- code/game/objects/items/stacks/medical.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/items/stacks/medical.dm b/code/game/objects/items/stacks/medical.dm index 04131676224..eceb1874564 100644 --- a/code/game/objects/items/stacks/medical.dm +++ b/code/game/objects/items/stacks/medical.dm @@ -12,7 +12,7 @@ /obj/item/stack/medical/attack(mob/living/carbon/M as mob, mob/user as mob) var/mob/living/carbon/human/H = M - var/obj/item/organ/limb/affecting = H.get_organ("chest") + var/obj/item/organ/limb/affecting = H.get_organ(user.zone_sel.selecting) if(affecting.status == ORGAN_ORGANIC) //Limb must be organic to be healed - RR From d3d4c79946f3a8892e065bd05dd673577b71a286 Mon Sep 17 00:00:00 2001 From: Robson Richards Date: Sun, 29 Dec 2013 17:40:12 +0000 Subject: [PATCH 8/9] Merges Heal_Damage and Heal_robotic_damage procs like I should have done in the first place. Corrects all usages of Heal_damage so it works with the changed version. Same goes for Heal_robotic_damage --- .../advance/symptoms/damage_converter.dm | 4 ++-- code/game/gamemodes/cult/runes.dm | 2 +- code/game/objects/items/stacks/medical.dm | 3 +-- .../objects/items/weapons/storage/bible.dm | 2 +- .../mob/living/carbon/human/human_damage.dm | 4 ++-- .../mob/living/carbon/human/human_defense.dm | 4 ++-- code/modules/surgery/organs/organ.dm | 21 +++++++------------ 7 files changed, 16 insertions(+), 24 deletions(-) diff --git a/code/datums/diseases/advance/symptoms/damage_converter.dm b/code/datums/diseases/advance/symptoms/damage_converter.dm index 40d599fdf7e..ed89fd53f41 100644 --- a/code/datums/diseases/advance/symptoms/damage_converter.dm +++ b/code/datums/diseases/advance/symptoms/damage_converter.dm @@ -44,9 +44,9 @@ Bonus for(var/obj/item/organ/limb/L in parts) if(L.status == ORGAN_ROBOTIC) - L.heal_robotic_damage(get_damage, get_damage) + L.heal_damage(get_damage, get_damage, 1) else - L.heal_damage(get_damage, get_damage) + L.heal_damage(get_damage, get_damage, 0) else if(M.getFireLoss() > 0 || M.getBruteLoss() > 0) diff --git a/code/game/gamemodes/cult/runes.dm b/code/game/gamemodes/cult/runes.dm index 5b4efd72951..ccec9e51165 100644 --- a/code/game/gamemodes/cult/runes.dm +++ b/code/game/gamemodes/cult/runes.dm @@ -288,7 +288,7 @@ var/list/sacrificed = list() return fizzle() for(var/obj/item/organ/limb/affecting in corpse_to_raise.organs) - affecting.heal_damage(1000, 1000) + affecting.heal_damage(1000, 1000, 0) corpse_to_raise.setToxLoss(0) corpse_to_raise.setOxyLoss(0) corpse_to_raise.SetParalysis(0) diff --git a/code/game/objects/items/stacks/medical.dm b/code/game/objects/items/stacks/medical.dm index eceb1874564..c143ddd39e6 100644 --- a/code/game/objects/items/stacks/medical.dm +++ b/code/game/objects/items/stacks/medical.dm @@ -63,9 +63,8 @@ if(!istype(affecting, /obj/item/organ/limb) || affecting:burn_dam <= 0) affecting = H.get_organ("head") - if(affecting.status == ORGAN_ORGANIC) // Just in case a robotic limb SOMEHOW got down to this point of the proc all you get is a message - RR - if (affecting.heal_damage(src.heal_brute, src.heal_burn)) + if (affecting.heal_damage(src.heal_brute, src.heal_burn, 0)) H.update_damage_overlays(0) M.updatehealth() diff --git a/code/game/objects/items/weapons/storage/bible.dm b/code/game/objects/items/weapons/storage/bible.dm index b9d760bdf11..fbcd8280015 100644 --- a/code/game/objects/items/weapons/storage/bible.dm +++ b/code/game/objects/items/weapons/storage/bible.dm @@ -28,7 +28,7 @@ var/heal_amt = 10 for(var/obj/item/organ/limb/affecting in H.organs) if(affecting.status == ORGAN_ORGANIC) //No Bible can heal a robotic arm! - if(affecting.heal_damage(heal_amt, heal_amt)) + if(affecting.heal_damage(heal_amt, heal_amt, 0)) H.update_damage_overlays(0) return diff --git a/code/modules/mob/living/carbon/human/human_damage.dm b/code/modules/mob/living/carbon/human/human_damage.dm index 77148d3dcfb..bdf34462d77 100644 --- a/code/modules/mob/living/carbon/human/human_damage.dm +++ b/code/modules/mob/living/carbon/human/human_damage.dm @@ -79,7 +79,7 @@ var/list/obj/item/organ/limb/parts = get_damaged_organs(brute,burn) if(!parts.len) return var/obj/item/organ/limb/picked = pick(parts) - if(picked.heal_damage(brute,burn)) + if(picked.heal_damage(brute,burn,0)) update_damage_overlays(0) updatehealth() @@ -106,7 +106,7 @@ var/brute_was = picked.brute_dam var/burn_was = picked.burn_dam - update |= picked.heal_damage(brute,burn) + update |= picked.heal_damage(brute,burn,0) brute -= (brute_was-picked.brute_dam) burn -= (burn_was-picked.burn_dam) diff --git a/code/modules/mob/living/carbon/human/human_defense.dm b/code/modules/mob/living/carbon/human/human_defense.dm index 435bb15ba1a..fc245264c18 100644 --- a/code/modules/mob/living/carbon/human/human_defense.dm +++ b/code/modules/mob/living/carbon/human/human_defense.dm @@ -129,7 +129,7 @@ emp_act if(affecting.status == ORGAN_ROBOTIC) if (WT.remove_fuel(0)) if(affecting.brute_dam > 0) - affecting.heal_robotic_damage(30,0) //Repair Brute + affecting.heal_damage(30,0,1) //Repair Brute update_damage_overlays(0) updatehealth() for(var/mob/O in viewers(user, null)) @@ -147,7 +147,7 @@ emp_act var/obj/item/weapon/cable_coil/coil = I if(affecting.status == ORGAN_ROBOTIC) if(affecting.burn_dam > 0) - affecting.heal_robotic_damage(0,30) //Repair Burn + affecting.heal_damage(0,30,1) //Repair Burn updatehealth() coil.use(1) for(var/mob/O in viewers(user, null)) diff --git a/code/modules/surgery/organs/organ.dm b/code/modules/surgery/organs/organ.dm index bbd1faf8f0f..6fbc2f55fbd 100644 --- a/code/modules/surgery/organs/organ.dm +++ b/code/modules/surgery/organs/organ.dm @@ -136,8 +136,13 @@ //Heals brute and burn damage for the organ. Returns 1 if the damage-icon states changed at all. //Damage cannot go below zero. //Cannot remove negative damage (i.e. apply damage) -/obj/item/organ/limb/proc/heal_damage(brute, burn) - if(status == ORGAN_ROBOTIC) // This makes robolimbs not healable by chems +/obj/item/organ/limb/proc/heal_damage(brute, burn, var/robotic) + + if(robotic && status != ORGAN_ROBOTIC) // This makes organic limbs not heal when the proc is in Robotic mode. + brute = max(0, brute - 3) + burn = max(0, burn - 3) + + if(!robotic && status == ORGAN_ROBOTIC) // This makes robolimbs not healable by chems. brute = max(0, brute - 3) burn = max(0, burn - 3) @@ -146,18 +151,6 @@ return update_organ_icon() -/obj/item/organ/limb/proc/heal_robotic_damage(brute, burn) //so you can heal robotic limbs but not with the original proc - RR - if(status == ORGAN_ORGANIC) //This is a robotic heal proc so no healing organic limbs - RR - brute = max(0, brute - 3) - burn = max(0, burn - 3) - - brute_dam = max(brute_dam - brute, 0) - burn_dam = max(burn_dam - burn, 0) - return update_organ_icon() - - - - //Returns total damage...kinda pointless really /obj/item/organ/limb/proc/get_damage() return brute_dam + burn_dam From 6397796058f2440b1a1781f0d0338b1588a7e1d9 Mon Sep 17 00:00:00 2001 From: Robson Richards Date: Mon, 30 Dec 2013 17:31:39 +0000 Subject: [PATCH 9/9] Removes a Check by Aran's request --- code/datums/diseases/advance/symptoms/damage_converter.dm | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/code/datums/diseases/advance/symptoms/damage_converter.dm b/code/datums/diseases/advance/symptoms/damage_converter.dm index ed89fd53f41..4c549377ccd 100644 --- a/code/datums/diseases/advance/symptoms/damage_converter.dm +++ b/code/datums/diseases/advance/symptoms/damage_converter.dm @@ -43,10 +43,7 @@ Bonus var/parts = H.get_damaged_organs(1,1) //1,1 because it needs inputs. for(var/obj/item/organ/limb/L in parts) - if(L.status == ORGAN_ROBOTIC) - L.heal_damage(get_damage, get_damage, 1) - else - L.heal_damage(get_damage, get_damage, 0) + L.heal_damage(get_damage, get_damage, 0) else if(M.getFireLoss() > 0 || M.getBruteLoss() > 0)