Merge pull request #719 from fospas/resp

resprait flatpack
fospas · Dec 23, 2024 · 26bbf3a · 26bbf3a
2 parents 754618e + 5d6e5b0
commit 26bbf3a
Show file tree

Hide file tree

Showing 22 changed files with 67 additions and 8 deletions.
diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_engines.yml b/Resources/Prototypes/Catalog/Cargo/cargo_engines.yml
@@ -63,7 +63,7 @@
 - type: cargoProduct
   id: EngineSolar
   icon:
-    sprite: Objects/Devices/flatpack.rsi
+    sprite: _SpaceCats/Objects/Devices/flatpack.rsi # Cats edit
     state: solar-assembly-part
   product: CrateEngineeringSolar
   cost: 1250

diff --git a/Resources/Prototypes/Entities/Objects/Devices/flatpack.yml b/Resources/Prototypes/Entities/Objects/Devices/flatpack.yml
@@ -3,13 +3,13 @@
   id: BaseFlatpack
   name: base flatpack
   description: A flatpack used for constructing something.
-  categories:
-  - HideSpawnMenu
+#  categories:
+#  - HideSpawnMenu
   components:
   - type: Item
     size: Large
   - type: Sprite
-    sprite: Objects/Devices/flatpack.rsi
+    sprite: _SpaceCats/Objects/Devices/flatpack.rsi # Cats edit
     layers:
     - state: base
     - state: overlay

diff --git a/Resources/Prototypes/Objectives/stealTargetGroups.yml b/Resources/Prototypes/Objectives/stealTargetGroups.yml
@@ -211,7 +211,7 @@
   id: AmePartFlatpack
   name: steal-target-groups-ame-part-flatpack
   sprite:
-    sprite: Objects/Devices/flatpack.rsi
+    sprite: _SpaceCats/Objects/Devices/flatpack.rsi # Cats edit
     state: ame-part
 
 - type: stealTargetGroup

diff --git a/Resources/Prototypes/Parallaxes/test.yml b/Resources/Prototypes/Parallaxes/test.yml
@@ -17,7 +17,7 @@
       scale: "3, 3"
     - texture:
         !type:ImageParallaxTextureSource
-        path: "/Textures/Objects/Devices/flatpack.rsi/ame-part.png"
+        path: "/Textures/_SpaceCats/Objects/Devices/flatpack.rsi/ame-part.png" # Cats edit
       slowness: 0.995
       tiled: false
       controlHomePosition: "-128, -128"
@@ -38,7 +38,7 @@
       scale: "1, 1"
     - texture:
         !type:ImageParallaxTextureSource
-        path: "/Textures/Objects/Devices/flatpack.rsi/ame-part.png"
+        path: "/Textures/_SpaceCats/Objects/Devices/flatpack.rsi/ame-part.png" # Cats edit
       slowness: 0.0
       tiled: false
       controlHomePosition: "0, 32"

diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/utilities/solarpanel.yml b/Resources/Prototypes/Recipes/Construction/Graphs/utilities/solarpanel.yml
@@ -9,7 +9,7 @@
             - tag: SolarAssemblyFlatpack
               name: solar assembly parts
               icon:
-                sprite: Objects/Devices/flatpack.rsi
+                sprite: _SpaceCats/Objects/Devices/flatpack.rsi # Cats edit
                 state: solar-assembly-part
               doAfter: 1
 

