diff --git a/Resources/Prototypes/SimpleStation14/Entities/Mobs/NPCs/animals.yml b/Resources/Prototypes/SimpleStation14/Entities/Mobs/NPCs/animals.yml
index 7852cefffd..363c8e7278 100644
--- a/Resources/Prototypes/SimpleStation14/Entities/Mobs/NPCs/animals.yml
+++ b/Resources/Prototypes/SimpleStation14/Entities/Mobs/NPCs/animals.yml
@@ -76,7 +76,7 @@
       Alive:
         Base: shiro
       Critical:
-        Base: shiro
+        Base: shiro_dead
       Dead:
         Base: shiro_dead
   - type: Butcherable
diff --git a/Resources/Prototypes/SimpleStation14/Entities/Mobs/NPCs/pets.yml b/Resources/Prototypes/SimpleStation14/Entities/Mobs/NPCs/pets.yml
index b7ce64067c..f8a5eb476b 100644
--- a/Resources/Prototypes/SimpleStation14/Entities/Mobs/NPCs/pets.yml
+++ b/Resources/Prototypes/SimpleStation14/Entities/Mobs/NPCs/pets.yml
@@ -117,8 +117,8 @@
     reagent:
       solutionName: chemicals
       reagent: ShirosDelight
-      unitsPerUpdate: 3.0
-      accumulatorTime: 4.0
+      unitsPerUpdate: 1.0
+      accumulatorTime: 5.0
   - type: SolutionContainerManager
     solutions:
       melee:
@@ -128,11 +128,12 @@
   - type: MeleeChemicalInjector
     solution: melee
     transferAmount: 2.0
-  - type: AutoRegenReagent
+  - type: SolutionRegeneration
     solution: melee
-    unitsPerSecond: 0.5
-    reagents:
-      - Desoxyephedrine
+    generated:
+      reagents:
+        - ReagentId: Desoxyephedrine
+          Quantity: 0.5
   - type: MeleeWeapon
     animation: WeaponArcClaw
     attackRate: 2
@@ -168,6 +169,34 @@
   - type: Loadout
     prototypes: [ ShirosVest ]
 
+- type: entity
+  name: Problems
+  id: MobCatProblems
+  parent: MobCat
+  description: Defender of the medbay... from mice anyway.
+  components:
+  - type: Sprite
+    drawdepth: Mobs
+    sprite: SimpleStation14/Mobs/Pets/problems.rsi
+    layers:
+    - map: ["enum.DamageStateVisualLayers.Base"]
+      state: cat
+  - type: Appearance
+  - type: DamageStateVisuals
+    states:
+      Alive:
+        Base: cat
+      Critical:
+        Base: cat_dead
+      Dead:
+        Base: cat_dead
+  - type: Tag
+    tags:
+    - CannotSuicide
+  - type: Grammar
+    attributes:
+      gender: neuter
+
 - type: entity
   name: Jack Parker
   id: MobMonkeyJackParker
@@ -263,7 +292,7 @@
     prototypes: [ JacksThings ]
 
 - type: entity
-  name: gorilla
+  name: Hughes
   parent: MobMonkey
   id: MobGorillaHughes
   description: Don't sign up for human testin bud.
@@ -339,7 +368,7 @@
     barks:
       - Grunt.
   - type: Loadout
-    prototypes: []
+    prototypes: [ HughesThings ]
 
 
 - type: startingGear
@@ -349,6 +378,10 @@
 
 - type: startingGear
   id: JacksThings
-  equipment:
-    inhand:
-      right hand: BriefcaseBrownFilled
+  inhand:
+    right hand: BriefcaseBrownFilled
+
+- type: startingGear
+  id: HughesThings
+  inhand:
+    right hand: FoodBanana
diff --git a/Resources/Prototypes/SimpleStation14/InventoryTemplates/shiro_inventory_template.yml b/Resources/Prototypes/SimpleStation14/InventoryTemplates/shiro_inventory_template.yml
index c4b5438c37..c362615a31 100644
--- a/Resources/Prototypes/SimpleStation14/InventoryTemplates/shiro_inventory_template.yml
+++ b/Resources/Prototypes/SimpleStation14/InventoryTemplates/shiro_inventory_template.yml
@@ -1,36 +1,36 @@
 - type: inventoryTemplate
   id: shiro
   slots:
