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>
2021-03-12 20:28:40 +00:00
parent 8c01d9d9dc
commit bf99a91507
91 changed files with 538 additions and 697 deletions
--- a/Resources/Prototypes/Entities/Constructible/Power/arcade.yml
+++ b/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
--- a/Resources/Prototypes/Entities/Effects/Markers/spawn_points.yml
+++ b/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
--- a/Resources/Prototypes/Entities/Effects/Markers/timed_spawners.yml
+++ b/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
--- a/Resources/Prototypes/Entities/Effects/Markers/gamemode_conditional_spawners.yml
+++ b/Resources/Prototypes/Entities/Effects/Markers/gamemode_conditional_spawners.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
-
--- a/Resources/Prototypes/Entities/Markers/Spawners/Conditional/timed.yml
+++ b/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
--- a/Resources/Prototypes/Entities/Markers/Spawners/Conditional/traitordm.yml
+++ b/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
--- a/Resources/Prototypes/Entities/Markers/Spawners/Random/arcade.yml
+++ b/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
--- a/Resources/Prototypes/Entities/Markers/Spawners/Random/bedsheet.yml
+++ b/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
--- a/Resources/Prototypes/Entities/Markers/Spawners/Random/toy.yml
+++ b/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
--- a/Resources/Prototypes/Entities/Markers/Spawners/Random/trash.yml
+++ b/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
--- a/Resources/Prototypes/Entities/Effects/Markers/spawn_points_jobs.yml
+++ b/Resources/Prototypes/Entities/Effects/Markers/spawn_points_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
--- a/Resources/Prototypes/Entities/Markers/Spawners/mobs.yml
+++ b/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
--- a/Resources/Prototypes/Entities/Effects/Markers/clientsideclone.yml
+++ b/Resources/Prototypes/Entities/Effects/Markers/clientsideclone.yml
--- a/Resources/Prototypes/Entities/Effects/Markers/construction_ghost.yml
+++ b/Resources/Prototypes/Entities/Effects/Markers/construction_ghost.yml
--- a/Resources/Prototypes/Entities/Effects/Markers/drag_shadow.yml
+++ b/Resources/Prototypes/Entities/Effects/Markers/drag_shadow.yml
--- a/Resources/Prototypes/Entities/Effects/Markers/hover_entity.yml
+++ b/Resources/Prototypes/Entities/Effects/Markers/hover_entity.yml
--- a/Resources/Prototypes/Entities/Effects/Markers/marker_base.yml
+++ b/Resources/Prototypes/Entities/Effects/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
-
-
-
--- a/Resources/Prototypes/Entities/Effects/Markers/pointing.yml
+++ b/Resources/Prototypes/Entities/Effects/Markers/pointing.yml
--- a/Resources/Prototypes/Entities/Effects/Markers/warp_point.yml
+++ b/Resources/Prototypes/Entities/Effects/Markers/warp_point.yml
@@ -5,8 +5,4 @@
  components:
  - type: WarpPoint
  - type: Sprite
-    state: cross_pink
-
-
-
-
+    state: pink
--- a/Resources/Prototypes/Entities/Mobs/Player/human.yml
+++ b/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
--- a/Resources/Prototypes/Entities/chemistry.yml
+++ b/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
--- a/Resources/Prototypes/Entities/stress_test.yml
+++ b/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