From 72a72086264f13a9814c0a26a0d0ba9566ce151f Mon Sep 17 00:00:00 2001
From: SweptWasTaken <sweptwastaken@protonmail.com>
Date: Thu, 27 May 2021 21:18:25 -0700
Subject: [PATCH] Adds a plasteel crate to cargo and fixes some cargo IDs

---
 Resources/Changelog/Parts/changelog.yml       |  4 +++
 .../Catalog/Cargo/cargo_atmospherics.yml      | 30 +++++++++----------
 .../Catalog/Cargo/cargo_materials.yml         | 12 ++++++++
 .../Catalog/Fills/Crates/materials.yml        |  2 +-
 .../Constructible/Power/cargo_console.yml     |  9 +++---
 5 files changed, 36 insertions(+), 21 deletions(-)
 create mode 100644 Resources/Changelog/Parts/changelog.yml

diff --git a/Resources/Changelog/Parts/changelog.yml b/Resources/Changelog/Parts/changelog.yml
new file mode 100644
index 0000000000..d1bb7b9857
--- /dev/null
+++ b/Resources/Changelog/Parts/changelog.yml
@@ -0,0 +1,4 @@
+author: Swept
+changes:
+  - type: Add # One of the following: Add, Remove, Tweak, Fix
+    message: Adds a plasteel crate to cargo
diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_atmospherics.yml b/Resources/Prototypes/Catalog/Cargo/cargo_atmospherics.yml
index caf3991219..235c6c701c 100644
--- a/Resources/Prototypes/Catalog/Cargo/cargo_atmospherics.yml
+++ b/Resources/Prototypes/Catalog/Cargo/cargo_atmospherics.yml
@@ -1,8 +1,6 @@
-#requires localisation
-
 - type: cargoProduct
   name: "air canister"
-  id: atmosphericsair
+  id: cargo.atmosphericsair
   description: "Air canister"
   icon:
     sprite: Constructible/Atmos/canister.rsi
@@ -11,10 +9,10 @@
   cost: 1000
   category: Atmospherics
   group: market
-  
+
 - type: cargoProduct
   name: "oxygen canister"
-  id: atmosphericsoxygen
+  id: cargo.atmosphericsoxygen
   description: "Oxygen canister"
   icon:
     sprite: Constructible/Atmos/canister.rsi
@@ -23,10 +21,10 @@
   cost: 1000
   category: Atmospherics
   group: market
-  
+
 - type: cargoProduct
   name: "nitrogen canister"
-  id: atmosphericsnitrogen
+  id: cargo.atmosphericsnitrogen
   description: "Nitrogen canister"
   icon:
     sprite: Constructible/Atmos/canister.rsi
@@ -35,10 +33,10 @@
   cost: 1000
   category: Atmospherics
   group: market
-  
+
 - type: cargoProduct
   name: "carbon dioxide canister"
-  id: atmosphericscarbondioxide
+  id: cargo.atmosphericscarbondioxide
   description: "Carbon dioxide canister"
   icon:
     sprite: Constructible/Atmos/canister.rsi
@@ -47,10 +45,10 @@
   cost: 1000
   category: Atmospherics
   group: market
-  
+
 - type: cargoProduct
   name: "water vapor canister"
-  id: atmosphericswatervapor
+  id: cargo.atmosphericswatervapor
   description: "Water vapor canister"
   icon:
     sprite: Constructible/Atmos/canister.rsi
@@ -59,10 +57,10 @@
   cost: 1000
   category: Atmospherics
   group: market
-  
+
 - type: cargoProduct
   name: "plasma canister"
-  id: atmosphericsplasma
+  id: cargo.atmosphericsplasma
   description: "Plasma canister"
   icon:
     sprite: Constructible/Atmos/canister.rsi
@@ -71,10 +69,10 @@
   cost: 2000
   category: Atmospherics
   group: market
-  
+
 - type: cargoProduct
   name: "tritium canister"
-  id: atmosphericstritium
+  id: cargo.atmosphericstritium
   description: "Tritium canister"
   icon:
     sprite: Constructible/Atmos/canister.rsi
@@ -82,4 +80,4 @@
   product: TritiumCanister
   cost: 2000
   category: Atmospherics
-  group: market
\ No newline at end of file
+  group: market
diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_materials.yml b/Resources/Prototypes/Catalog/Cargo/cargo_materials.yml
index 88e1b5ec8f..bc5cddd519 100644
--- a/Resources/Prototypes/Catalog/Cargo/cargo_materials.yml
+++ b/Resources/Prototypes/Catalog/Cargo/cargo_materials.yml
@@ -33,3 +33,15 @@
   cost: 1500
   category: Materials
   group: market
+
+- type: cargoProduct
+  name: "crate of plasteel sheets"
+  id: cargo.materialplasteel
+  description: "90 sheets of plasteel."
+  icon:
+    sprite: Objects/Materials/Sheets/metal.rsi
+    state: plasteel_3
+  product: CrateMaterialPlasteel
+  cost: 6000
+  category: Materials
+  group: market
diff --git a/Resources/Prototypes/Catalog/Fills/Crates/materials.yml b/Resources/Prototypes/Catalog/Fills/Crates/materials.yml
index 356d4dc823..f5850ae8af 100644
--- a/Resources/Prototypes/Catalog/Fills/Crates/materials.yml
+++ b/Resources/Prototypes/Catalog/Fills/Crates/materials.yml
@@ -86,4 +86,4 @@
   - type: StorageFill
     contents:
       - id: SheetPlasteel
-        amount: 1
+        amount: 3
diff --git a/Resources/Prototypes/Entities/Constructible/Power/cargo_console.yml b/Resources/Prototypes/Entities/Constructible/Power/cargo_console.yml
index c34bea117d..0edb24c752 100644
--- a/Resources/Prototypes/Entities/Constructible/Power/cargo_console.yml
+++ b/Resources/Prototypes/Entities/Constructible/Power/cargo_console.yml
@@ -44,15 +44,16 @@
       - cargo.materialsteel
       - cargo.materialglass
       - cargo.materialplastic
+      - cargo.materialplasteel
       - cargo.enginesingularityemitter
       - cargo.enginesingularitycollector
       - cargo.enginesingularitygenerator
       - cargo.enginesingularitycontainment
       - cargo.engineparticleaccelerator
-      - atmosphericsair
-      - atmosphericsoxygen
-      - atmosphericsnitrogen
-      - atmosphericscarbondioxide
+      - cargo.atmosphericsair
+      - cargo.atmosphericsoxygen
+      - cargo.atmosphericsnitrogen
+      - cargo.atmosphericscarbondioxide
 #      - atmosphericswatervapor
 #      - atmosphericsplasma
 #      - atmosphericstritium