From 7ccdcbce93418fc12439d3ba0c5634c4a9bcdfac Mon Sep 17 00:00:00 2001 From: ZomgPonies Date: Sun, 25 May 2014 18:45:49 -0400 Subject: [PATCH] Preleminary work on robolimbs. Expect more soon. --- code/modules/mob/living/carbon/human/human_damage.dm | 1 + code/modules/organs/pain.dm | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/code/modules/mob/living/carbon/human/human_damage.dm b/code/modules/mob/living/carbon/human/human_damage.dm index 5ed404d2d71..2c8bd863fca 100644 --- a/code/modules/mob/living/carbon/human/human_damage.dm +++ b/code/modules/mob/living/carbon/human/human_damage.dm @@ -85,6 +85,7 @@ if (prob(mut_prob)) var/list/datum/organ/external/candidates = list() for (var/datum/organ/external/O in organs) + if(O.status & ORGAN_ROBOT) continue if(!(O.status & ORGAN_MUTATED)) candidates |= O if (candidates.len) diff --git a/code/modules/organs/pain.dm b/code/modules/organs/pain.dm index 250e9b984de..cbb0a121d06 100644 --- a/code/modules/organs/pain.dm +++ b/code/modules/organs/pain.dm @@ -91,7 +91,7 @@ mob/living/carbon/human/proc/handle_pain() for(var/datum/organ/external/E in organs) // amputated limbs don't cause pain if(E.amputated) continue - if(E.status & ORGAN_DEAD) continue + if(E.status & ORGAN_DEAD|ORGAN_ROBOT) continue var/dam = E.get_damage() // make the choice of the organ depend on damage, // but also sometimes use one of the less damaged ones