Remake cargo orders to contains flatpacks (#25647)

* Remake cargo orders to contains flatpacks

* whoop

* grounging plamsa

diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_shuttle.yml b/Resources/Prototypes/Catalog/Cargo/cargo_shuttle.yml
index bc0f60fcf38f8b6369c618d17c7b9d7defe50c90..96a193881ef35334104c39b6095e2e9ebc7e6bbd 100644 (file)
--- a/Resources/Prototypes/Catalog/Cargo/cargo_shuttle.yml
+++ b/Resources/Prototypes/Catalog/Cargo/cargo_shuttle.yml
@@ -3,7 +3,7 @@
   icon:
     sprite: Structures/Shuttles/thruster.rsi
     state: base
-  product: ThrusterUnanchored
+  product: CrateEngineeringThruster
   cost: 1500
   category: Shuttle
   group: market
@@ -13,7 +13,7 @@
   icon:
     sprite: Structures/Shuttles/gyroscope.rsi
     state: base
-  product: GyroscopeUnanchored
+  product: CrateEngineeringGyroscope
   cost: 4000
   category: Shuttle
   group: market

diff --git a/Resources/Prototypes/Catalog/Fills/Crates/engines.yml b/Resources/Prototypes/Catalog/Fills/Crates/engines.yml
index 315c4dda2c179f991334125d537ed34059a14e64..9b47036b017295670049a9b7f1eb06707f3f4558 100644 (file)
--- a/Resources/Prototypes/Catalog/Fills/Crates/engines.yml
+++ b/Resources/Prototypes/Catalog/Fills/Crates/engines.yml
@@ -42,17 +42,18 @@
   components:
   - type: StorageFill
     contents:
-      - id: Emitter
+      - id: Emitter # TODO change to flatpack
 
 - type: entity
   id: CrateEngineeringSingularityCollector
   parent: CrateEngineeringSecure
   name: radiation collector crate
-  description: A radiation collector, best used for singularity engines.
+  description: A radiation collector, best used for singularity engines. Plasma is included.
   components:
   - type: StorageFill
     contents:
-      - id: RadiationCollectorFullTank
+      - id: RadiationCollectorFlatpack
+      - id: PlasmaTankFilled
 
 - type: entity
   id: CrateEngineeringSingularityContainment
@@ -62,7 +63,7 @@
   components:
   - type: StorageFill
     contents:
-      - id: ContainmentFieldGenerator
+      - id: ContainmentFieldGeneratorFlatpack
 
 - type: entity
   id: CrateEngineeringSingularityGenerator
@@ -72,7 +73,7 @@
   components:
   - type: StorageFill
     contents:
-      - id: SingularityGenerator
+      - id: SingularityGeneratorFlatpack
 
 # Particle Accelerator
 
@@ -113,7 +114,7 @@
   components:
   - type: StorageFill
     contents:
-      - id: DebugGenerator
+      - id: DebugGenerator # TODO change to flatpack
 
 - type: entity
   id: CrateEngineeringSolar
@@ -147,7 +148,7 @@
   components:
   - type: StorageFill
     contents:
-      - id: TeslaGenerator
+      - id: TeslaGeneratorFlatpack
 
 - type: entity
   id: CrateEngineeringTeslaCoil
@@ -157,7 +158,7 @@
   components:
   - type: StorageFill
     contents:
-      - id: TeslaCoil
+      - id: TeslaCoilFlatpack
 
 - type: entity
   id: CrateEngineeringTeslaGroundingRod
@@ -167,4 +168,4 @@
   components:
   - type: StorageFill
     contents:
-      - id: TeslaGroundingRod
+      - id: TeslaGroundingRodFlatpack

diff --git a/Resources/Prototypes/Catalog/Fills/Crates/shuttle.yml b/Resources/Prototypes/Catalog/Fills/Crates/shuttle.yml
new file mode 100644 (file)
index 0000000..e81fcb2
--- /dev/null
+++ b/Resources/Prototypes/Catalog/Fills/Crates/shuttle.yml
@@ -0,0 +1,19 @@
+- type: entity
+  parent: CrateEngineering
+  id: CrateEngineeringThruster
+  name: thruster crate
+  description: Contains a thruster flatpack.
+  components:
+  - type: StorageFill
+    contents:
+      - id: ThrusterFlatpack
+
+- type: entity
+  parent: CrateEngineering
+  id: CrateEngineeringGyroscope
+  name: thruster crate
+  description: Contains a gyroscope flatpack.
+  components:
+  - type: StorageFill
+    contents:
+      - id: GyroscopeFlatpack

diff --git a/Resources/Prototypes/Entities/Objects/Devices/flatpack.yml b/Resources/Prototypes/Entities/Objects/Devices/flatpack.yml
index 5ac66affdfb094474bd174d77c3549a862236508..5499348bd1984d1f4c74ede85deb962525ed5324 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Devices/flatpack.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/flatpack.yml
@@ -67,3 +67,117 @@
     guides: [ AME, Power ]
   - type: StealTarget
     stealGroup: AmePartFlatpack
+
+- type: entity
+  parent: BaseFlatpack
+  id: SingularityGeneratorFlatpack
+  name: singularity generator flatpack
+  description: A flatpack used for constructing a singularity generator.
+  components:
+  - type: Flatpack
+    entity: SingularityGenerator
+  - type: Sprite
+    layers:
+    - state: singularity-generator
+  - type: GuideHelp
+    guides: [ Singularity, Power ]
+
+- type: entity
+  parent: BaseFlatpack
+  id: RadiationCollectorFlatpack
+  name: radiation collector flatpack
+  description: A flatpack used for constructing a radiation collector.
+  components:
+  - type: Flatpack
+    entity: RadiationCollectorNoTank
+  - type: Sprite
+    layers:
+    - state: radiation-collector
+  - type: GuideHelp
+    guides: [ Singularity, Power ]
+
+- type: entity
+  parent: BaseFlatpack
+  id: ContainmentFieldGeneratorFlatpack
+  name: containment field generator flatpack
+  description: A flatpack used for constructing a containment field generator.
+  components:
+  - type: Flatpack
+    entity: ContainmentFieldGenerator
+  - type: Sprite
+    layers:
+    - state: containment-field-generator
+  - type: GuideHelp
+    guides: [ Singularity, Power ]
+
+- type: entity
+  parent: BaseFlatpack
+  id: TeslaGeneratorFlatpack
+  name: tesla generator flatpack
+  description: A flatpack used for constructing a tesla generator.
+  components:
+  - type: Flatpack
+    entity: TeslaGenerator
+  - type: Sprite
+    layers:
+    - state: tesla-generator
+  - type: GuideHelp
+    guides: [ Power ] # TODO add tesla guide
+
+- type: entity
+  parent: BaseFlatpack
+  id: TeslaCoilFlatpack
+  name: tesla coil flatpack
+  description: A flatpack used for constructing a tesla coil.
+  components:
+  - type: Flatpack
+    entity: TeslaCoil
+  - type: Sprite
+    layers:
+    - state: tesla-coil
+  - type: GuideHelp
+    guides: [ Power ] # TODO add tesla guide
+
+- type: entity
+  parent: BaseFlatpack
+  id: TeslaGroundingRodFlatpack
+  name: grounding rod flatpack
+  description: A flatpack used for constructing a grounding rod.
+  components:
+  - type: Flatpack
+    entity: TeslaGroundingRod
+  - type: Sprite
+    layers:
+    - state: grounding-rod
+  - type: GuideHelp
+    guides: [ Power ] # TODO add tesla guide
+
+- type: entity
+  parent: BaseFlatpack
+  id: GyroscopeFlatpack
+  name: gyroscope flatpack
+  description: A flatpack used for constructing a gyroscope.
+  components:
+  - type: Flatpack
+    entity: Gyroscope
+  - type: Sprite
+    layers:
+    - state: base
+    - state: overlay
+      color: "#cec8ac"
+    - state: icon-default
+
+- type: entity
+  parent: BaseFlatpack
+  id: ThrusterFlatpack
+  name: thruster flatpack
+  description: A flatpack used for constructing a thruster.
+  components:
+  - type: Flatpack
+    entity: Thruster
+  - type: Sprite
+    layers:
+    - state: base
+    - state: overlay
+      color: "#cec8ac"
+    - state: icon-default

diff --git a/Resources/Textures/Objects/Devices/flatpack.rsi/containment-field-generator.png b/Resources/Textures/Objects/Devices/flatpack.rsi/containment-field-generator.png
new file mode 100644 (file)
index 0000000..63c0450
Binary files /dev/null and b/Resources/Textures/Objects/Devices/flatpack.rsi/containment-field-generator.png differ

diff --git a/Resources/Textures/Objects/Devices/flatpack.rsi/grounding-rod.png b/Resources/Textures/Objects/Devices/flatpack.rsi/grounding-rod.png
new file mode 100644 (file)
index 0000000..847aab5
Binary files /dev/null and b/Resources/Textures/Objects/Devices/flatpack.rsi/grounding-rod.png differ

diff --git a/Resources/Textures/Objects/Devices/flatpack.rsi/meta.json b/Resources/Textures/Objects/Devices/flatpack.rsi/meta.json
index 8e573c2adec542d1de77eed3afe299ccc79e7fb0..2d1ca3714184b386a975063cd565289433d3287a 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",
+    "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",
     "size": {
         "x": 32,
         "y": 32
@@ -21,6 +21,24 @@
         },
         {
             "name": "ame-part"
+        },
+        {
+            "name": "singularity-generator"
+        },
+        {
+            "name": "tesla-generator"
+        },
+        {
+            "name": "radiation-collector"
+        },
+        {
+            "name": "tesla-coil"
+        },
+        {
+            "name": "grounding-rod"
+        },
+        {
+            "name": "containment-field-generator"
         }
     ]
 }

