From 00650f16ec15c210a51cbc8ca32d7fcaeea678fc Mon Sep 17 00:00:00 2001
From: Ed <96445749+TheShuEd@users.noreply.github.com>
Date: Sat, 14 Sep 2024 19:21:33 +0300
Subject: [PATCH] Dev mouse acorgillation (#32040)

* Update dev_map.yml

* real mouse returned
---
 Resources/Maps/Test/dev_map.yml               |   2 +-
 .../Entities/Markers/Spawners/mobs.yml        |  14 +
 .../Prototypes/Entities/Mobs/NPCs/pets.yml    |  23 ++
 .../Textures/Mobs/Pets/corgi.rsi/meta.json    | 292 ++----------------
 .../Mobs/Pets/corgi.rsi/real_mouse.png        | Bin 0 -> 2084 bytes
 .../Mobs/Pets/corgi.rsi/real_mouse_dead.png   | Bin 0 -> 733 bytes
 6 files changed, 71 insertions(+), 260 deletions(-)
 create mode 100644 Resources/Textures/Mobs/Pets/corgi.rsi/real_mouse.png
 create mode 100644 Resources/Textures/Mobs/Pets/corgi.rsi/real_mouse_dead.png

diff --git a/Resources/Maps/Test/dev_map.yml b/Resources/Maps/Test/dev_map.yml
index ce735e7318..75511b1760 100644
--- a/Resources/Maps/Test/dev_map.yml
+++ b/Resources/Maps/Test/dev_map.yml
@@ -5070,7 +5070,7 @@ entities:
     - type: Transform
       pos: 3.5,7.5
       parent: 179
-- proto: SpawnMobMouse
+- proto: SpawnMobCorgiMouse
   entities:
   - uid: 1050
     components:
diff --git a/Resources/Prototypes/Entities/Markers/Spawners/mobs.yml b/Resources/Prototypes/Entities/Markers/Spawners/mobs.yml
index cb06b39998..52c2c32689 100644
--- a/Resources/Prototypes/Entities/Markers/Spawners/mobs.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/mobs.yml
@@ -48,6 +48,20 @@
       - MobCorgiLisa
       - MobCorgiIanPup
 
+- type: entity
+  name: Dev Mouse Spawner
+  id: SpawnMobCorgiMouse
+  suffix: Admeme
+  parent: MarkerBase
+  components:
+  - type: Sprite
+    layers:
+      - state: green
+      - state: ai
+  - type: ConditionalSpawner
+    prototypes:
+      - MobCorgiMouse
+
 - type: entity
   name: Possum Morty Spawner
   id: SpawnMobPossumMorty
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml b/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml
index 6338a294e7..ebc1b80541 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml
@@ -85,6 +85,29 @@
       proper: true
       gender: female
 
+- type: entity
+  name: real mouse
+  parent: MobCorgiIan
+  id: MobCorgiMouse
+  description: It's 100% a real hungry mouse.
+  components:
+  - type: Sprite
+    layers:
+    - map: ["enum.DamageStateVisualLayers.Base"]
+      state: real_mouse
+  - type: DamageStateVisuals
+    states:
+      Alive:
+        Base: real_mouse
+      Critical:
+        Base: real_mouse_dead
+      Dead:
+        Base: real_mouse_dead
+  - type: Grammar
+    attributes:
+      proper: true
+      gender: female
+
 - type: entity
   name: Puppy Ian
   parent: MobCorgiPuppy
diff --git a/Resources/Textures/Mobs/Pets/corgi.rsi/meta.json b/Resources/Textures/Mobs/Pets/corgi.rsi/meta.json
index 3a54093164..0e36d32316 100644
--- a/Resources/Textures/Mobs/Pets/corgi.rsi/meta.json
+++ b/Resources/Textures/Mobs/Pets/corgi.rsi/meta.json
@@ -5,207 +5,60 @@
     "y": 32
   },
   "license": "CC-BY-SA-3.0",
