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:

diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_engines.yml b/Resources/Prototypes/Catalog/Cargo/cargo_engines.yml
index bd00b0c2d4cd96ceb4a155a516e9dd78c7c44d89..8d3bea5075c8ca692275f900e0acc4f01950f373 100644 (file)
--- 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 9b47036b017295670049a9b7f1eb06707f3f4558..79698b550a75d9e50b6c29dd74c3799da9fb61af 100644 (file)
--- 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 5499348bd1984d1f4c74ede85deb962525ed5324..2aecd1328809f90f9e69a66a887be0c0c0ace711 100644 (file)
--- 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 (file)
index 0000000..c663886
Binary files /dev/null and b/Resources/Textures/Objects/Devices/flatpack.rsi/emitter.png differ

diff --git a/Resources/Textures/Objects/Devices/flatpack.rsi/meta.json b/Resources/Textures/Objects/Devices/flatpack.rsi/meta.json
index 2d1ca3714184b386a975063cd565289433d3287a..8f46a0ca53be59bb31c7c4df01ec01a251a17587 100644 (file)
--- 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"
         }
     ]
 }