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

diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/mirror.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/mirror.yml
index 27b8390add29bce63433fed146bbae4110a8f52f..4ef0b7bd6431c743c9e077701bc362228c2ec9f6 100644 (file)
--- 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 73d8063a693375651863f1cc2b00d68f7896a2df..612debd794e4279afc66266930a63035a90cf752 100644 (file)
--- 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 (file)
index 0000000..347500e
Binary files /dev/null and b/Resources/Textures/Structures/Wallmounts/mirror.rsi/mirror-broke.png differ

diff --git a/Resources/Textures/Structures/Wallmounts/mirror.rsi/mirror.png b/Resources/Textures/Structures/Wallmounts/mirror.rsi/mirror.png
index 6411d2f12bdc2dd39380ec99d0764ecf62161ffe..66e85e08de92ea80308ad08712d5f06747b10016 100644 (file)
Binary files a/Resources/Textures/Structures/Wallmounts/mirror.rsi/mirror.png and b/Resources/Textures/Structures/Wallmounts/mirror.rsi/mirror.png differ

diff --git a/Resources/Textures/Structures/Wallmounts/mirror.rsi/mirror_broke.png b/Resources/Textures/Structures/Wallmounts/mirror.rsi/mirror_broke.png
deleted file mode 100644 (file)
index 53a7cf6..0000000
Binary files a/Resources/Textures/Structures/Wallmounts/mirror.rsi/mirror_broke.png and /dev/null differ

diff --git a/Resources/Textures/Structures/Wallmounts/mirror.rsi/rectangle-mirror-broke.png b/Resources/Textures/Structures/Wallmounts/mirror.rsi/rectangle-mirror-broke.png
new file mode 100644 (file)
index 0000000..9f953f8
Binary files /dev/null and b/Resources/Textures/Structures/Wallmounts/mirror.rsi/rectangle-mirror-broke.png differ

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 (file)
index 0000000..8985411
Binary files /dev/null and b/Resources/Textures/Structures/Wallmounts/mirror.rsi/rectangle-mirror.png differ