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

This reverts commit a47e1b817c.
2021-03-12 20:22:33 +11:00
parent e80b4fc459
commit 8c01d9d9dc
91 changed files with 775 additions and 529 deletions
--- a/Resources/Prototypes/Entities/Constructible/Power/arcade.yml
+++ b/Resources/Prototypes/Entities/Constructible/Power/arcade.yml
@@ -58,3 +58,18 @@
        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/bedsheet_spawner.yml
+++ b/Resources/Prototypes/Entities/Effects/Markers/bedsheet_spawner.yml
@@ -1,13 +1,17 @@
 - type: entity
  name: Random Sheet Spawner
  id: BedsheetSpawner
-  parent: MarkerBase
  components:
    - type: Sprite
-      layers:
-        - state: red
-        - texture: Objects/Misc/bedsheets.rsi/random_bedsheet.png
-    - type: RandomSpawner
+      netsync: false
+      visible: false
+      sprite: Objects/Misc/bedsheets.rsi
+      state: random_bedsheet
+    - type: Marker
+    - type: Clickable
+    - type: InteractionOutline
+    - type: Physics
+    - type: TrashSpawner
      rarePrototypes:
        - BedsheetIan
        - BedsheetCosmos
@@ -28,3 +32,5 @@
        - BedsheetRainbow
      chance: 0.97
      offset: 0
+  placement:
+    mode: AlignTileAny
--- 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/gamemode_conditional_spawners.yml
+++ b/Resources/Prototypes/Entities/Effects/Markers/gamemode_conditional_spawners.yml
@@ -1,12 +1,22 @@
+- type: entity
+  name: base conditional spawner
+  id: BaseConditionalSpawner
+  parent: MarkerBase
+  abstract: true
+  components:
+    - type: ConditionalSpawner
+
 - type: entity
  name: Suspicion Rifle Spawner
  id: SuspicionRifleSpawner
-  parent: MarkerBase
+  parent: BaseConditionalSpawner
  components:
    - type: Sprite
-      layers:
-        - state: blue
-        - texture: Objects/Weapons/Guns/Rifles/ak.rsi/icon.png
+      netsync: false
+      visible: false
+      sprite: Interface/Misc/markers.rsi
+      state: spawner_rifle
+
    - type: ConditionalSpawner
      prototypes:
        - RifleAk
@@ -24,12 +34,14 @@
 - type: entity
  name: Suspicion Pistol Spawner
  id: SuspicionPistolSpawner
-  parent: MarkerBase
+  parent: BaseConditionalSpawner
  components:
    - type: Sprite
-      layers:
-        - state: blue
-        - texture: Objects/Weapons/Guns/Pistols/colt.rsi/icon.png
+      netsync: false
+      visible: false
+      sprite: Interface/Misc/markers.rsi
+      state: spawner_pistol
+
    - type: ConditionalSpawner
      prototypes:
        - PistolClarissa
@@ -50,12 +62,14 @@
 - type: entity
  name: Suspicion Melee Spawner
  id: SuspicionMeleeSpawner
-  parent: MarkerBase
+  parent: BaseConditionalSpawner
  components:
    - type: Sprite
-      layers:
-        - state: blue
-        - texture: Objects/Weapons/Melee/kitchen_knife.rsi/icon.png
+      netsync: false
+      visible: false
+      sprite: Interface/Misc/markers.rsi
+      state: spawner_melee
+
    - type: ConditionalSpawner
      prototypes:
        - ButchCleaver
@@ -71,12 +85,14 @@
 - type: entity
  name: Suspicion Revolver Spawner
  id: SuspicionRevolverSpawner
-  parent: MarkerBase
+  parent: BaseConditionalSpawner
  components:
    - type: Sprite
-      layers:
-        - state: blue
-        - texture: Objects/Weapons/Guns/Revolvers/inspector.rsi/icon.png
+      netsync: false
+      visible: false
+      sprite: Interface/Misc/markers.rsi
+      state: spawner_revolver
+
    - type: ConditionalSpawner
      prototypes:
        - RevolverDeckard
@@ -89,12 +105,14 @@
 - type: entity
  name: Suspicion Shotgun Spawner
  id: SuspicionShotgunSpawner
-  parent: MarkerBase
+  parent: BaseConditionalSpawner
  components:
    - type: Sprite
