From fdf3df9fbdf4687794961038c7b9433c9ff8c104 Mon Sep 17 00:00:00 2001
From: Plykiya <58439124+Plykiya@users.noreply.github.com>
Date: Tue, 19 Nov 2024 17:05:20 -0800
Subject: [PATCH] Crew monitoring crate updated to contain flatpacks, science
 access instead of engi (#33417)

* Make a crew monitoring crate with flatpacks

* fix image

* migration
---
 .../Catalog/Cargo/cargo_circuitboards.yml     |  9 ---------
 .../Catalog/Cargo/cargo_science.yml           | 10 ++++++++++
 .../Catalog/Fills/Crates/circuitboards.yml    | 12 -----------
 .../Catalog/Fills/Crates/science.yml          | 12 +++++++++++
 .../Entities/Objects/Devices/flatpack.yml     | 20 ++++++++++++++++++-
 Resources/migration.yml                       |  3 +++
 6 files changed, 44 insertions(+), 22 deletions(-)
 delete mode 100644 Resources/Prototypes/Catalog/Cargo/cargo_circuitboards.yml
 delete mode 100644 Resources/Prototypes/Catalog/Fills/Crates/circuitboards.yml

diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_circuitboards.yml b/Resources/Prototypes/Catalog/Cargo/cargo_circuitboards.yml
deleted file mode 100644
index a96780fc3e..0000000000
--- a/Resources/Prototypes/Catalog/Cargo/cargo_circuitboards.yml
+++ /dev/null
@@ -1,9 +0,0 @@
-- type: cargoProduct
-  id: CrewMonitoringBoards
-  icon:
-    sprite: Objects/Misc/module.rsi
-    state: cpuboard
-  product: CrateCrewMonitoringBoards
-  cost: 2000
-  category: cargoproduct-category-name-circuitboards
-  group: market
diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_science.yml b/Resources/Prototypes/Catalog/Cargo/cargo_science.yml
index 756a223e74..cb7f8af822 100644
--- a/Resources/Prototypes/Catalog/Cargo/cargo_science.yml
+++ b/Resources/Prototypes/Catalog/Cargo/cargo_science.yml
@@ -27,3 +27,13 @@
   cost: 800
   category: cargoproduct-category-name-science
   group: market
+
+- type: cargoProduct
+  id: CrewMonitoring
+  icon:
+    sprite: Structures/Machines/server.rsi
+    state: server
+  product: CrateCrewMonitoring
+  cost: 2000
+  category: cargoproduct-category-name-science
+  group: market
diff --git a/Resources/Prototypes/Catalog/Fills/Crates/circuitboards.yml b/Resources/Prototypes/Catalog/Fills/Crates/circuitboards.yml
deleted file mode 100644
index 899db4c37c..0000000000
--- a/Resources/Prototypes/Catalog/Fills/Crates/circuitboards.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-- type: entity
-  id: CrateCrewMonitoringBoards
-  parent: CrateEngineeringSecure
-  name: crew monitoring boards
-  description: Has two crew monitoring console and server replacements. Requires engineering access to open.
-  components:
-    - type: StorageFill
-      contents:
-        - id: CrewMonitoringComputerCircuitboard
-          amount: 2
-        - id: CrewMonitoringServerMachineCircuitboard
-          amount: 2
diff --git a/Resources/Prototypes/Catalog/Fills/Crates/science.yml b/Resources/Prototypes/Catalog/Fills/Crates/science.yml
index 15ce05708e..6adf5942a4 100644
--- a/Resources/Prototypes/Catalog/Fills/Crates/science.yml
+++ b/Resources/Prototypes/Catalog/Fills/Crates/science.yml
@@ -12,3 +12,15 @@
         amount: 2
       - id: ClothingMaskSterile
         amount: 2
+
+- type: entity
+  id: CrateCrewMonitoring
+  parent: CrateScienceSecure
+  name: crew monitoring crate
+  description: Contains a flatpack of a crew monitoring server and a few crew monitoring computers. Requires Science access to open.
+  components:
+  - type: StorageFill
+    contents:
+    - id: CrewMonitoringServerFlatpack
+    - id: CrewMonitoringComputerFlatpack
+      amount: 3
diff --git a/Resources/Prototypes/Entities/Objects/Devices/flatpack.yml b/Resources/Prototypes/Entities/Objects/Devices/flatpack.yml
index 5fb81aa6d4..82d43cf7d8 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/flatpack.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/flatpack.yml
@@ -215,4 +215,22 @@
     layers:
     - state: fax-machine
   - type: Flatpack
-    entity: FaxMachineBase
\ No newline at end of file
+    entity: FaxMachineBase
+
+- type: entity
+  parent: BaseFlatpack
+  id: CrewMonitoringServerFlatpack
+  name: crew monitoring server flatpack
+  description: A flatpack used for constructing a crew monitoring server.
+  components:
+  - type: Flatpack
+    entity: CrewMonitoringServer
+
+- type: entity
+  parent: BaseFlatpack
+  id: CrewMonitoringComputerFlatpack
+  name: crew monitoring computer flatpack
+  description: A flatpack used for constructing a crew monitoring console.
+  components:
+  - type: Flatpack
+    entity: ComputerCrewMonitoring
diff --git a/Resources/migration.yml b/Resources/migration.yml
index 8940df2b65..a09986ebd8 100644
--- a/Resources/migration.yml
+++ b/Resources/migration.yml
@@ -475,3 +475,6 @@ LeftLegBorgJanitor: LeftLegBorg
 RightLegBorgJanitor: RightLegBorg
 HeadBorgJanitor: LightHeadBorg
 TorsoBorgJanitor: TorsoBorg
+
+# 2024-11-19
+CrateCrewMonitoringBoards: CrateCrewMonitoring
-- 
2.51.2