Rats eyes glow in dark + reorganize rat textures (#26300)

* Split mice from rats and made rats eye glow

+ added red eyes to regal rats (Both king and buff) + normal rats
- removed mouse-3 sprites from mice and moved it into a dedicated rat rsi
+fixed admin smite wording (you turn players into mice, not rats)

* minor formatting fix

* removed version numbers float.

* Typo fix + removed unneeded layer name

diff --git a/Resources/Locale/en-US/administration/smites.ftl b/Resources/Locale/en-US/administration/smites.ftl
index fe8077a550c725e96483399c56dce0cf186dbdfc..ae4e6f72715fc52ccad0bfd76ceedb97964984be 100644 (file)
--- a/Resources/Locale/en-US/administration/smites.ftl
+++ b/Resources/Locale/en-US/administration/smites.ftl
@@ -44,7 +44,7 @@ admin-smite-reptilian-species-swap-description = It changes their species to Rep
 admin-smite-locker-stuff-description = Stuffs them in a (welded) locker.
 admin-smite-headstand-description = Vertically flips their sprite.
 admin-smite-plasma-internals-description = Replaces the contents of their internals with plasma.
-admin-smite-become-mouse-description = They become a rat. Ratatouille.
+admin-smite-become-mouse-description = They become a mouse. Squeak!
 admin-smite-maid-description = Forcibly converts them into a janitorial cat maid. This is actual torture for some players, use it wisely.
 admin-smite-zoom-in-description = Zooms in their view so that they can no longer see their surroundings.
 admin-smite-flip-eye-description = Flips their view, effectively reversing their controls and making the game annoying to play.

diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/regalrat.yml b/Resources/Prototypes/Entities/Mobs/NPCs/regalrat.yml
index a28755821272226f2f0bd9722b0bfdddef656600..afcb2bac471c4b91cd4f6864f6b7befd2280c743 100644 (file)
--- a/Resources/Prototypes/Entities/Mobs/NPCs/regalrat.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/regalrat.yml
@@ -26,6 +26,9 @@
     layers:
     - map: ["enum.DamageStateVisualLayers.Base"]
       state: regalrat
+    - map: [ "enum.DamageStateVisualLayers.BaseUnshaded" ]
+      state: eyes
+      shader: unshaded
   - type: Physics
     bodyType: KinematicController
   - type: Fixtures
@@ -77,6 +80,7 @@
     states:
       Alive:
         Base: regalrat
+        BaseUnshaded: eyes
       Critical:
         Base: critical
       Dead:
@@ -126,6 +130,9 @@
     layers:
     - map: ["enum.DamageStateVisualLayers.Base"]
       state: regalrat
+    - map: [ "enum.DamageStateVisualLayers.BaseUnshaded"]
+      state: eyes
+      shader: unshaded
   - type: MobState
   - type: MobThresholds
     thresholds:
@@ -180,17 +187,21 @@
     - SimpleHostile
   - type: Sprite
     drawdepth: SmallMobs
-    sprite: Mobs/Animals/mouse.rsi
+    sprite: Mobs/Animals/rat.rsi
     layers:
     - map: ["enum.DamageStateVisualLayers.Base", "movement"]
-      state: mouse-3
+      state: rat
+    - map: [ "enum.DamageStateVisualLayers.BaseUnshaded"]
+      state: eyes
+      shader: unshaded
+
   - type: SpriteMovement
     movementLayers:
       movement:
-        state: mouse-moving-3
+        state: rat-moving
     noMovementLayers:
       movement:
-        state: mouse-3
+        state: rat
   - type: Physics
     bodyType: KinematicController
   - type: Fixtures
@@ -243,11 +254,12 @@
   - type: DamageStateVisuals
     states:
       Alive:
-        Base: mouse-3
+        Base: rat
+        BaseUnshaded: eyes
       Critical:
-        Base: dead-3
+        Base: dead
       Dead:
-        Base: splat-3
+        Base: splat
   - type: Butcherable
     spawned:
     - id: FoodMeatRat

diff --git a/Resources/Textures/Mobs/Animals/buffrat.rsi/eyes.png b/Resources/Textures/Mobs/Animals/buffrat.rsi/eyes.png
new file mode 100644 (file)
index 0000000..27e2720
Binary files /dev/null and b/Resources/Textures/Mobs/Animals/buffrat.rsi/eyes.png differ

diff --git a/Resources/Textures/Mobs/Animals/buffrat.rsi/meta.json b/Resources/Textures/Mobs/Animals/buffrat.rsi/meta.json
index 41c6250280752479e6740e7cdf79bf85e3d8cf97..4aac226eb45f0b08bcc402fcad37188657baaaac 100644 (file)
--- a/Resources/Textures/Mobs/Animals/buffrat.rsi/meta.json
+++ b/Resources/Textures/Mobs/Animals/buffrat.rsi/meta.json
@@ -1,21 +1,25 @@
 {
-  "version": 1,
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "license": "CC-BY-NC-SA-4.0",
-  "copyright": "Created by RamZ",
-  "states": [
-    {
-      "name": "dead"
+    "version": 1,
+    "size": {
+        "x": 32,
+        "y": 32
     },
-       {
-      "name": "icon"
-    },
-    {
-      "name": "regalrat",
-      "directions": 4
-    }
-  ]
+    "license": "CC-BY-NC-SA-4.0",
+    "copyright": "Created by RamZ + eyes added by jamessimo",
+    "states": [
+        {
+            "name": "dead"
+        },
+        {
+            "name": "icon"
+        },
+        {
+            "name": "regalrat",
+            "directions": 4
+        },
+        {
+            "name": "eyes",
+            "directions": 4
+        }
+    ]
 }

diff --git a/Resources/Textures/Mobs/Animals/mouse.rsi/meta.json b/Resources/Textures/Mobs/Animals/mouse.rsi/meta.json
index fb49b05c138ca05ae6258a2695ccbb3b06e69472..8fcbe50997a3b87976ff0784029b85eda25b8846 100644 (file)
--- a/Resources/Textures/Mobs/Animals/mouse.rsi/meta.json
+++ b/Resources/Textures/Mobs/Animals/mouse.rsi/meta.json
@@ -16,9 +16,6 @@
     {
       "name": "icon-2"
     },
-    {
-      "name": "icon-3"
-    },
     {
       "name": "mouse-0",
       "directions": 4
@@ -109,36 +106,6 @@
         ]
       ]
     },