-  - name: mask
-    slotTexture: mask
-    slotFlags: MASK
-    uiWindowPos: 1,1
-    strippingWindowPos: 1,1
-    displayName: Mask
-    whitelist:
-      tags:
-        - PetWearable
+    - name: mask
+      slotTexture: mask
+      slotFlags: MASK
+      uiWindowPos: 1,1
+      strippingWindowPos: 1,1
+      displayName: Mask
+      whitelist:
+        tags:
+          - PetWearable
 
-  - name: suitstorage
-    slotTexture: suit_storage
-    slotFlags: SUITSTORAGE
-    slotGroup: SecondHotbar
-    stripTime: 3
-    uiWindowPos: 2,0
-    strippingWindowPos: 2,5
-    displayName: Suit Storage
-    whitelist:
-      components:
-        - GasTank
+    - name: suitstorage
+      slotTexture: suit_storage
+      slotFlags: SUITSTORAGE
+      slotGroup: SecondHotbar
+      stripTime: 3
+      uiWindowPos: 2,0
+      strippingWindowPos: 2,5
+      displayName: Suit Storage
+      whitelist:
+        components:
+          - GasTank
 
-  - name: belt
-    slotTexture: belt
-    slotFlags: BELT
-    slotGroup: SecondHotbar
-    stripTime: 3
-    uiWindowPos: 3,1
-    strippingWindowPos: 1,5
-    displayName: Belt
-    whitelist:
-      tags:
-        - PetWearable
+    - name: belt
+      slotTexture: belt
+      slotFlags: BELT
+      slotGroup: SecondHotbar
+      stripTime: 3
+      uiWindowPos: 3,1
+      strippingWindowPos: 1,5
+      displayName: Belt
+      whitelist:
+        tags:
+          - PetWearable
diff --git a/Resources/Textures/SimpleStation14/Mobs/Pets/problems.rsi/cat.png b/Resources/Textures/SimpleStation14/Mobs/Pets/problems.rsi/cat.png
new file mode 100644
index 0000000000..b9e3deeb62
Binary files /dev/null and b/Resources/Textures/SimpleStation14/Mobs/Pets/problems.rsi/cat.png differ
diff --git a/Resources/Textures/SimpleStation14/Mobs/Pets/problems.rsi/cat_dead.png b/Resources/Textures/SimpleStation14/Mobs/Pets/problems.rsi/cat_dead.png
new file mode 100644
index 0000000000..214e47b59a
Binary files /dev/null and b/Resources/Textures/SimpleStation14/Mobs/Pets/problems.rsi/cat_dead.png differ
diff --git a/Resources/Textures/SimpleStation14/Mobs/Pets/problems.rsi/meta.json b/Resources/Textures/SimpleStation14/Mobs/Pets/problems.rsi/meta.json
new file mode 100644
index 0000000000..2b62ebe775
--- /dev/null
+++ b/Resources/Textures/SimpleStation14/Mobs/Pets/problems.rsi/meta.json
@@ -0,0 +1,37 @@
+{
+  "version": 1,
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "license": "CC-BY-SA-3.0",
+  "copyright": "",
+  "states": [
+    {
+      "name": "cat",
+      "directions": 4,
+      "delays": [
+        [
+          1
+        ],
+        [
+          1
+        ],
+        [
+          1
+        ],
+        [
+          1
+        ]
+      ]
+    },
+    {
+      "name": "cat_dead",
+      "delays": [
+        [
+          1
+        ]
+      ]
+    }
+  ]
+}