From c3fd280a01e92ba2b5b079f10fe13c307fa1dfc4 Mon Sep 17 00:00:00 2001 From: Jared-Fogle <35135081+Jared-Fogle@users.noreply.github.com> Date: Sun, 12 Jul 2020 20:50:14 -0700 Subject: [PATCH] You can now take off clothes while on stasis --- code/_onclick/click.dm | 2 +- code/_onclick/hud/screen_objects.dm | 2 +- code/modules/mob/mob.dm | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/code/_onclick/click.dm b/code/_onclick/click.dm index a796bfc93c3..47ea7db10df 100644 --- a/code/_onclick/click.dm +++ b/code/_onclick/click.dm @@ -98,7 +98,7 @@ CtrlClickOn(A) return - if(incapacitated(ignore_restraints = 1)) + if(incapacitated(ignore_restraints = TRUE, ignore_stasis = TRUE)) return face_atom(A) diff --git a/code/_onclick/hud/screen_objects.dm b/code/_onclick/hud/screen_objects.dm index e140a4fec03..114fd3e0f80 100644 --- a/code/_onclick/hud/screen_objects.dm +++ b/code/_onclick/hud/screen_objects.dm @@ -130,7 +130,7 @@ if(world.time <= usr.next_move) return TRUE - if(usr.incapacitated()) + if(usr.incapacitated(ignore_stasis = TRUE)) return TRUE if(ismecha(usr.loc)) // stops inventory actions in a mech return TRUE diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm index 85cf785f8ab..09953b1be69 100644 --- a/code/modules/mob/mob.dm +++ b/code/modules/mob/mob.dm @@ -287,7 +287,7 @@ return ///Is the mob incapacitated -/mob/proc/incapacitated(ignore_restraints = FALSE, ignore_grab = FALSE, check_immobilized = FALSE) +/mob/proc/incapacitated(ignore_restraints = FALSE, ignore_grab = FALSE, ignore_stasis = FALSE) return /**