Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into proc-define-shit

code/game/objects/structures/beds_chairs/alien_nest.dm

@@ -48,7 +48,7 @@
 			unbuckle_mob(M)
 			add_fingerprint(user)
 
-/obj/structure/bed/nest/user_buckle_mob(mob/living/M, mob/living/carbon/user)
+/obj/structure/bed/nest/user_buckle_mob(mob/living/M, mob/living/carbon/user, check_loc)
 	if ( !ismob(M) || (get_dist(src, user) > 1) || (M.loc != src.loc) || !user.cuff_resist_check() || M.buckled )
 		return
 

code/game/objects/structures/beds_chairs/bed.dm

@@ -87,7 +87,7 @@
 			R.loaded = src
 			forceMove(R)
 			user.visible_message("[user] collects [src].", "<span class='notice'>You collect [src].</span>")
-		return 1
+		return TRUE
 	else
 		return ..()
 
@@ -95,9 +95,9 @@
 	. = ..()
 	if(over_object == usr && Adjacent(usr))
 		if(!ishuman(usr) || !usr.canUseTopic(src, BE_CLOSE))
-			return 0
+			return FALSE
 		if(has_buckled_mobs())
-			return 0
+			return FALSE
 		usr.visible_message("[usr] collapses \the [src.name].", "<span class='notice'>You collapse \the [src.name].</span>")
 		var/obj/structure/bed/roller/B = new foldabletype(get_turf(src))
 		usr.put_in_hands(B)