Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into robust-squash

Conflicts: lots

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

@@ -120,8 +120,9 @@
 	return 1
 
 /obj/structure/closet/proc/toggle(mob/user as mob)
+	var/orig = src.opened
 	. = src.opened ? src.close() : src.open()
-	if(!.)
+	if(. == orig)
 		user << "<span class='notice'>It won't budge!</span>"
 	return
 

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

@@ -99,7 +99,6 @@
 		new /obj/item/clothing/shoes/white(src)
 //		new /obj/item/weapon/cartridge/medical(src)
 		new /obj/item/device/radio/headset/headset_med(src)
-		new /obj/item/weapon/storage/belt/medical(src)
 		return
 
 
@@ -140,7 +139,6 @@
 		new /obj/item/clothing/gloves/latex(src)
 		new /obj/item/clothing/shoes/brown	(src)
 		new /obj/item/device/radio/headset/heads/cmo(src)
-		new /obj/item/weapon/storage/belt/medical(src)
 		new /obj/item/device/flash(src)
 		new /obj/item/weapon/reagent_containers/hypospray(src)
 		return

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

@@ -124,7 +124,6 @@
 		/obj/item/stack/sheet/mineral/phoron,
 		/obj/item/stack/sheet/mineral/uranium,
 		/obj/item/stack/sheet/mineral/diamond,
-		/obj/item/stack/sheet/mineral/clown,
 		/obj/item/stack/sheet/plasteel,
 		/obj/item/stack/rods
 		)

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

@@ -7,6 +7,7 @@
 	icon_state = "crate"
 	icon_opened = "crateopen"
 	icon_closed = "crate"
+	climbable = 1
 //	mouse_drag_pointer = MOUSE_ACTIVE_POINTER	//???
 	var/rigged = 0
 
@@ -36,7 +37,11 @@
 		O.loc = get_turf(src)
 	icon_state = icon_opened
 	src.opened = 1
-	return 1
+
+	if(climbable)
+		structure_shaken()
+
+	return
 
 /obj/structure/closet/crate/close()
 	if(!src.opened)