You can stick duct tape to more than just paper now

This commit is contained in:
Citinited
2018-11-25 23:03:10 +00:00
parent 484a591a7d
commit 05b9955f2b
11 changed files with 91 additions and 94 deletions
+1 -1
View File
@@ -83,7 +83,7 @@ obj/item/clipboard/proc/penPlacement(mob/user, obj/item/pen/P, placing)
if(containedpen)
overlays += "clipboard_pen"
overlays += "clipboard_over"
return
..()
/obj/item/clipboard/attackby(obj/item/W, mob/user)
if(isPaperwork(W)) //If it's a photo, paper bundle, or piece of paper, place it on the clipboard.
+1 -6
View File
@@ -53,6 +53,7 @@
updateinfolinks()
/obj/item/paper/update_icon()
..()
if(icon_state == "paper_talisman")
return
if(info)
@@ -303,12 +304,6 @@
if(user.mind && (user.mind.assigned_role == "Clown"))
clown = 1
if(istype(P, /obj/item/stack/tape_roll))
var/obj/item/stack/tape_roll/tape = P
tape.stick(src, user)
tape.use(1)
return
if(istype(P, /obj/item/paper) || istype(P, /obj/item/photo))
if(istype(P, /obj/item/paper/carbon))
var/obj/item/paper/carbon/C = P
+1
View File
@@ -217,6 +217,7 @@
/obj/item/paper_bundle/update_icon()
..()
if(contents.len)
var/obj/item/paper/P = src[1]
icon_state = P.icon_state