cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-20 11:34:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

Adds canvas support to picture frames

Browse Source
This commit is contained in:
Tastyfish
2016-02-22 20:24:57 -05:00
parent 9b80f20ba7
commit eff33023d0
3 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/structures/artstuff.dm
+3 -1
View File
@@ -116,8 +116,10 @@ var/global/list/globalBlankCanvases[AMT_OF_CANVASES]
//Drawing one pixel with a crayon
if(istype(I, /obj/item/toy/crayon))
var/obj/item/toy/crayon/C = I
if(masterpiece.GetPixel(pixX, pixY)) // if the located pixel isn't blank (null))
var/pix = masterpiece.GetPixel(pixX, pixY)
if(pix && pix != C.colour) // if the located pixel isn't blank (null))
DrawPixelOn(C.colour, pixX, pixY)
qdel(masterpiece)
return
..()
code/modules/paperwork/frames.dm
+4 -2
View File
@@ -1,6 +1,6 @@
/obj/item/weapon/picture_frame
name = "picture frame"
desc = "Its patented design allows it to be folded larger or smaller to accommodate standard paper, photo, and poster sizes."
desc = "Its patented design allows it to be folded larger or smaller to accommodate standard paper, photo, and poster, and canvas sizes."
icon = 'icons/obj/bureaucracy.dmi'
var/icon_base
@@ -33,6 +33,8 @@
icon_state = "[icon_base]-photo"
else if(istype(displayed, /obj/structure/sign/poster))
icon_state = "[icon_base]-[(displayed.icon_state in wide_posters) ? "wposter" : "poster"]"
else if(istype(displayed, /obj/item/weapon/canvas))
icon_state = "[icon_base]-canvas-[displayed.icon_state]"
else
icon_state = "[icon_base]-paper"
@@ -81,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))
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)