From 1c4ac9c4a7a2eade03dab7c7101d98ffb4a5bb75 Mon Sep 17 00:00:00 2001
From: K-Dynamic <20566341+K-Dynamic@users.noreply.github.com>
Date: Fri, 30 May 2025 12:07:00 +1200
Subject: [PATCH] Bot spawners (supplybot, firebot, honkbot) (#37929)

* firebot, supplybot spawners

* moved honkbot spawner from misc.yml to bots.yml

* fix inconsistent ID and duplicate component field

* remove duplicate supplybot
---
 .../Entities/Markers/Spawners/Mobs/misc.yml   | 14 -----
 .../Entities/Markers/Spawners/bots.yml        | 63 +++++++++++++++----
 Resources/migration.yml                       |  3 +
 3 files changed, 55 insertions(+), 25 deletions(-)

diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Mobs/misc.yml b/Resources/Prototypes/Entities/Markers/Spawners/Mobs/misc.yml
index cd77ecc5f0..7f280312ef 100644
--- a/Resources/Prototypes/Entities/Markers/Spawners/Mobs/misc.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/Mobs/misc.yml
@@ -12,17 +12,3 @@
   - type: ConditionalSpawner
     prototypes:
     - MobGingerbreadAI
-
-- type: entity
-  parent: MarkerBase
-  id: SpawnHonkBot
-  name: honk bot spawner
-  components:
-  - type: Sprite
-    layers:
-    - state: green
-    - state: honkbot
-      sprite: Mobs/Silicon/Bots/honkbot.rsi
-  - type: ConditionalSpawner
-    prototypes:
-    - MobHonkBot
diff --git a/Resources/Prototypes/Entities/Markers/Spawners/bots.yml b/Resources/Prototypes/Entities/Markers/Spawners/bots.yml
index 9f0823f48e..b9ad49c60d 100644
--- a/Resources/Prototypes/Entities/Markers/Spawners/bots.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/bots.yml
@@ -1,28 +1,69 @@
 - type: entity
-  name: medibot spawner
-  id: SpawnMobMedibot
   parent: MarkerBase
+  id: SpawnMobMedibot
+  name: medibot spawner
   components:
   - type: Sprite
     layers:
-      - state: green
-      - sprite: Mobs/Silicon/Bots/medibot.rsi
-        state: medibot
+    - state: green
+    - sprite: Mobs/Silicon/Bots/medibot.rsi
+      state: medibot
   - type: ConditionalSpawner
     prototypes:
-      - MobMedibot
+    - MobMedibot
 
 - type: entity
-  name: cleanbot spawner
+  parent: MarkerBase
   id: SpawnMobCleanBot
+  name: cleanbot spawner
+  components:
+  - type: Sprite
+    layers:
+    - state: green
+    - sprite: Mobs/Silicon/Bots/cleanbot.rsi
+      state: cleanbot
+  - type: ConditionalSpawner
+    prototypes:
+    - MobCleanBot
+
+- type: entity
   parent: MarkerBase
+  id: SpawnMobFireBot
+  name: firebot spawner
   components:
   - type: Sprite
     layers:
-      - state: green
-      - sprite: Mobs/Silicon/Bots/cleanbot.rsi
-        state: cleanbot
+    - state: green
+    - sprite: Mobs/Silicon/Bots/firebot.rsi
+      state: firebot
   - type: ConditionalSpawner
     prototypes:
-      - MobCleanBot
+    - MobFireBot
 
+- type: entity
+  parent: MarkerBase
+  id: SpawnMobSupplyBot
+  name: supplybot spawner
+  components:
+  - type: Sprite
+    layers:
+    - state: green
+    - sprite: Mobs/Silicon/Bots/supplybot.rsi
+      state: supplybot
+  - type: ConditionalSpawner
+    prototypes:
+    - MobSupplyBot
+
+- type: entity
+  parent: MarkerBase
+  id: SpawnMobHonkBot
+  name: honkbot spawner
+  components:
+  - type: Sprite
+    layers:
+    - state: green
+    - sprite: Mobs/Silicon/Bots/honkbot.rsi
+      state: honkbot
+  - type: ConditionalSpawner
+    prototypes:
+    - MobHonkBot
diff --git a/Resources/migration.yml b/Resources/migration.yml
index 72a7961cf2..34ede90f45 100644
--- a/Resources/migration.yml
+++ b/Resources/migration.yml
@@ -641,3 +641,6 @@ ClothingNeckCloakMiner: null
 # 2025-05-22
 MatterBinStockPart: MicroManipulatorStockPart
 CapacitorStockPart: MicroManipulatorStockPart
+
+# 2025-05-30
+SpawnHonkBot: SpawnMobHonkBot
-- 
2.51.2