diff --git a/code/game/objects/structures/carts/carts.dm b/code/game/objects/structures/carts/carts.dm index 478f1c7580a..f70f981e7af 100644 --- a/code/game/objects/structures/carts/carts.dm +++ b/code/game/objects/structures/carts/carts.dm @@ -44,7 +44,7 @@ ABSTRACT_TYPE(/obj/structure/cart) . = ..() if(user.stat || user.stunned || user.weakened || user.paralysis || user.lying || user.restrained()) - if(user==pulling) + if(user == pulling) pulling = null user.pulledby = null to_chat(user, SPAN_WARNING("You lost your grip!")) @@ -58,11 +58,7 @@ ABSTRACT_TYPE(/obj/structure/cart) user.pulledby = null if(user==pulling) return - if(pulling && (get_dir(src.loc, pulling.loc) == direction)) - to_chat(user, SPAN_WARNING("You cannot go there.")) - // return - driving = 1 var/turf/turf = null if(pulling) turf = pulling.loc @@ -79,11 +75,10 @@ ABSTRACT_TYPE(/obj/structure/cart) pulling = null user.pulledby = null pulling.set_dir(get_dir(pulling, src)) - driving = 0 /obj/structure/cart/Move() . = ..() - if (pulling && (get_dist(src, pulling) > 1)) + if(pulling && (get_dist(src, pulling) > 1)) pulling.pulledby = null to_chat(pulling, SPAN_WARNING("You lost your grip!")) pulling = null diff --git a/html/changelogs/SleepyGemmy-cart_fixes.yml b/html/changelogs/SleepyGemmy-cart_fixes.yml new file mode 100644 index 00000000000..895027d4379 --- /dev/null +++ b/html/changelogs/SleepyGemmy-cart_fixes.yml @@ -0,0 +1,6 @@ +author: SleepyGemmy + +delete-after: True + +changes: + - bugfix: "Fixed carts displaying an error message when swapping directions."