-      layers:
-        - state: blue
-        - texture: Objects/Weapons/Guns/Shotguns/pump.rsi/icon.png
+      netsync: false
+      visible: false
+      sprite: Interface/Misc/markers.rsi
+      state: spawner_shotgun
+
    - type: ConditionalSpawner
      prototypes:
        - ShotgunBojevic
@@ -111,12 +129,14 @@
 - type: entity
  name: Suspicion SMG Spawner
  id: SuspicionSMGSpawner
-  parent: MarkerBase
+  parent: BaseConditionalSpawner
  components:
    - type: Sprite
-      layers:
-        - state: blue
-        - texture: Objects/Weapons/Guns/SMGs/c20r.rsi/icon.png
+      netsync: false
+      visible: false
+      sprite: Interface/Misc/markers.rsi
+      state: spawner_smg
+
    - type: ConditionalSpawner
      prototypes:
        - SmgAtreides
@@ -131,12 +151,14 @@
 - type: entity
  name: Suspicion Sniper Spawner
  id: SuspicionSniperSpawner
-  parent: MarkerBase
+  parent: BaseConditionalSpawner
  components:
    - type: Sprite
-      layers:
-        - state: blue
-        - texture: Objects/Weapons/Guns/Snipers/heavy_sniper.rsi/icon.png
+      netsync: false
+      visible: false
+      sprite: Interface/Misc/markers.rsi
+      state: spawner_sniper
+
    - type: ConditionalSpawner
      prototypes:
        - SniperBoltGun
@@ -149,12 +171,14 @@
 - type: entity
  name: Suspicion Hitscan Spawner
  id: SuspicionHitscanSpawner
-  parent: MarkerBase
+  parent: BaseConditionalSpawner
  components:
    - type: Sprite
-      layers:
-        - state: blue
-        - texture: Objects/Weapons/Guns/Battery/xray.rsi/icon.png
+      netsync: false
+      visible: false
+      sprite: Interface/Misc/markers.rsi
+      state: spawner_hitscan
+
    - type: ConditionalSpawner
      prototypes:
        - RedLaser
@@ -171,12 +195,14 @@
 - type: entity
  name: Suspicion Launchers Spawner
  id: SuspicionLaunchersSpawner
-  parent: MarkerBase
+  parent: BaseConditionalSpawner
  components:
    - type: Sprite
-      layers:
-        - state: blue
-        - texture: Objects/Weapons/Guns/Launchers/rocket.rsi/icon.png
+      netsync: false
+      visible: false
+      sprite: Interface/Misc/markers.rsi
+      state: spawner_launcher
+
    - type: ConditionalSpawner
      prototypes:
        - LauncherChinaLake
@@ -188,12 +214,14 @@
 - type: entity
  name: Suspicion Grenades Spawner
  id: SuspicionGrenadesSpawner
-  parent: MarkerBase
+  parent: BaseConditionalSpawner
  components:
    - type: Sprite
-      layers:
-        - state: blue
-        - texture: Objects/Weapons/Grenades/grenade.rsi/icon.png
+      netsync: false
+      visible: false
+      sprite: Interface/Misc/markers.rsi
+      state: spawner_grenade
+
    - type: ConditionalSpawner
      prototypes:
        - ExGrenade
@@ -211,12 +239,14 @@
 - type: entity
  name: Suspicion Rifle Ammo Spawner
  id: SuspicionRifleMagazineSpawner
-  parent: MarkerBase
+  parent: BaseConditionalSpawner
  components:
    - type: Sprite
-      layers:
-        - state: blue
-        - texture: Objects/Weapons/Guns/Ammunition/Boxes/LRifle/l_rifle_big_box.rsi/icon.png
+      netsync: false
+      visible: false
+      sprite: Interface/Misc/markers.rsi
+      state: spawner_rifle_ammo
+
    - type: ConditionalSpawner
      prototypes:
        - MagazineSRifle
@@ -232,12 +262,14 @@
 - type: entity
  name: Suspicion Shotgun Ammo Spawner
  id: SuspicionShotgunMagazineSpawner
-  parent: MarkerBase
+  parent: BaseConditionalSpawner
  components:
    - type: Sprite
-      layers:
-        - state: blue
-        - texture: Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell.rsi/base.png
+      netsync: false
+      visible: false
+      sprite: Interface/Misc/markers.rsi
+      state: spawner_shotgun_ammo
+
    - type: ConditionalSpawner
      prototypes:
        - MagazineShotgun
