Merge pull request #99 from Dalexiandr/Engineering/FloorTiles

ПР №10 Таск Хавк (Шаттлы и генераторы)
13lackHawk · May 15, 2024 · c460915 · c460915
2 parents 350b0fb + c6bce68
commit c460915
Show file tree

Hide file tree

Showing 8 changed files with 546 additions and 0 deletions.
diff --git a/Resources/Prototypes/Andromeda/Evil Prototype's/tilemeister3000.yml b/Resources/Prototypes/Andromeda/Evil Prototype's/tilemeister3000.yml
diff --git a/Resources/Prototypes/Entities/Objects/Misc/tiles.yml b/Resources/Prototypes/Entities/Objects/Misc/tiles.yml
@@ -718,6 +718,11 @@
       - FloorShuttleWhite
   - type: Stack
     stackType: FloorTileStackShuttleWhite
+# A-13 shuttle tiles building start
+  - type: Construction
+    graph: TileShuttleSteel
+    node: steeltile
+# A-13 shuttle tiles building end
 
 - type: entity
   name: blue shuttle floor

diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
@@ -393,6 +393,7 @@
     - BoozeDispenserMachineCircuitboard
     - SodaDispenserMachineCircuitboard
     - SpaceHeaterMachineCircuitBoard
+    - TileMeister3000Circuitboard # A-13 new TileMeister board
     dynamicRecipes:
       - ThermomachineFreezerMachineCircuitBoard
       - HellfireFreezerMachineCircuitBoard

diff --git a/Resources/Textures/Andromeda/Evil/tilemeister3000.rsi/building.png b/Resources/Textures/Andromeda/Evil/tilemeister3000.rsi/building.png
diff --git a/Resources/Textures/Andromeda/Evil/tilemeister3000.rsi/icon.png b/Resources/Textures/Andromeda/Evil/tilemeister3000.rsi/icon.png
diff --git a/Resources/Textures/Andromeda/Evil/tilemeister3000.rsi/meta.json b/Resources/Textures/Andromeda/Evil/tilemeister3000.rsi/meta.json
@@ -0,0 +1,36 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Sprites by SadBrat3, code by EvilBug for Andromeda-13",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "building",
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ]
+      ]
+    },
+	  {
+	  "name": "icon"
+	  },
+  	{
+    "name": "panel"
+    },
+	  {
+	  "name": "unlit"
+  	}
+  ]
+}
diff --git a/Resources/Textures/Andromeda/Evil/tilemeister3000.rsi/panel.png b/Resources/Textures/Andromeda/Evil/tilemeister3000.rsi/panel.png
diff --git a/Resources/Textures/Andromeda/Evil/tilemeister3000.rsi/unlit.png b/Resources/Textures/Andromeda/Evil/tilemeister3000.rsi/unlit.png