From 722faddd88f32cbc9797dc3af38af8d240c68c93 Mon Sep 17 00:00:00 2001 From: Geeves Date: Sat, 13 Jun 2020 09:11:50 +0200 Subject: [PATCH] Grab Stripping Fix (#9099) Attempting to strip someone while holding a grab will now properly strip them, instead of trying to put a grab on them. --- code/modules/mob/living/carbon/human/stripping.dm | 2 +- html/changelogs/geeves-grab_stripping_fix.yml | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 html/changelogs/geeves-grab_stripping_fix.yml diff --git a/code/modules/mob/living/carbon/human/stripping.dm b/code/modules/mob/living/carbon/human/stripping.dm index f08c92d3ffc..48c17d0b84e 100644 --- a/code/modules/mob/living/carbon/human/stripping.dm +++ b/code/modules/mob/living/carbon/human/stripping.dm @@ -69,7 +69,7 @@ var/stripping var/obj/item/held = user.get_active_hand() - if(!istype(held) || is_robot_module(held)) + if(!istype(held) || is_robot_module(held) || istype(held, /obj/item/grab)) if(!istype(target_slot)) // They aren't holding anything valid and there's nothing to remove, why are we even here? return 0 if(!target_slot.canremove) diff --git a/html/changelogs/geeves-grab_stripping_fix.yml b/html/changelogs/geeves-grab_stripping_fix.yml new file mode 100644 index 00000000000..de7ed5acd5e --- /dev/null +++ b/html/changelogs/geeves-grab_stripping_fix.yml @@ -0,0 +1,6 @@ +author: Geeves + +delete-after: True + +changes: + - bugfix: "Attempting to strip someone while holding a grab will now properly strip them, instead of trying to put a grab on them." \ No newline at end of file