Merge branch 'master' into development

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

@@ -64,18 +64,29 @@
 		user << "<span class='notice'>Access Denied</span>"
 
 /obj/structure/closet/secure_closet/attackby(obj/item/weapon/W as obj, mob/user as mob)
-
-	if(istype(W, /obj/item/weapon/melee/energy/blade))
+	if(src.opened)
+		if(istype(W, /obj/item/weapon/grab))
+			var/obj/item/weapon/grab/G = W
+			if(src.large)
+				src.MouseDrop_T(G.affecting, user)	//act like they were dragged onto the closet
+			else
+				user << "<span class='notice'>The locker is too small to stuff [G.affecting] into!</span>"
+		if(isrobot(user))
+			return
+		if(W.loc != user) // This should stop mounted modules ending up outside the module.
+			return
+		user.drop_item()
+		if(W)
+			W.forceMove(src.loc)
+	else if(istype(W, /obj/item/weapon/melee/energy/blade))//Attempt to cut open locker if locked
 		if(emag_act(INFINITY, user, "<span class='danger'>The locker has been sliced open by [user] with \an [W]</span>!", "<span class='danger'>You hear metal being sliced and sparks flying.</span>"))
 			var/datum/effect/effect/system/spark_spread/spark_system = new /datum/effect/effect/system/spark_spread()
 			spark_system.set_up(5, 0, src.loc)
 			spark_system.start()
 			playsound(src.loc, 'sound/weapons/blade1.ogg', 50, 1)
 			playsound(src.loc, "sparks", 50, 1)
-	else if (!locked)
-		return ..()
-	else
-		togglelock(user)
+	else if(!src.opened)
+		togglelock(user)//Attempt to lock locker if closed
 
 /obj/structure/closet/secure_closet/emag_act(var/remaining_charges, var/mob/user, var/emag_source, var/visual_feedback = "", var/audible_feedback = "")
 	if(!broken)

code/game/objects/structures/girders.dm

@@ -224,6 +224,7 @@
 	reinforcing = 0
 
 /obj/structure/girder/proc/dismantle()
+	new /obj/item/stack/material/steel(get_turf(src))
 	new /obj/item/stack/material/steel(get_turf(src))
 	qdel(src)