From faeba541a41bb24a32c1dd57b1c8cfcb1a89109c Mon Sep 17 00:00:00 2001
From: "steinhauer.erhard" <steinhauer.erhard@gmail.com>
Date: Wed, 2 Oct 2024 20:11:03 +0300
Subject: [PATCH 1/3] Syndie Cleanbot

---
 .../Maps/_NF/Bluespace/syndieftlintercept.yml |   2 +-
 .../mobs_hostile_syndicate_voidsmen.yml       |  16 ++++++++++++++
 .../_NF/Entities/Mobs/NPCs/silicon.yml        |  15 +++++++++++++
 .../Bots/syndicatecleanbot.rsi/cleanbot.png   | Bin 0 -> 765 bytes
 .../Bots/syndicatecleanbot.rsi/meta.json      |  20 ++++++++++++++++++
 5 files changed, 52 insertions(+), 1 deletion(-)
 create mode 100644 Resources/Textures/_NF/Mobs/Silicons/Bots/syndicatecleanbot.rsi/cleanbot.png
 create mode 100644 Resources/Textures/_NF/Mobs/Silicons/Bots/syndicatecleanbot.rsi/meta.json

diff --git a/Resources/Maps/_NF/Bluespace/syndieftlintercept.yml b/Resources/Maps/_NF/Bluespace/syndieftlintercept.yml
index 9c9430cc8d4..df09a61efd0 100644
--- a/Resources/Maps/_NF/Bluespace/syndieftlintercept.yml
+++ b/Resources/Maps/_NF/Bluespace/syndieftlintercept.yml
@@ -4688,7 +4688,7 @@ entities:
     - type: Transform
       pos: -4.5,2.5
       parent: 1
-- proto: SpawnMobCleanBot
+- proto: SpawnMobCleanBotSyndie
   entities:
   - uid: 895
     components:
diff --git a/Resources/Prototypes/_NF/Entities/Markers/Spawners/Conditional/mobs_hostile_syndicate_voidsmen.yml b/Resources/Prototypes/_NF/Entities/Markers/Spawners/Conditional/mobs_hostile_syndicate_voidsmen.yml
index 83b35627158..2ed19fe46a9 100644
--- a/Resources/Prototypes/_NF/Entities/Markers/Spawners/Conditional/mobs_hostile_syndicate_voidsmen.yml
+++ b/Resources/Prototypes/_NF/Entities/Markers/Spawners/Conditional/mobs_hostile_syndicate_voidsmen.yml
@@ -139,3 +139,19 @@
   - type: ConditionalSpawner
     prototypes:
       - MobSyndicateNavalCaptainVoid
+
+- type: entity
+  name: syndicate cleanbot spawner
+  id: SpawnMobCleanBotSyndie
+  parent: MarkerBase
+  suffix: AI
+  components:
+  - type: Sprite
+    layers:
+    - state: green
+    - state: ai
+    - sprite: _NF/Mobs/Silicons/Bots/syndicatecleanbot.rsi
+      state: cleanbot
+  - type: ConditionalSpawner
+    prototypes:
+    - MobCleanBotSyndie
diff --git a/Resources/Prototypes/_NF/Entities/Mobs/NPCs/silicon.yml b/Resources/Prototypes/_NF/Entities/Mobs/NPCs/silicon.yml
index a46359578cd..8c6840b414d 100644
--- a/Resources/Prototypes/_NF/Entities/Mobs/NPCs/silicon.yml
+++ b/Resources/Prototypes/_NF/Entities/Mobs/NPCs/silicon.yml
@@ -42,3 +42,18 @@
   - type: RadarConsole
     followEntity: true
   - type: VehicleHorn
