Merge branch 'master' into upstream-merge-13122

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

@@ -3,8 +3,10 @@
 	req_access = list(access_kitchen)
 
 	starts_with = list(
-		/obj/item/weapon/reagent_containers/food/condiment/flour = 7,
-		/obj/item/weapon/reagent_containers/food/condiment/sugar = 2,
+		/obj/item/weapon/reagent_containers/food/condiment/carton/flour = 6,
+		/obj/item/weapon/reagent_containers/food/condiment/carton/sugar = 1,
+		/obj/item/weapon/reagent_containers/food/condiment/carton/flour/rustic = 1,
+		/obj/item/weapon/reagent_containers/food/condiment/carton/sugar/rustic = 1,
 		/obj/item/weapon/reagent_containers/food/condiment/spacespice = 2
 		)
 

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

@@ -90,7 +90,9 @@
 	src.set_dir(turn(src.dir, 90))
 
 /obj/structure/closet/crate/attackby(obj/item/weapon/W as obj, mob/user as mob)
-	if(opened)
+	if(W.is_wrench() && istype(src,/obj/structure/closet/crate/bin))
+		return ..()
+	else if(opened)
 		if(isrobot(user))
 			return
 		if(W.loc != user) // This should stop mounted modules ending up outside the module.

code/game/objects/structures/girders.dm

@@ -3,7 +3,7 @@
 	icon_state = "girder"
 	anchored = TRUE
 	density = TRUE
-	plane = PLATING_PLANE
+	layer = TABLE_LAYER //CHOMPEdit - moved so that they render above catwalks.
 	w_class = ITEMSIZE_HUGE
 	var/state = 0
 	var/health = 200