From c0a0547b390422c4548ac8a70f0c88d59def5c14 Mon Sep 17 00:00:00 2001
From: Vera Aguilera Puerto <zddm@outlook.es>
Date: Sun, 20 Dec 2020 01:00:48 +0100
Subject: [PATCH] Cleanup markers - Removes PhysicsComponent from all of them.
 - Makes most spawners/markers actually inherit MarkerBase

---
 .../Entities/Constructible/Power/arcade.yml      |  1 +
 .../Markers/gamemode_conditional_spawners.yml    | 13 +------------
 .../Entities/Effects/Markers/marker_base.yml     |  3 ++-
 .../Entities/Effects/Markers/spawn_points.yml    | 13 +------------
 .../Entities/Effects/Markers/toy_spawner.yml     | 16 ++--------------
 5 files changed, 7 insertions(+), 39 deletions(-)

diff --git a/Resources/Prototypes/Entities/Constructible/Power/arcade.yml b/Resources/Prototypes/Entities/Constructible/Power/arcade.yml
index 59a771a9e9..f670343f7e 100644
--- a/Resources/Prototypes/Entities/Constructible/Power/arcade.yml
+++ b/Resources/Prototypes/Entities/Constructible/Power/arcade.yml
@@ -62,6 +62,7 @@
 - type: entity
   id: RandomArcade
   name: Random Arcade Spawner
+  parent: MarkerBase
   components:
   - type: RandomArcade
   - type: Sprite
diff --git a/Resources/Prototypes/Entities/Effects/Markers/gamemode_conditional_spawners.yml b/Resources/Prototypes/Entities/Effects/Markers/gamemode_conditional_spawners.yml
index 68d1485e5f..71939a4229 100644
--- a/Resources/Prototypes/Entities/Effects/Markers/gamemode_conditional_spawners.yml
+++ b/Resources/Prototypes/Entities/Effects/Markers/gamemode_conditional_spawners.yml
@@ -1,21 +1,10 @@
 - type: entity
   name: base conditional spawner
   id: BaseConditionalSpawner
+  parent: MarkerBase
   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: ConditionalSpawner
-  placement:
-    mode: AlignTileAny
 
 - type: entity
   name: Suspicion Rifle Spawner
diff --git a/Resources/Prototypes/Entities/Effects/Markers/marker_base.yml b/Resources/Prototypes/Entities/Effects/Markers/marker_base.yml
index 66c9fa0352..9ef628f01e 100644
--- a/Resources/Prototypes/Entities/Effects/Markers/marker_base.yml
+++ b/Resources/Prototypes/Entities/Effects/Markers/marker_base.yml
@@ -5,12 +5,13 @@
   - type: Marker
   - type: Clickable
   - type: InteractionOutline
-  - type: Physics
   - type: Sprite
     netsync: false
     visible: false
     sprite: Interface/Misc/markers.rsi
     state: cross_blue
+  placement:
+    mode: AlignTileAny
 
 
 
diff --git a/Resources/Prototypes/Entities/Effects/Markers/spawn_points.yml b/Resources/Prototypes/Entities/Effects/Markers/spawn_points.yml
index 897cd496e7..3b1faefe13 100644
--- a/Resources/Prototypes/Entities/Effects/Markers/spawn_points.yml
+++ b/Resources/Prototypes/Entities/Effects/Markers/spawn_points.yml
@@ -1,21 +1,10 @@
 - type: entity
   name: spawn point
   id: SpawnPoint
+  parent: MarkerBase
   abstract: true
   components:
-  - type: Sprite
-    netsync: false
-    visible: false
-    sprite: Interface/Misc/markers.rsi
-    state: cross_blue
-
   - type: SpawnPoint
-  - type: Marker
-  - type: Clickable
-  - type: InteractionOutline
-  - type: Physics
-  placement:
-    mode: AlignTileAny
 
 - type: entity
   name: latejoin spawn point
diff --git a/Resources/Prototypes/Entities/Effects/Markers/toy_spawner.yml b/Resources/Prototypes/Entities/Effects/Markers/toy_spawner.yml
index 96e9b06f2a..cbd285d48e 100644
--- a/Resources/Prototypes/Entities/Effects/Markers/toy_spawner.yml
+++ b/Resources/Prototypes/Entities/Effects/Markers/toy_spawner.yml
@@ -1,17 +1,13 @@
 - type: entity
   name: Toy Spawner
   id: ToySpawner
+  parent: MarkerBase
   components:
     - type: Sprite
       netsync: false
       visible: false
       sprite: Interface/Misc/markers.rsi
       state: spawner_toy
-
-    - type: Marker
-    - type: Clickable
-    - type: InteractionOutline
-    - type: Physics
     - type: TrashSpawner
       rarePrototypes:
         - CarvingHelpMe
@@ -32,23 +28,17 @@
         - ToyMouse
       chance: 0.5
       offset: 0.2
-  placement:
-    mode: AlignTileAny
 
 - type: entity
   name: Figure Spawner
   id: FigureSpawner
+  parent: MarkerBase
   components:
     - type: Sprite
       netsync: false
       visible: false
       sprite: Interface/Misc/markers.rsi
       state: spawner_figure
-
-    - type: Marker
-    - type: Clickable
-    - type: InteractionOutline
-    - type: Physics
     - type: TrashSpawner
       prototypes:
         - ToyAi
@@ -72,5 +62,3 @@
         - ToySkeleton
       chance: 0.5
       offset: 0.2
-  placement:
-    mode: AlignTileAny