@@ -248,12 +280,14 @@
 - type: entity
  name: Suspicion Pistol Ammo Spawner
  id: SuspicionPistolMagazineSpawner
-  parent: MarkerBase
+  parent: BaseConditionalSpawner
  components:
    - type: Sprite
-      layers:
-        - state: blue
-        - texture: Objects/Weapons/Guns/Ammunition/Boxes/Pistol/pistol_box.rsi/icon.png
+      netsync: false
+      visible: false
+      sprite: Interface/Misc/markers.rsi
+      state: spawner_pistol_ammo
+
    - type: ConditionalSpawner
      prototypes:
        - MagazinePistol
@@ -265,12 +299,14 @@
 - type: entity
  name: Suspicion Magnum Ammo Spawner
  id: SuspicionMagnumMagazineSpawner
-  parent: MarkerBase
+  parent: BaseConditionalSpawner
  components:
    - type: Sprite
-      layers:
-        - state: blue
-        - texture: Objects/Weapons/Guns/Ammunition/Boxes/Magnum/magnum_box.rsi/icon.png
+      netsync: false
+      visible: false
+      sprite: Interface/Misc/markers.rsi
+      state: spawner_magnum_ammo
+
    - type: ConditionalSpawner
      prototypes:
        - MagazineMagnum
@@ -282,12 +318,14 @@
 - type: entity
  name: Suspicion Launcher Ammo Spawner
  id: SuspicionLauncherAmmoSpawner
-  parent: MarkerBase
+  parent: BaseConditionalSpawner
  components:
    - type: Sprite
-      layers:
-        - state: blue
-        - texture: Objects/Weapons/Guns/Ammunition/Explosives/rpg.rsi/frag.png
+      netsync: false
+      visible: false
+      sprite: Interface/Misc/markers.rsi
+      state: spawner_launcher_ammo
+
    - type: ConditionalSpawner
      prototypes:
        - RocketAmmo
@@ -295,3 +333,22 @@
      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/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,9 +6,12 @@
  - type: Clickable
  - type: InteractionOutline
  - type: Sprite
-    sprite: Markers/cross.rsi
-# If serialization was cool this would work.
-#    layers:
-#      - state: blue
+    netsync: false
+    visible: false
+    sprite: Interface/Misc/markers.rsi
+    state: cross_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/spawn_points.yml
+++ b/Resources/Prototypes/Entities/Effects/Markers/spawn_points.yml
@@ -0,0 +1,27 @@
+- 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/spawn_points_jobs.yml
+++ b/Resources/Prototypes/Entities/Effects/Markers/spawn_points_jobs.yml
@@ -1,297 +1,251 @@
 # Base
-
 - type: entity
  id: SpawnPointJobBase
-  parent: MarkerBase
+  parent: SpawnPoint
  abstract: true
-  suffix: Job Spawn
  components:
  - type: SpawnPoint
    spawn_type: Job
-  - type: Sprite
-    sprite: Markers/jobs.rsi

+# Assistant
 - type: entity
-  name: observer spawn point
-  id: SpawnPointObserver
+  id: SpawnPointAssistant
  parent: SpawnPointJobBase
+  name: spawn point (assistant)
  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:
+    job_id: Assistant
  - type: Sprite
-    state: green
-  - type: SpawnPoint
-    spawn_type: LateJoin
-
-# Cargo
+    state: Assistant

+# Quartermaster
 #- type: entity
 #  id: SpawnPointQuartermaster
 #  parent: SpawnPointJobBase
-#  name: quartermaster
+#  name: spawn point (quartermaster)
 #  components:
 #    - type: SpawnPoint
 #      job_id: Quartermaster
 #    - type: Sprite
 #      state: Quartermaster

+# Cargo tech
 - type: entity
  id: SpawnPointCargoTechnician
  parent: SpawnPointJobBase
-  name: cargotechnician
+  name: spawn point (cargotechnician)
  components:
  - type: SpawnPoint
    job_id: CargoTechnician
  - type: Sprite
-    layers:
-      - state: green
-      - state: cargo_tech
+    state: Cargo Technician

-# 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: bartender
+  name: spawn point (bartender)
  components:
  - type: SpawnPoint
    job_id: Bartender
  - type: Sprite
