Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync

# Conflicts:
#	vorestation.dme

code/game/objects/structures/crates_lockers/closets/utility_closets.dm

@@ -22,7 +22,7 @@
 /obj/structure/closet/emcloset/New()
 	..()
 
-	switch (pickweight(list("small" = 55, "aid" = 25, "tank" = 10, "both" = 10, "nothing" = 0, "delete" = 0)))
+	switch (pickweight(list("small" = 55, "aid" = 25, "tank" = 10, "both" = 10)))
 		if ("small")
 			new /obj/item/weapon/tank/emergency_oxygen(src)
 			new /obj/item/weapon/tank/emergency_oxygen(src)
@@ -51,17 +51,6 @@
 			new /obj/item/clothing/suit/space/emergency(src)
 			new /obj/item/clothing/head/helmet/space/emergency(src)
 			new /obj/item/clothing/head/helmet/space/emergency(src)
-		if ("nothing")
-			// doot
-
-		// teehee - Ah, tg coders...
-		if ("delete")
-			qdel(src)
-
-		//If you want to re-add fire, just add "fire" = 15 to the pick list.
-		/*if ("fire")
-			new /obj/structure/closet/firecloset(src.loc)
-			qdel(src)*/
 
 /obj/structure/closet/emcloset/legacy/New()
 	..()

code/game/objects/structures/crates_lockers/largecrate.dm

@@ -5,6 +5,13 @@
 	icon_state = "densecrate"
 	density = 1
 
+/obj/structure/largecrate/initialize()
+	..()
+	for(var/obj/I in src.loc)
+		if(I.density || I.anchored || I == src || !I.simulated)
+			continue
+		I.forceMove(src)
+
 /obj/structure/largecrate/attack_hand(mob/user as mob)
 	user << "<span class='notice'>You need a crowbar to pry this open!</span>"
 	return

code/game/objects/structures/lattice.dm

@@ -9,7 +9,7 @@
 	layer = 2.3 //under pipes
 	//	flags = CONDUCT
 
-/obj/structure/lattice/New() //turf/simulated/floor/asteroid
+/obj/structure/lattice/initialize()
 	..()
 
 	if(!(istype(src.loc, /turf/space) || istype(src.loc, /turf/simulated/open) || istype(src.loc, /turf/simulated/mineral)))

code/game/objects/structures/mop_bucket.dm

@@ -12,7 +12,7 @@
 
 /obj/structure/mopbucket/New()
 	create_reagents(100)
-
+	..()
 
 /obj/structure/mopbucket/examine(mob/user)
 	if(..(user, 1))

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

@@ -129,6 +129,9 @@
 	else if(istype(W, /obj/item/weapon/grab))
 		var/obj/item/weapon/grab/G = W
 		var/mob/living/affecting = G.affecting
+		if(buckled_mob) //Handles trying to buckle someone else to a chair when someone else is on it
+			user  << "<span class='notice'>\The [src] already has someone buckled to it.</span>"
+			return
 		user.visible_message("<span class='notice'>[user] attempts to buckle [affecting] into \the [src]!</span>")
 		if(do_after(user, 20))
 			affecting.loc = loc
@@ -181,6 +184,9 @@
 	icon_state = "doublebed"
 	base_icon = "doublebed"
 
+/obj/structure/bed/double/padded/New(var/newloc)
+	..(newloc,"wood","cotton")
+
 /obj/structure/bed/double/post_buckle_mob(mob/living/M as mob)
 	if(M == buckled_mob)
 		M.pixel_y = 13