From b128c9d3b5c70cddb236b0b0645706cff7331459 Mon Sep 17 00:00:00 2001 From: oranges Date: Fri, 12 Jan 2018 09:06:45 +1300 Subject: [PATCH 1/2] Merge pull request #34117 from ShizCalev/medbot-tweak Makes medbots unable to inject you if you are are fully covered with THICKMATERIAL. --- code/modules/mob/living/simple_animal/bot/medbot.dm | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/code/modules/mob/living/simple_animal/bot/medbot.dm b/code/modules/mob/living/simple_animal/bot/medbot.dm index 03dbc240ec..5ef27e0f67 100644 --- a/code/modules/mob/living/simple_animal/bot/medbot.dm +++ b/code/modules/mob/living/simple_animal/bot/medbot.dm @@ -353,6 +353,11 @@ if(emagged == 2) //Everyone needs our medicine. (Our medicine is toxins) return TRUE + if(ishuman(C)) + var/mob/living/carbon/human/H = C + if((H.head && (H.head.flags_1 & THICKMATERIAL_1)) && (H.wear_suit && (H.wear_suit.flags_1 & THICKMATERIAL_1))) + return FALSE // Skip over them if they have no exposed flesh. + if(declare_crit && C.health <= 0) //Critical condition! Call for help! declare(C) @@ -479,7 +484,7 @@ C.visible_message("[src] is trying to inject [patient]!", \ "[src] is trying to inject you!") - var/failed = FALSE; + var/failed = FALSE if(do_mob(src, patient, 30)) //Is C == patient? This is so confusing if((get_dist(src, patient) <= 1) && (on) && assess_patient(patient)) if(reagent_id == "internal_beaker")