Revert "Revert "Slight changes to spawners"" (#3627)

* Revert "Revert "Slight changes to spawners (#3605)" (#3624)"

This reverts commit 8c01d9d9dc.

* Bring back clicktest.yml

* Update IgnoredComponents.cs

Co-authored-by: DrSmugleaf <DrSmugleaf@users.noreply.github.com>

Content.Client/IgnoredComponents.cs

@@ -246,6 +246,10 @@ namespace Content.Client
             "MouseAccent",
             "GhostTakeoverAvailable",
             "GhostRoleMobSpawner",
+            "BedsheetSpawner",
+            "ToySpawner",
+            "FigureSpawner",
+            "RandomSpawner",
         };
     }
 }

Content.Server/GameObjects/Components/Markers/RandomSpawnerComponent.cs

@@ -5,18 +5,17 @@ using Robust.Shared.Log;
 using Robust.Shared.Maths;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Random;
-using Robust.Shared.Serialization;
 using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.ViewVariables;
 
 namespace Content.Server.GameObjects.Components.Markers
 {
     [RegisterComponent]
-    public class TrashSpawnerComponent : ConditionalSpawnerComponent
+    public class RandomSpawnerComponent : ConditionalSpawnerComponent
     {
         [Dependency] private readonly IRobustRandom _robustRandom = default!;
 
-        public override string Name => "TrashSpawner";
+        public override string Name => "RandomSpawner";
 
         [ViewVariables(VVAccess.ReadWrite)]
         [DataField("rarePrototypes")]
@@ -45,7 +44,7 @@ namespace Content.Server.GameObjects.Components.Markers
 
             if (Prototypes.Count == 0)
             {
-                Logger.Warning($"Prototype list in TrashSpawnComponent is empty! Entity: {Owner}");
+                Logger.Warning($"Prototype list in RandomSpawnerComponent is empty! Entity: {Owner}");
                 return;
             }
 

Resources/Maps/saltern.yml

@@ -4102,245 +4102,245 @@ entities:
     parent: 853
     type: Transform
 - uid: 417
-  type: TrashSpawner
+  type: RandomSpawner
   components:
   - rot: 4.371139006309477E-08 rad
     pos: 9.5,13.5
     parent: 853
     type: Transform
 - uid: 418
-  type: TrashSpawner
+  type: RandomSpawner
   components:
   - rot: 4.371139006309477E-08 rad
     pos: 12.5,15.5
     parent: 853
     type: Transform
 - uid: 419
-  type: TrashSpawner
+  type: RandomSpawner
   components:
   - rot: 4.371139006309477E-08 rad
     pos: 13.5,19.5
     parent: 853
     type: Transform
 - uid: 420
-  type: TrashSpawner
+  type: RandomSpawner
   components:
   - rot: 4.371139006309477E-08 rad
     pos: 1.5,16.5
     parent: 853
     type: Transform
 - uid: 421
-  type: TrashSpawner
+  type: RandomSpawner
   components:
   - rot: 4.371139006309477E-08 rad
     pos: 4.5,9.5
     parent: 853
     type: Transform
 - uid: 422
-  type: TrashSpawner
+  type: RandomSpawner
   components:
   - rot: 4.371139006309477E-08 rad
     pos: -22.5,-6.5
     parent: 853
     type: Transform
 - uid: 423
-  type: TrashSpawner
+  type: RandomSpawner
   components:
   - rot: 4.371139006309477E-08 rad
     pos: -25.5,0.5
     parent: 853
     type: Transform
 - uid: 424
-  type: TrashSpawner
+  type: RandomSpawner
   components:
   - rot: 4.371139006309477E-08 rad
     pos: -17.5,3.5
     parent: 853
     type: Transform
 - uid: 425
-  type: TrashSpawner
+  type: RandomSpawner
   components:
   - rot: 4.371139006309477E-08 rad
     pos: -8.5,-1.5
     parent: 853
     type: Transform
 - uid: 426
-  type: TrashSpawner
+  type: RandomSpawner
   components:
   - rot: 4.371139006309477E-08 rad
     pos: -1.5,-0.5
     parent: 853
     type: Transform
 - uid: 427
-  type: TrashSpawner
+  type: RandomSpawner
   components:
   - rot: 4.371139006309477E-08 rad
     pos: -7.5,5.5
     parent: 853
     type: Transform
 - uid: 428
-  type: TrashSpawner
+  type: RandomSpawner
   components:
   - rot: 4.371139006309477E-08 rad
     pos: 19.5,3.5
     parent: 853
     type: Transform
 - uid: 429
-  type: TrashSpawner
+  type: RandomSpawner
   components:
   - rot: 4.371139006309477E-08 rad
     pos: 25.5,6.5
     parent: 853
     type: Transform
 - uid: 430
-  type: TrashSpawner
+  type: RandomSpawner
   components:
   - rot: 4.371139006309477E-08 rad
     pos: 6.5,1.5
     parent: 853
     type: Transform
 - uid: 431
-  type: TrashSpawner
+  type: RandomSpawner
   components:
   - rot: 4.371139006309477E-08 rad
     pos: 12.5,7.5
     parent: 853
     type: Transform
 - uid: 432
-  type: TrashSpawner
+  type: RandomSpawner
   components:
   - rot: 4.371139006309477E-08 rad
     pos: 12.5,12.5
     parent: 853
     type: Transform
 - uid: 433
-  type: TrashSpawner
+  type: RandomSpawner
   components:
   - rot: 4.371139006309477E-08 rad
     pos: 24.5,11.5
     parent: 853
     type: Transform
 - uid: 434
-  type: TrashSpawner
+  type: RandomSpawner
   components:
   - rot: 4.371139006309477E-08 rad
     pos: 27.5,13.5
     parent: 853
     type: Transform
 - uid: 435
-  type: TrashSpawner
+  type: RandomSpawner
   components:
   - rot: 4.371139006309477E-08 rad
     pos: 26.5,10.5
     parent: 853
     type: Transform
 - uid: 436
-  type: TrashSpawner
+  type: RandomSpawner
   components:
   - rot: 4.371139006309477E-08 rad
     pos: 28.5,8.5
     parent: 853
     type: Transform
 - uid: 437
-  type: TrashSpawner
+  type: RandomSpawner
   components:
   - rot: 4.371139006309477E-08 rad
     pos: 27.5,0.5
     parent: 853
     type: Transform
 - uid: 438
-  type: TrashSpawner
+  type: RandomSpawner
   components:
   - rot: 4.371139006309477E-08 rad
     pos: 35.5,2.5
     parent: 853
     type: Transform
 - uid: 439
-  type: TrashSpawner
+  type: RandomSpawner
   components:
   - rot: 4.371139006309477E-08 rad
     pos: 44.5,6.5
     parent: 853
     type: Transform
 - uid: 440
-  type: TrashSpawner
+  type: RandomSpawner
   components:
   - rot: 4.371139006309477E-08 rad
     pos: 42.5,-2.5
     parent: 853
     type: Transform
 - uid: 441
-  type: TrashSpawner
+  type: RandomSpawner
   components:
   - rot: 4.371139006309477E-08 rad
     pos: 37.5,-3.5
     parent: 853
     type: Transform
 - uid: 442
-  type: TrashSpawner
+  type: RandomSpawner
   components:
   - rot: 4.371139006309477E-08 rad
     pos: 37.5,-7.5
     parent: 853
     type: Transform
 - uid: 443
-  type: TrashSpawner
+  type: RandomSpawner
   components:
   - rot: 4.371139006309477E-08 rad
     pos: 32.5,-6.5
     parent: 853
     type: Transform
 - uid: 444
-  type: TrashSpawner
+  type: RandomSpawner
   components:
   - rot: 4.371139006309477E-08 rad
     pos: 20.5,0.5
     parent: 853
     type: Transform
 - uid: 445
-  type: TrashSpawner
+  type: RandomSpawner
   components:
   - rot: 4.371139006309477E-08 rad
     pos: 21.5,-2.5
     parent: 853
     type: Transform
 - uid: 446
-  type: TrashSpawner
+  type: RandomSpawner
   components:
   - rot: 4.371139006309477E-08 rad
     pos: 25.5,-1.5
     parent: 853
     type: Transform
 - uid: 447
-  type: TrashSpawner
+  type: RandomSpawner
   components:
   - rot: 4.371139006309477E-08 rad
     pos: 27.5,-3.5
     parent: 853
     type: Transform
 - uid: 448
-  type: TrashSpawner
+  type: RandomSpawner
   components:
   - rot: 4.371139006309477E-08 rad
     pos: 27.5,-7.5
     parent: 853
     type: Transform
 - uid: 449
-  type: TrashSpawner
+  type: RandomSpawner
   components:
   - rot: 4.371139006309477E-08 rad
     pos: 24.5,-9.5
     parent: 853
     type: Transform
 - uid: 450
-  type: TrashSpawner
+  type: RandomSpawner
   components:
   - rot: 4.371139006309477E-08 rad
     pos: 27.5,-13.5
     parent: 853
     type: Transform
 - uid: 451
-  type: TrashSpawner
+  type: RandomSpawner
   components:
   - rot: 4.371139006309477E-08 rad
     pos: 26.5,-17.5
@@ -4354,84 +4354,84 @@ entities:
     parent: 853
     type: Transform
 - uid: 453
-  type: TrashSpawner
+  type: RandomSpawner
   components:
   - rot: 4.371139006309477E-08 rad
     pos: 21.5,-17.5
     parent: 853
     type: Transform
 - uid: 454
-  type: TrashSpawner
+  type: RandomSpawner
   components:
   - rot: 4.371139006309477E-08 rad
     pos: 21.5,-20.5
     parent: 853
     type: Transform
 - uid: 455
-  type: TrashSpawner
+  type: RandomSpawner
   components:
   - rot: 4.371139006309477E-08 rad
     pos: 22.5,-23.5
     parent: 853
     type: Transform
 - uid: 456
-  type: TrashSpawner
+  type: RandomSpawner
   components:
   - rot: 4.371139006309477E-08 rad
     pos: 18.5,-25.5
     parent: 853
     type: Transform
 - uid: 457
-  type: TrashSpawner
+  type: RandomSpawner
   components:
   - rot: 4.371139006309477E-08 rad
     pos: 14.5,-24.5
     parent: 853
     type: Transform
 - uid: 458
-  type: TrashSpawner
+  type: RandomSpawner
   components:
   - rot: 4.371139006309477E-08 rad
     pos: 14.5,-21.5
     parent: 853
     type: Transform
 - uid: 459
-  type: TrashSpawner
+  type: RandomSpawner
   components:
   - rot: 4.371139006309477E-08 rad
     pos: 12.5,-19.5
     parent: 853
     type: Transform
 - uid: 460
-  type: TrashSpawner
+  type: RandomSpawner
   components:
   - rot: 4.371139006309477E-08 rad
     pos: 7.5,-18.5
     parent: 853
     type: Transform
 - uid: 461
-  type: TrashSpawner
+  type: RandomSpawner
   components:
   - rot: 4.371139006309477E-08 rad
     pos: -10.5,-17.5
     parent: 853
     type: Transform
 - uid: 462
-  type: TrashSpawner
+  type: RandomSpawner
   components:
   - rot: 4.371139006309477E-08 rad
     pos: -0.5,-22.5
     parent: 853
     type: Transform
 - uid: 463
-  type: TrashSpawner
+  type: RandomSpawner
   components:
   - rot: 4.371139006309477E-08 rad
     pos: -2.5,-26.5
     parent: 853
     type: Transform
 - uid: 464
-  type: TrashSpawner
+  type: RandomSpawner
   components:
   - rot: 4.371139006309477E-08 rad
     pos: -5.5,-27.5
@@ -4445,7 +4445,7 @@ entities:
     parent: 853
     type: Transform
 - uid: 466
-  type: TrashSpawner
+  type: RandomSpawner
   components:
   - rot: 4.371139006309477E-08 rad
     pos: -9.5,-25.5
@@ -4459,98 +4459,98 @@ entities:
     parent: 853
     type: Transform
 - uid: 468
-  type: TrashSpawner
+  type: RandomSpawner
   components:
   - rot: 4.371139006309477E-08 rad
     pos: -11.5,-27.5
     parent: 853
     type: Transform
 - uid: 469
-  type: TrashSpawner
+  type: RandomSpawner
   components:
   - rot: 4.371139006309477E-08 rad
     pos: -11.5,-23.5
     parent: 853
     type: Transform
 - uid: 470
-  type: TrashSpawner
+  type: RandomSpawner
   components:
   - rot: 4.371139006309477E-08 rad
     pos: 0.5,-6.5
     parent: 853
     type: Transform
 - uid: 471
-  type: TrashSpawner
+  type: RandomSpawner
   components:
   - rot: 4.371139006309477E-08 rad
     pos: -0.5,-8.5
     parent: 853
     type: Transform
 - uid: 472
-  type: TrashSpawner
+  type: RandomSpawner
   components:
   - rot: 4.371139006309477E-08 rad
     pos: -0.5,-9.5
     parent: 853
     type: Transform
 - uid: 473
-  type: TrashSpawner
+  type: RandomSpawner
   components:
   - rot: 4.371139006309477E-08 rad
     pos: -2.5,-10.5
     parent: 853
     type: Transform
 - uid: 474
-  type: TrashSpawner
+  type: RandomSpawner
   components:
   - rot: 4.371139006309477E-08 rad
     pos: -6.5,-9.5
     parent: 853
     type: Transform
 - uid: 475
-  type: TrashSpawner
+  type: RandomSpawner
   components:
   - rot: 4.371139006309477E-08 rad
     pos: -16.5,-5.5
     parent: 853
     type: Transform
 - uid: 476
-  type: TrashSpawner
+  type: RandomSpawner
   components:
   - rot: 4.371139006309477E-08 rad
     pos: -11.5,-6.5
     parent: 853
     type: Transform
 - uid: 477
-  type: TrashSpawner
+  type: RandomSpawner
   components:
   - rot: 4.371139006309477E-08 rad
     pos: -8.5,-11.5
     parent: 853
     type: Transform
 - uid: 478
-  type: TrashSpawner
+  type: RandomSpawner
   components:
   - rot: 4.371139006309477E-08 rad
     pos: -9.5,-12.5
     parent: 853
     type: Transform
 - uid: 479
-  type: TrashSpawner
+  type: RandomSpawner
   components:
   - rot: 4.371139006309477E-08 rad
     pos: -8.5,-15.5
     parent: 853
     type: Transform
 - uid: 480
-  type: TrashSpawner
+  type: RandomSpawner
   components:
   - rot: 4.371139006309477E-08 rad
     pos: -12.5,-15.5
     parent: 853
     type: Transform
 - uid: 481
-  type: TrashSpawner
+  type: RandomSpawner
   components:
   - rot: 4.371139006309477E-08 rad
     pos: -18.5,-13.5
@@ -4564,63 +4564,63 @@ entities:
     parent: 853
     type: Transform
 - uid: 483
-  type: TrashSpawner
+  type: RandomSpawner
   components:
   - rot: 4.371139006309477E-08 rad
     pos: -21.5,-10.5
     parent: 853
     type: Transform
 - uid: 484
-  type: TrashSpawner
+  type: RandomSpawner
   components:
   - rot: 4.371139006309477E-08 rad
     pos: -28.5,-11.5
     parent: 853
     type: Transform
 - uid: 485
-  type: TrashSpawner
+  type: RandomSpawner
   components:
   - rot: 4.371139006309477E-08 rad
     pos: -32.5,-5.5
     parent: 853
     type: Transform
 - uid: 486
-  type: TrashSpawner
+  type: RandomSpawner
   components:
   - rot: 4.371139006309477E-08 rad
     pos: -33.5,-11.5
     parent: 853
     type: Transform
 - uid: 487
-  type: TrashSpawner
+  type: RandomSpawner
   components:
   - rot: 4.371139006309477E-08 rad
     pos: -33.5,-7.5
     parent: 853
     type: Transform
 - uid: 488
-  type: TrashSpawner
+  type: RandomSpawner
   components:
   - rot: 4.371139006309477E-08 rad
     pos: -32.5,-0.5
     parent: 853
     type: Transform
 - uid: 489
-  type: TrashSpawner
+  type: RandomSpawner
   components:
   - rot: 4.371139006309477E-08 rad
     pos: -19.5,-5.5
     parent: 853
     type: Transform
 - uid: 490
-  type: TrashSpawner
+  type: RandomSpawner
   components:
   - rot: 4.371139006309477E-08 rad
     pos: -30.5,-8.5
     parent: 853
     type: Transform
 - uid: 491
-  type: TrashSpawner
+  type: RandomSpawner
   components:
   - rot: 4.371139006309477E-08 rad
     pos: -30.5,1.5
@@ -4634,63 +4634,63 @@ entities:
     parent: 853
     type: Transform
 - uid: 493
-  type: TrashSpawner
+  type: RandomSpawner
   components:
   - rot: 4.371139006309477E-08 rad
     pos: -32.5,5.5
     parent: 853
     type: Transform
 - uid: 494
-  type: TrashSpawner
+  type: RandomSpawner
   components:
   - rot: 4.371139006309477E-08 rad
     pos: -35.5,-2.5
     parent: 853
     type: Transform
 - uid: 495
-  type: TrashSpawner
+  type: RandomSpawner
   components:
   - rot: 4.371139006309477E-08 rad
     pos: -36.5,10.5
     parent: 853
     type: Transform
 - uid: 496
-  type: TrashSpawner
+  type: RandomSpawner
   components:
   - rot: 4.371139006309477E-08 rad
     pos: 0.5,8.5
     parent: 853
     type: Transform
 - uid: 497
-  type: TrashSpawner
+  type: RandomSpawner
   components:
   - rot: 4.371139006309477E-08 rad
     pos: -3.5,7.5
     parent: 853
     type: Transform
 - uid: 498
-  type: TrashSpawner
+  type: RandomSpawner
   components:
   - rot: 4.371139006309477E-08 rad
     pos: -2.5,20.5
     parent: 853
     type: Transform
 - uid: 499
-  type: TrashSpawner
+  type: RandomSpawner
   components:
   - rot: 4.371139006309477E-08 rad
     pos: -4.5,22.5
     parent: 853
     type: Transform
 - uid: 500
-  type: TrashSpawner
+  type: RandomSpawner
   components:
   - rot: 4.371139006309477E-08 rad
     pos: -7.5,23.5
     parent: 853
     type: Transform
 - uid: 501
-  type: TrashSpawner
+  type: RandomSpawner
   components:
   - rot: 4.371139006309477E-08 rad
     pos: -8.5,25.5
@@ -4709,77 +4709,77 @@ entities:
       light_bulb: !type:ContainerSlot {}
     type: ContainerContainer
 - uid: 503
-  type: TrashSpawner
+  type: RandomSpawner
   components:
   - rot: 4.371139006309477E-08 rad
     pos: -18.5,25.5
     parent: 853
     type: Transform
 - uid: 504
-  type: TrashSpawner
+  type: RandomSpawner
   components:
   - rot: 4.371139006309477E-08 rad
     pos: -18.5,19.5
     parent: 853
     type: Transform
 - uid: 505
-  type: TrashSpawner
+  type: RandomSpawner
   components:
   - rot: 4.371139006309477E-08 rad
     pos: -15.5,9.5
     parent: 853
     type: Transform
 - uid: 506
-  type: TrashSpawner
+  type: RandomSpawner
   components:
   - rot: 4.371139006309477E-08 rad
     pos: -17.5,13.5
     parent: 853
     type: Transform
 - uid: 507
-  type: TrashSpawner
+  type: RandomSpawner
   components:
   - rot: 4.371139006309477E-08 rad
     pos: -21.5,12.5
     parent: 853
     type: Transform
 - uid: 508
-  type: TrashSpawner
+  type: RandomSpawner
   components:
   - rot: 4.371139006309477E-08 rad
     pos: -23.5,14.5
     parent: 853
     type: Transform
 - uid: 509
-  type: TrashSpawner
+  type: RandomSpawner
   components:
   - rot: 4.371139006309477E-08 rad
     pos: -25.5,13.5
     parent: 853
     type: Transform
 - uid: 510
-  type: TrashSpawner
+  type: RandomSpawner
   components:
   - rot: 4.371139006309477E-08 rad
     pos: -30.5,14.5
     parent: 853
     type: Transform
 - uid: 511
-  type: TrashSpawner
+  type: RandomSpawner
   components:
   - rot: 4.371139006309477E-08 rad
     pos: -32.5,11.5
     parent: 853
     type: Transform
 - uid: 512
-  type: TrashSpawner
+  type: RandomSpawner
   components:
   - rot: 4.371139006309477E-08 rad
     pos: -31.5,7.5
     parent: 853
     type: Transform
 - uid: 513
-  type: TrashSpawner
+  type: RandomSpawner
   components:
   - rot: 4.371139006309477E-08 rad
     pos: -21.5,10.5
@@ -12374,7 +12374,7 @@ entities:
     parent: 853
     type: Transform
 - uid: 933
-  type: TrashSpawner
+  type: RandomSpawner
   components:
   - rot: 4.371139006309477E-08 rad
     pos: 7.5,13.5
@@ -40729,34 +40729,4 @@ entities:
   - pos: -36.5,4.5
     parent: 853
     type: Transform
-- uid: 4724
-  type: MouseAITimedSpawner
-  components:
-  - pos: -15.5,25.5
-    parent: 853
-    type: Transform
-- uid: 4725
-  type: MouseAITimedSpawner
-  components:
-  - pos: 13.5,18.5
-    parent: 853
-    type: Transform
-- uid: 4726
-  type: MouseAITimedSpawner
-  components:
-  - pos: 27.5,-1.5
-    parent: 853
-    type: Transform
-- uid: 4727
-  type: MouseAITimedSpawner
-  components:
-  - pos: -9.5,-25.5
-    parent: 853
-    type: Transform
-- uid: 4728
-  type: MouseAITimedSpawner
-  components:
-  - pos: -33.5,-11.5
-    parent: 853
-    type: Transform
 ...

Resources/Prototypes/Entities/Constructible/Power/arcade.yml

@@ -58,18 +58,3 @@
         type: WiresBoundUserInterface
   - type: Computer
     board: BlockGameArcadeComputerCircuitboard
-
-- type: entity
-  id: RandomArcade
-  name: Random Arcade Spawner
-  parent: MarkerBase
-  components:
-  - type: RandomArcade
-  - type: Sprite
-    netsync: false
-    visible: false
-    sprite: Interface/Misc/markers.rsi
-    state: cross_blue
-  - type: Marker
-  - type: Clickable
-  - type: InteractionOutline

Resources/Prototypes/Entities/Effects/Markers/spawn_points.yml

@@ -1,27 +0,0 @@
-- type: entity
-  name: spawn point
-  id: SpawnPoint
-  parent: MarkerBase
-  abstract: true
-  components:
-  - type: SpawnPoint
-
-- type: entity
-  name: latejoin spawn point
-  id: SpawnPointLatejoin
-  parent: SpawnPoint
-  components:
-  - type: Sprite
-    state: cross_red
-  - type: SpawnPoint
-    spawn_type: LateJoin
-
-- type: entity
-  name: observer spawn point
-  id: SpawnPointObserver
-  parent: SpawnPoint
-  components:
-  - type: Sprite
-    state: observer_start
-  - type: SpawnPoint
-    spawn_type: Observer

Resources/Prototypes/Entities/Effects/Markers/timed_spawners.yml

@@ -1,74 +0,0 @@
-- type: entity
-  name: base timed spawner
-  id: BaseTimedSpawner
-  abstract: true
-  components:
-    - type: Sprite
-      netsync: false
-      visible: false
-      sprite: Interface/Misc/markers.rsi
-      state: cross_blue
-    - type: Marker
-    - type: Clickable
-    - type: InteractionOutline
-    - type: Physics
-    - type: TimedSpawner
-  placement:
-    mode: AlignTileAny
-
-- type: entity
-  name: AI Timed Spawner
-  id: AITimedSpawner
-  parent: BaseTimedSpawner
-  components:
-    - type: Sprite
-      netsync: false
-      visible: false
-      sprite: Interface/Misc/markers.rsi
-      state: spawner_ai
-    - type: TimedSpawner
-      prototypes:
-        - HumanMob_Spirate
-        - HumanMob_Civilian
-      chance: 0.75
-      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: Interface/Misc/markers.rsi
-      state: spawner_xenoai
-    - type: TimedSpawner
-      prototypes:
-        - XenoMob_Content
-      chance: 0.85
-      intervalSeconds: 30
-      minimumEntitiesSpawned: 2
-      maximumEntitiesSpawned: 4
-
-- type: entity
-  name: Mouse AI Timed Spawner
-  id: MouseAITimedSpawner
-  parent: BaseTimedSpawner
-  components:
-    - type: Sprite
-      netsync: false
-      visible: false
-      sprite: Mobs/Animals/mouse.rsi
-      state: icon-2
-    - type: TimedSpawner
-      prototypes:
-        - MouseMob_Content
-        - MouseMob1_Content
-        - MouseMob2_Content
-      chance: 0.75
-      intervalSeconds: 100
-      minimumEntitiesSpawned: 1
-      maximumEntitiesSpawned: 1

Resources/Prototypes/Entities/Markers/Spawners/Conditional/suspicion.yml

@@ -1,22 +1,12 @@
-- type: entity
-  name: base conditional spawner
-  id: BaseConditionalSpawner
-  parent: MarkerBase
-  abstract: true
-  components:
-    - type: ConditionalSpawner
-
 - type: entity
   name: Suspicion Rifle Spawner
   id: SuspicionRifleSpawner
-  parent: BaseConditionalSpawner
+  parent: MarkerBase
   components:
     - type: Sprite
-      netsync: false
-      visible: false
-      sprite: Interface/Misc/markers.rsi
-      state: spawner_rifle
-
+      layers:
+        - state: blue
+        - texture: Objects/Weapons/Guns/Rifles/ak.rsi/icon.png
     - type: ConditionalSpawner
       prototypes:
         - RifleAk
@@ -34,14 +24,12 @@
 - type: entity
   name: Suspicion Pistol Spawner
   id: SuspicionPistolSpawner
-  parent: BaseConditionalSpawner
+  parent: MarkerBase
   components:
     - type: Sprite
-      netsync: false
-      visible: false
-      sprite: Interface/Misc/markers.rsi
-      state: spawner_pistol
-
+      layers:
+        - state: blue
+        - texture: Objects/Weapons/Guns/Pistols/colt.rsi/icon.png
     - type: ConditionalSpawner
       prototypes:
         - PistolClarissa
@@ -62,14 +50,12 @@
 - type: entity
   name: Suspicion Melee Spawner
   id: SuspicionMeleeSpawner
-  parent: BaseConditionalSpawner
+  parent: MarkerBase
   components:
     - type: Sprite
-      netsync: false
-      visible: false
-      sprite: Interface/Misc/markers.rsi
-      state: spawner_melee
-
+      layers:
+        - state: blue
+        - texture: Objects/Weapons/Melee/kitchen_knife.rsi/icon.png
     - type: ConditionalSpawner
       prototypes:
         - ButchCleaver
@@ -85,14 +71,12 @@
 - type: entity
   name: Suspicion Revolver Spawner
   id: SuspicionRevolverSpawner
-  parent: BaseConditionalSpawner
+  parent: MarkerBase
   components:
     - type: Sprite
-      netsync: false
-      visible: false
-      sprite: Interface/Misc/markers.rsi
-      state: spawner_revolver
-
+      layers:
+        - state: blue
+        - texture: Objects/Weapons/Guns/Revolvers/inspector.rsi/icon.png
     - type: ConditionalSpawner
       prototypes:
         - RevolverDeckard
@@ -105,14 +89,12 @@
 - type: entity
   name: Suspicion Shotgun Spawner
   id: SuspicionShotgunSpawner
-  parent: BaseConditionalSpawner
+  parent: MarkerBase
   components:
     - type: Sprite
-      netsync: false
-      visible: false
-      sprite: Interface/Misc/markers.rsi
-      state: spawner_shotgun
-
+      layers:
+        - state: blue
+        - texture: Objects/Weapons/Guns/Shotguns/pump.rsi/icon.png
     - type: ConditionalSpawner
       prototypes:
         - ShotgunBojevic
@@ -129,14 +111,12 @@
 - type: entity
   name: Suspicion SMG Spawner
   id: SuspicionSMGSpawner
-  parent: BaseConditionalSpawner
+  parent: MarkerBase
   components:
     - type: Sprite
-      netsync: false
-      visible: false
-      sprite: Interface/Misc/markers.rsi
-      state: spawner_smg
-
+      layers:
+        - state: blue
+        - texture: Objects/Weapons/Guns/SMGs/c20r.rsi/icon.png
     - type: ConditionalSpawner
       prototypes:
         - SmgAtreides
@@ -151,14 +131,12 @@
 - type: entity
   name: Suspicion Sniper Spawner
   id: SuspicionSniperSpawner
-  parent: BaseConditionalSpawner
+  parent: MarkerBase
   components:
     - type: Sprite
-      netsync: false
-      visible: false
-      sprite: Interface/Misc/markers.rsi
-      state: spawner_sniper
-
+      layers:
+        - state: blue
+        - texture: Objects/Weapons/Guns/Snipers/heavy_sniper.rsi/icon.png
     - type: ConditionalSpawner
       prototypes:
         - SniperBoltGun
@@ -171,14 +149,12 @@
 - type: entity
   name: Suspicion Hitscan Spawner
   id: SuspicionHitscanSpawner
-  parent: BaseConditionalSpawner
+  parent: MarkerBase
   components:
     - type: Sprite
-      netsync: false
-      visible: false
-      sprite: Interface/Misc/markers.rsi
-      state: spawner_hitscan
-
+      layers:
+        - state: blue
+        - texture: Objects/Weapons/Guns/Battery/xray.rsi/icon.png
     - type: ConditionalSpawner
       prototypes:
         - RedLaser
@@ -195,14 +171,12 @@
 - type: entity
   name: Suspicion Launchers Spawner
   id: SuspicionLaunchersSpawner
-  parent: BaseConditionalSpawner
+  parent: MarkerBase
   components:
     - type: Sprite
-      netsync: false
-      visible: false
-      sprite: Interface/Misc/markers.rsi
-      state: spawner_launcher
-
+      layers:
+        - state: blue
+        - texture: Objects/Weapons/Guns/Launchers/rocket.rsi/icon.png
     - type: ConditionalSpawner
       prototypes:
         - LauncherChinaLake
@@ -214,14 +188,12 @@
 - type: entity
   name: Suspicion Grenades Spawner
   id: SuspicionGrenadesSpawner
-  parent: BaseConditionalSpawner
+  parent: MarkerBase
   components:
     - type: Sprite
-      netsync: false
-      visible: false
-      sprite: Interface/Misc/markers.rsi
-      state: spawner_grenade
-
+      layers:
+        - state: blue
+        - texture: Objects/Weapons/Grenades/grenade.rsi/icon.png
     - type: ConditionalSpawner
       prototypes:
         - ExGrenade
@@ -239,14 +211,12 @@
 - type: entity
   name: Suspicion Rifle Ammo Spawner
   id: SuspicionRifleMagazineSpawner
-  parent: BaseConditionalSpawner
+  parent: MarkerBase
   components:
     - type: Sprite
-      netsync: false
-      visible: false
-      sprite: Interface/Misc/markers.rsi
-      state: spawner_rifle_ammo
-
+      layers:
+        - state: blue
+        - texture: Objects/Weapons/Guns/Ammunition/Boxes/LRifle/l_rifle_big_box.rsi/icon.png
     - type: ConditionalSpawner
       prototypes:
         - MagazineSRifle
@@ -262,14 +232,12 @@
 - type: entity
   name: Suspicion Shotgun Ammo Spawner
   id: SuspicionShotgunMagazineSpawner
-  parent: BaseConditionalSpawner
+  parent: MarkerBase
   components:
     - type: Sprite
-      netsync: false
-      visible: false
-      sprite: Interface/Misc/markers.rsi
-      state: spawner_shotgun_ammo
-
+      layers:
+        - state: blue
+        - texture: Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell.rsi/base.png
     - type: ConditionalSpawner
       prototypes:
         - MagazineShotgun
@@ -280,14 +248,12 @@
 - type: entity
   name: Suspicion Pistol Ammo Spawner
   id: SuspicionPistolMagazineSpawner
-  parent: BaseConditionalSpawner
+  parent: MarkerBase
   components:
     - type: Sprite
-      netsync: false
-      visible: false
-      sprite: Interface/Misc/markers.rsi
-      state: spawner_pistol_ammo
-
+      layers:
+        - state: blue
+        - texture: Objects/Weapons/Guns/Ammunition/Boxes/Pistol/pistol_box.rsi/icon.png
     - type: ConditionalSpawner
       prototypes:
         - MagazinePistol
@@ -299,14 +265,12 @@
 - type: entity
   name: Suspicion Magnum Ammo Spawner
   id: SuspicionMagnumMagazineSpawner
-  parent: BaseConditionalSpawner
+  parent: MarkerBase
   components:
     - type: Sprite
-      netsync: false
-      visible: false
-      sprite: Interface/Misc/markers.rsi
-      state: spawner_magnum_ammo
-
+      layers:
+        - state: blue
+        - texture: Objects/Weapons/Guns/Ammunition/Boxes/Magnum/magnum_box.rsi/icon.png
     - type: ConditionalSpawner
       prototypes:
         - MagazineMagnum
@@ -318,14 +282,12 @@
 - type: entity
   name: Suspicion Launcher Ammo Spawner
   id: SuspicionLauncherAmmoSpawner
-  parent: BaseConditionalSpawner
+  parent: MarkerBase
   components:
     - type: Sprite
-      netsync: false
-      visible: false
-      sprite: Interface/Misc/markers.rsi
-      state: spawner_launcher_ammo
-
+      layers:
+        - state: blue
+        - texture: Objects/Weapons/Guns/Ammunition/Explosives/rpg.rsi/frag.png
     - type: ConditionalSpawner
       prototypes:
         - RocketAmmo
@@ -333,22 +295,3 @@
       chance: 0.95
       gameRules:
         - RuleSuspicion
-
-- type: entity
-  name: Traitor DeathMatch PDA Redemption Machine Spawner
-  id: TraitorDMRedemptionMachineSpawner
-  parent: BaseConditionalSpawner
-  components:
-    - type: Sprite
-      netsync: false
-      visible: false
-      sprite: Objects/Misc/traitordm.rsi
-      state: redemption
-
-    - type: ConditionalSpawner
-      prototypes:
-        - TraitorDMRedemptionMachine
-      chance: 1.0
-      gameRules:
-        - RuleTraitorDeathMatch
-

Resources/Prototypes/Entities/Markers/Spawners/Conditional/timed.yml

@@ -0,0 +1,36 @@
+- type: entity
+  name: AI Timed Spawner
+  id: AITimedSpawner
+  parent: MarkerBase
+  components:
+    - type: Sprite
+      layers:
+        - state: blue
+        - texture: Mobs/Species/Human/parts.rsi/full.png
+        - state: ai
+    - type: TimedSpawner
+      prototypes:
+        - HumanMob_Spirate
+        - HumanMob_Civilian
+      chance: 0.75
+      intervalSeconds: 60
+      minimumEntitiesSpawned: 1
+      maximumEntitiesSpawned: 5
+
+- type: entity
+  name: Xeno AI Timed Spawner
+  id: XenoAITimedSpawner
+  parent: MarkerBase
+  components:
+    - type: Sprite
+      layers:
+        - state: blue
+        - texture: Mobs/Aliens/Xenos/xeno.rsi/crit.png
+        - state: ai
+    - type: TimedSpawner
+      prototypes:
+        - XenoMob_Content
+      chance: 0.85
+      intervalSeconds: 30
+      minimumEntitiesSpawned: 2
+      maximumEntitiesSpawned: 4

Resources/Prototypes/Entities/Markers/Spawners/Conditional/traitordm.yml

@@ -0,0 +1,15 @@
+- type: entity
+  name: PDA Redemption Machine Spawner
+  id: TraitorDMRedemptionMachineSpawner
+  parent: MarkerBase
+  components:
+    - type: Sprite
+      layers:
+        - state: blue
+        - texture: Objects/Misc/traitordm.rsi/redemption.png
+    - type: ConditionalSpawner
+      prototypes:
+        - TraitorDMRedemptionMachine
+      chance: 1.0
+      gameRules:
+        - RuleTraitorDeathMatch

Resources/Prototypes/Entities/Markers/Spawners/Random/arcade.yml

@@ -0,0 +1,10 @@
+- type: entity
+  id: RandomArcade
+  name: random arcade spawner
+  parent: MarkerBase
+  components:
+  - type: RandomArcade
+  - type: Sprite
+    layers:
+      - state: red
+      - texture: Constructible/Power/computers.rsi/arcade.png

Resources/Prototypes/Entities/Markers/Spawners/Random/bedsheet.yml

@@ -1,17 +1,13 @@
 - type: entity
   name: Random Sheet Spawner
   id: BedsheetSpawner
+  parent: MarkerBase
   components:
     - type: Sprite
-      netsync: false
-      visible: false
-      sprite: Objects/Misc/bedsheets.rsi
-      state: random_bedsheet
-    - type: Marker
-    - type: Clickable
-    - type: InteractionOutline
-    - type: Physics
-    - type: TrashSpawner
+      layers:
+        - state: red
+        - texture: Objects/Misc/bedsheets.rsi/random_bedsheet.png
+    - type: RandomSpawner
       rarePrototypes:
         - BedsheetIan
         - BedsheetCosmos
@@ -32,5 +28,3 @@
         - BedsheetRainbow
       chance: 0.97
       offset: 0
-  placement:
-    mode: AlignTileAny

Resources/Prototypes/Entities/Markers/Spawners/Random/toy.yml

@@ -4,11 +4,10 @@
   parent: MarkerBase
   components:
     - type: Sprite
-      netsync: false
-      visible: false
-      sprite: Interface/Misc/markers.rsi
-      state: spawner_toy
-    - type: TrashSpawner
+      layers:
+        - state: red
+        - texture: Objects/Fun/toys.rsi/plushie_h.png
+    - type: RandomSpawner
       rarePrototypes:
         - CarvingHelpMe
         - CarvingHello
@@ -35,11 +34,10 @@
   parent: MarkerBase
   components:
     - type: Sprite
-      netsync: false
-      visible: false
-      sprite: Interface/Misc/markers.rsi
-      state: spawner_figure
-    - type: TrashSpawner
+      layers:
+        - state: red
+        - texture: Objects/Fun/toys.rsi/ripleytoy.png
+    - type: RandomSpawner
       prototypes:
         - ToyAi
         - ToyNuke

Resources/Prototypes/Entities/Markers/Spawners/Random/trash.yml

@@ -1,18 +1,13 @@
 - type: entity
   name: Trash Spawner
-  id: TrashSpawner
+  id: RandomSpawner
+  parent: MarkerBase
   components:
     - type: Sprite
-      netsync: false
-      visible: false
-      sprite: Interface/Misc/markers.rsi
-      state: spawner_trash
-
-    - type: Marker
-    - type: Clickable
-    - type: InteractionOutline
-    - type: Physics
-    - type: TrashSpawner
+      layers:
+        - state: red
+        - texture: Objects/Consumable/Trash/candy.rsi/icon.png
+    - type: RandomSpawner
       rarePrototypes:
         - PuddleVomit
         - TrashPlate

Resources/Prototypes/Entities/Markers/Spawners/jobs.yml

@@ -1,251 +1,297 @@
 # Base
+
 - type: entity
   id: SpawnPointJobBase
-  parent: SpawnPoint
+  parent: MarkerBase
   abstract: true
+  suffix: Job Spawn
   components:
   - type: SpawnPoint
     spawn_type: Job
-
-# Assistant
-- type: entity
-  id: SpawnPointAssistant
-  parent: SpawnPointJobBase
-  name: spawn point (assistant)
-  components:
-  - type: SpawnPoint
-    job_id: Assistant
   - type: Sprite
-    state: Assistant
+    sprite: Markers/jobs.rsi
+
+- type: entity
+  name: observer spawn point
+  id: SpawnPointObserver
+  parent: SpawnPointJobBase
+  components:
+  - type: Sprite
+    layers:
+      - state: green
+      - texture: Mobs/Ghosts/ghost_human.rsi/icon.png
+    state: observer
+  - type: SpawnPoint
+    spawn_type: Observer
+
+- type: entity
+  name: latejoin spawn point
+  id: SpawnPointLatejoin
+  parent: SpawnPointJobBase
+  components:
+  - type: Sprite
+    state: green
+  - type: SpawnPoint
+    spawn_type: LateJoin
+
+# Cargo
 
-# Quartermaster
 #- type: entity
 #  id: SpawnPointQuartermaster
 #  parent: SpawnPointJobBase
-#  name: spawn point (quartermaster)
+#  name: quartermaster
 #  components:
 #    - type: SpawnPoint
 #      job_id: Quartermaster
 #    - type: Sprite
 #      state: Quartermaster
 
-# Cargo tech
 - type: entity
   id: SpawnPointCargoTechnician
   parent: SpawnPointJobBase
-  name: spawn point (cargotechnician)
+  name: cargotechnician
   components:
   - type: SpawnPoint
     job_id: CargoTechnician
   - type: Sprite
-    state: Cargo Technician
+    layers:
+      - state: green
+      - state: cargo_tech
 
+# Civilian
+
+- type: entity
+  id: SpawnPointAssistant
+  parent: SpawnPointJobBase
+  name: assistant
+  components:
+  - type: SpawnPoint
+    job_id: Assistant
+  - type: Sprite
+    layers:
+      - state: green
+      - state: assistant
 
-# Bartender
 - type: entity
   id: SpawnPointBartender
   parent: SpawnPointJobBase
-  name: spawn point (bartender)
+  name: bartender
   components:
   - type: SpawnPoint
     job_id: Bartender
   - type: Sprite
-    state: Bartender
+    layers:
+      - state: green
+      - state: bartender
 
-
-# Chef
 - type: entity
   id: SpawnPointChef
   parent: SpawnPointJobBase
-  name: spawn point (chef)
+  name: chef
   components:
   - type: SpawnPoint
     job_id: Chef
   - type: Sprite
-    state: Cook
+    layers:
+      - state: green
+      - state: chef
 
-# Botanist
 - type: entity
   id: SpawnPointBotanist
   parent: SpawnPointJobBase
-  name: spawn point (botanist)
+  name: botanist
   components:
-    - type: SpawnPoint
-      job_id: Botanist
-    - type: Sprite
-      state: Botanist
+  - type: SpawnPoint
+    job_id: Botanist
+  - type: Sprite
+    layers:
+      - state: green
+      - state: botanist
 
-# Clown
 - type: entity
   id: SpawnPointClown
   parent: SpawnPointJobBase
-  name: spawn point (clown)
+  name: clown
   components:
   - type: SpawnPoint
     job_id: Clown
   - type: Sprite
-    state: Clown
+    layers:
+      - state: green
+      - state: clown
 
-
-# Mime
 - type: entity
   id: SpawnPointMime
   parent: SpawnPointJobBase
-  name: spawn point (mime)
+  name: mime
   components:
   - type: SpawnPoint
     job_id: Mime
   - type: Sprite
-    state: Mime
+    layers:
+      - state: green
+      - state: mime
 
-# Chaplain
 #- type: entity
 #  id: SpawnPointChaplain
 #  parent: SpawnPointJobBase
-#  name: spawn point (chaplain)
+#  name: chaplain
 #  components:
 #    - type: SpawnPoint
 #      job_id: Chaplain
 #    - type: Sprite
 #      state: Chaplain
 
-# Janitor
 - type: entity
   id: SpawnPointJanitor
   parent: SpawnPointJobBase
-  name: spawn point (janitor)
+  name: janitor
   components:
   - type: SpawnPoint
     job_id: Janitor
   - type: Sprite
-    state: Janitor
+    layers:
+      - state: green
+      - state: janitor
 
+# Command
 
-# Captain
 - type: entity
   id: SpawnPointCaptain
   parent: SpawnPointJobBase
-  name: spawn point (captain)
+  name: captain
   components:
   - type: SpawnPoint
     job_id: Captain
   - type: Sprite
-    state: Captain
+    layers:
+      - state: green
+      - state: captain
 
-
-# Head of Personnel
 - type: entity
   id: SpawnPointHeadOfPersonnel
   parent: SpawnPointJobBase
-  name: spawn point (headofpersonnel)
+  name: headofpersonnel
   components:
   - type: SpawnPoint
     job_id: HeadOfPersonnel
   - type: Sprite
-    state: Head of Personnel
+    layers:
+      - state: green
+      - state: hop
 
+# Engineering
 
-# ChiefEngineer
 - type: entity
   id: SpawnPointChiefEngineer
   parent: SpawnPointJobBase
-  name: spawn point (chiefengineer)
+  name: chiefengineer
   components:
   - type: SpawnPoint
     job_id: ChiefEngineer
   - type: Sprite
-    state: Chief Engineer
+    layers:
+      - state: green
+      - state: ce
 
-
-# StationEngineer
 - type: entity
   id: SpawnPointStationEngineer
   parent: SpawnPointJobBase
-  name: spawn point (stationengineer)
+  name: stationengineer
   components:
   - type: SpawnPoint
     job_id: StationEngineer
   - type: Sprite
-    state: Station Engineer
+    layers:
+      - state: green
+      - state: engineer
 
+# Medical
 
-# ChiefMedicalOfficer
 - type: entity
   id: SpawnPointChiefMedicalOfficer
   parent: SpawnPointJobBase
-  name: spawn point (chiefmedicalofficer)
+  name: chiefmedicalofficer
   components:
   - type: SpawnPoint
     job_id: ChiefMedicalOfficer
   - type: Sprite
-    state: Chief Medical Officer
+    layers:
+      - state: green
+      - state: cmo
 
-
-# MedicalDoctor
 - type: entity
   id: SpawnPointMedicalDoctor
   parent: SpawnPointJobBase
-  name: spawn point (medicaldoctor)
+  name: medicaldoctor
   components:
   - type: SpawnPoint
     job_id: MedicalDoctor
   - type: Sprite
-    state: Medical Doctor
+    layers:
+      - state: green
+      - state: doctor
 
+# Science
 
-# ResearchDirector
 - type: entity
   id: SpawnPointResearchDirector
   parent: SpawnPointJobBase
-  name: spawn point (researchdirector)
+  name: researchdirector
   components:
   - type: SpawnPoint
     job_id: ResearchDirector
   - type: Sprite
-    state: Research Director
+    layers:
+      - state: green
+      - state: rd
 
-
-# Scientist
 - type: entity
   id: SpawnPointScientist
   parent: SpawnPointJobBase
-  name: spawn point (scientist)
+  name: scientist
   components:
   - type: SpawnPoint
     job_id: Scientist
   - type: Sprite
-    state: Scientist
+    layers:
+      - state: green
+      - state: scientist
 
+# Security
 
-# HeadOfSecurity
 - type: entity
   id: SpawnPointHeadOfSecurity
   parent: SpawnPointJobBase
-  name: spawn point (headofsecurity)
+  name: headofsecurity
   components:
   - type: SpawnPoint
     job_id: HeadOfSecurity
   - type: Sprite
-    state: Head of Security
+    layers:
+      - state: green
+      - state: hos
 
-# Warden
 - type: entity
   id: SpawnPointWarden
   parent: SpawnPointJobBase
-  name: spawn point (warden)
+  name: warden
   components:
-    - type: SpawnPoint
-      job_id: Warden
-    - type: Sprite
-      state: Warden
+  - type: SpawnPoint
+    job_id: Warden
+  - type: Sprite
+    layers:
+      - state: green
+      - state: warden
 
-# SecurityOfficer
 - type: entity
   id: SpawnPointSecurityOfficer
   parent: SpawnPointJobBase
-  name: spawn point (securityofficer)
+  name: securityofficer
   components:
   - type: SpawnPoint
     job_id: SecurityOfficer
   - type: Sprite
-    state: Security Officer
+    layers:
+      - state: green
+      - state: security_officer

Resources/Prototypes/Entities/Markers/Spawners/mobs.yml

@@ -0,0 +1,17 @@
+# Base
+
+- type: entity
+  name: Mouse Spawner
+  id: SpawnMobMouse
+  parent: MarkerBase
+  components:
+  - type: Sprite
+    layers:
+      - state: green
+      - texture: Mobs/Animals/mouse.rsi/icon-2.png
+      - state: ai
+  - type: ConditionalSpawner
+    prototypes:
+      - MouseMob_Content
+      - MouseMob1_Content
+      - MouseMob2_Content

Resources/Prototypes/Entities/Markers/marker_base.yml

@@ -6,12 +6,9 @@
   - type: Clickable
   - type: InteractionOutline
   - type: Sprite
-    netsync: false
-    visible: false
-    sprite: Interface/Misc/markers.rsi
-    state: cross_blue
+    sprite: Markers/cross.rsi
+# If serialization was cool this would work.
+#    layers:
+#      - state: blue
   placement:
     mode: AlignTileAny
-
-
-

Resources/Prototypes/Entities/Markers/warp_point.yml

@@ -5,8 +5,4 @@
   components:
   - type: WarpPoint
   - type: Sprite
-    state: cross_pink
-
-
-
-
+    state: pink

Resources/Prototypes/Entities/Mobs/Player/human.yml

@@ -31,8 +31,8 @@
   id: HumanMob_CentcomOfficial
   components:
   - type: Icon
-    sprite: Interface/Misc/markers.rsi
-    state: Centcom
+    sprite: Markers/jobs.rsi
+    state: centcom
   - type: GhostRoleMobSpawner
     prototype: HumanMob_CentcomOfficial
     deleteOnSpawn: true

Resources/Prototypes/Entities/chemistry.yml

@@ -1,8 +0,0 @@
-- type: entity
-  parent: BaseItem
-  id: ReagentItem
-  name: "reagent item"
-  abstract: true
-  components:
-  - type: SolutionContainer
-    maxVol: 5

Resources/Prototypes/Entities/stress_test.yml

@@ -1,7 +0,0 @@
-- type: entity
-  id: StressTest
-  name: stress test
-  components:
-  - type: Sprite
-    texture: Effects/explosion.rsi/explosion.png
-  - type: StressTestMovement

Resources/Textures/Interface/Misc/markers.rsi/meta.json

@@ -1,196 +0,0 @@
-{
-    "version": 1,
-    "license": "CC-BY-SA-3.0",
-    "copyright": "Taken from https://github.com/vgstation-coders/vgstation13/blob/e71d6c4fba5a51f99b81c295dcaec4fc2f58fb19/icons/mob/screen1.dmi",
-    "size": {
-        "x": 32,
-        "y": 32
-    },
-    "states": [
-        {
-            "name": "AI"
-        },
-        {
-            "name": "Assistant"
-        },
-        {
-            "name": "Atmospheric Technician"
-        },
-        {
-            "name": "Bartender"
-        },
-        {
-            "name": "Botanist"
-        },
-        {
-            "name": "Captain"
-        },
-        {
-            "name": "Cargo Technician"
-        },
-        {
-            "name": "Centcom"
-        },
-        {
-            "name": "Chaplain"
-        },
-        {
-            "name": "Chemist"
-        },
-        {
-            "name": "Chief Engineer"
-        },
-        {
-            "name": "Chief Medical Officer"
-        },
-        {
-            "name": "Clown"
-        },
-        {
-            "name": "Cook"
-        },
-        {
-            "name": "Curator"
-
-        },
-        {
-            "name": "Cyborg"
-
-        },
-        {
-            "name": "Detective"
-        },
-        {
-            "name": "Geneticist"
-        },
-        {
-            "name": "Head of Personnel"
-        },
-        {
-            "name": "Head of Security"
-        },
-        {
-            "name": "Janitor"
-        },
-        {
-            "name": "Lawyer"
-        },
-        {
-            "name": "Medical Doctor"
-        },
-        {
-            "name": "Mime"
-        },
-        {
-            "name": "Paramedic"
-        },
-        {
-            "name": "Prisoner"
-        },
-        {
-            "name": "Psychologist"
-        },
-        {
-            "name": "Quartermaster"
-        },
-        {
-            "name": "Research Director"
-        },
-        {
-            "name": "Roboticist"
-        },
-        {
-            "name": "Scientist"
-        },
-        {
-            "name": "Security Officer"
-        },
-        {
-            "name": "Shaft Miner"
-        },
-        {
-            "name": "Station Engineer"
-        },
-        {
-            "name": "Virologist"
-        },
-        {
-            "name": "Warden"
-        },
-        {
-            "name": "cross_blue"
-        },
-        {
-            "name": "cross_green"
-        },
-        {
-            "name": "cross_pink"
-        },
-        {
-            "name": "cross_red"
-        },
-        {
-            "name": "observer_start"
-        },
-        {
-            "name": "spawner_ai"
-        },
-        {
-            "name": "spawner_grenade"
-        },
-        {
-            "name": "spawner_hitscan"
-        },
-        {
-            "name": "spawner_launcher"
-        },
-        {
-            "name": "spawner_launcher_ammo"
-        },
-        {
-            "name": "spawner_magnum_ammo"
-        },
-        {
-            "name": "spawner_melee"
-        },
-        {
-            "name": "spawner_pistol"
-        },
-        {
-            "name": "spawner_pistol_ammo"
-        },
-        {
-            "name": "spawner_revolver"
-        },
-        {
-            "name": "spawner_rifle"
-        },
-        {
-            "name": "spawner_rifle_ammo"
-        },
-        {
-            "name": "spawner_shotgun"
-        },
-        {
-            "name": "spawner_shotgun_ammo"
-        },
-        {
-            "name": "spawner_smg"
-        },
-        {
-            "name": "spawner_sniper"
-        },
-        {
-            "name": "spawner_trash"
-        },
-        {
-            "name": "spawner_xenoai"
-        },
-        {
-            "name": "spawner_toy"
-        },
-        {
-            "name": "spawner_figure"
-        }
-    ]
-}

Resources/Textures/Markers/cross.rsi/meta.json

@@ -0,0 +1,26 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from https://github.com/vgstation-coders/vgstation13/blob/e71d6c4fba5a51f99b81c295dcaec4fc2f58fb19/icons/mob/screen1.dmi",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "ai"
+    },
+    {
+      "name": "blue"
+    },
+    {
+      "name": "green"
+    },
+    {
+      "name": "pink"
+    },
+    {
+      "name": "red"
+    }
+  ]
+}

