From d6cba67a290ef92e7fcf8f52eac1f9a75c0db067 Mon Sep 17 00:00:00 2001 From: Mykhailo Bykhovtsev Date: Tue, 4 Sep 2018 17:12:19 -0700 Subject: [PATCH] Beepsky fix (#5231) * Fixes beepsky agro * changelog --- code/modules/mob/living/bot/secbot.dm | 2 +- html/changelogs/Sindorman-beepsky-fix.yml | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 html/changelogs/Sindorman-beepsky-fix.yml diff --git a/code/modules/mob/living/bot/secbot.dm b/code/modules/mob/living/bot/secbot.dm index e8d1654f62a..594a83223a2 100644 --- a/code/modules/mob/living/bot/secbot.dm +++ b/code/modules/mob/living/bot/secbot.dm @@ -595,7 +595,7 @@ /mob/living/bot/secbot/attackby(var/obj/item/O, var/mob/user) ..() - if(istype(O, /obj/item/weapon/card/id)) + if(istype(O, /obj/item/weapon/card/id) || istype(O, /obj/item/weapon/pen) || istype(O, /obj/item/device/pda)) return target = user diff --git a/html/changelogs/Sindorman-beepsky-fix.yml b/html/changelogs/Sindorman-beepsky-fix.yml new file mode 100644 index 00000000000..5f66a81c47a --- /dev/null +++ b/html/changelogs/Sindorman-beepsky-fix.yml @@ -0,0 +1,6 @@ +author: PoZe + +delete-after: True + +changes: + - bugfix: "Beepsky/ED209 will no longer arrest you for using pen or PDA on it"