diff --git a/Resources/Textures/Objects/Devices/flatpack.rsi/radiation-collector.png b/Resources/Textures/Objects/Devices/flatpack.rsi/radiation-collector.png
new file mode 100644 (file)
index 0000000..34411a4
Binary files /dev/null and b/Resources/Textures/Objects/Devices/flatpack.rsi/radiation-collector.png differ

diff --git a/Resources/Textures/Objects/Devices/flatpack.rsi/singularity-generator.png b/Resources/Textures/Objects/Devices/flatpack.rsi/singularity-generator.png
new file mode 100644 (file)
index 0000000..b73a2ca
Binary files /dev/null and b/Resources/Textures/Objects/Devices/flatpack.rsi/singularity-generator.png differ

diff --git a/Resources/Textures/Objects/Devices/flatpack.rsi/solar-assembly-part.png b/Resources/Textures/Objects/Devices/flatpack.rsi/solar-assembly-part.png
index aaf291cb2f0a2e5db3606cc42e6ff84ef5057736..b72b053e4f579756fb3cfd0ce54b77694deb9858 100644 (file)
Binary files a/Resources/Textures/Objects/Devices/flatpack.rsi/solar-assembly-part.png and b/Resources/Textures/Objects/Devices/flatpack.rsi/solar-assembly-part.png differ

diff --git a/Resources/Textures/Objects/Devices/flatpack.rsi/tesla-coil.png b/Resources/Textures/Objects/Devices/flatpack.rsi/tesla-coil.png
new file mode 100644 (file)
index 0000000..bc7672e
Binary files /dev/null and b/Resources/Textures/Objects/Devices/flatpack.rsi/tesla-coil.png differ

diff --git a/Resources/Textures/Objects/Devices/flatpack.rsi/tesla-generator.png b/Resources/Textures/Objects/Devices/flatpack.rsi/tesla-generator.png
new file mode 100644 (file)
index 0000000..053a9c1
Binary files /dev/null and b/Resources/Textures/Objects/Devices/flatpack.rsi/tesla-generator.png differ