shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #4765 from Citadel-Station-13/upstream-merge-34117

Browse Source 
[MIRROR] Makes medbots unable to inject you if you are are fully covered with THICKMATERIAL.
This commit is contained in:
deathride58
2018-01-12 17:41:44 +00:00
committed by GitHub
parent 5c8f1f7f5b 8beabd4c64
commit a2fb8b5304
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
code/modules/mob/living/simple_animal/bot/medbot.dm
View File

@@ -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("<span class='danger'>[src] is trying to inject [patient]!</span>", \
"<span class='userdanger'>[src] is trying to inject you!</span>")
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")