From d32d75273de5c28a48aa8a445f892dc97cf032b1 Mon Sep 17 00:00:00 2001 From: SyncIt21 <110812394+SyncIt21@users.noreply.github.com> Date: Thu, 4 Jul 2024 02:13:21 +0530 Subject: [PATCH] Allow mobs to ctrl click mobs while resting (#84587) ## About The Pull Request - Fixes #84471 Of course, you still can't grab a mob while lying down. That and other grab/pull related functions when resting are unchanged ## Changelog :cl: fix: you can hold your wound while resting via ctrl click /:cl: --- code/_onclick/click_ctrl.dm | 2 +- code/modules/mob/living/living_defines.dm | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/code/_onclick/click_ctrl.dm b/code/_onclick/click_ctrl.dm index 9d799efed89..ebb22b9eafd 100644 --- a/code/_onclick/click_ctrl.dm +++ b/code/_onclick/click_ctrl.dm @@ -34,7 +34,7 @@ SHOULD_NOT_OVERRIDE(TRUE) . = ..() - if(. || world.time < next_move || !can_perform_action(target, NOT_INSIDE_TARGET | SILENT_ADJACENCY | FORBID_TELEKINESIS_REACH)) + if(. || world.time < next_move || !can_perform_action(target, NOT_INSIDE_TARGET | SILENT_ADJACENCY | ALLOW_RESTING | FORBID_TELEKINESIS_REACH)) return . = TRUE diff --git a/code/modules/mob/living/living_defines.dm b/code/modules/mob/living/living_defines.dm index 0b844a2362a..6ec18d0d539 100644 --- a/code/modules/mob/living/living_defines.dm +++ b/code/modules/mob/living/living_defines.dm @@ -3,6 +3,7 @@ hud_possible = list(HEALTH_HUD,STATUS_HUD,ANTAG_HUD) pressure_resistance = 10 hud_type = /datum/hud/living + interaction_flags_click = ALLOW_RESTING interaction_flags_mouse_drop = ALLOW_RESTING ///Tracks the current size of the mob in relation to its original size. Use update_transform(resize) to change it.