Merge remote-tracking branch 'upstream/master' into dev

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

@@ -4,7 +4,6 @@
 	icon = 'icons/obj/closet.dmi'
 	icon_state = "closed"
 	density = 1
-	flags = FPRINT
 	var/icon_closed = "closed"
 	var/icon_opened = "open"
 	var/opened = 0
@@ -21,7 +20,7 @@
 	var/store_items = 1
 	var/store_mobs = 1
 
-	var/const/mob_size = 15
+	var/const/default_mob_size = 15
 
 /obj/structure/closet/initialize()
 	if(!opened)		// if closed, any item at the crate's loc is put in the contents
@@ -121,20 +120,17 @@
 
 /obj/structure/closet/proc/store_mobs(var/stored_units)
 	var/added_units = 0
-	for(var/mob/M in src.loc)
-		if(stored_units + added_units + mob_size > storage_capacity)
-			break
-		if(istype (M, /mob/dead/observer))
-			continue
+	for(var/mob/living/M in src.loc)
 		if(M.buckled || M.pinned.len)
 			continue
-
+		var/current_mob_size = (M.mob_size ? M.mob_size : default_mob_size)
+		if(stored_units + added_units + current_mob_size > storage_capacity)
+			break
 		if(M.client)
 			M.client.perspective = EYE_PERSPECTIVE
 			M.client.eye = src
-
 		M.loc = src
-		added_units += mob_size
+		added_units += current_mob_size
 	return added_units
 
 /obj/structure/closet/proc/toggle(mob/user as mob)

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

@@ -4,7 +4,6 @@
 	icon = 'icons/obj/storage.dmi'
 	icon_state = "densecrate"
 	density = 1
-	flags = FPRINT
 
 /obj/structure/largecrate/attack_hand(mob/user as mob)
 	user << "<span class='notice'>You need a crowbar to pry this open!</span>"

code/game/objects/structures/grille.dm

@@ -5,7 +5,7 @@
 	icon_state = "grille"
 	density = 1
 	anchored = 1
-	flags = FPRINT | CONDUCT
+	flags = CONDUCT
 	pressure_resistance = 5*ONE_ATMOSPHERE
 	layer = 2.9
 	explosion_resistance = 5

code/game/objects/structures/mop_bucket.dm

@@ -5,7 +5,7 @@
 	icon_state = "mopbucket"
 	density = 1
 	pressure_resistance = 5
-	flags = FPRINT | TABLEPASS | OPENCONTAINER
+	flags = OPENCONTAINER
 	var/amount_per_transfer_from_this = 5	//shit I dunno, adding this so syringes stop runtime erroring. --NeoFite
 
 

code/game/objects/structures/noticeboard.dm

@@ -3,7 +3,6 @@
 	desc = "A board for pinning important notices upon."
 	icon = 'icons/obj/stationobjs.dmi'
 	icon_state = "nboard00"
-	flags = FPRINT
 	density = 0
 	anchored = 1
 	var/notices = 0

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

@@ -4,7 +4,6 @@
 	icon = 'icons/obj/objects.dmi'
 	icon_state = "stool"
 	anchored = 1.0
-	flags = FPRINT
 	pressure_resistance = 15
 
 /obj/structure/stool/ex_act(severity)