Merge branch 'master' of https://github.com/tgstation/-tg-station into more_fire

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

@@ -79,15 +79,20 @@
 	return 1
 
 /obj/structure/closet/proc/dump_contents()
-
 	for(var/obj/O in src)
 		O.loc = loc
+		if(throwing) //you keep some momentum when getting out of a thrown closet
+			step(O, dir)
 
 	for(var/mob/M in src)
 		M.loc = loc
 		if(M.client)
 			M.client.eye = M.client.mob
 			M.client.perspective = MOB_PERSPECTIVE
+		if(throwing)
+			step(M, dir)
+	if(throwing)
+		throwing = 0
 
 /obj/structure/closet/proc/take_contents()
 
@@ -100,14 +105,13 @@
 		return 0
 	if(!can_open())
 		return 0
-	dump_contents()
-
 	opened = 1
 	if(istype(src, /obj/structure/closet/body_bag))
 		playsound(loc, 'sound/items/zip.ogg', 15, 1, -3)
 	else
 		playsound(loc, 'sound/machines/click.ogg', 15, 1, -3)
 	density = 0
+	dump_contents()
 	update_icon()
 	return 1
 

code/game/objects/structures/mineral_doors.dm

@@ -65,9 +65,9 @@
 
 /obj/structure/mineral_door/proc/TryToSwitchState(atom/user)
 	if(isSwitchingStates) return
-	if(ismob(user))
-		var/mob/M = user
-		if(world.time - user.last_bumped <= 60) return //NOTE do we really need that?
+	if(isliving(user))
+		var/mob/living/M = user
+		if(world.time - M.last_bumped <= 60) return //NOTE do we really need that?
 		if(M.client)
 			if(iscarbon(M))
 				var/mob/living/carbon/C = M

code/game/objects/structures/morgue.dm

@@ -226,7 +226,7 @@ Crematorium Switch
 	layer = 2.9
 	var/obj/structure/bodycontainer/connected = null
 	anchored = 1.0
-	throwpass = 1
+	pass_flags = LETPASSTHROW
 
 /obj/structure/tray/Destroy()
 	if(connected)
@@ -278,3 +278,12 @@ Crematorium Switch
 	desc = "Apply corpse before closing."
 	icon_state = "morguet"
 
+/obj/structure/tray/m_tray/CanPass(atom/movable/mover, turf/target, height=0)
+	if(height==0) return 1
+
+	if(istype(mover) && mover.checkpass(PASSTABLE))
+		return 1
+	if(locate(/obj/structure/table) in get_turf(mover))
+		return 1
+	else
+		return 0

code/game/objects/structures/tables_racks.dm

@@ -20,7 +20,7 @@
 	density = 1
 	anchored = 1.0
 	layer = 2.8
-	throwpass = 1	//You can throw objects over this, despite it's density.")
+	pass_flags = LETPASSTHROW //You can throw objects over this, despite it's density.")
 	var/frame = /obj/structure/table_frame
 	var/framestack = /obj/item/stack/rods
 	var/buildstack = /obj/item/stack/sheet/metal
@@ -364,7 +364,7 @@
 	icon_state = "rack"
 	density = 1
 	anchored = 1.0
-	throwpass = 1	//You can throw objects over this, despite it's density.
+	pass_flags = LETPASSTHROW //You can throw objects over this, despite it's density.
 	var/health = 5
 
 /obj/structure/rack/ex_act(severity, target)