fix

Lost-Paradise-Project · Jan 7, 2025 · dd5ca9e · dd5ca9e
1 parent de51089
commit dd5ca9e
Show file tree

Hide file tree

Showing 26 changed files with 7 additions and 26 deletions.
diff --git a/Resources/Prototypes/_LostParadise/Entities/Structures/Walls/asteroid.yml b/Resources/Prototypes/_LostParadise/Entities/Structures/Walls/asteroid.yml
@@ -18,7 +18,7 @@
           state: rock_asteroid_north
         - map: [ "enum.EdgeLayer.West" ]
           state: rock_asteroid_west
-        - state: rock_ore_diamond
+        - state: rock_diamond
 
 - type: entity
   id: LPPWallRockOreDiamond
@@ -40,7 +40,7 @@
           state: rock_north
         - map: [ "enum.EdgeLayer.West" ]
           state: rock_west
-        - state: rock_ore_diamond
+        - state: rock_diamond
 
 - type: entity
   id: LPPWallRockBasaltOreDiamond
@@ -62,7 +62,7 @@
           state: rock_wall_north
         - map: [ "enum.EdgeLayer.West" ]
           state: rock_wall_west
-        - state: rock_ore_diamond
+        - state: rock_diamond
 
 - type: entity
   id: LPPWallRockSnowOreDiamond
@@ -84,7 +84,7 @@
           state: rock_snow_north
         - map: [ "enum.EdgeLayer.West" ]
           state: rock_snow_west
-        - state: rock_ore_diamond
+        - state: rock_diamond
 
 - type: entity
   id: LPPWallRockSandOreDiamond
@@ -106,7 +106,7 @@
           state: rock_sand_north
         - map: [ "enum.EdgeLayer.West" ]
           state: rock_sand_west
-        - state: rock_ore_diamond
+        - state: rock_diamond
 
 - type: entity
   id: LPPWallRockChromiteOreDiamond
@@ -128,7 +128,7 @@
           state: rock_chromite_north
         - map: [ "enum.EdgeLayer.West" ]
           state: rock_chromite_west
-        - state: rock_ore_diamond
+        - state: rock_diamond
 
 - type: entity
   id: LPPWallRockAndesiteOreDiamond
@@ -150,4 +150,4 @@
           state: rock_andesite_north
         - map: [ "enum.EdgeLayer.West" ]
           state: rock_andesite_west
-        - state: rock_ore_diamond
+        - state: rock_diamond
diff --git a/Resources/Textures/Objects/Materials/ore.rsi/adamantine.png b/Resources/Textures/Objects/Materials/ore.rsi/adamantine.png
diff --git a/Resources/Textures/Objects/Materials/ore.rsi/ammonia.png b/Resources/Textures/Objects/Materials/ore.rsi/ammonia.png
diff --git a/Resources/Textures/Objects/Materials/ore.rsi/copper.png b/Resources/Textures/Objects/Materials/ore.rsi/copper.png
diff --git a/Resources/Textures/Objects/Materials/ore.rsi/titanium.png b/Resources/Textures/Objects/Materials/ore.rsi/titanium.png
diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/direction_lawyer.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/direction_lawyer.png
diff --git a/Resources/Textures/Structures/Walls/rock.rsi/full.png b/Resources/Textures/Structures/Walls/rock.rsi/full.png
diff --git a/Resources/Textures/Structures/Walls/rock.rsi/full_two.png b/Resources/Textures/Structures/Walls/rock.rsi/full_two.png
diff --git a/Resources/Textures/Structures/Walls/rock.rsi/meta.json b/Resources/Textures/Structures/Walls/rock.rsi/meta.json
@@ -122,25 +122,6 @@
               ]
             ]
         },
-        {
-            "name": "rock_ore_diamond",
-            "delays": [
-              [
-               0.2,
-               0.2,
-               0.2,
-               0.2,
-               0.2,
-               0.2,
-               0.2,
-               0.2,
-               0.2,
-               0.2,
-               0.2,
-               0.2
-              ]
-            ]
-        },
         {
             "name": "rock_gold"
         },

diff --git a/Resources/Textures/Structures/Walls/rock.rsi/rock_0.png b/Resources/Textures/Structures/Walls/rock.rsi/rock_0.png
diff --git a/Resources/Textures/Structures/Walls/rock.rsi/rock_0_two.png b/Resources/Textures/Structures/Walls/rock.rsi/rock_0_two.png
diff --git a/Resources/Textures/Structures/Walls/rock.rsi/rock_1.png b/Resources/Textures/Structures/Walls/rock.rsi/rock_1.png
diff --git a/Resources/Textures/Structures/Walls/rock.rsi/rock_1_two.png b/Resources/Textures/Structures/Walls/rock.rsi/rock_1_two.png
diff --git a/Resources/Textures/Structures/Walls/rock.rsi/rock_2.png b/Resources/Textures/Structures/Walls/rock.rsi/rock_2.png
diff --git a/Resources/Textures/Structures/Walls/rock.rsi/rock_2_two.png b/Resources/Textures/Structures/Walls/rock.rsi/rock_2_two.png
diff --git a/Resources/Textures/Structures/Walls/rock.rsi/rock_3.png b/Resources/Textures/Structures/Walls/rock.rsi/rock_3.png
diff --git a/Resources/Textures/Structures/Walls/rock.rsi/rock_3_two.png b/Resources/Textures/Structures/Walls/rock.rsi/rock_3_two.png
diff --git a/Resources/Textures/Structures/Walls/rock.rsi/rock_4.png b/Resources/Textures/Structures/Walls/rock.rsi/rock_4.png
diff --git a/Resources/Textures/Structures/Walls/rock.rsi/rock_4_two.png b/Resources/Textures/Structures/Walls/rock.rsi/rock_4_two.png
diff --git a/Resources/Textures/Structures/Walls/rock.rsi/rock_5.png b/Resources/Textures/Structures/Walls/rock.rsi/rock_5.png
diff --git a/Resources/Textures/Structures/Walls/rock.rsi/rock_5_two.png b/Resources/Textures/Structures/Walls/rock.rsi/rock_5_two.png
diff --git a/Resources/Textures/Structures/Walls/rock.rsi/rock_6.png b/Resources/Textures/Structures/Walls/rock.rsi/rock_6.png
diff --git a/Resources/Textures/Structures/Walls/rock.rsi/rock_6_two.png b/Resources/Textures/Structures/Walls/rock.rsi/rock_6_two.png
diff --git a/Resources/Textures/Structures/Walls/rock.rsi/rock_7.png b/Resources/Textures/Structures/Walls/rock.rsi/rock_7.png
diff --git a/Resources/Textures/Structures/Walls/rock.rsi/rock_7_two.png b/Resources/Textures/Structures/Walls/rock.rsi/rock_7_two.png
diff --git a/Resources/Textures/Structures/Walls/rock.rsi/rock_ore_diamond.png b/Resources/Textures/Structures/Walls/rock.rsi/rock_ore_diamond.png
-Original file line number
+Diff line change
@@ Expand Up / @@ -122,25 +122,6 @@ @@
                   ]
                 ]
             },
-            {
-                "name": "rock_ore_diamond",
-                "delays": [
-                  [
-.2,
-.2,
-.2,
-.2,
-.2,
-.2,
-.2,
-.2,
-.2,
-.2,
-.2,
-.2
-                  ]
-                ]
-            },
             {
                 "name": "rock_gold"
             },
@@ Expand Down @@