From f3703815f9f3cba8fb5e62a49ad90b4323d4ed9a Mon Sep 17 00:00:00 2001 From: LFP Date: Fri, 16 Sep 2022 21:39:41 -0500 Subject: [PATCH 1/4] 19x23 frame --- code/game/objects/structures/artstuff.dm | 11 +++++++++++ icons/obj/artstuff.dmi | Bin 908 -> 1069 bytes 2 files changed, 11 insertions(+) diff --git a/code/game/objects/structures/artstuff.dm b/code/game/objects/structures/artstuff.dm index 19baed8ae..6eb47ac93 100644 --- a/code/game/objects/structures/artstuff.dm +++ b/code/game/objects/structures/artstuff.dm @@ -200,6 +200,17 @@ framed_offset_x = 8 framed_offset_y = 9 +/obj/item/canvas/nineteenXtwentythre + icon_state = "19x23" + width = 19 + height = 23 + ui_x = 600 + ui_y = 800 + pixel_x = 6 + pixel_y = 9 + framed_offset_x = 7 + framed_offset_y = 5 + /obj/item/canvas/twentythreeXnineteen icon_state = "23x19" width = 23 diff --git a/icons/obj/artstuff.dmi b/icons/obj/artstuff.dmi index 14970b76ef2e8b94b7cf689d7d7f67de3b13de16..ca7d8e1ad1f557c5fc6fac939bcb71158eb40f7f 100644 GIT binary patch delta 998 zcmVeQY4QME%a-yEWUKGabic6%viKP8ug(NZ|}SC_UBlTDn*if!auCB@`J z%$cOP1bgRg{!-d3+8`7)e<^A}3fM@r5Mk|S|H1?iusDDqwz`;qfE~3d510;ymYy&Q z|GG;3L~GTJZ8_Wz zBa(-!ol`@!R?p7KgurT5u@=>}dSEN%f2(~f1z=PVK-_LOQ4T=Z1jHKP-;v_`TBvdZh#i1?^42xqJJ*CP7OR+w zuhW-r92nqJ0mz-`j{!7WWd>+K8u^bm*#SU3)DI%;5(rLzQ4|2Qma>uP5ADwYT^AVu z8fnLl4A8VRKo5Oy?BfG85`({^6afXGy;awB>d8rf&>jJ>tb@Cn4;nxr^m_O@g>wLb zWN`K|{s!)iu1Dp+1uy~hIDF_60oW4&39$J0NdTmq12_c0DdCV{(}elY%24JcdX z-{AtpI1&JV7 z3?a!Bw5_(+8BhS|>}DXrD$wrIE`bd|_pH-7WMG_$@(#DVSXb^AP}+fbQ^|kOE-Fc~Ff8SSoOuhBOHn1RVqkVEqTJL;xlP8o>6- zd+#5Ay4F7d07n3WZ^ZcVQ(s>Z0N@C~m=0FE643S$09=qn0@m0c_W%(RfFA&=)wpSZ ziwUd)pufnuQi}k-jjkjBYySg)!^IZ`;L5Et7=lYRa1FrN9|M%WFJQ4)msNZXQ)Ubh z6(Dr34gp-Qkwmirx zWwdk(>00`e*3b=Y`92>Pubvz+EaVaZ00LJ@L_t(|ob8#7a)TfcgroFCFt+diw!Py| z1&j%%kg2zgn#7sx$KHP-%=C6+E$TXa(b3Ak@50dvz^WmD==)x@0}w6&u?G0s)BF8t z;L9lhKwb>+9|1%F5HA26HR;n0Y=^x*KM7E9p8-A;K&${neE>J;?S%oZ1rVz;K-b6W zDg&gdoj{kpUI;)$0HQ8H*pV;t5mW;Zn>irr12j)y+Y7ha03v?@@NbItd?kBA7K_DV zeXO!8&BXwQSd{?=kXB**Lv;Ya7yc1KlE6`kPM6OBkhPS9B!3tm8z}W=02rhjJ2Aj8 z<^eQlZS7Nl38u*$bSVHBBn5vbAwdqnc;iJWd=mrA;JxP=&#}SLUJYQG2Y0MT9sm)v z8NNv&0+^?jk_3O&yVe~5Dm_}?2h)#Z+GI8WO~VJB03diX#hPLnsBX?)G7r1E9{w8KC@! zEC3V(gu#>fm;&JN?fkc0sPiQ_1t8^U>_=*W2tZTzL|}gol}`ewa z0CM&f$jyQ?0Mgo<#mF#h0n}FMTCffP(zW0j02h78AOY|{;G&3|bnX8-fD0f9QiDW~ z?k4~TYk|!Ce%1W|i^XcL30W)_i^XEGSbwhOd$oS&Jp(WR126ys e)B|X|7W@Kt6GXDwuyv{c0000 Date: Fri, 16 Sep 2022 22:19:51 -0500 Subject: [PATCH 2/4] Fixes item name plus adds to map. --- _maps/map_files/LayeniaStation/LayeniaStation.dmm | 2 ++ code/game/objects/structures/artstuff.dm | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/_maps/map_files/LayeniaStation/LayeniaStation.dmm b/_maps/map_files/LayeniaStation/LayeniaStation.dmm index 09f94b61b..80ae74d68 100644 --- a/_maps/map_files/LayeniaStation/LayeniaStation.dmm +++ b/_maps/map_files/LayeniaStation/LayeniaStation.dmm @@ -104509,6 +104509,7 @@ /obj/item/canvas/twentythreeXtwentythree, /obj/item/canvas/twentythreeXnineteen, /obj/item/canvas/nineteenXnineteen, +/obj/item/canvas/nineteenXtwentythree, /obj/effect/turf_decal/tile/neutral, /obj/effect/turf_decal/tile/neutral{ dir = 4 @@ -118412,6 +118413,7 @@ /obj/item/canvas/twentythreeXtwentythree, /obj/item/canvas/twentythreeXnineteen, /obj/item/canvas/nineteenXnineteen, +/obj/item/canvas/nineteenXtwentythree, /obj/effect/turf_decal/tile/neutral, /obj/effect/turf_decal/tile/neutral{ dir = 4 diff --git a/code/game/objects/structures/artstuff.dm b/code/game/objects/structures/artstuff.dm index 6eb47ac93..ace302229 100644 --- a/code/game/objects/structures/artstuff.dm +++ b/code/game/objects/structures/artstuff.dm @@ -200,7 +200,7 @@ framed_offset_x = 8 framed_offset_y = 9 -/obj/item/canvas/nineteenXtwentythre +/obj/item/canvas/nineteenXtwentythree icon_state = "19x23" width = 19 height = 23 From d54eb09a3d91e623105e6ac4edb1b2867c428115 Mon Sep 17 00:00:00 2001 From: LFP Date: Fri, 16 Sep 2022 22:33:50 -0500 Subject: [PATCH 3/4] Revert "Fixes item name plus adds to map." This reverts commit e20236a51ca85bad142fc8189bdd4c016d9dc85d. --- _maps/map_files/LayeniaStation/LayeniaStation.dmm | 2 -- code/game/objects/structures/artstuff.dm | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/_maps/map_files/LayeniaStation/LayeniaStation.dmm b/_maps/map_files/LayeniaStation/LayeniaStation.dmm index 80ae74d68..09f94b61b 100644 --- a/_maps/map_files/LayeniaStation/LayeniaStation.dmm +++ b/_maps/map_files/LayeniaStation/LayeniaStation.dmm @@ -104509,7 +104509,6 @@ /obj/item/canvas/twentythreeXtwentythree, /obj/item/canvas/twentythreeXnineteen, /obj/item/canvas/nineteenXnineteen, -/obj/item/canvas/nineteenXtwentythree, /obj/effect/turf_decal/tile/neutral, /obj/effect/turf_decal/tile/neutral{ dir = 4 @@ -118413,7 +118412,6 @@ /obj/item/canvas/twentythreeXtwentythree, /obj/item/canvas/twentythreeXnineteen, /obj/item/canvas/nineteenXnineteen, -/obj/item/canvas/nineteenXtwentythree, /obj/effect/turf_decal/tile/neutral, /obj/effect/turf_decal/tile/neutral{ dir = 4 diff --git a/code/game/objects/structures/artstuff.dm b/code/game/objects/structures/artstuff.dm index ace302229..6eb47ac93 100644 --- a/code/game/objects/structures/artstuff.dm +++ b/code/game/objects/structures/artstuff.dm @@ -200,7 +200,7 @@ framed_offset_x = 8 framed_offset_y = 9 -/obj/item/canvas/nineteenXtwentythree +/obj/item/canvas/nineteenXtwentythre icon_state = "19x23" width = 19 height = 23 From 7785c9bef7847649f0eff42262017608e789daca Mon Sep 17 00:00:00 2001 From: LFP Date: Fri, 16 Sep 2022 22:43:21 -0500 Subject: [PATCH 4/4] Adds new canvas to the map using strongDMM and fixes item name. --- _maps/map_files/LayeniaStation/LayeniaStation.dmm | 13 +++++++------ code/game/objects/structures/artstuff.dm | 2 +- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/_maps/map_files/LayeniaStation/LayeniaStation.dmm b/_maps/map_files/LayeniaStation/LayeniaStation.dmm index 09f94b61b..5a06dca68 100644 --- a/_maps/map_files/LayeniaStation/LayeniaStation.dmm +++ b/_maps/map_files/LayeniaStation/LayeniaStation.dmm @@ -104507,18 +104507,19 @@ dir = 8 }, /obj/item/canvas/twentythreeXtwentythree, -/obj/item/canvas/twentythreeXnineteen, -/obj/item/canvas/nineteenXnineteen, /obj/effect/turf_decal/tile/neutral, +/obj/item/canvas/nineteenXnineteen, +/obj/item/canvas/twentythreeXnineteen, /obj/effect/turf_decal/tile/neutral{ dir = 4 }, /obj/item/canvas/nineteenXnineteen, -/obj/item/canvas, -/obj/item/canvas, /obj/machinery/light{ pixel_y = -1 }, +/obj/item/canvas, +/obj/item/canvas/nineteenXtwentythree, +/obj/item/canvas, /turf/open/floor/plasteel/dark, /area/artatrium) "pMc" = ( @@ -118411,13 +118412,13 @@ /obj/structure/table/wood, /obj/item/canvas/twentythreeXtwentythree, /obj/item/canvas/twentythreeXnineteen, -/obj/item/canvas/nineteenXnineteen, /obj/effect/turf_decal/tile/neutral, +/obj/item/canvas/nineteenXnineteen, /obj/effect/turf_decal/tile/neutral{ dir = 4 }, /obj/item/canvas/nineteenXnineteen, -/obj/item/canvas, +/obj/item/canvas/nineteenXtwentythree, /obj/item/canvas, /turf/open/floor/plasteel/dark, /area/artatrium) diff --git a/code/game/objects/structures/artstuff.dm b/code/game/objects/structures/artstuff.dm index 6eb47ac93..ace302229 100644 --- a/code/game/objects/structures/artstuff.dm +++ b/code/game/objects/structures/artstuff.dm @@ -200,7 +200,7 @@ framed_offset_x = 8 framed_offset_y = 9 -/obj/item/canvas/nineteenXtwentythre +/obj/item/canvas/nineteenXtwentythree icon_state = "19x23" width = 19 height = 23