fixes clipboards

code/modules/paperwork/clipboard.dm

@@ -36,3 +36,14 @@
 	if(istype(W,/obj/item/weapon/paper))
 		toppaper = W
 	..() //also calls update_icon()
+
+/obj/item/weapon/storage/bag/clipboard/remove_from_storage(obj/item/W as obj, atom/new_location, var/force = 0)
+	..()
+	for(var/i = contents.len; i>0; i--)
+		if(istype(contents[i],/obj/item/weapon/paper))
+			toppaper = W
+			update_icon()
+			return
+	//If we looped through everything and there's still no paper
+	toppaper = null
+	update_icon()

code/modules/paperwork/filingcabinet.dm

@@ -37,10 +37,16 @@
 	if(istype(P, /obj/item/weapon/paper) || istype(P, /obj/item/weapon/folder) || istype(P, /obj/item/weapon/photo))
 		if(user.drop_item(P, src))
 			to_chat(user, "<span class='notice'>You put [P] in [src].</span>")
-			icon_state = "[initial(icon_state)]-open"
+			flick("[initial(icon_state)]-open",src)
-			sleep(5)
-			icon_state = initial(icon_state)
 			updateUsrDialog()
+	else if(istype(P, /obj/item/weapon/storage/bag/clipboard))
+		for(var/obj/item/I in P)
+			if(!istype(I, /obj/item/weapon/pen))
+				user.drop_item(I,src)
+		P.update_icon()
+		flick("[initial(icon_state)]-open",src)
+		to_chat(user, "<span class='notice'>You empty the [P] into \the [src].</span>")
+		updateUsrDialog()
 	else if(iswrench(P))
 		playsound(loc, 'sound/items/Ratchet.ogg', 50, 1)
 		anchored = !anchored
@@ -75,9 +81,7 @@
 		if(P && (P.loc == src) && in_range(src, usr))
 			usr.put_in_hands(P)
 			updateUsrDialog()
-			icon_state = "[initial(icon_state)]-open"
+			flick("[initial(icon_state)]-open",src)
-			sleep(5)
-			icon_state = initial(icon_state)
 
 
 /*

code/modules/paperwork/paper.dm

@@ -185,7 +185,9 @@
 	overlays.len = 0
 	updateinfolinks()
 	update_icon()
-
+	if(istype(loc, /obj/item/weapon/storage/bag/clipboard))
+		var/obj/C = loc
+		C.update_icon()
 
 /obj/item/weapon/paper/proc/parsepencode(var/mob/user,var/obj/item/i, var/t)
 	if(istype(i,/obj/item/weapon/pen))
@@ -328,6 +330,10 @@
 
 		to_chat(user, "<span class='notice'>You stamp [src] with your rubber stamp.</span>")
 
+		if(istype(loc, /obj/item/weapon/storage/bag/clipboard))
+			var/obj/C = loc
+			C.update_icon()
+
 	else if(istype(P, /obj/item/weapon/photo))
 		if(user.drop_item(P, src))
 			if(img)