Baystation Wall/Window Port (#301)

* walls * rsifixcopyright * rsifix
ekrixi-14 · Apr 20, 2024 · ec58a4b · ec58a4b
1 parent 3b24624
commit ec58a4b
Show file tree

Hide file tree

Showing 72 changed files with 315 additions and 12 deletions.
diff --git a/Resources/Prototypes/Entities/Structures/Walls/walls.yml b/Resources/Prototypes/Entities/Structures/Walls/walls.yml
@@ -504,9 +504,11 @@
   name: armor plating
   components:
   - type: Sprite
-    sprite: Structures/Walls/solid.rsi
+    sprite: _FTL/Structures/Walls/solid.rsi
+    color: "#4A4A4A"
   - type: Icon
-    sprite: Structures/Walls/solid.rsi
+    sprite: _FTL/Structures/Walls/solid.rsi
+    color: "#4A4A4A"
     state: rgeneric
   - type: Construction
     graph: Girder
@@ -846,13 +848,15 @@
       - Wall
       - RCDDeconstructWhitelist
   - type: Sprite
-    sprite: Structures/Walls/solid.rsi
+    sprite: _FTL/Structures/Walls/solid.rsi
+    color: "#4A4A4A"
   - type: WallReplacementMarker
   - type: Construction
     graph: Girder
     node: wall
   - type: Icon
-    sprite: Structures/Walls/solid.rsi
+    sprite: _FTL/Structures/Walls/solid.rsi
+    color: "#4A4A4A"
   - type: Destructible
     thresholds:
     - trigger:

diff --git a/Resources/Prototypes/Entities/Structures/Windows/plasma.yml b/Resources/Prototypes/Entities/Structures/Windows/plasma.yml
@@ -5,9 +5,12 @@
   components:
   - type: Sprite
     drawdepth: WallTops
-    sprite: Structures/Windows/plasma_window.rsi
+    sprite: _FTL/Structures/Windows/plasma_window.rsi
+    color: "#C531C9"
   - type: Icon
-    sprite: Structures/Windows/plasma_window.rsi
+    sprite: _FTL/Structures/Windows/plasma_window.rsi
+    state: full
+    color: "#C531C9"
   - type: Damageable
     damageContainer: StructuralInorganic
     damageModifierSet: RGlass

diff --git a/Resources/Prototypes/Entities/Structures/Windows/reinforced.yml b/Resources/Prototypes/Entities/Structures/Windows/reinforced.yml
@@ -5,9 +5,11 @@
   components:
   - type: Sprite
     drawdepth: WallTops
-    sprite: Structures/Windows/reinforced_window.rsi
+    sprite: _FTL/Structures/Windows/reinforced_window.rsi
+    color: "#71abcc"
   - type: Icon
-    sprite: Structures/Windows/reinforced_window.rsi
+    sprite: _FTL/Structures/Windows/reinforced_window.rsi
+    color: "#71abcc"
   - type: Repairable
     fuelCost: 10
     doAfterDelay: 2

diff --git a/Resources/Prototypes/Entities/Structures/Windows/rplasma.yml b/Resources/Prototypes/Entities/Structures/Windows/rplasma.yml
@@ -5,9 +5,12 @@
   components:
   - type: Sprite
     drawdepth: WallTops
-    sprite: Structures/Windows/reinforced_plasma_window.rsi
+    sprite: _FTL/Structures/Windows/reinforced_plasma_window.rsi
+    color: "#C531C9"
   - type: Icon
-    sprite: Structures/Windows/reinforced_plasma_window.rsi
+    sprite: _FTL/Structures/Windows/reinforced_plasma_window.rsi
+    state: full
+    color: "#C531C9"
   - type: Damageable
     damageContainer: StructuralInorganic
     damageModifierSet: RGlass

diff --git a/Resources/Prototypes/Entities/Structures/Windows/window.yml b/Resources/Prototypes/Entities/Structures/Windows/window.yml
@@ -21,9 +21,11 @@
       - Window
   - type: Sprite
     drawdepth: WallTops
-    sprite: Structures/Windows/window.rsi
+    sprite: _FTL/Structures/Windows/window.rsi
+    color: "#71abcc"
   - type: Icon
-    sprite: Structures/Windows/window.rsi
+    sprite: _FTL/Structures/Windows/window.rsi
+    color: "#71abcc"
     state: full
   - type: Physics
     bodyType: Static

diff --git a/Resources/Textures/_FTL/Structures/Walls/solid.rsi/full.png b/Resources/Textures/_FTL/Structures/Walls/solid.rsi/full.png
diff --git a/Resources/Textures/_FTL/Structures/Walls/solid.rsi/meta.json b/Resources/Textures/_FTL/Structures/Walls/solid.rsi/meta.json
@@ -0,0 +1,105 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from https://github.com/Baystation12/Baystation12/blob/dev/icons/turf/wall_masks.dmi and modified.",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "full"
+    },
+    {
+      "name": "solid0",
+      "directions": 4
+    },
+    {
+      "name": "solid1",
+      "directions": 4
+    },
+    {
+      "name": "solid2",
+      "directions": 4
+    },
+    {
+      "name": "solid3",
+      "directions": 4
+    },
+    {
+      "name": "solid4",
+      "directions": 4
+    },
+    {
+      "name": "solid5",
+      "directions": 4
+    },
+    {
+      "name": "solid6",
+      "directions": 4
+    },
+    {
+      "name": "solid7",
+      "directions": 4
+    },
+    {
+      "name": "reinf_construct-0"
+    },
+    {
+      "name": "reinf_construct-1"
+    },
+    {
+      "name": "reinf_construct-2"
+    },
+    {
+      "name": "reinf_construct-3"
+    },
+    {
+      "name": "reinf_construct-4"
+    },
+    {
+      "name": "reinf_construct-5"
+    },
+    {
+      "name": "reinf_over0",
+      "directions": 4
+    },
+    {
+      "name": "reinf_over1",
+      "directions": 4
+    },
+    {
+      "name": "reinf_over2",
+      "directions": 4
+    },
+    {
+      "name": "reinf_over3",
+      "directions": 4
+    },
+    {
+      "name": "reinf_over4",
+      "directions": 4
+    },
+    {
+      "name": "reinf_over5",
+      "directions": 4
+    },
+    {
+      "name": "reinf_over6",
+      "directions": 4
+    },
+    {
+      "name": "reinf_over7",
+      "directions": 4
+    },
+    {
+      "name": "rgeneric"
+    },
+    {
+      "name": "wall_girder"
+    },
+    {
+      "name": "reinforced_wall_girder"
+    }
+  ]
+}
diff --git a/Resources/Textures/_FTL/Structures/Walls/solid.rsi/reinf_construct-0.png b/Resources/Textures/_FTL/Structures/Walls/solid.rsi/reinf_construct-0.png
diff --git a/Resources/Textures/_FTL/Structures/Walls/solid.rsi/reinf_construct-1.png b/Resources/Textures/_FTL/Structures/Walls/solid.rsi/reinf_construct-1.png
diff --git a/Resources/Textures/_FTL/Structures/Walls/solid.rsi/reinf_construct-2.png b/Resources/Textures/_FTL/Structures/Walls/solid.rsi/reinf_construct-2.png
diff --git a/Resources/Textures/_FTL/Structures/Walls/solid.rsi/reinf_construct-3.png b/Resources/Textures/_FTL/Structures/Walls/solid.rsi/reinf_construct-3.png
diff --git a/Resources/Textures/_FTL/Structures/Walls/solid.rsi/reinf_construct-4.png b/Resources/Textures/_FTL/Structures/Walls/solid.rsi/reinf_construct-4.png
diff --git a/Resources/Textures/_FTL/Structures/Walls/solid.rsi/reinf_construct-5.png b/Resources/Textures/_FTL/Structures/Walls/solid.rsi/reinf_construct-5.png
diff --git a/Resources/Textures/_FTL/Structures/Walls/solid.rsi/reinf_over0.png b/Resources/Textures/_FTL/Structures/Walls/solid.rsi/reinf_over0.png
diff --git a/Resources/Textures/_FTL/Structures/Walls/solid.rsi/reinf_over1.png b/Resources/Textures/_FTL/Structures/Walls/solid.rsi/reinf_over1.png
diff --git a/Resources/Textures/_FTL/Structures/Walls/solid.rsi/reinf_over2.png b/Resources/Textures/_FTL/Structures/Walls/solid.rsi/reinf_over2.png
diff --git a/Resources/Textures/_FTL/Structures/Walls/solid.rsi/reinf_over3.png b/Resources/Textures/_FTL/Structures/Walls/solid.rsi/reinf_over3.png
diff --git a/Resources/Textures/_FTL/Structures/Walls/solid.rsi/reinf_over4.png b/Resources/Textures/_FTL/Structures/Walls/solid.rsi/reinf_over4.png
diff --git a/Resources/Textures/_FTL/Structures/Walls/solid.rsi/reinf_over5.png b/Resources/Textures/_FTL/Structures/Walls/solid.rsi/reinf_over5.png
diff --git a/Resources/Textures/_FTL/Structures/Walls/solid.rsi/reinf_over6.png b/Resources/Textures/_FTL/Structures/Walls/solid.rsi/reinf_over6.png
diff --git a/Resources/Textures/_FTL/Structures/Walls/solid.rsi/reinf_over7.png b/Resources/Textures/_FTL/Structures/Walls/solid.rsi/reinf_over7.png
diff --git a/Resources/Textures/_FTL/Structures/Walls/solid.rsi/reinforced_wall_girder.png b/Resources/Textures/_FTL/Structures/Walls/solid.rsi/reinforced_wall_girder.png
diff --git a/Resources/Textures/_FTL/Structures/Walls/solid.rsi/rgeneric.png b/Resources/Textures/_FTL/Structures/Walls/solid.rsi/rgeneric.png
diff --git a/Resources/Textures/_FTL/Structures/Walls/solid.rsi/solid0.png b/Resources/Textures/_FTL/Structures/Walls/solid.rsi/solid0.png
diff --git a/Resources/Textures/_FTL/Structures/Walls/solid.rsi/solid1.png b/Resources/Textures/_FTL/Structures/Walls/solid.rsi/solid1.png
diff --git a/Resources/Textures/_FTL/Structures/Walls/solid.rsi/solid2.png b/Resources/Textures/_FTL/Structures/Walls/solid.rsi/solid2.png
diff --git a/Resources/Textures/_FTL/Structures/Walls/solid.rsi/solid3.png b/Resources/Textures/_FTL/Structures/Walls/solid.rsi/solid3.png
diff --git a/Resources/Textures/_FTL/Structures/Walls/solid.rsi/solid4.png b/Resources/Textures/_FTL/Structures/Walls/solid.rsi/solid4.png
diff --git a/Resources/Textures/_FTL/Structures/Walls/solid.rsi/solid5.png b/Resources/Textures/_FTL/Structures/Walls/solid.rsi/solid5.png
diff --git a/Resources/Textures/_FTL/Structures/Walls/solid.rsi/solid6.png b/Resources/Textures/_FTL/Structures/Walls/solid.rsi/solid6.png
diff --git a/Resources/Textures/_FTL/Structures/Walls/solid.rsi/solid7.png b/Resources/Textures/_FTL/Structures/Walls/solid.rsi/solid7.png
diff --git a/Resources/Textures/_FTL/Structures/Walls/solid.rsi/wall_girder.png b/Resources/Textures/_FTL/Structures/Walls/solid.rsi/wall_girder.png
diff --git a/Resources/Textures/_FTL/Structures/Windows/plasma_window.rsi/full.png b/Resources/Textures/_FTL/Structures/Windows/plasma_window.rsi/full.png
diff --git a/Resources/Textures/_FTL/Structures/Windows/plasma_window.rsi/meta.json b/Resources/Textures/_FTL/Structures/Windows/plasma_window.rsi/meta.json
@@ -0,0 +1,46 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from https://github.com/Baystation12/Baystation12/blob/dev/icons/obj/structures/window.dmi and modified.",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "full"
+    },
+    {
+      "name": "pwindow0",
+      "directions": 4
+    },
+    {
+      "name": "pwindow1",
+      "directions": 4
+    },
+    {
+      "name": "pwindow2",
+      "directions": 4
+    },
+    {
+      "name": "pwindow3",
+      "directions": 4
+    },
+    {
+      "name": "pwindow4",
+      "directions": 4
+    },
+    {
+      "name": "pwindow5",
+      "directions": 4
+    },
+    {
+      "name": "pwindow6",
+      "directions": 4
+    },
+    {
+      "name": "pwindow7",
+      "directions": 4
+	}
+  ]
+}
diff --git a/Resources/Textures/_FTL/Structures/Windows/plasma_window.rsi/pwindow0.png b/Resources/Textures/_FTL/Structures/Windows/plasma_window.rsi/pwindow0.png
diff --git a/Resources/Textures/_FTL/Structures/Windows/plasma_window.rsi/pwindow1.png b/Resources/Textures/_FTL/Structures/Windows/plasma_window.rsi/pwindow1.png
diff --git a/Resources/Textures/_FTL/Structures/Windows/plasma_window.rsi/pwindow2.png b/Resources/Textures/_FTL/Structures/Windows/plasma_window.rsi/pwindow2.png
diff --git a/Resources/Textures/_FTL/Structures/Windows/plasma_window.rsi/pwindow3.png b/Resources/Textures/_FTL/Structures/Windows/plasma_window.rsi/pwindow3.png
diff --git a/Resources/Textures/_FTL/Structures/Windows/plasma_window.rsi/pwindow4.png b/Resources/Textures/_FTL/Structures/Windows/plasma_window.rsi/pwindow4.png
diff --git a/Resources/Textures/_FTL/Structures/Windows/plasma_window.rsi/pwindow5.png b/Resources/Textures/_FTL/Structures/Windows/plasma_window.rsi/pwindow5.png
diff --git a/Resources/Textures/_FTL/Structures/Windows/plasma_window.rsi/pwindow6.png b/Resources/Textures/_FTL/Structures/Windows/plasma_window.rsi/pwindow6.png
diff --git a/Resources/Textures/_FTL/Structures/Windows/plasma_window.rsi/pwindow7.png b/Resources/Textures/_FTL/Structures/Windows/plasma_window.rsi/pwindow7.png
diff --git a/Resources/Textures/_FTL/Structures/Windows/reinforced_plasma_window.rsi/full.png b/Resources/Textures/_FTL/Structures/Windows/reinforced_plasma_window.rsi/full.png
diff --git a/Resources/Textures/_FTL/Structures/Windows/reinforced_plasma_window.rsi/meta.json b/Resources/Textures/_FTL/Structures/Windows/reinforced_plasma_window.rsi/meta.json
@@ -0,0 +1,46 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from https://github.com/Baystation12/Baystation12/blob/dev/icons/obj/structures/window.dmi and modified.",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "full"
+    },
+    {
+      "name": "rpwindow0",
+      "directions": 4
+    },
+    {
+      "name": "rpwindow1",
+      "directions": 4
+    },
+    {
+      "name": "rpwindow2",
+      "directions": 4
+    },
+    {
+      "name": "rpwindow3",
+      "directions": 4
+    },
+    {
+      "name": "rpwindow4",
+      "directions": 4
+    },
+    {
+      "name": "rpwindow5",
+      "directions": 4
+    },
+    {
+      "name": "rpwindow6",
+      "directions": 4
+    },
+    {
+      "name": "rpwindow7",
+      "directions": 4
+    }
+  ]
+}
diff --git a/...ces/Textures/_FTL/Structures/Windows/reinforced_plasma_window.rsi/rpwindow0.png b/...ces/Textures/_FTL/Structures/Windows/reinforced_plasma_window.rsi/rpwindow0.png
diff --git a/...ces/Textures/_FTL/Structures/Windows/reinforced_plasma_window.rsi/rpwindow1.png b/...ces/Textures/_FTL/Structures/Windows/reinforced_plasma_window.rsi/rpwindow1.png
diff --git a/...ces/Textures/_FTL/Structures/Windows/reinforced_plasma_window.rsi/rpwindow2.png b/...ces/Textures/_FTL/Structures/Windows/reinforced_plasma_window.rsi/rpwindow2.png
diff --git a/...ces/Textures/_FTL/Structures/Windows/reinforced_plasma_window.rsi/rpwindow3.png b/...ces/Textures/_FTL/Structures/Windows/reinforced_plasma_window.rsi/rpwindow3.png
diff --git a/...ces/Textures/_FTL/Structures/Windows/reinforced_plasma_window.rsi/rpwindow4.png b/...ces/Textures/_FTL/Structures/Windows/reinforced_plasma_window.rsi/rpwindow4.png
diff --git a/...ces/Textures/_FTL/Structures/Windows/reinforced_plasma_window.rsi/rpwindow5.png b/...ces/Textures/_FTL/Structures/Windows/reinforced_plasma_window.rsi/rpwindow5.png
diff --git a/...ces/Textures/_FTL/Structures/Windows/reinforced_plasma_window.rsi/rpwindow6.png b/...ces/Textures/_FTL/Structures/Windows/reinforced_plasma_window.rsi/rpwindow6.png
diff --git a/...ces/Textures/_FTL/Structures/Windows/reinforced_plasma_window.rsi/rpwindow7.png b/...ces/Textures/_FTL/Structures/Windows/reinforced_plasma_window.rsi/rpwindow7.png
diff --git a/Resources/Textures/_FTL/Structures/Windows/reinforced_window.rsi/full.png b/Resources/Textures/_FTL/Structures/Windows/reinforced_window.rsi/full.png
diff --git a/Resources/Textures/_FTL/Structures/Windows/reinforced_window.rsi/meta.json b/Resources/Textures/_FTL/Structures/Windows/reinforced_window.rsi/meta.json
@@ -0,0 +1,46 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from https://github.com/Baystation12/Baystation12/blob/dev/icons/obj/structures/window.dmi and modified.",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "full"
+    },
+    {
+      "name": "rwindow0",
+      "directions": 4
+    },
+    {
+      "name": "rwindow1",
+      "directions": 4
+    },
+    {
+      "name": "rwindow2",
+      "directions": 4
+    },
+    {
+      "name": "rwindow3",
+      "directions": 4
+    },
+    {
+      "name": "rwindow4",
+      "directions": 4
+    },
+    {
+      "name": "rwindow5",
+      "directions": 4
+    },
+    {
+      "name": "rwindow6",
+      "directions": 4
+    },
+    {
+      "name": "rwindow7",
+      "directions": 4
+    }
+  ]
+}
diff --git a/Resources/Textures/_FTL/Structures/Windows/reinforced_window.rsi/rwindow0.png b/Resources/Textures/_FTL/Structures/Windows/reinforced_window.rsi/rwindow0.png
diff --git a/Resources/Textures/_FTL/Structures/Windows/reinforced_window.rsi/rwindow1.png b/Resources/Textures/_FTL/Structures/Windows/reinforced_window.rsi/rwindow1.png
diff --git a/Resources/Textures/_FTL/Structures/Windows/reinforced_window.rsi/rwindow2.png b/Resources/Textures/_FTL/Structures/Windows/reinforced_window.rsi/rwindow2.png
diff --git a/Resources/Textures/_FTL/Structures/Windows/reinforced_window.rsi/rwindow3.png b/Resources/Textures/_FTL/Structures/Windows/reinforced_window.rsi/rwindow3.png
diff --git a/Resources/Textures/_FTL/Structures/Windows/reinforced_window.rsi/rwindow4.png b/Resources/Textures/_FTL/Structures/Windows/reinforced_window.rsi/rwindow4.png
diff --git a/Resources/Textures/_FTL/Structures/Windows/reinforced_window.rsi/rwindow5.png b/Resources/Textures/_FTL/Structures/Windows/reinforced_window.rsi/rwindow5.png
diff --git a/Resources/Textures/_FTL/Structures/Windows/reinforced_window.rsi/rwindow6.png b/Resources/Textures/_FTL/Structures/Windows/reinforced_window.rsi/rwindow6.png
diff --git a/Resources/Textures/_FTL/Structures/Windows/reinforced_window.rsi/rwindow7.png b/Resources/Textures/_FTL/Structures/Windows/reinforced_window.rsi/rwindow7.png
diff --git a/Resources/Textures/_FTL/Structures/Windows/window.rsi/full.png b/Resources/Textures/_FTL/Structures/Windows/window.rsi/full.png
diff --git a/Resources/Textures/_FTL/Structures/Windows/window.rsi/meta.json b/Resources/Textures/_FTL/Structures/Windows/window.rsi/meta.json
@@ -0,0 +1,46 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from https://github.com/Baystation12/Baystation12/blob/dev/icons/obj/structures/window.dmi and modified.",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "full"
+    },
+    {
+      "name": "window0",
+      "directions": 4
+    },
+    {
+      "name": "window1",
+      "directions": 4
+    },
+    {
+      "name": "window2",
+      "directions": 4
+    },
+    {
+      "name": "window3",
+      "directions": 4
+    },
+    {
+      "name": "window4",
+      "directions": 4
+    },
+    {
+      "name": "window5",
+      "directions": 4
+    },
+    {
+      "name": "window6",
+      "directions": 4
+    },
+    {
+      "name": "window7",
+      "directions": 4
+	}
+  ]
+}
diff --git a/Resources/Textures/_FTL/Structures/Windows/window.rsi/window0.png b/Resources/Textures/_FTL/Structures/Windows/window.rsi/window0.png
diff --git a/Resources/Textures/_FTL/Structures/Windows/window.rsi/window1.png b/Resources/Textures/_FTL/Structures/Windows/window.rsi/window1.png
diff --git a/Resources/Textures/_FTL/Structures/Windows/window.rsi/window2.png b/Resources/Textures/_FTL/Structures/Windows/window.rsi/window2.png
diff --git a/Resources/Textures/_FTL/Structures/Windows/window.rsi/window3.png b/Resources/Textures/_FTL/Structures/Windows/window.rsi/window3.png
diff --git a/Resources/Textures/_FTL/Structures/Windows/window.rsi/window4.png b/Resources/Textures/_FTL/Structures/Windows/window.rsi/window4.png
diff --git a/Resources/Textures/_FTL/Structures/Windows/window.rsi/window5.png b/Resources/Textures/_FTL/Structures/Windows/window.rsi/window5.png
diff --git a/Resources/Textures/_FTL/Structures/Windows/window.rsi/window6.png b/Resources/Textures/_FTL/Structures/Windows/window.rsi/window6.png
diff --git a/Resources/Textures/_FTL/Structures/Windows/window.rsi/window7.png b/Resources/Textures/_FTL/Structures/Windows/window.rsi/window7.png