From 388159c7f148c287f0902c85dd6cc1964c23a2f5 Mon Sep 17 00:00:00 2001 From: Kelenius Date: Tue, 8 Sep 2015 11:36:55 +0300 Subject: [PATCH] Makes beepsky less brutal Fixes #10979 Fixes beepsky beating up handcuffed people --- code/modules/mob/living/bot/secbot.dm | 1 + code/modules/mob/mob_helpers.dm | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/code/modules/mob/living/bot/secbot.dm b/code/modules/mob/living/bot/secbot.dm index 547361f4005..39dcb11f83d 100644 --- a/code/modules/mob/living/bot/secbot.dm +++ b/code/modules/mob/living/bot/secbot.dm @@ -183,6 +183,7 @@ if(!Adjacent(target)) awaiting_surrender = 5 // I'm done playing nice mode = SECBOT_HUNT + return var/threat = check_threat(target) if(threat < 4) target = null diff --git a/code/modules/mob/mob_helpers.dm b/code/modules/mob/mob_helpers.dm index c667a469349..862f92fd5bc 100644 --- a/code/modules/mob/mob_helpers.dm +++ b/code/modules/mob/mob_helpers.dm @@ -622,6 +622,12 @@ proc/is_blind(A) return 0 +/mob/living/carbon/assess_perp(var/obj/access_obj, var/check_access, var/auth_weapons, var/check_records, var/check_arrest) + if(handcuffed) + return SAFE_PERP + + return ..() + /mob/living/carbon/human/assess_perp(var/obj/access_obj, var/check_access, var/auth_weapons, var/check_records, var/check_arrest) var/threatcount = ..() if(. == SAFE_PERP)