From f9ed1733785df111dbb825c2de832e049ac87804 Mon Sep 17 00:00:00 2001 From: Tastyfish Date: Fri, 26 Feb 2016 17:51:40 -0500 Subject: [PATCH 1/2] Temporarilly disables canvas support on frames --- code/modules/paperwork/frames.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/paperwork/frames.dm b/code/modules/paperwork/frames.dm index f8592e35c5d..078b470dc99 100644 --- a/code/modules/paperwork/frames.dm +++ b/code/modules/paperwork/frames.dm @@ -83,7 +83,7 @@ O.forceMove(user.loc) displayed = null qdel(src) - else if(istype(I, /obj/item/weapon/paper) || istype(I, /obj/item/weapon/photo) || istype(I, /obj/item/weapon/contraband/poster) || istype(I, /obj/item/weapon/canvas)) + else if(istype(I, /obj/item/weapon/paper) || istype(I, /obj/item/weapon/photo) || istype(I, /obj/item/weapon/contraband/poster)/* || istype(I, /obj/item/weapon/canvas)*/) if(!displayed) user.unEquip(I) insert(I) From 9f2dd0314a4113ed7a5fd3097f68e5ca6f01ecd6 Mon Sep 17 00:00:00 2001 From: Tastyfish Date: Fri, 26 Feb 2016 18:02:29 -0500 Subject: [PATCH 2/2] Alright --- code/modules/paperwork/frames.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/paperwork/frames.dm b/code/modules/paperwork/frames.dm index 078b470dc99..ec014d6a845 100644 --- a/code/modules/paperwork/frames.dm +++ b/code/modules/paperwork/frames.dm @@ -83,7 +83,7 @@ O.forceMove(user.loc) displayed = null qdel(src) - else if(istype(I, /obj/item/weapon/paper) || istype(I, /obj/item/weapon/photo) || istype(I, /obj/item/weapon/contraband/poster)/* || istype(I, /obj/item/weapon/canvas)*/) + else if(istype(I, /obj/item/weapon/paper) || istype(I, /obj/item/weapon/photo) || istype(I, /obj/item/weapon/contraband/poster)) if(!displayed) user.unEquip(I) insert(I)