From 28e9fa308bc339000ed0b5adb5f56e1fc62b646e Mon Sep 17 00:00:00 2001
From: GuillaumePrata <55374212+GuillaumePrata@users.noreply.github.com>
Date: Fri, 15 Jul 2022 20:45:02 -0300
Subject: [PATCH] Fix roller beds not folding and bodybags runtiming (#68334)

* Fixes roller beds not folding on right-click and fixes bodybags runtiming.

Co-authored-by: Mothblocks <35135081+Mothblocks@users.noreply.github.com>
---
 code/game/objects/structures/beds_chairs/bed.dm            | 7 ++++---
 .../objects/structures/crates_lockers/closets/bodybag.dm   | 3 ++-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/code/game/objects/structures/beds_chairs/bed.dm b/code/game/objects/structures/beds_chairs/bed.dm
index 288f6a5984a..1e684a48b05 100644
--- a/code/game/objects/structures/beds_chairs/bed.dm
+++ b/code/game/objects/structures/beds_chairs/bed.dm
@@ -88,15 +88,16 @@
 /obj/structure/bed/roller/attack_hand_secondary(mob/user, list/modifiers)
 	. = ..()
 	if(. == SECONDARY_ATTACK_CANCEL_ATTACK_CHAIN)
-		return
+		return SECONDARY_ATTACK_CANCEL_ATTACK_CHAIN
 	if(!ishuman(user) || !user.canUseTopic(src, BE_CLOSE))
-		return FALSE
+		return SECONDARY_ATTACK_CANCEL_ATTACK_CHAIN
 	if(has_buckled_mobs())
-		return FALSE
+		return SECONDARY_ATTACK_CANCEL_ATTACK_CHAIN
 	user.visible_message(span_notice("[user] collapses [src]."), span_notice("You collapse [src]."))
 	var/obj/structure/bed/roller/folding_bed = new foldabletype(get_turf(src))
 	user.put_in_hands(folding_bed)
 	qdel(src)
+	return SECONDARY_ATTACK_CANCEL_ATTACK_CHAIN
 
 /obj/structure/bed/roller/post_buckle_mob(mob/living/M)
 	set_density(TRUE)
diff --git a/code/game/objects/structures/crates_lockers/closets/bodybag.dm b/code/game/objects/structures/crates_lockers/closets/bodybag.dm
index dd1c1ec9f9f..0662a6847a9 100644
--- a/code/game/objects/structures/crates_lockers/closets/bodybag.dm
+++ b/code/game/objects/structures/crates_lockers/closets/bodybag.dm
@@ -65,11 +65,12 @@
 /obj/structure/closet/body_bag/attack_hand_secondary(mob/user, list/modifiers)
 	. = ..()
 	if(. == SECONDARY_ATTACK_CANCEL_ATTACK_CHAIN)
-		return
+		return SECONDARY_ATTACK_CANCEL_ATTACK_CHAIN
 	if(!attempt_fold(user))
 		return SECONDARY_ATTACK_CONTINUE_CHAIN
 	perform_fold(user)
 	qdel(src)
+	return SECONDARY_ATTACK_CANCEL_ATTACK_CHAIN
 
 		/**
 		  * Checks to see if we can fold. Return TRUE to actually perform the fold and delete.