-    layers:
-      - state: green
-      - state: bartender
+    state: Bartender

+
+# Chef
 - type: entity
  id: SpawnPointChef
  parent: SpawnPointJobBase
-  name: chef
+  name: spawn point (chef)
  components:
  - type: SpawnPoint
    job_id: Chef
  - type: Sprite
-    layers:
-      - state: green
-      - state: chef
+    state: Cook

+# Botanist
 - type: entity
  id: SpawnPointBotanist
  parent: SpawnPointJobBase
-  name: botanist
+  name: spawn point (botanist)
  components:
-  - type: SpawnPoint
-    job_id: Botanist
-  - type: Sprite
-    layers:
-      - state: green
-      - state: botanist
+    - type: SpawnPoint
+      job_id: Botanist
+    - type: Sprite
+      state: Botanist

+# Clown
 - type: entity
  id: SpawnPointClown
  parent: SpawnPointJobBase
-  name: clown
+  name: spawn point (clown)
  components:
  - type: SpawnPoint
    job_id: Clown
  - type: Sprite
-    layers:
-      - state: green
-      - state: clown
+    state: Clown

+
+# Mime
 - type: entity
  id: SpawnPointMime
  parent: SpawnPointJobBase
-  name: mime
+  name: spawn point (mime)
  components:
  - type: SpawnPoint
    job_id: Mime
  - type: Sprite
-    layers:
-      - state: green
-      - state: mime
+    state: Mime

+# Chaplain
 #- type: entity
 #  id: SpawnPointChaplain
 #  parent: SpawnPointJobBase
-#  name: chaplain
+#  name: spawn point (chaplain)
 #  components:
 #    - type: SpawnPoint
 #      job_id: Chaplain
 #    - type: Sprite
 #      state: Chaplain

+# Janitor
 - type: entity
  id: SpawnPointJanitor
  parent: SpawnPointJobBase
-  name: janitor
+  name: spawn point (janitor)
  components:
  - type: SpawnPoint
    job_id: Janitor
  - type: Sprite
-    layers:
-      - state: green
-      - state: janitor
+    state: Janitor

-# Command

+# Captain
 - type: entity
  id: SpawnPointCaptain
  parent: SpawnPointJobBase
-  name: captain
+  name: spawn point (captain)
  components:
  - type: SpawnPoint
    job_id: Captain
  - type: Sprite
-    layers:
-      - state: green
-      - state: captain
+    state: Captain

+
+# Head of Personnel
 - type: entity
  id: SpawnPointHeadOfPersonnel
  parent: SpawnPointJobBase
-  name: headofpersonnel
+  name: spawn point (headofpersonnel)
  components:
  - type: SpawnPoint
    job_id: HeadOfPersonnel
  - type: Sprite
-    layers:
-      - state: green
-      - state: hop
+    state: Head of Personnel

-# Engineering

+# ChiefEngineer
 - type: entity
  id: SpawnPointChiefEngineer
  parent: SpawnPointJobBase
-  name: chiefengineer
+  name: spawn point (chiefengineer)
  components:
  - type: SpawnPoint
    job_id: ChiefEngineer
  - type: Sprite
-    layers:
-      - state: green
-      - state: ce
+    state: Chief Engineer

+
+# StationEngineer
 - type: entity
  id: SpawnPointStationEngineer
  parent: SpawnPointJobBase
-  name: stationengineer
+  name: spawn point (stationengineer)
  components:
  - type: SpawnPoint
    job_id: StationEngineer
  - type: Sprite
-    layers:
-      - state: green
-      - state: engineer
+    state: Station Engineer

-# Medical

+# ChiefMedicalOfficer
 - type: entity
  id: SpawnPointChiefMedicalOfficer
  parent: SpawnPointJobBase
-  name: chiefmedicalofficer
+  name: spawn point (chiefmedicalofficer)
  components:
  - type: SpawnPoint
    job_id: ChiefMedicalOfficer
  - type: Sprite
-    layers:
-      - state: green
-      - state: cmo
+    state: Chief Medical Officer

+
+# MedicalDoctor
 - type: entity
  id: SpawnPointMedicalDoctor
  parent: SpawnPointJobBase
-  name: medicaldoctor
+  name: spawn point (medicaldoctor)
  components:
  - type: SpawnPoint
    job_id: MedicalDoctor
  - type: Sprite
