cyberpresidentvanellope/CHOMPstation
1
0
Fork 0
mirror of https://github.com/CHOMPstation/CHOMPstation.git synced 2026-08-22 11:36:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

Added ability to put paper bundles into folders and cabinets

Browse Source
This commit is contained in:
Hubblenaut
2014-05-08 00:56:32 +02:00
parent 8e08231c3a
commit 435240ce2e
3 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/paperwork/filingcabinet.dm
+2 -2
View File
@@ -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 << "<span class='notice'>You put [P] in [src].</span>"
user.drop_item()
P.loc = src
code/modules/paperwork/folders.dm
+8 -1
View File
@@ -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 << "<span class='notice'>You put the [W] into \the [src].</span>"
@@ -47,6 +47,8 @@
dat += "<A href='?src=\ref[src];remove=\ref[P]'>Remove</A> - <A href='?src=\ref[src];read=\ref[P]'>[P.name]</A><BR>"
for(var/obj/item/weapon/photo/Ph in src)
dat += "<A href='?src=\ref[src];remove=\ref[Ph]'>Remove</A> - <A href='?src=\ref[src];look=\ref[Ph]'>[Ph.name]</A><BR>"
for(var/obj/item/weapon/paper_bundle/Pb in src)
dat += "<A href='?src=\ref[src];remove=\ref[Pb]'>Remove</A> - <A href='?src=\ref[src];browse=\ref[Pb]'>[Pb.name]</A><BR>"
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)
code/modules/paperwork/paper_bundle.dm
+1 -1
View File
@@ -105,7 +105,7 @@
page--
playsound(src.loc, "pageturn", 50, 1)
else
usr << "<span class='notice'>You need to hold it in hands.</span>"
usr << "<span class='notice'>You need to hold it in hands!</span>"
if (istype(src.loc, /mob))
src.attack_self(src.loc)