-    {
-      "name": "mouse-3",
-      "directions": 4
-    },
-    {
-      "name": "mouse-moving-3",
-      "directions": 4,
-      "delays": [
-        [
-          0.2,
-          0.2,
-          0.2
-        ],
-        [
-          0.2,
-          0.2,
-          0.2
-        ],
-        [
-          0.2,
-          0.2,
-          0.2
-        ],
-        [
-          0.2,
-          0.2,
-          0.2
-        ]
-      ]
-    },
     {
       "name": "dead-0"
     },
@@ -148,9 +115,6 @@
     {
       "name": "dead-2"
     },
-    {
-      "name": "dead-3"
-    },
     {
       "name": "splat-0"
     },
@@ -160,9 +124,6 @@
     {
       "name": "splat-2"
     },
-    {
-      "name": "splat-3"
-    },
     {
       "name": "0-equipped-HELMET",
       "directions": 4

diff --git a/Resources/Textures/Mobs/Animals/mouse.rsi/mouse-moving-3.png b/Resources/Textures/Mobs/Animals/mouse.rsi/mouse-moving-3.png
deleted file mode 100644 (file)
index 4b0694a..0000000
Binary files a/Resources/Textures/Mobs/Animals/mouse.rsi/mouse-moving-3.png and /dev/null differ

diff --git a/Resources/Textures/Mobs/Animals/mouse.rsi/dead-3.png b/Resources/Textures/Mobs/Animals/rat.rsi/dead.png
similarity index 100%
rename from Resources/Textures/Mobs/Animals/mouse.rsi/dead-3.png
rename to Resources/Textures/Mobs/Animals/rat.rsi/dead.png

diff --git a/Resources/Textures/Mobs/Animals/rat.rsi/eyes-moving.png b/Resources/Textures/Mobs/Animals/rat.rsi/eyes-moving.png
new file mode 100644 (file)
index 0000000..34020da
Binary files /dev/null and b/Resources/Textures/Mobs/Animals/rat.rsi/eyes-moving.png differ

diff --git a/Resources/Textures/Mobs/Animals/rat.rsi/eyes.png b/Resources/Textures/Mobs/Animals/rat.rsi/eyes.png
new file mode 100644 (file)
index 0000000..716195b
Binary files /dev/null and b/Resources/Textures/Mobs/Animals/rat.rsi/eyes.png differ

diff --git a/Resources/Textures/Mobs/Animals/mouse.rsi/icon-3.png b/Resources/Textures/Mobs/Animals/rat.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Mobs/Animals/mouse.rsi/icon-3.png
rename to Resources/Textures/Mobs/Animals/rat.rsi/icon.png

diff --git a/Resources/Textures/Mobs/Animals/rat.rsi/meta.json b/Resources/Textures/Mobs/Animals/rat.rsi/meta.json
new file mode 100644 (file)
index 0000000..be50d5e
--- /dev/null
+++ b/Resources/Textures/Mobs/Animals/rat.rsi/meta.json
@@ -0,0 +1,80 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from https://github.com/tgstation/tgstation/commit/e15c63d100db65eaaa5231133b8a2662ff439131#diff-8dd94e19fdb2ff341b57e31bce101298 eyes added by jamessimo",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "rat",
+            "directions": 4
+        },
+        {
+            "name": "eyes",
+            "directions": 4
+        },
+        {
+            "name": "rat-moving",
+            "directions": 4,
+            "delays": [
+                [
+                    0.2,
+                    0.2,
+                    0.2
+                ],
+                [
+                    0.2,
+                    0.2,
+                    0.2
+                ],
+                [
+                    0.2,
+                    0.2,
+                    0.2
+                ],
+                [
+                    0.2,
+                    0.2,
+                    0.2
+                ]
+            ]
+        },
+        {
+            "name": "eyes-moving",
+            "directions": 4,
+            "delays": [
+                [
+                    0.2,
+                    0.2,
+                    0.2
+                ],
+                [
+                    0.2,
+                    0.2,
+                    0.2
+                ],
+                [
+                    0.2,
+                    0.2,
+                    0.2
+                ],
+                [
+                    0.2,
+                    0.2,
+                    0.2
+                ]
+            ]
+        },
+        {
+            "name": "dead"
+        },
+        {
+            "name": "splat"
+        }
+    ]
+}

