Merge pull request #7212 from Loganbacca/ducttape

Duct Tape
This commit is contained in:
Ccomp5950
2014-12-02 20:32:04 -05:00
4 changed files with 94 additions and 0 deletions

View File

@@ -365,6 +365,11 @@
if(user.mind && (user.mind.assigned_role == "Clown"))
clown = 1
if(istype(P, /obj/item/weapon/tape_roll))
var/obj/item/weapon/tape_roll/tape = P
tape.stick(src, user)
return
if(istype(P, /obj/item/weapon/paper) || istype(P, /obj/item/weapon/photo))
if (istype(P, /obj/item/weapon/paper/carbon))
var/obj/item/weapon/paper/carbon/C = P