From 7b9d5b400f0014e0ee40dc63ea111ccf7892e83f Mon Sep 17 00:00:00 2001 From: K-Dynamic <20566341+K-Dynamic@users.noreply.github.com> Date: Sun, 1 Jun 2025 13:36:10 +1200 Subject: [PATCH] Mirror resprite (#37899) * mirror resprite, add snapgridcenter * antique mirror * swap default mirror; antique-mirror renamed back to mirror, new mirror renamed rectangle-mirror, changed RSI underscore to regular dash for consistency --- .../Entities/Structures/Wallmounts/mirror.yml | 12 +++++++++ .../Wallmounts/mirror.rsi/meta.json | 24 +++++++++++++++++- .../Wallmounts/mirror.rsi/mirror-broke.png | Bin 0 -> 551 bytes .../Wallmounts/mirror.rsi/mirror.png | Bin 279 -> 518 bytes .../Wallmounts/mirror.rsi/mirror_broke.png | Bin 424 -> 0 bytes .../mirror.rsi/rectangle-mirror-broke.png | Bin 0 -> 514 bytes .../mirror.rsi/rectangle-mirror.png | Bin 0 -> 471 bytes 7 files changed, 35 insertions(+), 1 deletion(-) create mode 100644 Resources/Textures/Structures/Wallmounts/mirror.rsi/mirror-broke.png delete mode 100644 Resources/Textures/Structures/Wallmounts/mirror.rsi/mirror_broke.png create mode 100644 Resources/Textures/Structures/Wallmounts/mirror.rsi/rectangle-mirror-broke.png create mode 100644 Resources/Textures/Structures/Wallmounts/mirror.rsi/rectangle-mirror.png diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/mirror.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/mirror.yml index 27b8390add..4ef0b7bd64 100644 --- a/Resources/Prototypes/Entities/Structures/Wallmounts/mirror.yml +++ b/Resources/Prototypes/Entities/Structures/Wallmounts/mirror.yml @@ -2,6 +2,8 @@ id: Mirror name: mirror description: 'Mirror mirror on the wall , who''s the most robust of them all?' + placement: + mode: SnapgridCenter components: - type: WallMount - type: Sprite @@ -24,3 +26,13 @@ interfaces: enum.MagicMirrorUiKey.Key: type: MagicMirrorBoundUserInterface + +- type: entity + parent: Mirror + id: MirrorModern + name: mirror + suffix: rectangle + components: + - type: Sprite + sprite: Structures/Wallmounts/mirror.rsi + state: rectangle-mirror diff --git a/Resources/Textures/Structures/Wallmounts/mirror.rsi/meta.json b/Resources/Textures/Structures/Wallmounts/mirror.rsi/meta.json index 73d8063a69..612debd794 100644 --- a/Resources/Textures/Structures/Wallmounts/mirror.rsi/meta.json +++ b/Resources/Textures/Structures/Wallmounts/mirror.rsi/meta.json @@ -1 +1,23 @@ -{"version":1,"size":{"x":32,"y":32},"copyright":"Taken from tgstation","license":"CC-BY-SA-3.0","states":[{"name":"mirror"},{"name":"mirror_broke"}]} \ No newline at end of file +{ + "version": 1, + "copyright": "Taken from /tg/station 13 at https://github.com/tgstation/tgstation/commit/a2c5a0f15bad5c46a828771bbba6ea5752a9d191. mirror and mirror-broke repositioned by K-Dynamic (github), modern-mirror and modern-mirror-broke by K-Dynamic.", + "license": "CC-BY-SA-3.0", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "mirror" + }, + { + "name": "rectangle-mirror" + }, + { + "name": "mirror-broke" + }, + { + "name": "rectangle-mirror-broke" + } + ] +} diff --git a/Resources/Textures/Structures/Wallmounts/mirror.rsi/mirror-broke.png b/Resources/Textures/Structures/Wallmounts/mirror.rsi/mirror-broke.png new file mode 100644 index 0000000000000000000000000000000000000000..347500ef24228944cf7b736fa65439a18a581347 GIT binary patch literal 551 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCim11AIbU)6&u=PMrAY(WC$W{{zKZpFQ#eQmiFGe!)PI{|vvk@dX0~I14-? ziy0XB4uLSEsD@VqP*9@8HKHUqKdq!Zu_%=xATcwqM9$cc0dZzK3s^i0$OeH= zWsD3jfF6X=XqGYnr6#a5umDvW7#SNdE`XQ{vXONG#H1-eHV7~Q&1C|s46?KUvY@&Q z4GciCXY#~qyniT^vI!{NGM;bTbQ=bcO-OOz8od3rI-tU*btoQ-)fv2mV J%Q~loCIF=!o#_Ao literal 0 HcmV?d00001 diff --git a/Resources/Textures/Structures/Wallmounts/mirror.rsi/mirror.png b/Resources/Textures/Structures/Wallmounts/mirror.rsi/mirror.png index 6411d2f12bdc2dd39380ec99d0764ecf62161ffe..66e85e08de92ea80308ad08712d5f06747b10016 100644 GIT binary patch literal 518 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCim11AIbU)6&u=PMrAY(WC$W{{zKZpFQ#eQmiFGe!)PI{|vvk@dX0~I14-? ziy0XB4uLSEsD@VqP*9@8HKHUqKdq!Zu_%=xATcwqM9$cc0dZzK3s^i0$OeH= zWsD3jfF6X=XqGYnr6#a5umDvW7#SNdE`XQ{vXONG#H1-eHV7~Q&1C|s46?KUvY@&Q z4GciCXY#~qynm!9N ZWsGU}`78xy_sjt~(9_k=Wt~$(69Ajfjh+221<+521Eq&Jk#RN zIfzI(1L2m_Bxi3%`Uv7FMx>3qtU3&7lZnrE_8Uz)&Kwi M07*qoM6N<$f`~0Ox&b#KZnz1mp#f9~IVekz#>s%~j1SQ}A`pLvMd0^7&mi!_~@Nzt;IQq_a5gQDW#frMUQ2Kt_-vhIp>Hma=Ba( zk-Djl-&*sq0F55jG^dm>#^Ajt#)yb)jz&b-SII*HU_JX7BhEQO2=ypL1n+(I!7YzG zML;V=H;*y0EDI^6DsJzKrweE!RS_YCI@ZqVp}Pv;+h`hTN{J8xr_%{*?a;=`a0XO_ z8qIr;wH6Vn;zk(CfR>qNKtyWPtuIDIbluz9eD*)qlGJZ)U%0n9{m5^3zxD?mAL$3( z9@t;K#+Xed!0LX@%AcUowh=4(ZL}K>neeOE-+T|i>WR_!z{_7m2L}fSFXt1kIVpU@ SGj8Mn0000XTq8!K*4Mt|LI1`X<$jHPX0HmXUIJ2DvES?2qgTT!) zMurza55j0POBsMt6WAG8fGQ1)j13qUKuiVM$hrVx(i9*Y1ek#4GJ#bFSy}*DP+f)w z1|Zp|wVAC+fm8PZnXR5Kjv*HQZztU5JD|Yfyzs~W`+LOlyKg@_9H)9rs+!^GDK)-; z#|)-y3D34~sJt)wPVnH}!v`-L?D}N)q=`#N`+YAU7J{sFZNXV#;|Sizn=XLn&LaF V_&E3Py^#WPoTsaw%Q~loCIHZyk0t;B literal 0 HcmV?d00001 diff --git a/Resources/Textures/Structures/Wallmounts/mirror.rsi/rectangle-mirror.png b/Resources/Textures/Structures/Wallmounts/mirror.rsi/rectangle-mirror.png new file mode 100644 index 0000000000000000000000000000000000000000..8985411a8b90e7aa3d8bd11c7f95c4779807c53e GIT binary patch literal 471 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCim11AIbU)6&u=PMrAv|Nlpi9s$MnObuQEq*zOW{DOgk{~3O7;|m4~a29w( z7BevL9ROj*tZSW|KtYKT*NBqf{Irtt#G+J&fW*wa5nAmtPE0&tPG4mmKP99L)jpgYcMi{#hHL?Lq;YB0U#X(#F_0ZVDT&<8wB>3 zF*3XWdJsmVS;_#En!wJ$0#s>WWNg5=0Aec0M%D!olcoUKAixAPmkF#g$kGDHg6c9f zFaXK=WGwnAdyeZVkQwFa;uvD#|Mr44AA=$XOMt_>`n1J0syRB_O1ab%<5WMW@_Wcl zuwXbK(y`n0qQn-tUjA#XXAyIIhNGCR$08;HfkW)sta@5I>b|D` aV|vEvaFMUd-lO>($VN|BKbLh*2~7aT32$8h literal 0 HcmV?d00001 -- 2.51.2