-  "copyright": "https://github.com/tgstation/tgstation/commit/53d1f1477d22a11a99c6c6924977cd431075761b , cerberus by Alekshhh",
+  "copyright": "https://github.com/tgstation/tgstation/commit/53d1f1477d22a11a99c6c6924977cd431075761b , cerberus by Alekshhh, real mouse by TheShuEd",
   "states": [
     {
       "name": "corgi",
-      "directions": 4,
-      "delays": [
-        [
-          1
-        ],
-        [
-          1
-        ],
-        [
-          1
-        ],
-        [
-          1
-        ]
-      ]
+      "directions": 4
     },
     {
       "name": "corgi_rest",
-      "directions": 4,
-      "delays": [
-        [
-          1
-        ],
-        [
-          1
-        ],
-        [
-          1
-        ],
-        [
-          1
-        ]
-      ]
+      "directions": 4
     },
     {
-      "name": "corgi_dead",
-      "delays": [
-        [
-          1
-        ]
-      ]
+      "name": "corgi_dead"
     },
     {
       "name": "ian",
-      "directions": 4,
-      "delays": [
-        [
-          1
-        ],
-        [
-          1
-        ],
-        [
-          1
-        ],
-        [
-          1
-        ]
-      ]
+      "directions": 4
     },
     {
-      "name": "ian_dead",
-      "delays": [
-        [
-          1
-        ]
-      ]
+      "name": "ian_dead"
     },
     {
-      "name": "corgi_deadcollar",
-      "delays": [
-        [
-          1
-        ]
-      ]
+      "name": "corgi_deadcollar"
     },
     {
-      "name": "corgi_deadtag",
-      "delays": [
-        [
-          1
-        ]
-      ]
+      "name": "corgi_deadtag"
     },
     {
       "name": "ian_shaved",
-      "directions": 4,
-      "delays": [
-        [
-          1
-        ],
-        [
-          1
-        ],
-        [
-          1
-        ],
-        [
-          1
-        ]
-      ]
+      "directions": 4
     },
     {
-      "name": "ian_shaved_dead",
-      "delays": [
-        [
-          1
-        ]
-      ]
+      "name": "ian_shaved_dead"
     },
     {
       "name": "corgicollar",
-      "directions": 4,
-      "delays": [
-        [
-          1
-        ],
-        [
-          1
-        ],
-        [
-          1
-        ],
-        [
-          1
-        ]
-      ]
+      "directions": 4
     },
     {
       "name": "corgitag",
-      "directions": 4,
-      "delays": [
-        [
-          1
-        ],
-        [
-          1
-        ],
-        [
-          1
-        ],
-        [
-          1
-        ]
-      ]
+      "directions": 4
     },
     {
       "name": "lisa",
-      "directions": 4,
-      "delays": [
-        [
-          1
-        ],
-        [
-          1
-        ],
-        [
-          1
-        ],
-        [
-          1
-        ]
-      ]
+      "directions": 4
     },
     {
-      "name": "lisa_dead",
-      "delays": [
-        [
-          1
-        ]
-      ]
+      "name": "lisa_dead"
     },
     {
       "name": "lisa_shaved",
-      "directions": 4,
-      "delays": [
-        [
-          1
-        ],
-        [
-          1
-        ],
-        [
-          1
-        ],
-        [
-          1
-        ]
-      ]
+      "directions": 4
     },
     {
-      "name": "lisa_shaved_dead",
-      "delays": [
-        [
-          1
-        ]
-      ]
+      "name": "lisa_shaved_dead"
     },
     {
       "name": "narsian",
@@ -238,12 +91,7 @@
       ]
     },
     {
-      "name": "old_ian_dead",
-      "delays": [
-        [
-          1
-        ]
-      ]
+      "name": "old_ian_dead"
     },
     {
       "name": "old_ian_shaved",
@@ -268,116 +116,42 @@
       ]
     },
     {
-      "name": "old_ian_shaved_dead",
-      "delays": [
-        [
-          1
-        ]
-      ]
+      "name": "old_ian_shaved_dead"
     },
     {
       "name": "puppy",
-      "directions": 4,
-      "delays": [
-        [
-          1
-        ],
-        [
-          1
-        ],
-        [
-          1
-        ],
-        [
-          1
-        ]
-      ]
+      "directions": 4
     },
     {
-      "name": "puppy_dead",
-      "delays": [
-        [
-          1
-        ]
-      ]
+      "name": "puppy_dead"
     },
     {
-      "name": "puppy_deadcollar",
-      "delays": [
-        [
-          1
-        ]
-      ]
+      "name": "puppy_deadcollar"
     },
     {
-      "name": "puppy_deadtag",
-      "delays": [
-        [
-          1
-        ]
-      ]
+      "name": "puppy_deadtag"
     },
     {
       "name": "puppy_shaved",
-      "directions": 4,
-      "delays": [
-        [
-          1
-        ],
-        [
-          1
-        ],
-        [
-          1
-        ],
-        [
-          1
-        ]
-      ]
+      "directions": 4
     },
     {
-      "name": "puppy_shaved_dead",
-      "delays": [
-        [
-          1
-        ]
-      ]
+      "name": "puppy_shaved_dead"
     },
     {
       "name": "puppycollar",
-      "directions": 4,
-      "delays": [
-        [
-          1
-        ],
-        [
-          1
-        ],
-        [
-          1
-        ],
-        [
-          1
-        ]
-      ]
+      "directions": 4
     },
     {
       "name": "puppytag",
-      "directions": 4,
-      "delays": [
-        [
-          1
-        ],
-        [
-          1
-        ],
-        [
-          1
-        ],
-        [
-          1
-        ]
-      ]
+      "directions": 4
+    },
+    {
+      "name": "real_mouse",
+      "directions": 4
+    },
+    {
+      "name": "real_mouse_dead"
     }
   ]
 }
