Skip to content
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
3 changes: 2 additions & 1 deletion Resources/Prototypes/Entities/Structures/Walls/grille.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,9 @@
fx: EffectRCDDeconstruct4
- type: CanBuildWindowOnTop
- type: Sprite
drawdepth: Walls
drawdepth: Mobs
sprite: Structures/Walls/grille.rsi
snapCardinals: true
layers:
- state: grille
- state: electrified
Expand Down
18 changes: 9 additions & 9 deletions Resources/Prototypes/Entities/Structures/Walls/walls.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
- Wall
- type: IsRoof
- type: Sprite
drawdepth: Walls
drawdepth: Mobs
- type: Icon
state: full
- type: PlacementReplacement
Expand Down Expand Up @@ -499,7 +499,7 @@
- Wall
components:
- type: Sprite
drawdepth: Walls
drawdepth: Mobs
sprite: Structures/Walls/plastitanium_diagonal.rsi
state: state0
- type: IconSmooth
Expand Down Expand Up @@ -550,7 +550,7 @@
- Wall
- Diagonal
- type: Sprite
drawdepth: Walls
drawdepth: Mobs
sprite: Structures/Walls/plastitanium_diagonal.rsi
state: state0
- type: IconSmooth
Expand Down Expand Up @@ -694,7 +694,7 @@
tags:
- Diagonal
- type: Sprite
drawdepth: Walls
drawdepth: Mobs
sprite: Structures/Walls/reinforced_diagonal.rsi
state: state0
- type: IconSmooth
Expand Down Expand Up @@ -837,7 +837,7 @@
- Wall
- Diagonal
- type: Sprite
drawdepth: Walls
drawdepth: Mobs
sprite: Structures/Walls/shuttle_diagonal.rsi
state: state0
- type: IconSmooth
Expand Down Expand Up @@ -964,13 +964,13 @@
tags:
- Wall
- type: Sprite
sprite: Structures/Walls/solid.rsi
sprite: _Encore/Structures/Walls/tall/metal.rsi
- type: WallReplacementMarker
- type: Construction
graph: Girder
node: wall
- type: Icon
sprite: Structures/Walls/solid.rsi
sprite: _Encore/Structures/Walls/tall/metal.rsi
- type: RCDDeconstructable
cost: 6
delay: 8
Expand Down Expand Up @@ -1012,7 +1012,7 @@
- Wall
components:
- type: Sprite
drawdepth: Walls
drawdepth: Mobs
sprite: Structures/Walls/solid_diagonal.rsi
state: state0
- type: IconSmooth
Expand Down Expand Up @@ -1252,7 +1252,7 @@
- Wall
components:
- type: Sprite
drawdepth: Walls
drawdepth: Mobs
sprite: Structures/Walls/mining_diagonal.rsi
state: state0
- type: IconSmooth
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@
parent: Window
components:
- type: Sprite
drawdepth: WallTops
sprite: Structures/Windows/reinforced_window.rsi
drawdepth: Mobs
sprite: _Encore/Structures/Windows/tall/reinforced_window.rsi
- type: Icon
sprite: Structures/Windows/reinforced_window.rsi
sprite: _Encore/Structures/Windows/tall/reinforced_window.rsi
- type: Repairable
fuelCost: 10
doAfterDelay: 2
Expand Down Expand Up @@ -126,7 +126,7 @@
- Window
components:
- type: Sprite
drawdepth: WallTops
drawdepth: Mobs
sprite: Structures/Windows/reinforced_window_diagonal.rsi
state: state0
- type: Tag
Expand Down
10 changes: 5 additions & 5 deletions Resources/Prototypes/Entities/Structures/Windows/window.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,10 @@
- Window
- WeldbotFixableStructure
- type: Sprite
drawdepth: WallTops
sprite: Structures/Windows/window.rsi
drawdepth: Mobs
sprite: _Encore/Structures/Windows/tall/window.rsi
- type: Icon
sprite: Structures/Windows/window.rsi
sprite: _Encore/Structures/Windows/tall/window.rsi
state: full
- type: Physics
bodyType: Static
Expand Down Expand Up @@ -98,7 +98,7 @@
name: tinted window
components:
- type: Sprite
drawdepth: WallTops
drawdepth: Mobs
sprite: Structures/Windows/tinted_window.rsi
- type: Icon
sprite: Structures/Windows/tinted_window.rsi
Expand Down Expand Up @@ -250,7 +250,7 @@
- Window
components:
- type: Sprite
drawdepth: WallTops
drawdepth: Mobs
sprite: Structures/Windows/window_diagonal.rsi
state: state0
- type: Tag
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
- type: entity
id: PoweredLEDLightClubRezzSign
name: club sign
description: "The magnanimous sign of Club Rezz, infamous as it may be. You're certain those sodium bulbs inside have been running longer than you've been alive..."
parent: LightPostSmall
components:
- type: Sprite
sprite: _Encore/Structures/City/club_rezz_sign.rsi
snapCardinals: true
drawdepth: Overdoors
Offset: 0,1.25
- type: PointLight
enabled: true
radius: 6
energy: 1
softness: 0.9
color: "#EB8B3D"
- type: PoweredLight
hasLampOnSpawn: LedLightTube
- type: AmbientOnPowered
- type: AmbientSound
volume: -15
range: 3
sound:
path: /Audio/Ambience/Objects/light_hum.ogg
Binary file modified Resources/Textures/Decals/road.rsi/crosswalk_e.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/Decals/road.rsi/crosswalk_n.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/Decals/road.rsi/thin_corner_ne.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/Decals/road.rsi/thin_corner_nw.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/Decals/road.rsi/thin_corner_se.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/Decals/road.rsi/thin_corner_sw.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/Decals/road.rsi/thin_line_e.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/Decals/road.rsi/thin_line_n.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/Decals/road.rsi/thin_line_s.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/Decals/road.rsi/thin_line_w.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/Decals/road.rsi/thin_mid_e.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/Decals/road.rsi/thin_mid_n.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/Decals/road.rsi/thin_mid_s.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/Decals/road.rsi/thin_mid_w.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/Storage/Crates/trashbin.rsi/base.png
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/Storage/Crates/trashbin.rsi/icon.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
@@ -1,7 +1,7 @@
{
"version": 1,
"license": "CC-BY-NC-SA-3.0",
"copyright": "Taken from Nukapop13, states created / modified by Peptide90 for ss14",
"copyright": "by kyres1",
"size": {
"x": 32,
"y": 32
Expand Down
Binary file modified Resources/Textures/Structures/Storage/Crates/trashbin.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/Walls/grille.rsi/grille.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/grille.rsi/grille_broken.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/grille.rsi/grille_damaged_0.png
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/grille.rsi/grille_damaged_2.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/grille.rsi/grille_damaged_3.png
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.
4 changes: 2 additions & 2 deletions Resources/Textures/Structures/Walls/grille.rsi/meta.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Taken from https://github.com/tgstation/tgstation at commit 17c603f1d037f22081d446b9a3f3ae8d41f52e86",
"copyright": "Taken from https://github.com/tgstation/tgstation at commit 17c603f1d037f22081d446b9a3f3ae8d41f52e86, resized and edited by kyres1",
"size": {
"x": 32,
"y": 32
"y": 64
},
"states": [
{
Expand Down
Binary file modified Resources/Textures/Structures/catwalk.rsi/catwalk_0.png
Binary file modified Resources/Textures/Structures/catwalk.rsi/catwalk_1.png
Binary file modified Resources/Textures/Structures/catwalk.rsi/catwalk_2.png
Binary file modified Resources/Textures/Structures/catwalk.rsi/catwalk_3.png
Binary file modified Resources/Textures/Structures/catwalk.rsi/catwalk_4.png
Binary file modified Resources/Textures/Structures/catwalk.rsi/catwalk_5.png
Binary file modified Resources/Textures/Structures/catwalk.rsi/catwalk_6.png
Binary file modified Resources/Textures/Structures/catwalk.rsi/catwalk_7.png
Binary file modified Resources/Textures/Structures/catwalk.rsi/catwalk_preview.png
2 changes: 1 addition & 1 deletion Resources/Textures/Structures/catwalk.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 tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24 and modified by Swept",
"copyright": "by kyres1",
"size": {
"x": 32,
"y": 32
Expand Down
Binary file modified Resources/Textures/Tiles/plating.png
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "by kyres1",
"size": {
"x": 64,
"y": 64
},
"states": [
{
"name": "base"
},
{
"name": "broken"
},
{
"name": "burned"
},
{
"name": "empty"
},
{
"name": "glow"
}
]
}
108 changes: 108 additions & 0 deletions Resources/Textures/_Encore/Structures/Walls/tall/metal.rsi/meta.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,108 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "by kyres1",
"size": {
"x": 32,
"y": 64
},
"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_cult"
},
{
"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"
}
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "by kyres1",
"size": {
"x": 32,
"y": 64
},
"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
}
]
}
Loading
Loading