-    layers:
-      - state: green
-      - state: doctor
+    state: Medical Doctor

-# Science

+# ResearchDirector
 - type: entity
  id: SpawnPointResearchDirector
  parent: SpawnPointJobBase
-  name: researchdirector
+  name: spawn point (researchdirector)
  components:
  - type: SpawnPoint
    job_id: ResearchDirector
  - type: Sprite
-    layers:
-      - state: green
-      - state: rd
+    state: Research Director

+
+# Scientist
 - type: entity
  id: SpawnPointScientist
  parent: SpawnPointJobBase
-  name: scientist
+  name: spawn point (scientist)
  components:
  - type: SpawnPoint
    job_id: Scientist
  - type: Sprite
-    layers:
-      - state: green
-      - state: scientist
+    state: Scientist

-# Security

+# HeadOfSecurity
 - type: entity
  id: SpawnPointHeadOfSecurity
  parent: SpawnPointJobBase
-  name: headofsecurity
+  name: spawn point (headofsecurity)
  components:
  - type: SpawnPoint
    job_id: HeadOfSecurity
  - type: Sprite
-    layers:
-      - state: green
-      - state: hos
+    state: Head of Security

+# Warden
 - type: entity
  id: SpawnPointWarden
  parent: SpawnPointJobBase
-  name: warden
+  name: spawn point (warden)
  components:
-  - type: SpawnPoint
-    job_id: Warden
-  - type: Sprite
-    layers:
-      - state: green
-      - state: warden
+    - type: SpawnPoint
+      job_id: Warden
+    - type: Sprite
+      state: Warden

+# SecurityOfficer
 - type: entity
  id: SpawnPointSecurityOfficer
  parent: SpawnPointJobBase
-  name: securityofficer
+  name: spawn point (securityofficer)
  components:
  - type: SpawnPoint
    job_id: SecurityOfficer
  - type: Sprite
-    layers:
-      - state: green
-      - state: security_officer
+    state: Security Officer
--- a/Resources/Prototypes/Entities/Effects/Markers/timed_spawners.yml
+++ b/Resources/Prototypes/Entities/Effects/Markers/timed_spawners.yml
@@ -0,0 +1,74 @@
+- 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/toy_spawner.yml
+++ b/Resources/Prototypes/Entities/Effects/Markers/toy_spawner.yml
@@ -4,10 +4,11 @@
  parent: MarkerBase
  components:
    - type: Sprite
-      layers:
-        - state: red
-        - texture: Objects/Fun/toys.rsi/plushie_h.png
-    - type: RandomSpawner
+      netsync: false
+      visible: false
+      sprite: Interface/Misc/markers.rsi
+      state: spawner_toy
+    - type: TrashSpawner
      rarePrototypes:
        - CarvingHelpMe
        - CarvingHello
@@ -34,10 +35,11 @@
  parent: MarkerBase
  components:
    - type: Sprite
-      layers:
-        - state: red
-        - texture: Objects/Fun/toys.rsi/ripleytoy.png
-    - type: RandomSpawner
+      netsync: false
+      visible: false
+      sprite: Interface/Misc/markers.rsi
+      state: spawner_figure
+    - type: TrashSpawner
      prototypes:
        - ToyAi
        - ToyNuke
--- a/Resources/Prototypes/Entities/Effects/Markers/trash_spawner.yml
+++ b/Resources/Prototypes/Entities/Effects/Markers/trash_spawner.yml
@@ -1,13 +1,18 @@
 - type: entity
  name: Trash Spawner
-  id: RandomSpawner
-  parent: MarkerBase
+  id: TrashSpawner
  components:
    - type: Sprite
-      layers:
-        - state: red
-        - texture: Objects/Consumable/Trash/candy.rsi/icon.png
-    - type: RandomSpawner
+      netsync: false
+      visible: false
+      sprite: Interface/Misc/markers.rsi
+      state: spawner_trash
+
+    - type: Marker
+    - type: Clickable
+    - type: InteractionOutline
+    - type: Physics
+    - type: TrashSpawner
      rarePrototypes:
        - PuddleVomit
        - TrashPlate
--- a/Resources/Prototypes/Entities/Effects/Markers/warp_point.yml
+++ b/Resources/Prototypes/Entities/Effects/Markers/warp_point.yml
@@ -5,4 +5,8 @@
  components:
  - type: WarpPoint
  - type: Sprite
