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.

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

stops attempted stripping when stunned etc. #6810

Merged
merged 5 commits into from
Jul 29, 2024
Merged
Changes from 1 commit
Commits
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
2 changes: 1 addition & 1 deletion code/datums/elements/strippable.dm
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@
if (isnull(item))
return FALSE

if (user.action_busy && !skillcheck(user, SKILL_POLICE, SKILL_POLICE_SKILLED))
if ((user.action_busy && !skillcheck(user, SKILL_POLICE, SKILL_POLICE_SKILLED)) || user.is_mob_restrained() || HAS_TRAIT(user, (TRAIT_IMMOBILIZED || TRAIT_INCAPACITATED || TRAIT_FLOORED)))
zzzmike marked this conversation as resolved.
Show resolved Hide resolved
to_chat(user, SPAN_WARNING("You can't do this right now."))
return FALSE

Expand Down
Loading