diff --git a/Resources/Prototypes/Entities/Effects/Markers/gamemode_conditional_spawners.yml b/Resources/Prototypes/Entities/Effects/Markers/gamemode_conditional_spawners.yml
index f5a840c392..b203903616 100644
--- a/Resources/Prototypes/Entities/Effects/Markers/gamemode_conditional_spawners.yml
+++ b/Resources/Prototypes/Entities/Effects/Markers/gamemode_conditional_spawners.yml
@@ -260,6 +260,139 @@
         - ExGrenade
         - GrenadeFlashBang
         - SyndieMiniBomb
+        - GrenadeFlash
+        - GrenadeBlast
+        - GrenadeFrag
+        - GrenadeBaton
       chance: 0.75
       gameRules:
         - RuleSuspicion
+
+- type: entity
+  name: Suspicion Sniper Spawner
+  id: SuspicionSniperSpawner
+  parent: BaseConditionalSpawner
+  components:
+    - type: Sprite
+      netsync: false
+      visible: false
+      sprite: Interface/Misc/markers.rsi
+      state: spawner_sniper
+    - type: Icon
+      sprite: Interface/Misc/markers.rsi
+      state: spawner_sniper
+    - type: ConditionalSpawner
+      prototypes:
+        - SniperBoltGun
+        - SniperBoltGunWood
+        - SniperHeavy
+      chance: 0.75
+      gameRules:
+        - RuleSuspicion
+
+- type: entity
+  name: Suspicion Rifle Ammo Spawner
+  id: SuspicionRifleMagazineSpawner
+  parent: BaseConditionalSpawner
+  components:
+    - type: Sprite
+      netsync: false
+      visible: false
+      sprite: Interface/Misc/markers.rsi
+      state: spawner_rifle_ammo
+    - type: Icon
+      sprite: Interface/Misc/markers.rsi
+      state: spawner_rifle_ammo
+    - type: ConditionalSpawner
+      prototypes:
+        - MagazineSRifle
+        - MagazineClRifle
+        - MagazineLRifle
+      chance: 0.95
+      gameRules:
+        - RuleSuspicion
+
+- type: entity
+  name: Suspicion Shotgun Ammo Spawner
+  id: SuspicionShotgunMagazineSpawner
+  parent: BaseConditionalSpawner
+  components:
+    - type: Sprite
+      netsync: false
+      visible: false
+      sprite: Interface/Misc/markers.rsi
+      state: spawner_shotgun_ammo
+    - type: Icon
+      sprite: Interface/Misc/markers.rsi
+      state: spawner_shotgun_ammo
+    - type: ConditionalSpawner
+      prototypes:
+        - MagazineShotgun
+      chance: 0.95
+      gameRules:
+        - RuleSuspicion
+
+- type: entity
+  name: Suspicion Pistol Ammo Spawner
+  id: SuspicionPistolMagazineSpawner
+  parent: BaseConditionalSpawner
+  components:
+    - type: Sprite
+      netsync: false
+      visible: false
+      sprite: Interface/Misc/markers.rsi
+      state: spawner_pistol_ammo
+    - type: Icon
+      sprite: Interface/Misc/markers.rsi
+      state: spawner_pistol_ammo
+    - type: ConditionalSpawner
+      prototypes:
+        - MagazinePistol
+        - MagazineHCPistol
+        - MagazinePistolSmg
+        - MagazineClRiflePistol
+      chance: 0.95
+      gameRules:
+        - RuleSuspicion
+
+- type: entity
+  name: Suspicion Magnum Ammo Spawner
+  id: SuspicionMagnumMagazineSpawner
+  parent: BaseConditionalSpawner
+  components:
+    - type: Sprite
+      netsync: false
+      visible: false
+      sprite: Interface/Misc/markers.rsi
+      state: spawner_magnum_ammo
+    - type: Icon
+      sprite: Interface/Misc/markers.rsi
+      state: spawner_magnum_ammo
+    - type: ConditionalSpawner
+      prototypes:
+        - MagazineMagnum
+        - MagazineMagnumSmg
+      chance: 0.95
+      gameRules:
+        - RuleSuspicion
+
+- type: entity
+  name: Suspicion Launcher Ammo Spawner
+  id: SuspicionLauncherAmmoSpawner
+  parent: BaseConditionalSpawner
+  components:
+    - type: Sprite
+      netsync: false
+      visible: false
+      sprite: Interface/Misc/markers.rsi
+      state: spawner_launcher_ammo
+    - type: Icon
+      sprite: Interface/Misc/markers.rsi
+      state: spawner_launcher_ammo
+    - type: ConditionalSpawner
+      prototypes:
+        - RocketAmmo
+        - GrenadeFrag
+      chance: 0.95
+      gameRules:
+        - RuleSuspicion
diff --git a/Resources/Textures/Interface/Misc/markers.rsi/meta.json b/Resources/Textures/Interface/Misc/markers.rsi/meta.json
index a1fa3f2b53..3c58904297 100644
--- a/Resources/Textures/Interface/Misc/markers.rsi/meta.json
+++ b/Resources/Textures/Interface/Misc/markers.rsi/meta.json
@@ -403,6 +403,24 @@
                 ]
             ]
         },
