diff --git a/Resources/Prototypes/Entities/Markers/Spawners/mobs.yml b/Resources/Prototypes/Entities/Markers/Spawners/mobs.yml
index e31279df76..74fb648a95 100644
--- a/Resources/Prototypes/Entities/Markers/Spawners/mobs.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/mobs.yml
@@ -16,21 +16,6 @@
       - MobMouse1
       - MobMouse2
 
-- type: entity
-  name: Cat Spawner
-  id: SpawnMobCat
-  parent: MarkerBase
-  components:
-  - type: Sprite
-    layers:
-      - state: green
-      - state: ai
-  - type: ConditionalSpawner
-    prototypes:
-      - MobCat
-      - MobCatCalico
-      - MobCatCaracal
-
 - type: entity
   name: Corgi Spawner
   id: SpawnMobCorgi
@@ -71,8 +56,6 @@
     prototypes:
       - MobRaccoonMorticia
 
-## Player-controlled
-
 - type: entity
   name: Drone Spawner
   id: SpawnMobDrone
@@ -99,6 +82,88 @@
     prototypes:
       - MobFoxRenault
 
+- type: entity
+  name: Runtime Spawner
+  id: SpawnMobCatRuntime
+  parent: MarkerBase
+  components:
+  - type: Sprite
+    layers:
+      - state: green
+      - state: ai
+  - type: ConditionalSpawner
+    prototypes:
+      - MobCatRuntime
+      
+- type: entity
+  name: Exception Spawner
+  id: SpawnMobCatException
+  parent: MarkerBase
+  components:
+  - type: Sprite
+    layers:
+      - state: green
+      - state: ai
+  - type: ConditionalSpawner
+    prototypes:
+      - MobCatException
+
+- type: entity
+  name: Floppa Spawner
+  id: SpawnMobCatFloppa
+  parent: MarkerBase
+  components:
+  - type: Sprite
+    layers:
+      - state: green
+      - state: ai
+  - type: ConditionalSpawner
+    prototypes:
+      - MobCatFloppa
+
+- type: entity
+  name: Cat Spawner
+  id: SpawnMobCat
+  parent: MarkerBase
+  components:
+  - type: Sprite
+    layers:
+      - state: green
+      - state: ai
+  - type: ConditionalSpawner
+    prototypes:
+      - MobCatRuntime
+      - MobCatException
+      - MobCatFloppa
+
+- type: entity
+  name: Generic Cat Spawner
+  id: SpawnMobCatGeneric
+  parent: MarkerBase
+  components:
+  - type: Sprite
+    layers:
+      - state: green
+      - state: ai
+  - type: ConditionalSpawner
+    prototypes:
+      - MobCat
+      - MobCatCalico
+      - MobCatCaracal
+
+- type: entity
+  name: Bandito Spawner
+  id: SpawnMobBandito
+  parent: MarkerBase
+  components:
+  - type: Sprite
+    layers:
+      - state: green
+      - state: ai
+  - type: ConditionalSpawner
+    prototypes:
+      - MobBandito
+  
 - type: entity
   name:  McGriff Spawner
   id: SpawnMobMcGriff
@@ -111,7 +176,7 @@
   - type: ConditionalSpawner
     prototypes:
       - MobMcGriff
-      
+
 - type: entity
   name: Sloth Paperwork Spawner
   id: SpawnMobSlothPaperwork
@@ -124,7 +189,7 @@
   - type: ConditionalSpawner
     prototypes:
       - MobPaperwork
-      
+
 - type: entity
   name: Walter Spawner
   id: SpawnMobWalter
@@ -136,4 +201,4 @@
       - state: ai
   - type: ConditionalSpawner
     prototypes:
-      - MobWalter
+      - MobWalter
\ No newline at end of file
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml b/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml
index 0736b164e8..cf95a475b1 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml
@@ -225,6 +225,16 @@
     attributes:
       gender: epicene
 
+- type: entity
+  name: Runtime
+  parent: MobCat
+  id: MobCatRuntime
+  description: Professional mouse hunter. Escape artist.
+  components:
+  - type: Grammar
+    attributes:
+      gender: female
+
 - type: entity
   name: calico cat
   id: MobCatCalico
@@ -247,6 +257,16 @@
     attributes:
       gender: epicene
 
+- type: entity
+  name: Exception
+  id: MobCatException
+  parent: MobCat
+  description: Ask nicely, and maybe they'll give you one of their spare lives.
+  components:
+  - type: Grammar
+    attributes:
+      gender: male
+
 - type: entity
   name: space cat
   id: MobCatSpace
@@ -297,6 +317,16 @@
     attributes:
       gender: epicene
 
+- type: entity
+  name: Floppa
+  id: MobCatFloppa
+  parent: MobCat
+  description: He out here.
+  components:
+  - type: Grammar
+    attributes:
+      gender: male
+
 - type: entity
   name: sloth
   parent: SimpleMobBase
@@ -388,6 +418,16 @@
     attributes:
       gender: epicene
 
+- type: entity
+  name: Bandito
+  parent: MobFerret
+  id: MobBandito
+  description: Just a silly little guy!
+  components:
+  - type: Grammar
+    attributes:
+      gender: male
+
 - type: entity
   name: bingus
   parent: SimpleMobBase
@@ -557,4 +597,4 @@
   - type: Grammar
     attributes:
       proper: true
-      gender: male
+      gender: male
\ No newline at end of file