From c129bb177c8f4e7eec0ae43c09a48aa5bc0f7268 Mon Sep 17 00:00:00 2001
From: pigeonpeas <147350443+pigeonpeas@users.noreply.github.com>
Date: Tue, 23 Apr 2024 07:34:09 -0400
Subject: [PATCH] Allow the purchase of emitters from cargo. (#27229)

add emitter crates back to cargo + changes the contents of an emittercrate from emitter to emitterflatpack

:+1:
---
 .../Catalog/Cargo/cargo_engines.yml           |  22 +++++++++---------
 .../Catalog/Fills/Crates/engines.yml          |   2 +-
 .../Entities/Objects/Devices/flatpack.yml     |  14 +++++++++++
 .../Objects/Devices/flatpack.rsi/emitter.png  | Bin 0 -> 326 bytes
 .../Objects/Devices/flatpack.rsi/meta.json    |   5 +++-
 5 files changed, 30 insertions(+), 13 deletions(-)
 create mode 100644 Resources/Textures/Objects/Devices/flatpack.rsi/emitter.png

diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_engines.yml b/Resources/Prototypes/Catalog/Cargo/cargo_engines.yml
index bd00b0c2d4..8d3bea5075 100644
--- a/Resources/Prototypes/Catalog/Cargo/cargo_engines.yml
+++ b/Resources/Prototypes/Catalog/Cargo/cargo_engines.yml
@@ -28,17 +28,17 @@
   category: cargoproduct-category-name-engineering
   group: market
 
-#- type: cargoProduct
-#  name: "emitter crate"
-#  id: EngineSingularityEmitter
-#  description: "Contains an emitter. Used only for dangerous applications."
-#  icon:
-#    sprite: Structures/Power/Generation/Singularity/emitter.rsi
-#    state: emitter2
-#  product: CrateEngineeringSingularityEmitter
-#  cost: 3000
-#  category: cargoproduct-category-name-engineering
-#  group: market
+- type: cargoProduct
+  name: "emitter crate"
+  id: EngineSingularityEmitter
+  description: "Contains an emitter. Used only for dangerous applications."
+  icon:
+    sprite: Structures/Power/Generation/Singularity/emitter.rsi
+    state: emitter2
+  product: CrateEngineeringSingularityEmitter
+  cost: 3000
+  category: cargoproduct-category-name-engineering
+  group: market
 
 - type: cargoProduct
   id: EngineSingularityCollector
diff --git a/Resources/Prototypes/Catalog/Fills/Crates/engines.yml b/Resources/Prototypes/Catalog/Fills/Crates/engines.yml
index 9b47036b01..79698b550a 100644
--- a/Resources/Prototypes/Catalog/Fills/Crates/engines.yml
+++ b/Resources/Prototypes/Catalog/Fills/Crates/engines.yml
@@ -42,7 +42,7 @@
   components:
   - type: StorageFill
     contents:
-      - id: Emitter # TODO change to flatpack
+      - id: EmitterFlatpack # TODO change to flatpack
 
 - type: entity
   id: CrateEngineeringSingularityCollector
diff --git a/Resources/Prototypes/Entities/Objects/Devices/flatpack.yml b/Resources/Prototypes/Entities/Objects/Devices/flatpack.yml
index 5499348bd1..2aecd13288 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/flatpack.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/flatpack.yml
@@ -110,6 +110,20 @@
   - type: GuideHelp
     guides: [ Singularity, Power ]
 
+- type: entity
+  parent: BaseFlatpack
+  id: EmitterFlatpack
+  name: emitter flatpack
+  description: A flatpack used for constructing an emitter.
+  components:
+  - type: Flatpack
+    entity: Emitter
+  - type: Sprite
+    layers:
+    - state: emitter
+  - type: GuideHelp
+    guides: [ Singularity, Power ]
+
 - type: entity
   parent: BaseFlatpack
   id: TeslaGeneratorFlatpack
diff --git a/Resources/Textures/Objects/Devices/flatpack.rsi/emitter.png b/Resources/Textures/Objects/Devices/flatpack.rsi/emitter.png
new file mode 100644
index 0000000000000000000000000000000000000000..c663886f9cce33df769cbe389312c741626769c3
GIT binary patch
literal 326
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl
z_H+M9WCijK0(?ST4UBZ%J)P4s5(<iQ&dxM@zu7T9DJD47_y7O@>({UE>gxK>zz`c7
zYiDQ2(q;zKq!wP11f&E?g8YJkYLEfL1Lasrpd4p`M`SSr1K(i~W;~w1A_XYe?CIhd
zV&VUG;%mMJ1rE1^-et!3|K~QloL%~jp|sB8TcH`7Q^iAZCD#Ti&u)ea_JBt^4VN->
zk^{77$T4Y^aITVWDl9%Ub6P@v(_2n%L!oOP@i)p2$u|qm{=Uz;Y1;!e`?tC#MZcR~
zO<Qnz>5e%;aV@W|%=jJ2@yWZX#U;?X#);!0%VY~9-rbe4j6mlwc)I$ztaD0e0sv(1
Bdo%z5

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Devices/flatpack.rsi/meta.json b/Resources/Textures/Objects/Devices/flatpack.rsi/meta.json
index 2d1ca37141..8f46a0ca53 100644
--- a/Resources/Textures/Objects/Devices/flatpack.rsi/meta.json
+++ b/Resources/Textures/Objects/Devices/flatpack.rsi/meta.json
@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC0-1.0",
-    "copyright": "Created by EmoGarbage404 (github) for SS14, solar-assembly-part taken from tgstation and modified at https://tgstation13.org/wiki/Guide_to_construction#Solar_Panels_and_Trackers, ame-part taken from vgstation at https://github.com/vgstation-coders/vgstation13/commit/1b7952787c06c21ef1623e494dcfe7cb1f46e041; singularity-generator, tesla-generator, radiation-collector, containment-field-generator, tesla-coil, grounding-rod inner icons made by lzk228",
+    "copyright": "Created by EmoGarbage404 (github) for SS14, solar-assembly-part taken from tgstation and modified at https://tgstation13.org/wiki/Guide_to_construction#Solar_Panels_and_Trackers, ame-part taken from vgstation at https://github.com/vgstation-coders/vgstation13/commit/1b7952787c06c21ef1623e494dcfe7cb1f46e041; singularity-generator, tesla-generator, radiation-collector, containment-field-generator, tesla-coil, grounding-rod inner icons made by lzk228; emitter made by pigeonpeas",
     "size": {
         "x": 32,
         "y": 32
@@ -39,6 +39,9 @@
         },
         {
             "name": "containment-field-generator"
+        },
+		{
+            "name": "emitter"
         }
     ]
 }
-- 
2.52.0