+        {
+            "name": "spawner_launcher_ammo",
+            "directions": 1,
+            "delays": [
+                [
+                    1.0
+                ]
+            ]
+        },
+        {
+            "name": "spawner_magnum_ammo",
+            "directions": 1,
+            "delays": [
+                [
+                    1.0
+                ]
+            ]
+        },
         {
             "name": "spawner_melee",
             "directions": 1,
@@ -421,6 +439,15 @@
                 ]
             ]
         },
+        {
+            "name": "spawner_pistol_ammo",
+            "directions": 1,
+            "delays": [
+                [
+                    1.0
+                ]
+            ]
+        },
         {
             "name": "spawner_revolver",
             "directions": 1,
@@ -439,6 +466,15 @@
                 ]
             ]
         },
+        {
+            "name": "spawner_rifle_ammo",
+            "directions": 1,
+            "delays": [
+                [
+                    1.0
+                ]
+            ]
+        },
         {
             "name": "spawner_shotgun",
             "directions": 1,
@@ -448,6 +484,15 @@
                 ]
             ]
         },
+        {
+            "name": "spawner_shotgun_ammo",
+            "directions": 1,
+            "delays": [
+                [
+                    1.0
+                ]
+            ]
+        },
         {
             "name": "spawner_smg",
             "directions": 1,
@@ -466,7 +511,7 @@
                 ]
             ]
         },
-		{
+        {
             "name": "spawner_trash",
             "directions": 1,
             "delays": [
diff --git a/Resources/Textures/Interface/Misc/markers.rsi/spawner_ai.png b/Resources/Textures/Interface/Misc/markers.rsi/spawner_ai.png
index c9d18bf907..6e7304d762 100644
Binary files a/Resources/Textures/Interface/Misc/markers.rsi/spawner_ai.png and b/Resources/Textures/Interface/Misc/markers.rsi/spawner_ai.png differ
diff --git a/Resources/Textures/Interface/Misc/markers.rsi/spawner_launcher_ammo.png b/Resources/Textures/Interface/Misc/markers.rsi/spawner_launcher_ammo.png
new file mode 100644
index 0000000000..b7cffe180e
Binary files /dev/null and b/Resources/Textures/Interface/Misc/markers.rsi/spawner_launcher_ammo.png differ
diff --git a/Resources/Textures/Interface/Misc/markers.rsi/spawner_magnum_ammo.png b/Resources/Textures/Interface/Misc/markers.rsi/spawner_magnum_ammo.png
new file mode 100644
index 0000000000..3b59a3ca46
Binary files /dev/null and b/Resources/Textures/Interface/Misc/markers.rsi/spawner_magnum_ammo.png differ
diff --git a/Resources/Textures/Interface/Misc/markers.rsi/spawner_pistol_ammo.png b/Resources/Textures/Interface/Misc/markers.rsi/spawner_pistol_ammo.png
new file mode 100644
index 0000000000..1e5330cfe2
Binary files /dev/null and b/Resources/Textures/Interface/Misc/markers.rsi/spawner_pistol_ammo.png differ
diff --git a/Resources/Textures/Interface/Misc/markers.rsi/spawner_rifle_ammo.png b/Resources/Textures/Interface/Misc/markers.rsi/spawner_rifle_ammo.png
new file mode 100644
index 0000000000..1c9372e9ea
Binary files /dev/null and b/Resources/Textures/Interface/Misc/markers.rsi/spawner_rifle_ammo.png differ
diff --git a/Resources/Textures/Interface/Misc/markers.rsi/spawner_shotgun_ammo.png b/Resources/Textures/Interface/Misc/markers.rsi/spawner_shotgun_ammo.png
new file mode 100644
index 0000000000..2c341f2218
Binary files /dev/null and b/Resources/Textures/Interface/Misc/markers.rsi/spawner_shotgun_ammo.png differ
diff --git a/Resources/Textures/Interface/Misc/markers.rsi/spawner_trash.png b/Resources/Textures/Interface/Misc/markers.rsi/spawner_trash.png
index b92ba56c3d..0a685dc041 100644
Binary files a/Resources/Textures/Interface/Misc/markers.rsi/spawner_trash.png and b/Resources/Textures/Interface/Misc/markers.rsi/spawner_trash.png differ
diff --git a/Resources/Textures/Interface/Misc/markers.rsi/spawner_xenoai.png b/Resources/Textures/Interface/Misc/markers.rsi/spawner_xenoai.png
index 7b0db41b65..4f64d33046 100644
Binary files a/Resources/Textures/Interface/Misc/markers.rsi/spawner_xenoai.png and b/Resources/Textures/Interface/Misc/markers.rsi/spawner_xenoai.png differ