From d90ae1ac7dd6c6c331c42bd7b07ace42dcbf9aa4 Mon Sep 17 00:00:00 2001 From: zzzmike <85382350+zzzmike@users.noreply.github.com> Date: Sat, 27 Jul 2024 13:17:26 -0700 Subject: [PATCH 1/5] Update objs.dm --- code/game/objects/objs.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/objs.dm b/code/game/objects/objs.dm index 2dc064aa86d4..6838a331dbab 100644 --- a/code/game/objects/objs.dm +++ b/code/game/objects/objs.dm @@ -277,7 +277,7 @@ //trying to buckle a mob /obj/proc/buckle_mob(mob/M, mob/user) - if (!ismob(M) || (get_dist(src, user) > 1) || user.is_mob_restrained() || user.stat || buckled_mob || M.buckled || !isturf(user.loc)) + if (!ismob(M) || (get_dist(src, user) > 1) || user.is_mob_restrained() || HASTRAIT(src, (TRAIT_IMMOBILIZED || TRAIT_INCAPACITATED || TRAIT_FLOORED)) || user.stat || buckled_mob || M.buckled || !isturf(user.loc)) return if (isxeno(user) && !HAS_TRAIT(user, TRAIT_OPPOSABLE_THUMBS)) From 4e3ec8b6e523f892c26f0a9760203e2e2702c2ef Mon Sep 17 00:00:00 2001 From: zzzmike <85382350+zzzmike@users.noreply.github.com> Date: Sat, 27 Jul 2024 13:21:26 -0700 Subject: [PATCH 2/5] woooops --- code/game/objects/objs.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/objs.dm b/code/game/objects/objs.dm index 6838a331dbab..51f99c8314ae 100644 --- a/code/game/objects/objs.dm +++ b/code/game/objects/objs.dm @@ -277,7 +277,7 @@ //trying to buckle a mob /obj/proc/buckle_mob(mob/M, mob/user) - if (!ismob(M) || (get_dist(src, user) > 1) || user.is_mob_restrained() || HASTRAIT(src, (TRAIT_IMMOBILIZED || TRAIT_INCAPACITATED || TRAIT_FLOORED)) || user.stat || buckled_mob || M.buckled || !isturf(user.loc)) + if (!ismob(M) || (get_dist(src, user) > 1) || user.is_mob_restrained() || HAS_TRAIT(src, (TRAIT_IMMOBILIZED || TRAIT_INCAPACITATED || TRAIT_FLOORED)) || user.stat || buckled_mob || M.buckled || !isturf(user.loc)) return if (isxeno(user) && !HAS_TRAIT(user, TRAIT_OPPOSABLE_THUMBS)) From 588e6883287db39865c380920b65b3d5edb0fcc1 Mon Sep 17 00:00:00 2001 From: zzzmike <85382350+zzzmike@users.noreply.github.com> Date: Sat, 27 Jul 2024 17:45:41 -0700 Subject: [PATCH 3/5] Update objs.dm --- code/game/objects/objs.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/objs.dm b/code/game/objects/objs.dm index 51f99c8314ae..afe1b1a1d861 100644 --- a/code/game/objects/objs.dm +++ b/code/game/objects/objs.dm @@ -277,7 +277,7 @@ //trying to buckle a mob /obj/proc/buckle_mob(mob/M, mob/user) - if (!ismob(M) || (get_dist(src, user) > 1) || user.is_mob_restrained() || HAS_TRAIT(src, (TRAIT_IMMOBILIZED || TRAIT_INCAPACITATED || TRAIT_FLOORED)) || user.stat || buckled_mob || M.buckled || !isturf(user.loc)) + if (!ismob(M) || (get_dist(src, user) > 1) || user.is_mob_restrained() || HAS_TRAIT(user, (TRAIT_IMMOBILIZED || TRAIT_INCAPACITATED || TRAIT_FLOORED)) || user.stat || buckled_mob || M.buckled || !isturf(user.loc)) return if (isxeno(user) && !HAS_TRAIT(user, TRAIT_OPPOSABLE_THUMBS)) From a8dd268420230e0ee503a7a6af594359e1b4c317 Mon Sep 17 00:00:00 2001 From: zzzmike <85382350+zzzmike@users.noreply.github.com> Date: Sun, 28 Jul 2024 07:45:08 -0700 Subject: [PATCH 4/5] fix per other pr --- code/game/objects/objs.dm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/code/game/objects/objs.dm b/code/game/objects/objs.dm index afe1b1a1d861..610945184821 100644 --- a/code/game/objects/objs.dm +++ b/code/game/objects/objs.dm @@ -277,7 +277,11 @@ //trying to buckle a mob /obj/proc/buckle_mob(mob/M, mob/user) - if (!ismob(M) || (get_dist(src, user) > 1) || user.is_mob_restrained() || HAS_TRAIT(user, (TRAIT_IMMOBILIZED || TRAIT_INCAPACITATED || TRAIT_FLOORED)) || user.stat || buckled_mob || M.buckled || !isturf(user.loc)) + if (!ismob(M) || (get_dist(src, user) > 1) || user.is_mob_incapacitated() || user.stat || buckled_mob || M.buckled || !isturf(user.loc)) + return + + if (HAS_TRAIT(user, TRAIT_IMMOBILIZED) || HAS_TRAIT(user, TRAIT_FLOORED)) + to_chat(user, SPAN_WARNING("You can't do this right now.")) return if (isxeno(user) && !HAS_TRAIT(user, TRAIT_OPPOSABLE_THUMBS)) From 54491b99233333a4175934b567e550d3e1477094 Mon Sep 17 00:00:00 2001 From: zzzmike <85382350+zzzmike@users.noreply.github.com> Date: Mon, 29 Jul 2024 16:05:38 -0700 Subject: [PATCH 5/5] agreed on all points, thanks :) --- code/game/objects/objs.dm | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/code/game/objects/objs.dm b/code/game/objects/objs.dm index 610945184821..77b15e22d055 100644 --- a/code/game/objects/objs.dm +++ b/code/game/objects/objs.dm @@ -277,10 +277,10 @@ //trying to buckle a mob /obj/proc/buckle_mob(mob/M, mob/user) - if (!ismob(M) || (get_dist(src, user) > 1) || user.is_mob_incapacitated() || user.stat || buckled_mob || M.buckled || !isturf(user.loc)) + if (!ismob(M) || (get_dist(src, user) > 1) || user.stat || buckled_mob || M.buckled || !isturf(user.loc)) return - if (HAS_TRAIT(user, TRAIT_IMMOBILIZED) || HAS_TRAIT(user, TRAIT_FLOORED)) + if (user.is_mob_incapacitated() || HAS_TRAIT(user, TRAIT_IMMOBILIZED) || HAS_TRAIT(user, TRAIT_FLOORED)) to_chat(user, SPAN_WARNING("You can't do this right now.")) return @@ -290,11 +290,6 @@ if (iszombie(user)) return - // mobs that become immobilized should not be able to buckle themselves. - if(M == user && HAS_TRAIT(user, TRAIT_IMMOBILIZED)) - to_chat(user, SPAN_WARNING("You are unable to do this in your current state.")) - return - if(density) density = FALSE if(!step(M, get_dir(M, src)) && loc != M.loc)