rename the rocks (#21275)

diff --git a/Resources/Locale/en-US/tiles/tiles.ftl b/Resources/Locale/en-US/tiles/tiles.ftl
index 219c7295d9e19d0f7e8b79993d50969e8999a2e4..508c3378e11724cb9f5fba84a71d1dda71c11ff3 100644 (file)
--- a/Resources/Locale/en-US/tiles/tiles.ftl
+++ b/Resources/Locale/en-US/tiles/tiles.ftl
@@ -110,3 +110,4 @@ tiles-wood3 = wood broken floor
 tiles-hull = exterior hull plating
 tiles-hull-reinforced = exterior reinforced hull plating
 tiles-web = web tile
+tiles-chromite = chromite
\ No newline at end of file

diff --git a/Resources/Prototypes/Entities/Objects/Decoration/flora.yml b/Resources/Prototypes/Entities/Objects/Decoration/flora.yml
index 8c6a87b5639523db8c37b4260455d59c7435e1ef..97368a21bdbe7df4677687107ffdaff854ab5d40 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Decoration/flora.yml
+++ b/Resources/Prototypes/Entities/Objects/Decoration/flora.yml
@@ -1,5 +1,6 @@
 - type: entity
   id: BaseRock
+  name: boulder
   description: Heavy as a really heavy thing.
   abstract: true
   components:
@@ -32,7 +33,6 @@
           - !type:DoActsBehavior
             acts: [ "Destruction" ]
 
-
 - type: entity
   id: BaseTree
   description: Yep, it's a tree.
@@ -149,7 +149,6 @@
 - type: entity
   parent: BaseRock
   id: FloraRockSolid01
-  name: rock
   components:
   - type: Sprite
     state: rocksolid01
@@ -157,7 +156,6 @@
 - type: entity
   parent: BaseRock
   id: FloraRockSolid02
-  name: rock
   components:
   - type: Sprite
     state: rocksolid02
@@ -165,60 +163,55 @@
 - type: entity
   parent: BaseRock
   id: FloraRockSolid03
-  name: rock
   components:
   - type: Sprite
     state: rocksolid03
 
 - type: entity
+  name: stalagmite
+  description: Natural stone spikes.
   parent: BaseRock
   id: FloraStalagmite1
-  name: rock
   components:
   - type: Sprite
     sprite: Objects/Decoration/Flora/flora_stalagmite.rsi
     state: stalagmite1
 
 - type: entity
-  parent: BaseRock
+  parent: FloraStalagmite1
   id: FloraStalagmite2
-  name: rock
   components:
   - type: Sprite
     sprite: Objects/Decoration/Flora/flora_stalagmite.rsi
     state: stalagmite2
 
 - type: entity
-  parent: BaseRock
+  parent: FloraStalagmite1
   id: FloraStalagmite3
-  name: rock
   components:
   - type: Sprite
     sprite: Objects/Decoration/Flora/flora_stalagmite.rsi
     state: stalagmite3
 
 - type: entity
-  parent: BaseRock
+  parent: FloraStalagmite1
   id: FloraStalagmite4
-  name: rock
   components:
   - type: Sprite
     sprite: Objects/Decoration/Flora/flora_stalagmite.rsi
     state: stalagmite4
 
 - type: entity
-  parent: BaseRock
+  parent: FloraStalagmite1
   id: FloraStalagmite5
-  name: rock
   components:
   - type: Sprite
     sprite: Objects/Decoration/Flora/flora_stalagmite.rsi
     state: stalagmite5
     
 - type: entity
-  parent: BaseRock
+  parent: FloraStalagmite1
   id: FloraStalagmite6
-  name: rock
   components:
   - type: Sprite
     sprite: Objects/Decoration/Flora/flora_stalagmite.rsi
@@ -450,7 +443,8 @@
 - type: entity
   parent: FloraTree01
   id: ShadowTree01
-  name: tree
+  name: dark wood
+  description: The leaves are whispering about you.
   components:
   - type: Sprite
     sprite: Objects/Decoration/Flora/flora_shadow_trees.rsi
@@ -459,7 +453,6 @@
 - type: entity
   parent: ShadowTree01
   id: ShadowTree02
-  name: tree
   components:
   - type: Sprite
     state: tree02
@@ -467,7 +460,6 @@
 - type: entity
   parent: ShadowTree01
   id: ShadowTree03
-  name: tree
   components:
   - type: Sprite
     state: tree03
@@ -475,7 +467,6 @@
 - type: entity
   parent: ShadowTree01
   id: ShadowTree04
-  name: tree
   components:
   - type: Sprite
     state: tree04
@@ -483,7 +474,6 @@
 - type: entity
   parent: ShadowTree01
   id: ShadowTree05
-  name: tree
   components:
   - type: Sprite
     state: tree05
@@ -491,7 +481,6 @@
 - type: entity
   parent: ShadowTree01
   id: ShadowTree06
-  name: tree
   components:
   - type: Sprite
     state: tree06

diff --git a/Resources/Prototypes/Entities/Structures/Walls/asteroid.yml b/Resources/Prototypes/Entities/Structures/Walls/asteroid.yml
index 9d5ff1b473257ea703d70e2558ab147749fef1c7..ac12dc2717f33b41a1116e114a44721b7bafe753 100644 (file)
--- a/Resources/Prototypes/Entities/Structures/Walls/asteroid.yml
+++ b/Resources/Prototypes/Entities/Structures/Walls/asteroid.yml
@@ -379,6 +379,7 @@
 # Basalt variants
 - type: entity
   id: WallRockBasalt
+  name: basalt
   parent: WallRock
   components:
     - type: Sprite
@@ -574,6 +575,7 @@
 # Snow variants
 - type: entity
   id: WallRockSnow
+  name: snowdrift
   parent: WallRock
   components:
     - type: Sprite
@@ -770,6 +772,7 @@
 # Sand variants
 - type: entity
   id: WallRockSand
+  name: sandstone
   parent: WallRock
   components:
     - type: Sprite
@@ -965,6 +968,7 @@
 # Chromite variants
 - type: entity
   id: WallRockChromite
+  name: chromite
   parent: WallRock
   components:
     - type: Sprite
@@ -1160,6 +1164,7 @@
 # Andesite variants
 - type: entity
   id: WallRockAndesite
+  name: andesite
   parent: WallRock
   components:
     - type: Sprite