Resources/Textures/Markers/jobs.rsi/meta.json

@@ -0,0 +1,122 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from https://github.com/vgstation-coders/vgstation13/blob/e71d6c4fba5a51f99b81c295dcaec4fc2f58fb19/icons/mob/screen1.dmi",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "green"
+    },
+    {
+      "name": "ai"
+    },
+    {
+      "name": "assistant"
+    },
+    {
+      "name": "atmospherics"
+    },
+    {
+      "name": "bartender"
+    },
+    {
+      "name": "botanist"
+    },
+    {
+      "name": "captain"
+    },
+    {
+      "name": "cargo_tech"
+    },
+    {
+      "name": "centcom"
+    },
+    {
+      "name": "chaplain"
+    },
+    {
+      "name": "chemist"
+    },
+    {
+      "name": "ce"
+    },
+    {
+      "name": "cmo"
+    },
+    {
+      "name": "clown"
+    },
+    {
+      "name": "chef"
+    },
+    {
+      "name": "curator"
+    },
+    {
+      "name": "cyborg"
+    },
+    {
+      "name": "detective"
+    },
+    {
+      "name": "geneticist"
+    },
+    {
+      "name": "hop"
+    },
+    {
+      "name": "hos"
+    },
+    {
+      "name": "janitor"
+    },
+    {
+      "name": "lawyer"
+    },
+    {
+      "name": "doctor"
+    },
+    {
+      "name": "mime"
+    },
+    {
+      "name": "paramedic"
+    },
+    {
+      "name": "prisoner"
+    },
+    {
+      "name": "psychologist"
+    },
+    {
+      "name": "qm"
+    },
+    {
+      "name": "rd"
+    },
+    {
+      "name": "roboticist"
+    },
+    {
+      "name": "scientist"
+    },
+    {
+      "name": "security_officer"
+    },
+    {
+      "name": "miner"
+    },
+    {
+      "name": "engineer"
+    },
+    {
+      "name": "virologist"
+    },
+    {
+      "name": "warden"
+    }
+  ]
+}