From 27c4eeff5b9a86034b1de0838eaddaca0b7c0078 Mon Sep 17 00:00:00 2001 From: Geeves Date: Mon, 28 Oct 2019 11:02:38 +0200 Subject: [PATCH] No More Grab Retaliation (#7276) * grabs, man * oops Co-Authored-By: Werner --- code/modules/mob/living/carbon/human/human_attackhand.dm | 2 ++ html/changelogs/geeves - fuckingGrabs.yml | 7 +++++++ 2 files changed, 9 insertions(+) create mode 100644 html/changelogs/geeves - fuckingGrabs.yml diff --git a/code/modules/mob/living/carbon/human/human_attackhand.dm b/code/modules/mob/living/carbon/human/human_attackhand.dm index dcab42d0681..36f2571886a 100644 --- a/code/modules/mob/living/carbon/human/human_attackhand.dm +++ b/code/modules/mob/living/carbon/human/human_attackhand.dm @@ -382,6 +382,8 @@ if(src.a_intent != I_HELP) for(var/obj/item/weapon/W in holding) if(W && prob(holding[W])) + if(istype(W, /obj/item/weapon/grab)) + continue if(istype(W,/obj/item/weapon/gun)) var/list/turfs = list() for(var/turf/T in view()) diff --git a/html/changelogs/geeves - fuckingGrabs.yml b/html/changelogs/geeves - fuckingGrabs.yml new file mode 100644 index 00000000000..3f1f64cf19c --- /dev/null +++ b/html/changelogs/geeves - fuckingGrabs.yml @@ -0,0 +1,7 @@ + +author: Geeves + +delete-after: True + +changes: + - bugfix: "You can no longer retaliate against disarm attempts with an in-hand grab."