diff --git a/Resources/Textures/Mobs/Animals/rat.rsi/rat-moving.png b/Resources/Textures/Mobs/Animals/rat.rsi/rat-moving.png
new file mode 100644 (file)
index 0000000..f6c1d6d
Binary files /dev/null and b/Resources/Textures/Mobs/Animals/rat.rsi/rat-moving.png differ

diff --git a/Resources/Textures/Mobs/Animals/mouse.rsi/mouse-3.png b/Resources/Textures/Mobs/Animals/rat.rsi/rat.png
similarity index 100%
rename from Resources/Textures/Mobs/Animals/mouse.rsi/mouse-3.png
rename to Resources/Textures/Mobs/Animals/rat.rsi/rat.png

diff --git a/Resources/Textures/Mobs/Animals/mouse.rsi/splat-3.png b/Resources/Textures/Mobs/Animals/rat.rsi/splat.png
similarity index 100%
rename from Resources/Textures/Mobs/Animals/mouse.rsi/splat-3.png
rename to Resources/Textures/Mobs/Animals/rat.rsi/splat.png

diff --git a/Resources/Textures/Mobs/Animals/regalrat.rsi/eyes.png b/Resources/Textures/Mobs/Animals/regalrat.rsi/eyes.png
new file mode 100644 (file)
index 0000000..8b841a0
Binary files /dev/null and b/Resources/Textures/Mobs/Animals/regalrat.rsi/eyes.png differ

diff --git a/Resources/Textures/Mobs/Animals/regalrat.rsi/meta.json b/Resources/Textures/Mobs/Animals/regalrat.rsi/meta.json
index 5c804713134a45a2f84b8b127d22f5be70f77732..f3ed84b963c6863ac1abe432c65554f8ff320319 100644 (file)
--- a/Resources/Textures/Mobs/Animals/regalrat.rsi/meta.json
+++ b/Resources/Textures/Mobs/Animals/regalrat.rsi/meta.json
@@ -1,24 +1,28 @@
 {
-  "version": 1,
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from https://github.com/tgstation/tgstation/commit/53d1f1477d22a11a99c6c6924977cd431075761b Changed by Alekshhh",
-  "states": [
-    {
-      "name": "critical"
+    "version": 1,
+    "size": {
+        "x": 32,
+        "y": 32
     },
-    {
-      "name": "dead"
-    },
-       {
-      "name": "icon"
-    },
-    {
-      "name": "regalrat",
-      "directions": 4
-    }
-  ]
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from https://github.com/tgstation/tgstation/commit/53d1f1477d22a11a99c6c6924977cd431075761b Changed by Alekshhh + eyes added by jamessimo",
+    "states": [
+        {
+            "name": "critical"
+        },
+        {
+            "name": "dead"
+        },
+        {
+            "name": "icon"
+        },
+        {
+            "name": "regalrat",
+            "directions": 4
+        },
+        {
+            "name": "eyes",
+            "directions": 4
+        }
+    ]
 }