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

Walls/Windows Resprites! #402

Merged
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
Original file line number Diff line number Diff line change
Expand Up @@ -131,9 +131,6 @@
- board
- type: PlacementReplacement
key: walls
- type: IconSmooth
key: walls
mode: NoSprite
- type: PaintableAirlock
group: Standard
department: Civilian
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -52,9 +52,6 @@
behaviors:
- !type:DoActsBehavior
acts: ["Destruction"]
- type: IconSmooth
key: walls
mode: NoSprite
- type: Occluder
- type: BlockWeather

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -73,9 +73,6 @@
behaviors:
- !type:DoActsBehavior
acts: ["Destruction"]
- type: IconSmooth
key: walls
mode: NoSprite
- type: DoorSignalControl
- type: DeviceNetwork
deviceNetId: Wireless
Expand Down
4 changes: 2 additions & 2 deletions Resources/Prototypes/Entities/Structures/Windows/window.yml
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@
acts: [ "Destruction" ]
- type: Airtight
- type: IconSmooth
key: windows
key: walls
base: window
- type: InteractionPopup
interactSuccessString: comp-window-knock
Expand Down Expand Up @@ -242,4 +242,4 @@
sprite: Structures/Windows/cracks_diagonal.rsi
- type: Construction
graph: WindowDiagonal
node: windowDiagonal
node: windowDiagonal
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
Expand Up @@ -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
]
]
},
Expand All @@ -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
]
]
}
Expand Down
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
Expand Up @@ -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"
Expand Down
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
Expand Up @@ -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
Expand Down
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
Expand Down
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
Expand Down
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
Expand Down
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
Expand Down
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
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
Expand Down
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
Loading