Pretty much all new click code

code/modules/paperwork/filingcabinet.dm

@@ -66,6 +66,22 @@
 
 	return
 
+/obj/structure/filingcabinet/attack_tk(mob/user)
+	if(anchored)
+		attack_self_tk(user)
+	else
+		..()
+
+/obj/structure/filingcabinet/attack_self_tk(mob/user)
+	if(contents.len)
+		if(prob(40 + contents.len * 5))
+			var/obj/item/I = pick(contents)
+			I.loc = loc
+			if(prob(25))
+				step_rand(I)
+			user << "<span class='notice'>You pull \a [I] out of [src] at random.</span>"
+			return
+	user << "<span class='notice'>You find nothing in [src].</span>"
 
 /obj/structure/filingcabinet/Topic(href, href_list)
 	if(href_list["retrieve"])
@@ -88,7 +104,7 @@
 	var/virgin = 1
 
 
-/obj/structure/filingcabinet/security/attack_hand(mob/user as mob)
+/obj/structure/filingcabinet/security/proc/populate()
 	if(virgin)
 		for(var/datum/data/record/G in data_core.general)
 			var/datum/data/record/S
@@ -110,6 +126,13 @@
 						//before the records have been generated, so we do this inside the loop.
 	..()
 
+/obj/structure/filingcabinet/security/attack_hand()
+	populate()
+	..()
+
+/obj/structure/filingcabinet/security/attack_tk()
+	populate()
+	..()
 
 /*
  * Medical Record Cabinets
@@ -117,7 +140,7 @@
 /obj/structure/filingcabinet/medical
 	var/virgin = 1
 
-/obj/structure/filingcabinet/medical/attack_hand(mob/user as mob)
+/obj/structure/filingcabinet/medical/proc/populate()
 	if(virgin)
 		for(var/datum/data/record/G in data_core.general)
 			var/datum/data/record/M
@@ -138,3 +161,11 @@
 			virgin = 0	//tabbing here is correct- it's possible for people to try and use it
 						//before the records have been generated, so we do this inside the loop.
 	..()
+
+/obj/structure/filingcabinet/medical/attack_hand()
+	populate()
+	..()
+
+/obj/structure/filingcabinet/medical/attack_tk()
+	populate()
+	..()

code/modules/paperwork/handlabeler.dm

@@ -7,7 +7,8 @@
 	var/labels_left = 30
 	var/mode = 0	//off or on.
 
-/obj/item/weapon/hand_labeler/afterattack(atom/A, mob/user as mob)
+/obj/item/weapon/hand_labeler/afterattack(atom/A, mob/user as mob, proximity)
+	if(!proximity) return
 	if(!mode)	//if it's off, give up.
 		return
 	if(A == loc)	// if placing the labeller into something (e.g. backpack)

code/modules/paperwork/photography.dm

@@ -116,7 +116,7 @@
 	icon_state = "camera"
 	item_state = "electropack"
 	w_class = 2.0
-	flags = FPRINT | CONDUCT | USEDELAY | TABLEPASS
+	flags = FPRINT | CONDUCT | TABLEPASS
 	slot_flags = SLOT_BELT
 	m_amt = 2000
 	var/pictures_max = 10
@@ -273,7 +273,7 @@
 	icon_state = "videocam"
 	item_state = "videocam"
 	w_class = 2.0
-	flags = FPRINT | CONDUCT | USEDELAY | TABLEPASS
+	flags = FPRINT | CONDUCT | TABLEPASS
 	slot_flags = SLOT_BELT
 	m_amt = 2000
 	var/on = 0