diff --git a/Content.Client/EntryPoint.cs b/Content.Client/EntryPoint.cs
index d939d9cbce..57e2e3d2aa 100644
--- a/Content.Client/EntryPoint.cs
+++ b/Content.Client/EntryPoint.cs
@@ -178,6 +178,8 @@ namespace Content.Client
                 "FlashExplosive",
                 "FlashProjectile",
                 "Utensil",
+                "UnarmedCombat",
+                "TimedSpawner",
             };
 
             foreach (var ignoreName in registerIgnore)
diff --git a/Resources/Prototypes/Entities/Markers/timed_spawners.yml b/Resources/Prototypes/Entities/Markers/timed_spawners.yml
index 4bc96baeed..3a1a25b5cc 100644
--- a/Resources/Prototypes/Entities/Markers/timed_spawners.yml
+++ b/Resources/Prototypes/Entities/Markers/timed_spawners.yml
@@ -28,10 +28,10 @@
       netsync: false
       visible: false
       sprite: Objects/markers.rsi
-      state: spawner_rifle
+      state: spawner_ai
     - type: Icon
       sprite: Objects/markers.rsi
-      state: spawner_rifle
+      state: spawner_ai
     - type: TimedSpawner
       prototypes:
         - HumanMob_Spirate
@@ -40,3 +40,24 @@
       intervalSeconds: 60
       minimumEntitiesSpawned: 1
       maximumEntitiesSpawned: 5
+
+- type: entity
+  name: Xeno AI Timed Spawner
+  id: XenoAITimedSpawner
+  parent: BaseTimedSpawner
+  components:
+    - type: Sprite
+      netsync: false
+      visible: false
+      sprite: Objects/markers.rsi
+      state: spawner_xenoai
+    - type: Icon
+      sprite: Objects/markers.rsi
+      state: spawner_xenoai
+    - type: TimedSpawner
+      prototypes:
+        - XenoMob_Content
+      chance: 0.85
+      intervalSeconds: 30
+      minimumEntitiesSpawned: 2
+      maximumEntitiesSpawned: 4
diff --git a/Resources/Textures/Objects/markers.rsi/meta.json b/Resources/Textures/Objects/markers.rsi/meta.json
index 7eb1bca74a..251af4f644 100644
--- a/Resources/Textures/Objects/markers.rsi/meta.json
+++ b/Resources/Textures/Objects/markers.rsi/meta.json
@@ -367,6 +367,15 @@
                 ]
             ]
         },
+        {
+            "name": "spawner_ai",
+            "directions": 1,
+            "delays": [
+                [
+                    1.0
+                ]
+            ]
+        },
         {
             "name": "spawner_grenade",
             "directions": 1,
@@ -456,6 +465,15 @@
                     1.0
                 ]
             ]
+        },
+        {
+            "name": "spawner_xenoai",
+            "directions": 1,
+            "delays": [
+                [
+                    1.0
+                ]
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Resources/Textures/Objects/markers.rsi/spawner_ai.png b/Resources/Textures/Objects/markers.rsi/spawner_ai.png
new file mode 100644
index 0000000000..c9d18bf907
Binary files /dev/null and b/Resources/Textures/Objects/markers.rsi/spawner_ai.png differ
diff --git a/Resources/Textures/Objects/markers.rsi/spawner_xenoai.png b/Resources/Textures/Objects/markers.rsi/spawner_xenoai.png
new file mode 100644
index 0000000000..7b0db41b65
Binary files /dev/null and b/Resources/Textures/Objects/markers.rsi/spawner_xenoai.png differ