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 Resprite #418

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 @@ -56,6 +56,7 @@
- type: Sprite
drawdepth: FloorObjects
sprite: Structures/Piping/Atmospherics/vent.rsi
noRot: true
layers:
- sprite: Structures/Piping/Atmospherics/pipe.rsi
state: pipeHalf
Expand Down Expand Up @@ -97,6 +98,7 @@
- type: Sprite
drawdepth: FloorObjects
sprite: Structures/Piping/Atmospherics/vent.rsi
noRot: true
layers:
- sprite: Structures/Piping/Atmospherics/pipe.rsi
state: pipeHalf
Expand Down Expand Up @@ -146,6 +148,7 @@
- type: Sprite
drawdepth: FloorObjects
sprite: Structures/Piping/Atmospherics/scrubber.rsi
noRot: true
layers:
- sprite: Structures/Piping/Atmospherics/pipe.rsi
state: pipeHalf
Expand Down
1 change: 0 additions & 1 deletion Resources/Prototypes/Entities/Structures/Walls/walls.yml
Original file line number Diff line number Diff line change
Expand Up @@ -452,7 +452,6 @@
- type: Tag
tags:
- Wall
- RCDDeconstructWhitelist
- type: Destructible
thresholds:
- trigger:
Expand Down
46 changes: 46 additions & 0 deletions Resources/Prototypes/Entities/Structures/Windows/plastitanium.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
- type: entity
id: PlastitaniumWindow
name: plastitanium window
parent: Window
components:
- type: Sprite
drawdepth: WallTops
sprite: Structures/Windows/plastitanium_window.rsi
- type: Icon
sprite: Structures/Windows/plastitanium_window.rsi
- type: Damageable
damageContainer: Inorganic
damageModifierSet: RGlass
- type: Destructible
thresholds:
- trigger:
!type:DamageTrigger
damage: 2000
behaviors: #excess damage, don't spawn entities.
- !type:DoActsBehavior
acts: [ "Destruction" ]
- trigger:
!type:DamageTrigger
damage: 1000
behaviors:
- !type:PlaySoundBehavior
sound:
collection: GlassBreak
- !type:SpawnEntitiesBehavior
spawn:
PartRodMetal:
min: 1
max: 2
- !type:DoActsBehavior
acts: [ "Destruction" ]
- type: IconSmooth
base: plwindow
- type: Appearance
- type: DamageVisuals
thresholds: [4, 8, 12]
damageDivisor: 36
trackAllDamage: true
damageOverlay:
sprite: Structures/Windows/cracks.rsi
- type: StaticPrice
price: 65
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@
acts: [ "Destruction" ]
- type: Airtight
- type: IconSmooth
key: windows
key: walls
base: window
- type: InteractionPopup
interactSuccessString: comp-window-knock
Expand Down
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
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.
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
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_over6.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_over7.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/rgeneric.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/solid0.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/solid1.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/solid2.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/solid3.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/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
@@ -0,0 +1,46 @@
{
"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": "plwindow0",
"directions": 4
},
{
"name": "plwindow1",
"directions": 4
},
{
"name": "plwindow2",
"directions": 4
},
{
"name": "plwindow3",
"directions": 4
},
{
"name": "plwindow4",
"directions": 4
},
{
"name": "plwindow5",
"directions": 4
},
{
"name": "plwindow6",
"directions": 4
},
{
"name": "plwindow7",
"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 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
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
Expand Down
Binary file modified Resources/Textures/Structures/Windows/uranium_window.rsi/full.png
Loading
Loading