diff --git a/Resources/Textures/Mobs/Pets/corgi.rsi/real_mouse.png b/Resources/Textures/Mobs/Pets/corgi.rsi/real_mouse.png
new file mode 100644
index 0000000000000000000000000000000000000000..2983063c4fd885579acfe4f39ea30759330e03eb
GIT binary patch
literal 2084
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
O0000<MNUMnLSTZuyb8zw

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Mobs/Pets/corgi.rsi/real_mouse_dead.png b/Resources/Textures/Mobs/Pets/corgi.rsi/real_mouse_dead.png
new file mode 100644
index 0000000000000000000000000000000000000000..4b51443c73bc04878064a519c034004323616d9a
GIT binary patch
literal 733
zcmV<30wVp1P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px%mq|oHR9J=Wl|M`qVHn1LHL{WGT?b1r?UiUwjT7-7VE}_@TrdtUjR`3Wi=@OD
zCtO{0;!*|(L}E-j;2?I;1T?Z>Km`Yh$t~KFG}K7jYuFghLGHLKz2h27T>5PH-Sge^
zywCT3??Dqy{AUFGkW@8gL?dkg<TkfRCP!TN)x!li?$>GGwHs)f)^P4IKctS2_W@9H
z6LhRRAQNvf{BQwJF4U0#fSz3^6qd+k^NtS>q<5{DMNzQ07g(n#x08wI4Liq<Lwg_-
zZ!vl&x6x;MthJxoCNU*Ku~4F-?@%sRtanklolsbEeB(>(k!wGA9)YT+jNZv@SRA$1
ziiHwFuoZw%SV9Q45|!Jn%B#fz&YV5(s^O~#^z6Fh*)9?aOO_Egoc#WTXrv8QO&#b5
zR|Be=G7^bFNA+F^g(XB$pjar?EWj;=Llf|-z8WzlQgb~hce?KJbp-XG+Mp@Eu<)*C
z6CQdEgL3DA6zai`)%WDGd6Ma8HE*1!0Zr3T`p3a`1^uA<db-U3%fRc$cZ^$OFD;U)
zri||HE{o)rLajMq!b|jk0Xs}_MN#$_`^O0`jyg;f3ng;dyl){-11*whi6;_+f8W>y
z%|<elXq32R0O0hgbA~!T!SeDqK7U%`;-y|-?-*A0H$1%p6@8~6;tm6XzQxqr1r$X=
zpXs4kc*D?ig%4A=9nn8r>Edo+qY>J`-W(85L;)DSd7atW=X_n=U}(C+{Fuzu;a83g
z_oTUoRS$a!lz-(|`&|kEtR+VP$i#OHfcY`mA{Ps#njQbo2FwKP7)b91GHe*;UoNIZ
z8rFDrc#h(M^lqSBt{?<kJ?Ht688FdtxsRo}7Y(o8mjO`}j!e9XCIJ2bd!-g{$XOE+
P00000NkvXXu0mjf+4V_)

literal 0
HcmV?d00001