From 3295990dde0fcb080ddb6105927b5ba2f374d91c Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Mon, 24 Jun 2024 05:40:24 +0200 Subject: [PATCH] [MIRROR] Now you can hold Ian in your arms (#28334) * Now you can hold Ian in your arms (#84236) ## About The Pull Request Previously, you couldn't pick up Ian because the clothing interface would always open instead. Now, when you grab Ian (or any other corgi or mob with the `can_be_held` trait) in an aggressive grip and pull him towards you, you will take him into your hands! ## Why It's Good For The Game ... You can hug Ian... That's enough ## Changelog :cl: fix: you can hold Ian in your arms /:cl: closes https://github.com/tgstation/tgstation/issues/84023 * Now you can hold Ian in your arms --------- Co-authored-by: Kocma-san <112967882+Kocma-san@users.noreply.github.com> --- code/datums/elements/strippable.dm | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/code/datums/elements/strippable.dm b/code/datums/elements/strippable.dm index 99f5fb4d3d7..70894593b76 100644 --- a/code/datums/elements/strippable.dm +++ b/code/datums/elements/strippable.dm @@ -52,6 +52,11 @@ if (!isnull(should_strip_proc_path) && !call(source, should_strip_proc_path)(user)) return + if (isliving(source)) + var/mob/living/mob = source + if (mob.can_be_held && (user.grab_state == GRAB_AGGRESSIVE) && (user.pulling == source)) + return + var/datum/strip_menu/strip_menu = LAZYACCESS(strip_menus, source) if (isnull(strip_menu))