From 6525351d3155283d77f15de86ef14a3abf33f0e2 Mon Sep 17 00:00:00 2001 From: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com> Date: Sun, 12 Nov 2023 15:04:09 -0500 Subject: [PATCH] Removes the IPC damage mod. For real this time. (#23178) --- code/modules/mob/living/carbon/human/species/machine.dm | 2 -- code/modules/surgery/organs/organ_external.dm | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/code/modules/mob/living/carbon/human/species/machine.dm b/code/modules/mob/living/carbon/human/species/machine.dm index aa4d306a9ad..da2d70dc4e2 100644 --- a/code/modules/mob/living/carbon/human/species/machine.dm +++ b/code/modules/mob/living/carbon/human/species/machine.dm @@ -16,8 +16,6 @@ skinned_type = /obj/item/stack/sheet/metal // Let's grind up IPCs for station resources! eyes = "blank_eyes" - brute_mod = 1 / 0.66 // 1 * 0.66 (robolimbs) * 1/0.66 = 1 - burn_mod = 1 / 0.66 // so no damage mod overall. tox_mod = 0 clone_mod = 0 death_message = "gives a short series of shrill beeps, their chassis shuddering before falling limp, nonfunctional." diff --git a/code/modules/surgery/organs/organ_external.dm b/code/modules/surgery/organs/organ_external.dm index 594cc18b598..f4bc08df16e 100644 --- a/code/modules/surgery/organs/organ_external.dm +++ b/code/modules/surgery/organs/organ_external.dm @@ -205,7 +205,7 @@ if((brute <= 0) && (burn <= 0)) return 0 - if(!ignore_resists) + if(!ignore_resists && !ismachineperson(owner)) //Machine people can't have augmented limbs, and this lets us give them no strange damage issues from countering the 33% resist brute *= brute_mod burn *= burn_mod