+
+- type: entity
+  parent: MobCleanBot
+  id: MobCleanBotSyndie
+  name: syndicate cleanbot
+  description: The creep of automation now threatening space janitors with a knife.
+  components:
+  - type: NpcFactionMember
+    factions:
+    - SyndicateNF
+  - type: Sprite
+    sprite: _NF/Mobs/Silicons/Bots/syndicatecleanbot.rsi
+  - type: HTN
+    rootTask:
+      task: CleanbotCompound
diff --git a/Resources/Textures/_NF/Mobs/Silicons/Bots/syndicatecleanbot.rsi/cleanbot.png b/Resources/Textures/_NF/Mobs/Silicons/Bots/syndicatecleanbot.rsi/cleanbot.png
new file mode 100644
index 0000000000000000000000000000000000000000..b1f98bd4a2e81323d600129881c3407c6b7d7717
GIT binary patch
literal 765
zcmV<Z0s{SsP)<h;3K|Lk000e1NJLTq001BW002M;1^@s6dyaLk00001b5ch_0Itp)
z=>Px%w@E}nRA_<in7?aNQ545NuUM#7gqn7+DQThQL7{XjT!)q}#zoCw1Sz3|L(w60
z?UW&Zh(pQHp@C{9+d)XcJSVjj3n2mfXatAqq_jl14)s3XkG$li(x7-haLMDG_s%)@
z+>_ycL8H-VG@Ab%Bg`R$kd|e&^{3Nm>9=ifZ->U}86kvJD@yWC_6sNXKSxOt<{yv6
zLcjC0O(k=;UfCulCV<YZRs|d%9}^bGf2>_!09bqaOr{GvjGeWZesDJ|KaH2K_;BMY
zZyw!a|NT3s2o*b-OahS4=bap$0>Xw4;7MXS@)<w38-{yRs*pmVAZxXnr-*^5K>=dY
z@T`yHV*#5RwITJJ$z%-EGy%xva?(?PyH#P_`S#semG~$_l@^uwsK@Td-&J=J09ShH
zfFd_H$xx*Qz)+<{ZgG<Q!BOPzGntH2l;;TCUC3s$vRN<6X1y5bO8(%8)5SpmP8SDz
zO715xbV3NZu&@BYO40`4_Wc(IoDbsTuRol3b93IEZ{57+3}93|N07~Co!zb^Z4$Gq
z#AhCc2K<wqE86}GRC4=pGvM1B8EzYBZ)BL6v!6W|;B=r_FG~Ax)00@WUQwTlGhmu*
z?Y^cy6=&vC)3KYT$=g~DzFe>?&3aK*OR2U)=VobXsjWZEuF+^T8jVKt*Q51;(B%H-
zC`m3-MBns*@mNfLJ~;_|+ZTPHQ;xpq1D!;QzUTw)Lj3wbU<Sgv(C%Vt&0C0l(e;Ar
zkLy-Sdg_2bIe;~9k(-<B_<lE$!h>5MsFqT)T1rVc@4)W$Th0<fNY;=-2#>v&S%EJ4
zz{dJAfOAFft3I%?zKngi8Mq<4xio!1B~Q$*27H&M4^&GjnV4Pnh!TEv<TCVuwklbe
vEK@F*4M3LdhJoFntQ>X&K>qe?{w;n1A@|KWygLsZ00000NkvXXu0mjfobYXq

literal 0
HcmV?d00001

diff --git a/Resources/Textures/_NF/Mobs/Silicons/Bots/syndicatecleanbot.rsi/meta.json b/Resources/Textures/_NF/Mobs/Silicons/Bots/syndicatecleanbot.rsi/meta.json
new file mode 100644
index 00000000000..d25b83c6e64
--- /dev/null
+++ b/Resources/Textures/_NF/Mobs/Silicons/Bots/syndicatecleanbot.rsi/meta.json
@@ -0,0 +1,20 @@
+{
+  "version": 1,
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from https://github.com/tgstation/tgstation/commit/53d1f1477d22a11a99c6c6924977cd431075761b | Changed colors and added a knife by ErhardSteinhauer (discord/github)",
+  "states": [
+    {
+      "name": "cleanbot",
+      "delays": [
+        [
+          0.5,
+          0.2
+        ]
+      ]
+    }
+  ]
+}

From 0ecca6274c2996458c6fed300644be19a8876449 Mon Sep 17 00:00:00 2001
From: Whatstone <whatston3@gmail.com>
Date: Wed, 2 Oct 2024 14:23:25 -0400
Subject: [PATCH 2/3] Mark syndie cleanbot as syndie contraband

---
 Resources/Prototypes/_NF/Entities/Mobs/NPCs/silicon.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/Resources/Prototypes/_NF/Entities/Mobs/NPCs/silicon.yml b/Resources/Prototypes/_NF/Entities/Mobs/NPCs/silicon.yml
index 8c6840b414d..d7ef2fd5e6c 100644
--- a/Resources/Prototypes/_NF/Entities/Mobs/NPCs/silicon.yml
+++ b/Resources/Prototypes/_NF/Entities/Mobs/NPCs/silicon.yml
@@ -44,7 +44,9 @@
   - type: VehicleHorn
 
 - type: entity
-  parent: MobCleanBot
+  parent:
+  - MobCleanBot
+  - BaseC3SyndicateContrabandNoValue
   id: MobCleanBotSyndie
   name: syndicate cleanbot
   description: The creep of automation now threatening space janitors with a knife.

From b6349758508fce9fdf5327af24f261bc066090f2 Mon Sep 17 00:00:00 2001
From: Whatstone <whatston3@gmail.com>
Date: Wed, 2 Oct 2024 14:23:46 -0400
Subject: [PATCH 3/3] Changelog order

---
 Resources/Changelog/Admin.yml     |  2 +-
 Resources/Changelog/Changelog.yml |  3 ++-
 Resources/Changelog/Frontier.yml  | 12 ++++++++++++
 3 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/Resources/Changelog/Admin.yml b/Resources/Changelog/Admin.yml
index 537c6b09ff5..2207139aa48 100644
--- a/Resources/Changelog/Admin.yml
+++ b/Resources/Changelog/Admin.yml
@@ -553,4 +553,4 @@ Entries:
   time: '2024-09-23T07:28:42.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/32395
 Name: Admin
-Order: 1
+Order: 2 # Frontier: 1<2
diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index a3dd8da68a6..323e4e196e6 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,4 +1,5 @@
-Entries:
+Order: 1 # Frontier
+Entries:
 - author: Jezithyr
   changes:
   - message: Removed the Geras ability from Slimes
diff --git a/Resources/Changelog/Frontier.yml b/Resources/Changelog/Frontier.yml
index 12f5931c728..fd633cceda0 100644
--- a/Resources/Changelog/Frontier.yml
+++ b/Resources/Changelog/Frontier.yml
@@ -4199,3 +4199,15 @@ Entries:
       message: Issues with Stasis floor tiles and SMES wiring.
   id: 5354
   time: '2024-10-02T09:27:03.0000000+00:00'
+- author: whatston3
+  changes:
+    - type: Tweak
+      message: >-
+        Asteroids now spawn larger ore stacks for common minerals, and their max
+        stack size has been increased.
+    - type: Tweak
+      message: >-
+        Composite materials like plasma glass have been reduced in value and are
+        not printable from the base ore processor.
+  id: 5355
+  time: '2024-10-02T12:27:03.0000000+00:00'