Dev mouse acorgillation (#32040)

* Update dev_map.yml

* real mouse returned

diff --git a/Resources/Maps/Test/dev_map.yml b/Resources/Maps/Test/dev_map.yml
index ce735e7318f5518160c267eba63c28426e1fe4c7..75511b1760439c0aa6c02e5b6483cc0fde4a98bf 100644 (file)
--- 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 cb06b39998fe300f2ff75c9fed1562fc24a7d00a..52c2c326896723a640d30b0a8324da7c9a0214ae 100644 (file)
--- 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 6338a294e7715eb82ac3ea61fd8eeb6da6d25d63..ebc1b80541cf3e7737a679500c6b4bc5a59e35a2 100644 (file)
--- 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 3a540931649037e1e6b0bebf9cdfdb69a05baafe..0e36d32316f8026dd160e18310e93886b44bf8bd 100644 (file)
--- 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 (file)
index 0000000..2983063
Binary files /dev/null and b/Resources/Textures/Mobs/Pets/corgi.rsi/real_mouse.png differ

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 (file)
index 0000000..4b51443
Binary files /dev/null and b/Resources/Textures/Mobs/Pets/corgi.rsi/real_mouse_dead.png differ