From 227ea83a1d2dbcbca25e64aa4a8d2bbd7721e67b Mon Sep 17 00:00:00 2001 From: zzzmike <85382350+zzzmike@users.noreply.github.com> Date: Sun, 28 Jul 2024 02:38:17 -0700 Subject: [PATCH 1/5] Update strippable.dm --- code/datums/elements/strippable.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/datums/elements/strippable.dm b/code/datums/elements/strippable.dm index e0daaee74a8c..78d5526ed192 100644 --- a/code/datums/elements/strippable.dm +++ b/code/datums/elements/strippable.dm @@ -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))) to_chat(user, SPAN_WARNING("You can't do this right now.")) return FALSE From 2135fdf2a1c8fca5c141bae57c657fa6d5998d99 Mon Sep 17 00:00:00 2001 From: zzzmike <85382350+zzzmike@users.noreply.github.com> Date: Sun, 28 Jul 2024 03:12:08 -0700 Subject: [PATCH 2/5] Update code/datums/elements/strippable.dm Co-authored-by: Drathek <76988376+Drulikar@users.noreply.github.com> --- code/datums/elements/strippable.dm | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/code/datums/elements/strippable.dm b/code/datums/elements/strippable.dm index 78d5526ed192..3f996f209f9a 100644 --- a/code/datums/elements/strippable.dm +++ b/code/datums/elements/strippable.dm @@ -122,7 +122,17 @@ if (isnull(item)) return FALSE - if ((user.action_busy && !skillcheck(user, SKILL_POLICE, SKILL_POLICE_SKILLED)) || user.is_mob_restrained() || HAS_TRAIT(user, (TRAIT_IMMOBILIZED || TRAIT_INCAPACITATED || TRAIT_FLOORED))) + if (user.action_busy && !skillcheck(user, SKILL_POLICE, SKILL_POLICE_SKILLED)) + to_chat(user, SPAN_WARNING("You can't do this right now.")) + return FALSE + + if (user.is_mob_incapacitated()) + to_chat(user, SPAN_WARNING("You can't do this right now.")) + return FALSE + + if (HAS_TRAIT(user, TRAIT_IMMOBILIZED) || HAS_TRAIT(user, TRAIT_FLOORED)) + to_chat(user, SPAN_WARNING("You can't do this right now.")) + return FALSE to_chat(user, SPAN_WARNING("You can't do this right now.")) return FALSE From c3e85b0928a30e5c1a7b9c9c076ed986116f2d62 Mon Sep 17 00:00:00 2001 From: zzzmike <85382350+zzzmike@users.noreply.github.com> Date: Sun, 28 Jul 2024 03:14:07 -0700 Subject: [PATCH 3/5] restrained got lost i think --- code/datums/elements/strippable.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/datums/elements/strippable.dm b/code/datums/elements/strippable.dm index 3f996f209f9a..2cef8b79584e 100644 --- a/code/datums/elements/strippable.dm +++ b/code/datums/elements/strippable.dm @@ -126,7 +126,7 @@ to_chat(user, SPAN_WARNING("You can't do this right now.")) return FALSE - if (user.is_mob_incapacitated()) + if ((user.is_mob_incapacitated() || user.is_mob_restrained()) to_chat(user, SPAN_WARNING("You can't do this right now.")) return FALSE From 4b629f8b04b2c10036d8b91d86eeb29e513a5be5 Mon Sep 17 00:00:00 2001 From: zzzmike <85382350+zzzmike@users.noreply.github.com> Date: Sun, 28 Jul 2024 03:15:48 -0700 Subject: [PATCH 4/5] woops --- code/datums/elements/strippable.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/datums/elements/strippable.dm b/code/datums/elements/strippable.dm index 2cef8b79584e..8188077c7c55 100644 --- a/code/datums/elements/strippable.dm +++ b/code/datums/elements/strippable.dm @@ -126,7 +126,7 @@ to_chat(user, SPAN_WARNING("You can't do this right now.")) return FALSE - if ((user.is_mob_incapacitated() || user.is_mob_restrained()) + if ((user.is_mob_incapacitated() || user.is_mob_restrained())) to_chat(user, SPAN_WARNING("You can't do this right now.")) return FALSE From a9f98dcf3e51667a18b7cc2f63618feec58552a4 Mon Sep 17 00:00:00 2001 From: zzzmike <85382350+zzzmike@users.noreply.github.com> Date: Sun, 28 Jul 2024 03:25:26 -0700 Subject: [PATCH 5/5] woops I see what you mean, thanks :) Co-authored-by: Drathek <76988376+Drulikar@users.noreply.github.com> --- code/datums/elements/strippable.dm | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/code/datums/elements/strippable.dm b/code/datums/elements/strippable.dm index 8188077c7c55..d93b07234c9d 100644 --- a/code/datums/elements/strippable.dm +++ b/code/datums/elements/strippable.dm @@ -126,15 +126,13 @@ to_chat(user, SPAN_WARNING("You can't do this right now.")) return FALSE - if ((user.is_mob_incapacitated() || user.is_mob_restrained())) + if (user.is_mob_incapacitated()) to_chat(user, SPAN_WARNING("You can't do this right now.")) return FALSE if (HAS_TRAIT(user, TRAIT_IMMOBILIZED) || HAS_TRAIT(user, TRAIT_FLOORED)) to_chat(user, SPAN_WARNING("You can't do this right now.")) return FALSE - to_chat(user, SPAN_WARNING("You can't do this right now.")) - return FALSE if ((item.flags_inventory & CANTSTRIP) || ((item.flags_item & NODROP) && !(item.flags_item & FORCEDROP_CONDITIONAL)) || (item.flags_item & ITEM_ABSTRACT)) return FALSE