Skip to content

Commit

Permalink
Walls/Windows Resprites! (#402)
Browse files Browse the repository at this point in the history
<!--
This is a semi-strict format, you can add/remove sections as needed but
the order/format should be kept the same
Remove these comments before submitting
-->

# Walls/Windows Resprites!

<!--
Explain this PR in as much detail as applicable

Some example prompts to consider:
How might this affect the game? The codebase?
What might be some alternatives to this?
How/Who does this benefit/hurt [the game/codebase]?
-->

Import the changes that i provided to frontier in PR:
new-frontiers-14/frontier-station-14#418 to EE,
including part of this PR:
new-frontiers-14/frontier-station-14#757

Those Walls/Windows LOOK EXTREMLY MORE BETTER then the old TG
walls/windows, Common its 2024!
We need DRIP IN ALL WALLS!

.yml changes are needed for connection to walls/window and prevent
connected from doors, shutters, ect...

---

# TODO

<!--
A list of everything you have to do before this PR is "complete"
You probably won't have to complete everything before merging but it's
good to leave future references
-->

- [x] Import Sprites.
- [x] yml changes

---

<!--
This is default collapsed, readers click to expand it and see all your
media
The PR media section can get very large at times, so this is a good way
to keep it clean
The title is written using HTML tags
The title must be within the <summary> tags or you won't see it
-->

<details><summary><h1>Media</h1></summary>
<p>


![image](https://github.com/Simple-Station/Einstein-Engines/assets/45297731/28221333-4c14-44d4-8557-697462d676f2)

</p>
</details>

---

# Changelog

<!--
You can add an author after the `:cl:` to change the name that appears
in the changelog (ex: `:cl: Death`)
Leaving it blank will default to your GitHub display name
This includes all available types for the changelog
-->

:cl:
- tweak: Better wall sprites.
- tweak: Better window sprites.
FoxxoTrystan authored May 28, 2024
1 parent 4123236 commit 16fa1ca
Showing 129 changed files with 130 additions and 121 deletions.
Original file line number Diff line number Diff line change
@@ -131,9 +131,6 @@
- board
- type: PlacementReplacement
key: walls
- type: IconSmooth
key: walls
mode: NoSprite
- type: PaintableAirlock
group: Standard
department: Civilian
Original file line number Diff line number Diff line change
@@ -52,9 +52,6 @@
behaviors:
- !type:DoActsBehavior
acts: ["Destruction"]
- type: IconSmooth
key: walls
mode: NoSprite
- type: Occluder
- type: BlockWeather

Original file line number Diff line number Diff line change
@@ -73,9 +73,6 @@
behaviors:
- !type:DoActsBehavior
acts: ["Destruction"]
- type: IconSmooth
key: walls
mode: NoSprite
- type: DoorSignalControl
- type: DeviceNetwork
deviceNetId: Wireless
4 changes: 2 additions & 2 deletions Resources/Prototypes/Entities/Structures/Windows/window.yml
Original file line number Diff line number Diff line change
@@ -69,7 +69,7 @@
acts: [ "Destruction" ]
- type: Airtight
- type: IconSmooth
key: windows
key: walls
base: window
- type: InteractionPopup
interactSuccessString: comp-window-knock
@@ -242,4 +242,4 @@
sprite: Structures/Windows/cracks_diagonal.rsi
- type: Construction
graph: WindowDiagonal
node: windowDiagonal
node: windowDiagonal
Binary file modified Resources/Textures/Structures/Doors/secret_door.rsi/assembly.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Resources/Textures/Structures/Doors/secret_door.rsi/closed.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Resources/Textures/Structures/Doors/secret_door.rsi/closing.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
24 changes: 12 additions & 12 deletions Resources/Textures/Structures/Doors/secret_door.rsi/meta.json
Original file line number Diff line number Diff line change
@@ -24,12 +24,12 @@
"directions": 1,
"delays": [
[
0.2,
0.2,
0.2,
0.2,
0.2,
0.2
0.1,
0.1,
0.1,
0.1,
0.1,
0.1
]
]
},
@@ -47,12 +47,12 @@
"directions": 1,
"delays": [
[
0.2,
0.2,
0.2,
0.2,
0.2,
0.2
0.1,
0.1,
0.1,
0.1,
0.1,
0.1
]
]
}
Binary file modified Resources/Textures/Structures/Doors/secret_door.rsi/open.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Resources/Textures/Structures/Doors/secret_door.rsi/opening.png
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
@@ -5,7 +5,7 @@
"y": 32
},
"license": "CC-BY-SA-3.0",
"copyright": "Sprited by SonicHDC (Github) for Space Station 14",
"copyright": "Sprited by erhardsteinhauer (discord) for Space Station 14 New Frontier server",
"states": [
{
"name": "state0"
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.
20 changes: 19 additions & 1 deletion Resources/Textures/Structures/Walls/shuttle.rsi/meta.json
Original file line number Diff line number Diff line change
@@ -41,6 +41,24 @@
{
"name": "state7",
"directions": 4
},
{
"name": "shuttle_construct-0"
},
{
"name": "shuttle_construct-1"
},
{
"name": "shuttle_construct-2"
},
{
"name": "shuttle_construct-3"
},
{
"name": "shuttle_construct-4"
},
{
"name": "shuttle_construct-5"
}
]
}
}
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.
Binary file modified Resources/Textures/Structures/Walls/solid.rsi/full.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion Resources/Textures/Structures/Walls/solid.rsi/meta.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Taken from https://github.com/discordia-space/CEV-Eris/blob/c34c1b30abf18aa552e19294523924c39e5ea127/icons/turf/wall_masks.dmi and modified.",
"copyright": "Taken from https://github.com/ParadiseSS13/Paradise/ and modified by FoxxoTrystan",
"size": {
"x": 32,
"y": 32
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.
Binary file modified Resources/Textures/Structures/Walls/solid.rsi/reinf_over0.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Resources/Textures/Structures/Walls/solid.rsi/reinf_over1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Resources/Textures/Structures/Walls/solid.rsi/reinf_over2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Resources/Textures/Structures/Walls/solid.rsi/reinf_over3.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Resources/Textures/Structures/Walls/solid.rsi/reinf_over4.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Resources/Textures/Structures/Walls/solid.rsi/reinf_over5.png
Binary file modified Resources/Textures/Structures/Walls/solid.rsi/reinf_over6.png
Binary file modified Resources/Textures/Structures/Walls/solid.rsi/reinf_over7.png
Binary file modified Resources/Textures/Structures/Walls/solid.rsi/rgeneric.png
Binary file modified Resources/Textures/Structures/Walls/solid.rsi/solid0.png
Binary file modified Resources/Textures/Structures/Walls/solid.rsi/solid1.png
Binary file modified Resources/Textures/Structures/Walls/solid.rsi/solid2.png
Binary file modified Resources/Textures/Structures/Walls/solid.rsi/solid3.png
Binary file modified Resources/Textures/Structures/Walls/solid.rsi/solid4.png
Binary file modified Resources/Textures/Structures/Walls/solid.rsi/solid5.png
Binary file modified Resources/Textures/Structures/Walls/solid.rsi/solid6.png
Binary file modified Resources/Textures/Structures/Walls/solid.rsi/solid7.png
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/9c7d509354ee030300f63c701da63c17928c3b3b and modified by Swept",
"copyright": "Taken from https://github.com/ParadiseSS13/Paradise/ and modified by FoxxoTrystan",
"size": {
"x": 32,
"y": 32
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/9c7d509354ee030300f63c701da63c17928c3b3b",
"copyright": "Taken from https://github.com/ParadiseSS13/Paradise/ and modified by FoxxoTrystan",
"size": {
"x": 32,
"y": 32
Original file line number Diff line number Diff line change
@@ -1,46 +1,46 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "resprited by AsikKEsel | Original source: from vgstation at commit https://github.com/vgstation-coders/vgstation13/raw/99cc2ab62d65a3a7b554dc7b21ff5f57c835f973/icons/turf/walls.dmi and modified by Swept ",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "full"
},
{
"name": "ruwindow0",
"directions": 4
},
{
"name": "ruwindow1",
"directions": 4
},
{
"name": "ruwindow2",
"directions": 4
},
{
"name": "ruwindow3",
"directions": 4
},
{
"name": "ruwindow4",
"directions": 4
},
{
"name": "ruwindow5",
"directions": 4
},
{
"name": "ruwindow6",
"directions": 4
},
{
"name": "ruwindow7",
"directions": 4
}
]
}
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Taken from https://github.com/ParadiseSS13/Paradise/ and modified by FoxxoTrystan",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "full"
},
{
"name": "ruwindow0",
"directions": 4
},
{
"name": "ruwindow1",
"directions": 4
},
{
"name": "ruwindow2",
"directions": 4
},
{
"name": "ruwindow3",
"directions": 4
},
{
"name": "ruwindow4",
"directions": 4
},
{
"name": "ruwindow5",
"directions": 4
},
{
"name": "ruwindow6",
"directions": 4
},
{
"name": "ruwindow7",
"directions": 4
}
]
}
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Taken from vgstation at commit https://github.com/vgstation-coders/vgstation13/raw/99cc2ab62d65a3a7b554dc7b21ff5f57c835f973/icons/turf/walls.dmi and modified by Swept",
"copyright": "Taken from https://github.com/ParadiseSS13/Paradise/ and modified by FoxxoTrystan",
"size": {
"x": 32,
"y": 32
Binary file modified Resources/Textures/Structures/Windows/tinted_window.rsi/full.png
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/ f141c349e063f7318d8c8a2417d840f0b2d06600, modified",
"copyright": "Taken from https://github.com/ParadiseSS13/Paradise/ and modified by FoxxoTrystan",
"size": {
"x": 32,
"y": 32
Binary file modified Resources/Textures/Structures/Windows/uranium_window.rsi/full.png
90 changes: 45 additions & 45 deletions Resources/Textures/Structures/Windows/uranium_window.rsi/meta.json
Original file line number Diff line number Diff line change
@@ -1,46 +1,46 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "resprited by AsikKEsel | Original source: from vgstation at commit https://github.com/vgstation-coders/vgstation13/raw/99cc2ab62d65a3a7b554dc7b21ff5f57c835f973/icons/turf/walls.dmi and modified by Swept",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "full"
},
{
"name": "uwindow0",
"directions": 4
},
{
"name": "uwindow1",
"directions": 4
},
{
"name": "uwindow2",
"directions": 4
},
{
"name": "uwindow3",
"directions": 4
},
{
"name": "uwindow4",
"directions": 4
},
{
"name": "uwindow5",
"directions": 4
},
{
"name": "uwindow6",
"directions": 4
},
{
"name": "uwindow7",
"directions": 4
}
]
}
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Taken from https://github.com/ParadiseSS13/Paradise/ and modified by FoxxoTrystan",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "full"
},
{
"name": "uwindow0",
"directions": 4
},
{
"name": "uwindow1",
"directions": 4
},
{
"name": "uwindow2",
"directions": 4
},
{
"name": "uwindow3",
"directions": 4
},
{
"name": "uwindow4",
"directions": 4
},
{
"name": "uwindow5",
"directions": 4
},
{
"name": "uwindow6",
"directions": 4
},
{
"name": "uwindow7",
"directions": 4
}
]
}
Binary file modified Resources/Textures/Structures/Windows/window.rsi/full.png
2 changes: 1 addition & 1 deletion Resources/Textures/Structures/Windows/window.rsi/meta.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Taken from vgstation at commit https://github.com/vgstation-coders/vgstation13/raw/99cc2ab62d65a3a7b554dc7b21ff5f57c835f973/icons/turf/walls.dmi and modified by Swept",
"copyright": "Taken from https://github.com/ParadiseSS13/Paradise/ and modified by FoxxoTrystan",
"size": {
"x": 32,
"y": 32
Binary file modified Resources/Textures/Structures/Windows/window.rsi/window0.png
Binary file modified Resources/Textures/Structures/Windows/window.rsi/window1.png
Binary file modified Resources/Textures/Structures/Windows/window.rsi/window2.png
Binary file modified Resources/Textures/Structures/Windows/window.rsi/window3.png
Binary file modified Resources/Textures/Structures/Windows/window.rsi/window4.png
Binary file modified Resources/Textures/Structures/Windows/window.rsi/window5.png
Binary file modified Resources/Textures/Structures/Windows/window.rsi/window6.png
Binary file modified Resources/Textures/Structures/Windows/window.rsi/window7.png

0 comments on commit 16fa1ca

Please sign in to comment.