Reorganizes Resources/Constructible (#4252)

2021-07-15 18:30:50 +00:00
parent 0ae9bc088f
commit 5f9ba812ca
2782 changed files with 2550 additions and 2293 deletions
--- a/Resources/Prototypes/Recipes/Construction/Graphs/airlock.yml
+++ b/Resources/Prototypes/Recipes/Construction/Graphs/airlock.yml
@@ -52,7 +52,7 @@
              store: board
              name: "door electronics circuit board"
              icon:
-                sprite: "Constructible/Misc/module.rsi"
+                sprite: "Objects/Misc/module.rsi"
                state: "door_electronics"
              doAfter: 1
        - to: assembly
--- a/Resources/Prototypes/Recipes/Construction/Graphs/computer.yml
+++ b/Resources/Prototypes/Recipes/Construction/Graphs/computer.yml
@@ -26,7 +26,7 @@
              store: board
              name: any computer circuit board
              icon:
-                sprite: "Constructible/Misc/module.rsi"
+                sprite: "Objects/Misc/module.rsi"
                state: "id_mod"

        - to: start
--- a/Resources/Prototypes/Recipes/Construction/Graphs/conveyor.yml
+++ b/Resources/Prototypes/Recipes/Construction/Graphs/conveyor.yml
@@ -8,7 +8,7 @@
          steps:
            - tag: ConveyorAssembly
              icon:
-                sprite: Constructible/Power/conveyor.rsi
+                sprite: Structures/conveyor.rsi
                state: conveyor_loose
              name: conveyor belt assembly
              doAfter: 2
--- a/Resources/Prototypes/Recipes/Construction/Graphs/firelock.yml
+++ b/Resources/Prototypes/Recipes/Construction/Graphs/firelock.yml
@@ -53,7 +53,7 @@
            - tag: FirelockElectronics
              name: Firelock Electronics
              icon:
-                sprite: "Constructible/Misc/module.rsi"
+                sprite: "Objects/Misc/module.rsi"
                state: "mainboard"

        - to: frame1
--- a/Resources/Prototypes/Recipes/Construction/Graphs/girder.yml
+++ b/Resources/Prototypes/Recipes/Construction/Graphs/girder.yml
@@ -18,7 +18,7 @@
      actions:
        - !type:SpriteChange
          specifier:
-            sprite: /Textures/Constructible/Structures/Walls/solid.rsi
+            sprite: /Textures/Structures/Walls/solid.rsi
            state: wall_girder
      edges:
        - to: start
@@ -70,7 +70,7 @@
      actions:
        - !type:SpriteChange
          specifier:
-            sprite: /Textures/Constructible/Structures/Walls/solid.rsi
+            sprite: /Textures/Structures/Walls/solid.rsi
            state: reinforced_wall_girder
      edges:
        - to: reinforcedWall
--- a/Resources/Prototypes/Recipes/Construction/Graphs/solarpanel.yml
+++ b/Resources/Prototypes/Recipes/Construction/Graphs/solarpanel.yml
@@ -44,7 +44,7 @@
            - prototype: SolarTrackerElectronics
              name: Solar Tracker Electronics
              icon: 
-                sprite: Constructible/Misc/module.rsi
+                sprite: Objects/Misc/module.rsi
                state: id_mod
              doAfter: 1
            - material: Glass
--- a/Resources/Prototypes/Recipes/Construction/conveyor.yml
+++ b/Resources/Prototypes/Recipes/Construction/conveyor.yml
@@ -10,7 +10,7 @@
  placementMode: SnapgridCenter
  canBuildInImpassable: false
  icon:
-    sprite: Constructible/Power/conveyor.rsi
+    sprite: Structures/conveyor.rsi
    state: conveyor_stopped_cw
  conditions:
    - !type:TileNotBlocked {}
@@ -26,7 +26,7 @@
  objectType: Structure
  canBuildInImpassable: false
  icon:
-    sprite: Constructible/Power/conveyor.rsi
+    sprite: Structures/conveyor.rsi
    state: switch-off
  conditions:
    - !type:TileNotBlocked {}
--- a/Resources/Prototypes/Recipes/Construction/furniture.yml
+++ b/Resources/Prototypes/Recipes/Construction/furniture.yml
@@ -7,7 +7,7 @@
  category: Furniture
  description: You sit in this. Either by will or force.
  icon:
-    sprite: Constructible/Misc/furniture.rsi
+    sprite: Structures/Furniture/furniture.rsi
    state: chair
  objectType: Structure
  placementMode: SnapgridCenter
@@ -24,7 +24,7 @@
  category: Furniture
  description: You sit in this. Either by will or force.
  icon:
-    sprite: Constructible/Misc/furniture.rsi
+    sprite: Structures/Furniture/furniture.rsi
    state: stool_base
  objectType: Structure
  placementMode: SnapgridCenter
@@ -41,7 +41,7 @@
  category: Furniture
  description: You sit in this. Either by will or force.
  icon:
-    sprite: Constructible/Misc/furniture.rsi
+    sprite: Structures/Furniture/furniture.rsi
    state: bar_stool
  objectType: Structure
  placementMode: SnapgridCenter
@@ -58,7 +58,7 @@
  category: Furniture
  description: You sit in this. Either by will or force.
  icon:
-    sprite: Constructible/Misc/furniture.rsi
+    sprite: Structures/Furniture/furniture.rsi
    state: officechair_white
  objectType: Structure
  placementMode: SnapgridCenter
@@ -75,7 +75,7 @@
  category: Furniture
  description: You sit in this. Either by will or force.
  icon:
-    sprite: Constructible/Misc/furniture.rsi
+    sprite: Structures/Furniture/furniture.rsi
    state: officechair_dark
  objectType: Structure
  placementMode: SnapgridCenter
@@ -92,7 +92,7 @@
  category: Furniture
  description: It looks comfy.
  icon:
-    sprite: Constructible/Misc/furniture.rsi
+    sprite: Structures/Furniture/furniture.rsi
    state: comfychair_preview
  objectType: Structure
  placementMode: SnapgridCenter
@@ -109,7 +109,7 @@
  category: Furniture
  description: You sit in this. Either by will or force.
  icon:
-    sprite: Constructible/Misc/furniture.rsi
+    sprite: Structures/Furniture/furniture.rsi
    state: wooden_chair
  objectType: Structure
  placementMode: SnapgridCenter
--- a/Resources/Prototypes/Recipes/Construction/lighting.yml
+++ b/Resources/Prototypes/Recipes/Construction/lighting.yml
@@ -7,7 +7,7 @@
  category: Structures
  description: A wall light fixture. Use light tubes.
  icon:
-    sprite: Constructible/Lighting/light_tube.rsi
+    sprite: Structures/Wallmounts/Lighting/light_tube.rsi
    state: off
  objectType: Structure
  placementMode: WallmountLight
@@ -25,7 +25,7 @@
  category: Structures
  description: A wall light fixture. Use light bulbs.
  icon:
-    sprite: Constructible/Lighting/light_small.rsi
+    sprite: Structures/Wallmounts/Lighting/light_small.rsi
    state: off
  objectType: Structure
  placementMode: WallmountLight
--- a/Resources/Prototypes/Recipes/Construction/machines.yml
+++ b/Resources/Prototypes/Recipes/Construction/machines.yml
@@ -8,7 +8,7 @@
  placementMode: SnapgridCenter
  canBuildInImpassable: false
  icon:
-    sprite: Constructible/Misc/stock_parts.rsi
+    sprite: Structures/Machines/parts.rsi
    state: 4

 - type: construction
@@ -21,5 +21,5 @@
  placementMode: SnapgridCenter
  canBuildInImpassable: false
  icon:
-    sprite: Constructible/Misc/stock_parts.rsi
+    sprite: Structures/Machines/parts.rsi
    state: "box_0"
--- a/Resources/Prototypes/Recipes/Construction/power.yml
+++ b/Resources/Prototypes/Recipes/Construction/power.yml
@@ -7,7 +7,7 @@
  category: Utility
  description: "Area Power Controller (APC). Controls power. In an area."
  icon:
-    sprite: Constructible/Power/apc.rsi
+    sprite: Structures/Power/apc.rsi
    state: apc0
  objectType: Structure
  placementMode: AlignWallProper
@@ -22,7 +22,7 @@
  category: Utility
  description: "Can be turned into a solar panel or solar tracker."
  icon:
-    sprite: Constructible/Power/solar_panel.rsi
+    sprite: Structures/Power/Generation/solar_panel.rsi
    state: solar_assembly
  objectType: Structure
  placementMode: SnapgridCenter
--- a/Resources/Prototypes/Recipes/Construction/structures.yml
+++ b/Resources/Prototypes/Recipes/Construction/structures.yml
@@ -7,7 +7,7 @@
  category: Structures
  description: A large structural assembly made out of metal.
  icon:
-    sprite: /Textures/Constructible/Structures/Walls/solid.rsi
+    sprite: /Textures/Structures/Walls/solid.rsi
    state: wall_girder
  objectType: Structure
  placementMode: SnapgridCenter
@@ -25,7 +25,7 @@
  category: Structures
  description: Keeps the air in and the greytide out.
  icon:
-    sprite: Constructible/Structures/Walls/solid.rsi
+    sprite: Structures/Walls/solid.rsi
    state: full
  objectType: Structure
  placementMode: SnapgridCenter
@@ -43,7 +43,7 @@
  category: Structures
  description: Keeps the air in and the greytide out.
  icon:
-    sprite: Constructible/Structures/Walls/solid.rsi
+    sprite: Structures/Walls/solid.rsi
    state: rgeneric
  objectType: Structure
  placementMode: SnapgridCenter
@@ -64,7 +64,7 @@
    - !type:NoWindowsInTile {}
    - !type:TileNotBlocked {}
  icon:
-    sprite: Constructible/Structures/Walls/low_wall.rsi
+    sprite: Structures/Walls/low_wall.rsi
    state: metal
  objectType: Structure
  placementMode: SnapgridCenter
@@ -82,7 +82,7 @@
    - !type:LowWallInTile {}
    - !type:NoWindowsInTile {}
  icon:
-    sprite: Constructible/Structures/Windows/window.rsi
+    sprite: Structures/Windows/window.rsi
    state: full
  objectType: Structure
  placementMode: SnapgridCenter
@@ -100,7 +100,7 @@
    - !type:LowWallInTile {}
    - !type:NoWindowsInTile {}
  icon:
-    sprite: Constructible/Structures/Windows/reinforced_window.rsi
+    sprite: Structures/Windows/reinforced_window.rsi
    state: full
  objectType: Structure
  placementMode: SnapgridCenter
@@ -118,7 +118,7 @@
    - !type:LowWallInTile {}
    - !type:NoWindowsInTile {}
  icon:
-    sprite: Constructible/Structures/Windows/plasma_window.rsi
+    sprite: Structures/Windows/plasma_window.rsi
    state: full
  objectType: Structure
  placementMode: SnapgridCenter
@@ -133,7 +133,7 @@
  category: Structures
  description: This is a firelock - it locks an area when a fire alarm in the area is triggered. Don't get squished!
  icon:
-    sprite: Constructible/Structures/Doors/Standard/firelock.rsi
+    sprite: Structures/Doors/Airlocks/Standard/firelock.rsi
    state: closed
  objectType: Structure
  placementMode: SnapgridCenter
@@ -157,7 +157,7 @@
        - plating
        - underplating
  icon:
-    sprite: Constructible/Tiles/catwalk.rsi
+    sprite: Structures/catwalk.rsi
    state: catwalk_preview
  objectType: Structure
  placementMode: SnapgridCenter
@@ -172,7 +172,7 @@
  category: Structures
  description: An improvised barricade made out of wooden planks.
  icon:
-    sprite: Constructible/Structures/barricades.rsi
+    sprite: Structures/Walls/barricades.rsi
    state: barricadewooden
  objectType: Structure
  placementMode: SnapgridCenter
@@ -189,7 +189,7 @@
  category: Structures
  description: It opens, it closes, and maybe crushes you.
  icon:
-    sprite: Constructible/Structures/Doors/Standard/basic.rsi
+    sprite: Structures/Doors/Airlocks/Standard/basic.rsi
    state: assembly
  objectType: Structure
  placementMode: SnapgridCenter
--- a/Resources/Prototypes/Recipes/Construction/tables.yml
+++ b/Resources/Prototypes/Recipes/Construction/tables.yml
@@ -7,7 +7,7 @@
  category: Structures
  description: A square piece of metal standing on four metal legs.
  icon:
-    sprite: Constructible/Structures/Tables/carpet.rsi
+    sprite: Structures/Furniture/Tables/carpet.rsi
    state: full
  objectType: Structure
  placementMode: SnapgridCenter
@@ -24,7 +24,7 @@
  category: Structures
  description: A fancy table. Perfect for serving drinks.
  icon:
-    sprite: Constructible/Structures/Tables/bar.rsi
+    sprite: Structures/Furniture/Tables/bar.rsi
    state: full
  objectType: Structure
  placementMode: SnapgridCenter
@@ -41,7 +41,7 @@
  category: Structures
  description: A square piece of metal standing on four metal legs. Extra robust.
  icon:
-    sprite: Constructible/Structures/Tables/reinforced.rsi
+    sprite: Structures/Furniture/Tables/reinforced.rsi
    state: full
  objectType: Structure
  placementMode: SnapgridCenter
@@ -58,7 +58,7 @@
  category: Structures
  description: A square piece of glass, standing on four metal legs.
  icon:
-    sprite: Constructible/Structures/Tables/glass.rsi
+    sprite: Structures/Furniture/Tables/glass.rsi
    state: full
  objectType: Structure
  placementMode: SnapgridCenter
@@ -75,7 +75,7 @@
  category: Structures
  description: A square piece of glass, standing on four metal legs. Extra robust.
  icon:
-    sprite: Constructible/Structures/Tables/r_glass.rsi
+    sprite: Structures/Furniture/Tables/r_glass.rsi
    state: full
  objectType: Structure
  placementMode: SnapgridCenter
@@ -92,7 +92,7 @@
  category: Structures
  description: Do not apply fire to this. Rumour says it burns easily.
  icon:
-    sprite: Constructible/Structures/Tables/wood.rsi
+    sprite: Structures/Furniture/Tables/wood.rsi
    state: full
  objectType: Structure
  placementMode: SnapgridCenter
@@ -109,7 +109,7 @@
  category: Structures
  description: A square piece of wood standing on four legs covered by a cloth. (What did you expect?)
  icon:
-    sprite: Constructible/Structures/Tables/carpet.rsi
+    sprite: Structures/Furniture/Tables/carpet.rsi
    state: full
  objectType: Structure
  placementMode: SnapgridCenter
--- a/Resources/Prototypes/Recipes/Crafting/crates.yml
+++ b/Resources/Prototypes/Recipes/Crafting/crates.yml
@@ -6,6 +6,6 @@
  targetNode: cratelivestock
  category: Storage
  description: "A wooden crate for holding livestock"
-  icon: Constructible/Storage/Crates/livestock.rsi/livestockcrate.png
+  icon: Structures/Storage/Crates/livestock.rsi/livestockcrate.png
  objectType: Item
  
--- a/Resources/Prototypes/Recipes/Lathes/cargo.yml
+++ b/Resources/Prototypes/Recipes/Lathes/cargo.yml
@@ -1,7 +1,7 @@
 - type: latheRecipe
  id: ConveyorAssembly
  icon:
-    sprite: Constructible/Power/conveyor.rsi
+    sprite: Structures/conveyor.rsi
    state: conveyor_loose
  result: ConveyorBeltAssembly
  completetime: 1000
--- a/Resources/Prototypes/Recipes/Lathes/electronics.yml
+++ b/Resources/Prototypes/Recipes/Lathes/electronics.yml
@@ -1,6 +1,6 @@
 - type: latheRecipe
  id: FirelockElectronics
-  icon: Constructible/Misc/module.rsi/mainboard.png
+  icon: Objects/Misc/module.rsi/mainboard.png
  result: FirelockElectronics
  completetime: 500
  materials:
@@ -9,7 +9,7 @@

 - type: latheRecipe
  id: DoorElectronics
-  icon: Constructible/Misc/module.rsi/door_electronics.png
+  icon: Objects/Misc/module.rsi/door_electronics.png
  result: DoorElectronics
  completetime: 500
  materials:
@@ -18,7 +18,7 @@

 - type: latheRecipe
  id: APCElectronics
-  icon: Constructible/Misc/module.rsi/charger_APC.png
+  icon: Objects/Misc/module.rsi/charger_APC.png
  result: APCElectronics
  completetime: 500
  materials: