From 5aa6e6de45ae8acf1e41f63b151be696769ec1c3 Mon Sep 17 00:00:00 2001 From: Aronai Sieyes Date: Sun, 4 Jul 2021 18:21:44 -0400 Subject: [PATCH] Fix canvas sprites --- code/game/objects/structures/artstuff.dm | 19 +++++++++++++------ icons/obj/artstuff.dmi | Bin 980 -> 1030 bytes 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/code/game/objects/structures/artstuff.dm b/code/game/objects/structures/artstuff.dm index eae0cc66cc7..5873d395fcf 100644 --- a/code/game/objects/structures/artstuff.dm +++ b/code/game/objects/structures/artstuff.dm @@ -56,9 +56,14 @@ ///boolean that blocks persistence from saving it. enabled from printing copies, because we do not want to save copies. var/no_save = FALSE - // Painting overlay offset when framed + /// From the origin of the turf we're on, where should the left of the canvas pixel be var/framed_offset_x = 11 + /// From the origin of the turf we're on, where should the bottom of the canvas be var/framed_offset_y = 10 + /// The frame takes the painting's offset, then moves this X offset + var/frame_offset_x = -1 + /// The frame takes the painting's offset, then moves this Y offset + var/frame_offset_y = -1 pixel_x = 10 pixel_y = 9 @@ -229,14 +234,16 @@ /obj/item/canvas/twentyfour_twentyfour name = "ai universal standard canvas" - desc = "Besides being very large, the AI can accept these as a display from their internal database after you've hung it up." + //desc = "Besides being very large, the AI can accept these as a display from their internal database after you've hung it up." // Not yet icon_state = "24x24" width = 24 height = 24 pixel_x = 2 - pixel_y = 1 + pixel_y = 2 framed_offset_x = 4 - framed_offset_y = 5 + framed_offset_y = 4 + frame_offset_x = -2 + frame_offset_y = -2 /obj/item/frame/painting name = "painting frame" @@ -370,8 +377,8 @@ MA.pixel_y = current_canvas.framed_offset_y . += MA var/mutable_appearance/frame = mutable_appearance(current_canvas.icon,"[current_canvas.icon_state]frame") - frame.pixel_x = current_canvas.framed_offset_x - 1 - frame.pixel_y = current_canvas.framed_offset_y - 1 + frame.pixel_x = current_canvas.framed_offset_x + current_canvas.frame_offset_x + frame.pixel_y = current_canvas.framed_offset_y + current_canvas.frame_offset_y . += frame add_overlay(.) diff --git a/icons/obj/artstuff.dmi b/icons/obj/artstuff.dmi index 847ebd5ca614bd5beacd6ce035675320d5e9af04..1397bb26ab25f3144d8984412da42beef493f353 100644 GIT binary patch delta 1008 zcmVfFD zZ*Bkpc$|&Wy$Zu15Ww+SpF)zo^whWnIGddhc?ZsJetP0I z|CH28>V2h>R1^hfSAiiZNC33guWq3Q5Fr=}tQjO&N=R3in0i3VAyY6kT9b&hME#|$ z=*O;p+%MN(zkeM}e=d&z00PHJL_t(|obA{PcdH-_0N^S^?1j4h|6h9v@dbpU6L9A= z*{tocGauoh?(yK*qU-E0Y*0^nEYx1Bkf-Vh{LAM)Ca6@a<&<$V7Z) zfXx8!4>RBlK&${!5O8>mV6*qHg#bq@#DMz&Vh0fI0e^F&{T%~73lK(QK-Y)SH3r1d zx&j@!{~&+}0HQ5my(8aZDM2%U@aBMM54gPo{#bal28al-yvaS7aC~m0 z7D@&jKEc&>ItR$=sH@dUzz{}bz#tXI`uBqeAbiCE(*D{XHJ8Jy0OczWfU_$#D9A6z z5D@vw0)OP7=5vEV4r2@meWd||f`&aItRMhTzQTZQoIPRuMS$3M29R4H;QLTooBBDp z{&xAjX&CuV0Wy_Y0P_T+0I{zyKrL;QX@Ku5UxBABFTRV%0O2bS!0fo#gaE=<8nB)m z&OQ==&{rOy)acGVLWx5_?5oiQHw|p0T^ivrjG$H`Fgnxc2xi_x7}%N--LikF1e@4zSaR)f^p4vRR{pn zYkwD2Du4wr(0pkkfECO&m?{Cb{3ZdIpdaj34FFxBaYq9j!4;xX7eIau6A;Ql0m8 z0wD9!1Jo>d3%FJR?MHkq*cTv9B!4ij0co}i5q|IhZZWP1pdtXIj^T04p9W+eOfCa3 zeHw80qZtPWM>cMsq^U#<_%ndq7`Z%tvVdP4X8;2j@TUOT^`SZ-mx}=mU;qOc@T+^i e6ZeFhi+%fVK{qf}zp65|Ngr{?bpvlNGynhsjY&j7RCt{2m*{5E}qd7GQcJpXDMb1|U{rK$Hilp1`^XHa`H&#X2Z!dWgcw+f~!TS690NSE| zPXmzR$N*s7?PTZ!pq`H-pm!e<15Ax4^KK7-&9~#<_ClQjK&j5ychm(o0GhHV0&`FZ zSxV4##@=M$10ZKtfefR-xT|ppYykSTF0Tb=0LJL240ZtS2gWGU0*nDn0=T#wN1h2| zYk`UwL;+YoUc3KtFH{D9;BQc+077>dzyf6NAW?wO_ZWZy7{I-`yH@`n055pG%t4p( z00TJhVZd_*fZ?@JjS>tlgP|J0Ky|>Q9)LkGK~w{Gp! zE@&@6fdt?XAaerC0QN@kWtB4lSo&81I9d(C5*(D^cxQAUz}kmP0U~?Dx*JCpi^XD{ zQEaZxK99#%E8l$vU;qaARsgr>huZ)rev1JZfB_hQ0geG~J`>(u3;qE-Gi% O0000