Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixes not being able to stand up when handcuffed. #4827

Merged
merged 1 commit into from
Jan 31, 2025
Merged

Fixes not being able to stand up when handcuffed. #4827

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions code/modules/mob/living/living.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -646,7 +646,7 @@ default behaviour is:
set category = "IC"

// No posture, no adjustment.
if(length(get_available_postures()) <= 1 || incapacitated(INCAPACITATION_KNOCKOUT) || !canClick())
if(length(get_available_postures()) <= 1 || incapacitated(INCAPACITATION_KNOCKDOWN) || !canClick())
return

var/list/selectable_postures = get_selectable_postures()
Expand All @@ -667,18 +667,18 @@ default behaviour is:
selected_posture = selectable_postures[1]
else
selected_posture = input(usr, "Which posture do you wish to adopt?", "Change Posture", current_posture) as null|anything in selectable_postures
if(!selected_posture || length(get_available_postures()) <= 1 || incapacitated(INCAPACITATION_KNOCKOUT) || !canClick())
if(!selected_posture || length(get_available_postures()) <= 1 || incapacitated(INCAPACITATION_KNOCKDOWN) || !canClick())
return
if(current_posture == selected_posture || !(selected_posture in get_selectable_postures()))
return

setClickCooldown(3)
to_chat(src, SPAN_NOTICE("You are now [selected_posture.posture_change_message]."))
if(current_posture.prone && !selected_posture.prone)
if(!do_after(src, 2 SECONDS, src, incapacitation_flags = ~INCAPACITATION_FORCELYING))
if(!do_after(src, 2 SECONDS, src, incapacitation_flags = INCAPACITATION_KNOCKDOWN))
return
if(current_posture == selected_posture || !(selected_posture in get_selectable_postures()))
return
to_chat(src, SPAN_NOTICE("You are now [selected_posture.posture_change_message]."))
set_posture(selected_posture)

//called when the mob receives a bright flash
Expand Down
Loading