Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Baystation Wall/Window Port #301

Merged
merged 3 commits into from
Apr 20, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 8 additions & 4 deletions Resources/Prototypes/Entities/Structures/Walls/walls.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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:
Expand Down
7 changes: 5 additions & 2 deletions Resources/Prototypes/Entities/Structures/Windows/plasma.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
7 changes: 5 additions & 2 deletions Resources/Prototypes/Entities/Structures/Windows/rplasma.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 4 additions & 2 deletions Resources/Prototypes/Entities/Structures/Windows/window.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
105 changes: 105 additions & 0 deletions Resources/Textures/_FTL/Structures/Walls/solid.rsi/meta.json
Original file line number Diff line number Diff line change
@@ -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"
}
]
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -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
}
]
}
Original file line number Diff line number Diff line change
@@ -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
}
]
}
Original file line number Diff line number Diff line change
@@ -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
}
]
}
46 changes: 46 additions & 0 deletions Resources/Textures/_FTL/Structures/Windows/window.rsi/meta.json
Original file line number Diff line number Diff line change
@@ -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
}
]
}
Loading