diff --git a/Resources/Textures/_SpaceCats/Objects/Devices/flatpack.rsi/ame-part.png b/Resources/Textures/_SpaceCats/Objects/Devices/flatpack.rsi/ame-part.png
diff --git a/Resources/Textures/_SpaceCats/Objects/Devices/flatpack.rsi/base.png b/Resources/Textures/_SpaceCats/Objects/Devices/flatpack.rsi/base.png
diff --git a/...extures/_SpaceCats/Objects/Devices/flatpack.rsi/containment-field-generator.png b/...extures/_SpaceCats/Objects/Devices/flatpack.rsi/containment-field-generator.png
diff --git a/Resources/Textures/_SpaceCats/Objects/Devices/flatpack.rsi/emitter.png b/Resources/Textures/_SpaceCats/Objects/Devices/flatpack.rsi/emitter.png
diff --git a/Resources/Textures/_SpaceCats/Objects/Devices/flatpack.rsi/fax-machine.png b/Resources/Textures/_SpaceCats/Objects/Devices/flatpack.rsi/fax-machine.png
diff --git a/Resources/Textures/_SpaceCats/Objects/Devices/flatpack.rsi/grounding-rod.png b/Resources/Textures/_SpaceCats/Objects/Devices/flatpack.rsi/grounding-rod.png
diff --git a/Resources/Textures/_SpaceCats/Objects/Devices/flatpack.rsi/icon-default.png b/Resources/Textures/_SpaceCats/Objects/Devices/flatpack.rsi/icon-default.png
diff --git a/Resources/Textures/_SpaceCats/Objects/Devices/flatpack.rsi/meta.json b/Resources/Textures/_SpaceCats/Objects/Devices/flatpack.rsi/meta.json
@@ -0,0 +1,59 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Made for the Imperial Space community, authors'es discord nickname: pyrolizz | supermatter, sophie, oracle, fax-machine, emitter, authors'es github: CrimeMoot",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "base"
+        },
+        {
+            "name": "overlay"
+        },
+        {
+            "name": "oracle"
+        },
+        {
+            "name": "sophie"
+        },
+        {
+            "name": "supermatter"
+        },
+        {
+            "name": "icon-default"
+        },
+        {
+            "name": "solar-assembly-part"
+        },
+        {
+            "name": "ame-part"
+        },
+        {
+            "name": "singularity-generator"
+        },
+        {
+            "name": "tesla-generator"
+        },
+        {
+            "name": "radiation-collector"
+        },
+        {
+            "name": "tesla-coil"
+        },
+        {
+            "name": "grounding-rod"
+        },
+        {
+            "name": "containment-field-generator"
+        },
+		{
+            "name": "emitter"
+        },
+        {
+            "name": "fax-machine"
+        }
+    ]
+}
diff --git a/Resources/Textures/_SpaceCats/Objects/Devices/flatpack.rsi/oracle.png b/Resources/Textures/_SpaceCats/Objects/Devices/flatpack.rsi/oracle.png
diff --git a/Resources/Textures/_SpaceCats/Objects/Devices/flatpack.rsi/overlay.png b/Resources/Textures/_SpaceCats/Objects/Devices/flatpack.rsi/overlay.png
diff --git a/Resources/Textures/_SpaceCats/Objects/Devices/flatpack.rsi/radiation-collector.png b/Resources/Textures/_SpaceCats/Objects/Devices/flatpack.rsi/radiation-collector.png
diff --git a/...rces/Textures/_SpaceCats/Objects/Devices/flatpack.rsi/singularity-generator.png b/...rces/Textures/_SpaceCats/Objects/Devices/flatpack.rsi/singularity-generator.png
diff --git a/Resources/Textures/_SpaceCats/Objects/Devices/flatpack.rsi/solar-assembly-part.png b/Resources/Textures/_SpaceCats/Objects/Devices/flatpack.rsi/solar-assembly-part.png
diff --git a/Resources/Textures/_SpaceCats/Objects/Devices/flatpack.rsi/sophie.png b/Resources/Textures/_SpaceCats/Objects/Devices/flatpack.rsi/sophie.png
diff --git a/Resources/Textures/_SpaceCats/Objects/Devices/flatpack.rsi/supermatter.png b/Resources/Textures/_SpaceCats/Objects/Devices/flatpack.rsi/supermatter.png
diff --git a/Resources/Textures/_SpaceCats/Objects/Devices/flatpack.rsi/tesla-coil.png b/Resources/Textures/_SpaceCats/Objects/Devices/flatpack.rsi/tesla-coil.png
diff --git a/Resources/Textures/_SpaceCats/Objects/Devices/flatpack.rsi/tesla-generator.png b/Resources/Textures/_SpaceCats/Objects/Devices/flatpack.rsi/tesla-generator.png