From 3f8f44ff4ca7f4565a94ed2ab92965553c0bc803 Mon Sep 17 00:00:00 2001 From: ShizCalev Date: Fri, 5 Jan 2018 04:22:01 -0500 Subject: [PATCH 1/2] medbot tweak --- 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 03dbc240ec4..d9c75108440 100644 --- a/code/modules/mob/living/simple_animal/bot/medbot.dm +++ b/code/modules/mob/living/simple_animal/bot/medbot.dm @@ -350,6 +350,11 @@ if(C.suiciding) return FALSE //Kevorkian school of robotic medical assistants. + 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(emagged == 2) //Everyone needs our medicine. (Our medicine is toxins) return TRUE @@ -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") From 9112f0c0055bc5c95a45a03ee749e2853674ce68 Mon Sep 17 00:00:00 2001 From: ShizCalev Date: Fri, 5 Jan 2018 14:58:02 -0500 Subject: [PATCH 2/2] Made emagged bots /slightly/ more aggressive. --- code/modules/mob/living/simple_animal/bot/medbot.dm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/code/modules/mob/living/simple_animal/bot/medbot.dm b/code/modules/mob/living/simple_animal/bot/medbot.dm index d9c75108440..5ef27e0f671 100644 --- a/code/modules/mob/living/simple_animal/bot/medbot.dm +++ b/code/modules/mob/living/simple_animal/bot/medbot.dm @@ -350,14 +350,14 @@ if(C.suiciding) return FALSE //Kevorkian school of robotic medical assistants. + 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(emagged == 2) //Everyone needs our medicine. (Our medicine is toxins) - return TRUE - if(declare_crit && C.health <= 0) //Critical condition! Call for help! declare(C)