folder exploit fixes

Conflicts:
	code/modules/paperwork/folders.dm
This commit is contained in:
Walter0o
2014-08-03 14:58:04 -04:00
committed by ZomgPonies
parent 3cc234cb03
commit fb7d02ee1f
+12 -7
View File
@@ -59,29 +59,34 @@
if((usr.stat || usr.restrained()))
return
if(usr.contents.Find(src))
if(src.loc == usr)
if(href_list["remove"])
var/obj/item/P = locate(href_list["remove"])
if(P)
if(P && (P.loc == src) && istype(P))
P.loc = usr.loc
usr.put_in_hands(P)
if(href_list["read"])
else if(href_list["read"])
var/obj/item/weapon/paper/P = locate(href_list["read"])
if(P)
if(P && (P.loc == src) && istype(P))
if(!(istype(usr, /mob/living/carbon/human) || istype(usr, /mob/dead/observer) || istype(usr, /mob/living/silicon)))
usr << browse("<HTML><HEAD><TITLE>[P.name]</TITLE></HEAD><BODY>[stars(P.info)][P.stamps]</BODY></HTML>", "window=[P.name]")
onclose(usr, "[P.name]")
else
usr << browse("<HTML><HEAD><TITLE>[P.name]</TITLE></HEAD><BODY>[P.info][P.stamps]</BODY></HTML>", "window=[P.name]")
onclose(usr, "[P.name]")
if(href_list["look"])
else if(href_list["look"])
var/obj/item/weapon/photo/P = locate(href_list["look"])
if(P)
if(P && (P.loc == src) && istype(P))
P.show(usr)
else if(href_list["browse"])
var/obj/item/weapon/paper_bundle/P = locate(href_list["browse"])
if(P && (P.loc == src) && istype(P))
P.attack_self(usr)
onclose(usr, "[P.name]")
//Update everything
attack_self(usr)
update_icon()
return
return