diff --git a/code/modules/mob/living/carbon/human/human_damage.dm b/code/modules/mob/living/carbon/human/human_damage.dm index 6c5ee24dfae..ae08c322167 100644 --- a/code/modules/mob/living/carbon/human/human_damage.dm +++ b/code/modules/mob/living/carbon/human/human_damage.dm @@ -278,9 +278,11 @@ return parts //Returns a list of damageable organs -/mob/living/carbon/human/proc/get_damageable_organs() +/mob/living/carbon/human/proc/get_damageable_organs(affect_robotic = TRUE) var/list/obj/item/organ/external/parts = list() for(var/obj/item/organ/external/O in bodyparts) + if(!affect_robotic && O.is_robotic()) + continue if(O.brute_dam + O.burn_dam < O.max_damage) parts += O return parts @@ -334,10 +336,10 @@ UpdateDamageIcon() // damage MANY external organs, in random order -/mob/living/carbon/human/take_overall_damage(brute, burn, updating_health = TRUE, used_weapon = null, sharp = 0, edge = 0) +/mob/living/carbon/human/take_overall_damage(brute, burn, updating_health = TRUE, used_weapon = null, sharp = 0, edge = 0, affect_robotic = 1) if(status_flags & GODMODE) return ..() //godmode - var/list/obj/item/organ/external/parts = get_damageable_organs() + var/list/obj/item/organ/external/parts = get_damageable_organs(affect_robotic) var/update = 0 while(parts.len && (brute>0 || burn>0) ) diff --git a/code/modules/reagents/chemistry/reagents/medicine.dm b/code/modules/reagents/chemistry/reagents/medicine.dm index 6a8e9fbe0ff..b2c466a857a 100644 --- a/code/modules/reagents/chemistry/reagents/medicine.dm +++ b/code/modules/reagents/chemistry/reagents/medicine.dm @@ -466,8 +466,13 @@ if(prob(75)) update_flags |= M.adjustToxLoss(-2, FALSE) if(prob(33)) - update_flags |= M.adjustBruteLoss(0.5, FALSE) - update_flags |= M.adjustFireLoss(0.5, FALSE) + if(ishuman(M)) + var/mob/living/carbon/human/human = M + human.take_overall_damage(0.5, 0.5, FALSE, affect_robotic = FALSE) + else + update_flags |= M.adjustBruteLoss(0.5, FALSE) + update_flags |= M.adjustFireLoss(0.5, FALSE) + return ..() | update_flags /datum/reagent/medicine/sal_acid