From dd19158a6e4a7372750208a5c3e370cf10fff4b7 Mon Sep 17 00:00:00 2001 From: LDip999 Date: Mon, 9 Mar 2026 03:12:04 +0100 Subject: [PATCH 1/2] Unjaks the carts --- code/game/objects/structures/roguetown/handcart.dm | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/code/game/objects/structures/roguetown/handcart.dm b/code/game/objects/structures/roguetown/handcart.dm index f26971f38a6..30065aa1cd0 100644 --- a/code/game/objects/structures/roguetown/handcart.dm +++ b/code/game/objects/structures/roguetown/handcart.dm @@ -102,9 +102,6 @@ if(!fits_in_cart(O)) to_chat(user, span_warning("[living_mob] doesn't fit into the cart!")) return FALSE - if(!insertion_allowed(living_mob)) - to_chat(user, span_warning("[living_mob] cannot be put into the cart!")) - return FALSE put_in(living_mob) play_sound = TRUE else @@ -286,7 +283,7 @@ if(L.anchored || (L.buckled && L.buckled != src) || L.incorporeal_move || L.has_buckled_mobs()) return FALSE if(L.mob_size > MOB_SIZE_TINY) // Tiny mobs are treated as items. - if(L.cmode && L.stat != DEAD) + if(L.cmode) return FALSE L.stop_pulling() From dd9d66530ef85286431a3e89d51d7658b43c1680 Mon Sep 17 00:00:00 2001 From: LDip999 Date: Mon, 9 Mar 2026 03:15:27 +0100 Subject: [PATCH 2/2] Comment --- code/game/objects/structures/roguetown/handcart.dm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/code/game/objects/structures/roguetown/handcart.dm b/code/game/objects/structures/roguetown/handcart.dm index 30065aa1cd0..3ecb1f07bbe 100644 --- a/code/game/objects/structures/roguetown/handcart.dm +++ b/code/game/objects/structures/roguetown/handcart.dm @@ -102,6 +102,9 @@ if(!fits_in_cart(O)) to_chat(user, span_warning("[living_mob] doesn't fit into the cart!")) return FALSE + if(!insertion_allowed(living_mob)) + to_chat(user, span_warning("[living_mob] cannot be put into the cart!")) + return FALSE put_in(living_mob) play_sound = TRUE else @@ -283,7 +286,7 @@ if(L.anchored || (L.buckled && L.buckled != src) || L.incorporeal_move || L.has_buckled_mobs()) return FALSE if(L.mob_size > MOB_SIZE_TINY) // Tiny mobs are treated as items. - if(L.cmode) + if(L.cmode) //CC Edit: Removes the L.stat check return FALSE L.stop_pulling()