Skip to content

Commit

Permalink
agreed on all points, thanks :)
Browse files Browse the repository at this point in the history
  • Loading branch information
zzzmike committed Jul 29, 2024
1 parent a8dd268 commit 54491b9
Showing 1 changed file with 2 additions and 7 deletions.
9 changes: 2 additions & 7 deletions code/game/objects/objs.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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)
Expand Down

0 comments on commit 54491b9

Please sign in to comment.