diff --git a/code/modules/paperwork/filingcabinet.dm b/code/modules/paperwork/filingcabinet.dm
index 38b42a86b9..aeb6851145 100644
--- a/code/modules/paperwork/filingcabinet.dm
+++ b/code/modules/paperwork/filingcabinet.dm
@@ -29,12 +29,12 @@
/obj/structure/filingcabinet/initialize()
for(var/obj/item/I in loc)
- if(istype(I, /obj/item/weapon/paper) || istype(I, /obj/item/weapon/folder) || istype(I, /obj/item/weapon/photo))
+ if(istype(I, /obj/item/weapon/paper) || istype(I, /obj/item/weapon/folder) || istype(I, /obj/item/weapon/photo) || istype(I, /obj/item/weapon/paper_bundle))
I.loc = src
/obj/structure/filingcabinet/attackby(obj/item/P as obj, mob/user as mob)
- if(istype(P, /obj/item/weapon/paper) || istype(P, /obj/item/weapon/folder) || istype(P, /obj/item/weapon/photo))
+ if(istype(P, /obj/item/weapon/paper) || istype(P, /obj/item/weapon/folder) || istype(P, /obj/item/weapon/photo) || istype(P, /obj/item/weapon/paper_bundle))
user << "You put [P] in [src]."
user.drop_item()
P.loc = src
diff --git a/code/modules/paperwork/folders.dm b/code/modules/paperwork/folders.dm
index 1c491c126d..0f1b612e93 100644
--- a/code/modules/paperwork/folders.dm
+++ b/code/modules/paperwork/folders.dm
@@ -29,7 +29,7 @@
return
/obj/item/weapon/folder/attackby(obj/item/weapon/W as obj, mob/user as mob)
- if(istype(W, /obj/item/weapon/paper) || istype(W, /obj/item/weapon/photo))
+ if(istype(W, /obj/item/weapon/paper) || istype(W, /obj/item/weapon/photo) || istype(W, /obj/item/weapon/paper_bundle))
user.drop_item()
W.loc = src
user << "You put the [W] into \the [src]."
@@ -47,6 +47,8 @@
dat += "Remove - [P.name]
"
for(var/obj/item/weapon/photo/Ph in src)
dat += "Remove - [Ph.name]
"
+ for(var/obj/item/weapon/paper_bundle/Pb in src)
+ dat += "Remove - [Pb.name]
"
user << browse(dat, "window=folder")
onclose(user, "folder")
add_fingerprint(usr)
@@ -78,6 +80,11 @@
var/obj/item/weapon/photo/P = locate(href_list["look"])
if(P)
P.show(usr)
+ if(href_list["browse"])
+ var/obj/item/weapon/paper_bundle/P = locate(href_list["browse"])
+ if(P)
+ P.attack_self(usr)
+ onclose(usr, "[P.name]")
//Update everything
attack_self(usr)
diff --git a/code/modules/paperwork/paper_bundle.dm b/code/modules/paperwork/paper_bundle.dm
index a017a78348..c6a6c25e31 100644
--- a/code/modules/paperwork/paper_bundle.dm
+++ b/code/modules/paperwork/paper_bundle.dm
@@ -105,7 +105,7 @@
page--
playsound(src.loc, "pageturn", 50, 1)
else
- usr << "You need to hold it in hands."
+ usr << "You need to hold it in hands!"
if (istype(src.loc, /mob))
src.attack_self(src.loc)