-    state: pink
+    state: cross_pink
+
+
+
+
--- a/Resources/Prototypes/Entities/Markers/Spawners/Conditional/timed.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/Conditional/timed.yml
@@ -1,36 +0,0 @@
- 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
@@ -1,15 +0,0 @@
- 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
@@ -1,10 +0,0 @@
- 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/mobs.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/mobs.yml
@@ -1,17 +0,0 @@
-# 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/Mobs/Player/human.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/human.yml
@@ -31,8 +31,8 @@
  id: HumanMob_CentcomOfficial
  components:
  - type: Icon
-    sprite: Markers/jobs.rsi
-    state: centcom
+    sprite: Interface/Misc/markers.rsi
+    state: Centcom
  - type: GhostRoleMobSpawner
    prototype: HumanMob_CentcomOfficial
    deleteOnSpawn: true
--- a/Resources/Prototypes/Entities/chemistry.yml
+++ b/Resources/Prototypes/Entities/chemistry.yml
@@ -0,0 +1,8 @@
+- type: entity
+  parent: BaseItem
+  id: ReagentItem
+  name: "reagent item"
+  abstract: true
+  components:
+  - type: SolutionContainer
+    maxVol: 5
--- a/Resources/Prototypes/Entities/clicktest.yml
+++ b/Resources/Prototypes/Entities/clicktest.yml
@@ -0,0 +1,83 @@
+# Entities specifically for testing click detection with ClickableComponent.
+#
+# Each entity has a bounding box AND texture equivalent.
+# Note that bounding box versions still have dots on the outside or center to make it possible to... see them.
+# These dots' texture detection should not interfere with the actual bounding box being tested.
+
+- type: entity
+  abstract: true
+  id: ClickTestBase
+  components:
+  - type: Clickable
+  - type: InteractionOutline
+  - type: Sprite
+    noRot: false
+    sprite: Effects/clicktest.rsi
+
+
+- type: entity
+  id: ClickTestRotatingCornerVisible
+  name: ClickTestRotatingCornerVisible
+  parent: ClickTestBase
+  components:
+  - type: Clickable
+  - type: InteractionOutline
+  - type: Sprite
+    state: rotating_corner
+
+- type: entity
+  id: ClickTestRotatingCornerVisibleNoRot
+  name: ClickTestRotatingCornerVisibleNoRot
+  parent: ClickTestRotatingCornerVisible
+  components:
+  - type: Sprite
+    noRot: true
+
+- type: entity
+  id: ClickTestRotatingCornerInvisible
+  name: ClickTestRotatingCornerInvisible
+  parent: ClickTestBase
+  components:
+  - type: Clickable
+    bounds:
+      south: "0.125,0.125,0.375,0.375"
+      north: "-0.375,-0.375,-0.125,-0.125"
+      east: "0.125,-0.375,0.375,-0.125"
+      west: "-0.375,0.125,-0.125,0.375"
+
+  - type: InteractionOutline
+  - type: Sprite
+    state: invis_base
+
+- type: entity
+  id: ClickTestRotatingCornerInvisibleNoRot
+  name: ClickTestRotatingCornerInvisibleNoRot
+  parent: ClickTestRotatingCornerInvisible
+  components:
+    - type: Sprite
+      noRot: true
+
+
+- type: entity
+  id: ClickTestFixedCornerVisible
+  name: ClickTestFixedCornerVisible
+  parent: ClickTestBase
+  components:
+  - type: Clickable
+  - type: InteractionOutline
+  - type: Sprite
+    state: fixed_corner
+
+- type: entity
+  id: ClickTestFixedCornerInvisible
+  name: ClickTestFixedCornerInvisible
+  parent: ClickTestBase
+  components:
+  - type: Clickable
+    bounds:
+      all: "0.125,0.125,0.375,0.375"
+
+  - type: InteractionOutline
+  - type: Sprite
+    state: invis_base
+
--- a/Resources/Prototypes/Entities/stress_test.yml
+++ b/Resources/Prototypes/Entities/stress_test.yml
@@ -0,0 +1,7 @@
+- type: entity
+  id: StressTest
+  name: stress test
+  components:
+  - type: Sprite
+    texture: Effects/explosion.rsi/explosion.png
+  - type: StressTestMovement