diff --git a/Content.Client/Entry/IgnoredComponents.cs b/Content.Client/Entry/IgnoredComponents.cs
index 12f78f19dc..2d24467e8b 100644
--- a/Content.Client/Entry/IgnoredComponents.cs
+++ b/Content.Client/Entry/IgnoredComponents.cs
@@ -236,7 +236,6 @@ namespace Content.Client.Entry
             "MorgueEntityStorage",
             "MorgueTray",
             "CrematoriumEntityStorage",
-            "RandomArcade",
             "RandomSpriteState",
             "DebugEquip",
             "InnateActions",
diff --git a/Content.Server/Arcade/Components/RandomArcadeGameComponent.cs b/Content.Server/Arcade/Components/RandomArcadeGameComponent.cs
deleted file mode 100644
index 5d5047824b..0000000000
--- a/Content.Server/Arcade/Components/RandomArcadeGameComponent.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-using Robust.Shared.GameObjects;
-using Robust.Shared.IoC;
-using Robust.Shared.Random;
-
-namespace Content.Server.Arcade.Components
-{
-    [RegisterComponent]
-    public class RandomArcadeGameComponent : Component, IMapInit
-    {
-        public override string Name => "RandomArcade";
-
-        public void MapInit()
-        {
-            var arcades = new[]
-            {
-                "BlockGameArcade",
-                "SpaceVillainArcade"
-            };
-
-            var entityManager = IoCManager.Resolve<IEntityManager>();
-
-            entityManager.SpawnEntity(
-                IoCManager.Resolve<IRobustRandom>().Pick(arcades),
-                Owner.Transform.Coordinates);
-
-            Owner.Delete();
-        }
-    }
-}
diff --git a/Content.Server/GameTicking/Commands/MappingCommand.cs b/Content.Server/GameTicking/Commands/MappingCommand.cs
index f47dba563b..c13e93072d 100644
--- a/Content.Server/GameTicking/Commands/MappingCommand.cs
+++ b/Content.Server/GameTicking/Commands/MappingCommand.cs
@@ -71,6 +71,7 @@ namespace Content.Server.GameTicking.Commands
                 shell.ExecuteCommand("aghost");
 
             shell.ExecuteCommand($"tp 0 0 {mapId}");
+            shell.RemoteExecuteCommand("showmarkers");
 
             var newGrid = mapManager.GetAllGrids().OrderByDescending(g => (int) g.Index).First();
             var pauseManager = IoCManager.Resolve<IPauseManager>();
diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/arcade.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/arcade.yml
index 07c6487652..4f8b30f143 100644
--- a/Resources/Prototypes/Entities/Markers/Spawners/Random/arcade.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/arcade.yml
@@ -3,8 +3,12 @@
   name: random arcade spawner
   parent: MarkerBase
   components:
-  - type: RandomArcade
   - type: Sprite
     layers:
       - state: red
       - texture: Structures/Machines/arcade.rsi/arcade.png
+  - type: RandomSpawner
+    prototypes:
+      - BlockGameArcade
+      - SpaceVillainArcade
+    chance: 1
diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/instruments.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/instruments.yml
new file mode 100644
index 0000000000..665eedea50
--- /dev/null
+++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/instruments.yml
@@ -0,0 +1,29 @@
+- type: entity
+  id: RandomInstruments
+  name: random instruments spawner
+  parent: MarkerBase
+  components:
+  - type: Sprite
+    layers:
+      - state: red
+      - texture: Objects/Fun/Instruments/h_synthesizer.rsi/icon.png
+  - type: RandomSpawner
+    prototypes:
+      - AcousticGuitarInstrument
+      - ViolinInstrument
+      - TrumpetInstrument
+      - ElectricGuitarInstrument
+      - AccordionInstrument
+      - HarmonicaInstrument
+      - TromboneInstrument
+      - SaxophoneInstrument
+      - BanjoInstrument
+      - GlockenspielInstrument
+      - XylophoneInstrument
+      - BikeHornInstrument
+      - RecorderInstrument
+    chance: 0.95
+    rarePrototypes:
+      - SynthesizerInstrument
+      - GunpetInstrument
+    rareChance: 0.05
diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/soap.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/soap.yml
new file mode 100644
index 0000000000..7a9c3dff10
--- /dev/null
+++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/soap.yml
@@ -0,0 +1,20 @@
+- type: entity
+  id: RandomSoap
+  name: random soap spawner
+  parent: MarkerBase
+  components:
+  - type: Sprite
+    layers:
+      - state: red
+      - texture: Objects/Specific/Janitorial/soap.rsi/soap.png
+  - type: RandomSpawner
+    prototypes:
+      - Soap
+      - SoapHomemade
+      - SoapNT
+      - SoapDeluxe
+    chance: 0.95
+    rarePrototypes:
+      - SoapSyndie
+      - SoapOmega
+    rareChance: 0.05