diff --git a/Resources/Prototypes/Entities/Structures/Walls/grille.yml b/Resources/Prototypes/Entities/Structures/Walls/grille.yml index a62eef640be..cff116db671 100644 --- a/Resources/Prototypes/Entities/Structures/Walls/grille.yml +++ b/Resources/Prototypes/Entities/Structures/Walls/grille.yml @@ -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 diff --git a/Resources/Prototypes/Entities/Structures/Walls/walls.yml b/Resources/Prototypes/Entities/Structures/Walls/walls.yml index 814f1a7a003..2c50e51db31 100644 --- a/Resources/Prototypes/Entities/Structures/Walls/walls.yml +++ b/Resources/Prototypes/Entities/Structures/Walls/walls.yml @@ -23,7 +23,7 @@ - Wall - type: IsRoof - type: Sprite - drawdepth: Walls + drawdepth: Mobs - type: Icon state: full - type: PlacementReplacement @@ -499,7 +499,7 @@ - Wall components: - type: Sprite - drawdepth: Walls + drawdepth: Mobs sprite: Structures/Walls/plastitanium_diagonal.rsi state: state0 - type: IconSmooth @@ -550,7 +550,7 @@ - Wall - Diagonal - type: Sprite - drawdepth: Walls + drawdepth: Mobs sprite: Structures/Walls/plastitanium_diagonal.rsi state: state0 - type: IconSmooth @@ -694,7 +694,7 @@ tags: - Diagonal - type: Sprite - drawdepth: Walls + drawdepth: Mobs sprite: Structures/Walls/reinforced_diagonal.rsi state: state0 - type: IconSmooth @@ -837,7 +837,7 @@ - Wall - Diagonal - type: Sprite - drawdepth: Walls + drawdepth: Mobs sprite: Structures/Walls/shuttle_diagonal.rsi state: state0 - type: IconSmooth @@ -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 @@ -1012,7 +1012,7 @@ - Wall components: - type: Sprite - drawdepth: Walls + drawdepth: Mobs sprite: Structures/Walls/solid_diagonal.rsi state: state0 - type: IconSmooth @@ -1252,7 +1252,7 @@ - Wall components: - type: Sprite - drawdepth: Walls + drawdepth: Mobs sprite: Structures/Walls/mining_diagonal.rsi state: state0 - type: IconSmooth diff --git a/Resources/Prototypes/Entities/Structures/Windows/reinforced.yml b/Resources/Prototypes/Entities/Structures/Windows/reinforced.yml index 53eda68a72b..f35effff046 100644 --- a/Resources/Prototypes/Entities/Structures/Windows/reinforced.yml +++ b/Resources/Prototypes/Entities/Structures/Windows/reinforced.yml @@ -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 @@ -126,7 +126,7 @@ - Window components: - type: Sprite - drawdepth: WallTops + drawdepth: Mobs sprite: Structures/Windows/reinforced_window_diagonal.rsi state: state0 - type: Tag diff --git a/Resources/Prototypes/Entities/Structures/Windows/window.yml b/Resources/Prototypes/Entities/Structures/Windows/window.yml index f6eeff1ebf2..1195ffec0a0 100644 --- a/Resources/Prototypes/Entities/Structures/Windows/window.yml +++ b/Resources/Prototypes/Entities/Structures/Windows/window.yml @@ -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 @@ -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 @@ -250,7 +250,7 @@ - Window components: - type: Sprite - drawdepth: WallTops + drawdepth: Mobs sprite: Structures/Windows/window_diagonal.rsi state: state0 - type: Tag diff --git a/Resources/Prototypes/_Encore/Entities/Structures/City/club_rezz.yml b/Resources/Prototypes/_Encore/Entities/Structures/City/club_rezz.yml new file mode 100644 index 00000000000..63c86f50224 --- /dev/null +++ b/Resources/Prototypes/_Encore/Entities/Structures/City/club_rezz.yml @@ -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 diff --git a/Resources/Textures/Decals/road.rsi/crosswalk_e.png b/Resources/Textures/Decals/road.rsi/crosswalk_e.png index eddef69c285..735931bddf1 100644 Binary files a/Resources/Textures/Decals/road.rsi/crosswalk_e.png and b/Resources/Textures/Decals/road.rsi/crosswalk_e.png differ diff --git a/Resources/Textures/Decals/road.rsi/crosswalk_n.png b/Resources/Textures/Decals/road.rsi/crosswalk_n.png index e3004ff1b4f..6773475ada1 100644 Binary files a/Resources/Textures/Decals/road.rsi/crosswalk_n.png and b/Resources/Textures/Decals/road.rsi/crosswalk_n.png differ diff --git a/Resources/Textures/Decals/road.rsi/thin_corner_ne.png b/Resources/Textures/Decals/road.rsi/thin_corner_ne.png index 9555807fb56..d42dd801cea 100644 Binary files a/Resources/Textures/Decals/road.rsi/thin_corner_ne.png and b/Resources/Textures/Decals/road.rsi/thin_corner_ne.png differ diff --git a/Resources/Textures/Decals/road.rsi/thin_corner_nw.png b/Resources/Textures/Decals/road.rsi/thin_corner_nw.png index e0c856bbd01..ca93491dcbd 100644 Binary files a/Resources/Textures/Decals/road.rsi/thin_corner_nw.png and b/Resources/Textures/Decals/road.rsi/thin_corner_nw.png differ diff --git a/Resources/Textures/Decals/road.rsi/thin_corner_se.png b/Resources/Textures/Decals/road.rsi/thin_corner_se.png index 9208c1929f8..b819689da8e 100644 Binary files a/Resources/Textures/Decals/road.rsi/thin_corner_se.png and b/Resources/Textures/Decals/road.rsi/thin_corner_se.png differ diff --git a/Resources/Textures/Decals/road.rsi/thin_corner_sw.png b/Resources/Textures/Decals/road.rsi/thin_corner_sw.png index 8fb169ccf7a..98aebdcf796 100644 Binary files a/Resources/Textures/Decals/road.rsi/thin_corner_sw.png and b/Resources/Textures/Decals/road.rsi/thin_corner_sw.png differ diff --git a/Resources/Textures/Decals/road.rsi/thin_line_e.png b/Resources/Textures/Decals/road.rsi/thin_line_e.png index 80db602620d..84885d96981 100644 Binary files a/Resources/Textures/Decals/road.rsi/thin_line_e.png and b/Resources/Textures/Decals/road.rsi/thin_line_e.png differ diff --git a/Resources/Textures/Decals/road.rsi/thin_line_n.png b/Resources/Textures/Decals/road.rsi/thin_line_n.png index 108b2d3e672..6e2b918e973 100644 Binary files a/Resources/Textures/Decals/road.rsi/thin_line_n.png and b/Resources/Textures/Decals/road.rsi/thin_line_n.png differ diff --git a/Resources/Textures/Decals/road.rsi/thin_line_s.png b/Resources/Textures/Decals/road.rsi/thin_line_s.png index af6792843f1..cce4342f8e6 100644 Binary files a/Resources/Textures/Decals/road.rsi/thin_line_s.png and b/Resources/Textures/Decals/road.rsi/thin_line_s.png differ diff --git a/Resources/Textures/Decals/road.rsi/thin_line_w.png b/Resources/Textures/Decals/road.rsi/thin_line_w.png index 4e39c642c68..4816c635763 100644 Binary files a/Resources/Textures/Decals/road.rsi/thin_line_w.png and b/Resources/Textures/Decals/road.rsi/thin_line_w.png differ diff --git a/Resources/Textures/Decals/road.rsi/thin_mid_e.png b/Resources/Textures/Decals/road.rsi/thin_mid_e.png index d62994d5921..0063fef86c7 100644 Binary files a/Resources/Textures/Decals/road.rsi/thin_mid_e.png and b/Resources/Textures/Decals/road.rsi/thin_mid_e.png differ diff --git a/Resources/Textures/Decals/road.rsi/thin_mid_n.png b/Resources/Textures/Decals/road.rsi/thin_mid_n.png index 7c1a9f66e95..37d1a5a9f16 100644 Binary files a/Resources/Textures/Decals/road.rsi/thin_mid_n.png and b/Resources/Textures/Decals/road.rsi/thin_mid_n.png differ diff --git a/Resources/Textures/Decals/road.rsi/thin_mid_s.png b/Resources/Textures/Decals/road.rsi/thin_mid_s.png index 5d30c50d7b5..7cd7150b95e 100644 Binary files a/Resources/Textures/Decals/road.rsi/thin_mid_s.png and b/Resources/Textures/Decals/road.rsi/thin_mid_s.png differ diff --git a/Resources/Textures/Decals/road.rsi/thin_mid_w.png b/Resources/Textures/Decals/road.rsi/thin_mid_w.png index 4d9b79bc901..a14932f6f0e 100644 Binary files a/Resources/Textures/Decals/road.rsi/thin_mid_w.png and b/Resources/Textures/Decals/road.rsi/thin_mid_w.png differ diff --git a/Resources/Textures/Structures/Storage/Crates/trashbin.rsi/base.png b/Resources/Textures/Structures/Storage/Crates/trashbin.rsi/base.png index ade5f8427e3..6c9a0e464ce 100644 Binary files a/Resources/Textures/Structures/Storage/Crates/trashbin.rsi/base.png and b/Resources/Textures/Structures/Storage/Crates/trashbin.rsi/base.png differ diff --git a/Resources/Textures/Structures/Storage/Crates/trashbin.rsi/closed.png b/Resources/Textures/Structures/Storage/Crates/trashbin.rsi/closed.png index f23806fbd0e..7db008e9c83 100644 Binary files a/Resources/Textures/Structures/Storage/Crates/trashbin.rsi/closed.png and b/Resources/Textures/Structures/Storage/Crates/trashbin.rsi/closed.png differ diff --git a/Resources/Textures/Structures/Storage/Crates/trashbin.rsi/icon.png b/Resources/Textures/Structures/Storage/Crates/trashbin.rsi/icon.png index c197616dee9..a193b1b5479 100644 Binary files a/Resources/Textures/Structures/Storage/Crates/trashbin.rsi/icon.png and b/Resources/Textures/Structures/Storage/Crates/trashbin.rsi/icon.png differ diff --git a/Resources/Textures/Structures/Storage/Crates/trashbin.rsi/meta.json b/Resources/Textures/Structures/Storage/Crates/trashbin.rsi/meta.json index 3e766f497f3..fa8af1cb995 100644 --- a/Resources/Textures/Structures/Storage/Crates/trashbin.rsi/meta.json +++ b/Resources/Textures/Structures/Storage/Crates/trashbin.rsi/meta.json @@ -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 diff --git a/Resources/Textures/Structures/Storage/Crates/trashbin.rsi/open.png b/Resources/Textures/Structures/Storage/Crates/trashbin.rsi/open.png index a99a2cc6b08..bb16e83f8f5 100644 Binary files a/Resources/Textures/Structures/Storage/Crates/trashbin.rsi/open.png and b/Resources/Textures/Structures/Storage/Crates/trashbin.rsi/open.png differ diff --git a/Resources/Textures/Structures/Walls/grille.rsi/grille.png b/Resources/Textures/Structures/Walls/grille.rsi/grille.png index 29d9b1685b5..80692b41be8 100644 Binary files a/Resources/Textures/Structures/Walls/grille.rsi/grille.png and b/Resources/Textures/Structures/Walls/grille.rsi/grille.png differ diff --git a/Resources/Textures/Structures/Walls/grille.rsi/grille_broken.png b/Resources/Textures/Structures/Walls/grille.rsi/grille_broken.png index f13aae568ec..4bef29eb933 100644 Binary files a/Resources/Textures/Structures/Walls/grille.rsi/grille_broken.png and b/Resources/Textures/Structures/Walls/grille.rsi/grille_broken.png differ diff --git a/Resources/Textures/Structures/Walls/grille.rsi/grille_damaged_0.png b/Resources/Textures/Structures/Walls/grille.rsi/grille_damaged_0.png index 624eee3feb9..3b9db21c54f 100644 Binary files a/Resources/Textures/Structures/Walls/grille.rsi/grille_damaged_0.png and b/Resources/Textures/Structures/Walls/grille.rsi/grille_damaged_0.png differ diff --git a/Resources/Textures/Structures/Walls/grille.rsi/grille_damaged_1.png b/Resources/Textures/Structures/Walls/grille.rsi/grille_damaged_1.png index 7914850c545..98577c3bc32 100644 Binary files a/Resources/Textures/Structures/Walls/grille.rsi/grille_damaged_1.png and b/Resources/Textures/Structures/Walls/grille.rsi/grille_damaged_1.png differ diff --git a/Resources/Textures/Structures/Walls/grille.rsi/grille_damaged_2.png b/Resources/Textures/Structures/Walls/grille.rsi/grille_damaged_2.png index 5db2c0b4ddd..20aede77bbc 100644 Binary files a/Resources/Textures/Structures/Walls/grille.rsi/grille_damaged_2.png and b/Resources/Textures/Structures/Walls/grille.rsi/grille_damaged_2.png differ diff --git a/Resources/Textures/Structures/Walls/grille.rsi/grille_damaged_3.png b/Resources/Textures/Structures/Walls/grille.rsi/grille_damaged_3.png index e1f86fe756a..ce11bb31bca 100644 Binary files a/Resources/Textures/Structures/Walls/grille.rsi/grille_damaged_3.png and b/Resources/Textures/Structures/Walls/grille.rsi/grille_damaged_3.png differ diff --git a/Resources/Textures/Structures/Walls/grille.rsi/grille_diagonal.png b/Resources/Textures/Structures/Walls/grille.rsi/grille_diagonal.png index 64443a0b4d2..7c2168aefe2 100644 Binary files a/Resources/Textures/Structures/Walls/grille.rsi/grille_diagonal.png and b/Resources/Textures/Structures/Walls/grille.rsi/grille_diagonal.png differ diff --git a/Resources/Textures/Structures/Walls/grille.rsi/meta.json b/Resources/Textures/Structures/Walls/grille.rsi/meta.json index 975d50264c4..050bfb6e82b 100644 --- a/Resources/Textures/Structures/Walls/grille.rsi/meta.json +++ b/Resources/Textures/Structures/Walls/grille.rsi/meta.json @@ -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": [ { diff --git a/Resources/Textures/Structures/catwalk.rsi/catwalk_0.png b/Resources/Textures/Structures/catwalk.rsi/catwalk_0.png index a2295320bb3..dc78bfe63bf 100644 Binary files a/Resources/Textures/Structures/catwalk.rsi/catwalk_0.png and b/Resources/Textures/Structures/catwalk.rsi/catwalk_0.png differ diff --git a/Resources/Textures/Structures/catwalk.rsi/catwalk_1.png b/Resources/Textures/Structures/catwalk.rsi/catwalk_1.png index 680b2a96aba..5451442dba6 100644 Binary files a/Resources/Textures/Structures/catwalk.rsi/catwalk_1.png and b/Resources/Textures/Structures/catwalk.rsi/catwalk_1.png differ diff --git a/Resources/Textures/Structures/catwalk.rsi/catwalk_2.png b/Resources/Textures/Structures/catwalk.rsi/catwalk_2.png index a2295320bb3..545d088479a 100644 Binary files a/Resources/Textures/Structures/catwalk.rsi/catwalk_2.png and b/Resources/Textures/Structures/catwalk.rsi/catwalk_2.png differ diff --git a/Resources/Textures/Structures/catwalk.rsi/catwalk_3.png b/Resources/Textures/Structures/catwalk.rsi/catwalk_3.png index 680b2a96aba..0e2bf9b4474 100644 Binary files a/Resources/Textures/Structures/catwalk.rsi/catwalk_3.png and b/Resources/Textures/Structures/catwalk.rsi/catwalk_3.png differ diff --git a/Resources/Textures/Structures/catwalk.rsi/catwalk_4.png b/Resources/Textures/Structures/catwalk.rsi/catwalk_4.png index fa879556562..caba1715952 100644 Binary files a/Resources/Textures/Structures/catwalk.rsi/catwalk_4.png and b/Resources/Textures/Structures/catwalk.rsi/catwalk_4.png differ diff --git a/Resources/Textures/Structures/catwalk.rsi/catwalk_5.png b/Resources/Textures/Structures/catwalk.rsi/catwalk_5.png index eef2c0ec2af..cce82490fb5 100644 Binary files a/Resources/Textures/Structures/catwalk.rsi/catwalk_5.png and b/Resources/Textures/Structures/catwalk.rsi/catwalk_5.png differ diff --git a/Resources/Textures/Structures/catwalk.rsi/catwalk_6.png b/Resources/Textures/Structures/catwalk.rsi/catwalk_6.png index fa879556562..4ce88762e20 100644 Binary files a/Resources/Textures/Structures/catwalk.rsi/catwalk_6.png and b/Resources/Textures/Structures/catwalk.rsi/catwalk_6.png differ diff --git a/Resources/Textures/Structures/catwalk.rsi/catwalk_7.png b/Resources/Textures/Structures/catwalk.rsi/catwalk_7.png index 88ffa378d2a..230eddbd795 100644 Binary files a/Resources/Textures/Structures/catwalk.rsi/catwalk_7.png and b/Resources/Textures/Structures/catwalk.rsi/catwalk_7.png differ diff --git a/Resources/Textures/Structures/catwalk.rsi/catwalk_preview.png b/Resources/Textures/Structures/catwalk.rsi/catwalk_preview.png index 9d3ff80e707..dfef1f713d7 100644 Binary files a/Resources/Textures/Structures/catwalk.rsi/catwalk_preview.png and b/Resources/Textures/Structures/catwalk.rsi/catwalk_preview.png differ diff --git a/Resources/Textures/Structures/catwalk.rsi/meta.json b/Resources/Textures/Structures/catwalk.rsi/meta.json index 217278d1db1..7ede8fbed25 100644 --- a/Resources/Textures/Structures/catwalk.rsi/meta.json +++ b/Resources/Textures/Structures/catwalk.rsi/meta.json @@ -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 diff --git a/Resources/Textures/Tiles/plating.png b/Resources/Textures/Tiles/plating.png index 5bdbadaa6ae..a9db6c5094a 100644 Binary files a/Resources/Textures/Tiles/plating.png and b/Resources/Textures/Tiles/plating.png differ diff --git a/Resources/Textures/_Encore/Structures/City/club_rezz_sign.rsi/base.png b/Resources/Textures/_Encore/Structures/City/club_rezz_sign.rsi/base.png new file mode 100644 index 00000000000..fdebf5fe010 Binary files /dev/null and b/Resources/Textures/_Encore/Structures/City/club_rezz_sign.rsi/base.png differ diff --git a/Resources/Textures/_Encore/Structures/City/club_rezz_sign.rsi/broken.png b/Resources/Textures/_Encore/Structures/City/club_rezz_sign.rsi/broken.png new file mode 100644 index 00000000000..992f4ec1044 Binary files /dev/null and b/Resources/Textures/_Encore/Structures/City/club_rezz_sign.rsi/broken.png differ diff --git a/Resources/Textures/_Encore/Structures/City/club_rezz_sign.rsi/burned.png b/Resources/Textures/_Encore/Structures/City/club_rezz_sign.rsi/burned.png new file mode 100644 index 00000000000..75d971d2a04 Binary files /dev/null and b/Resources/Textures/_Encore/Structures/City/club_rezz_sign.rsi/burned.png differ diff --git a/Resources/Textures/_Encore/Structures/City/club_rezz_sign.rsi/empty.png b/Resources/Textures/_Encore/Structures/City/club_rezz_sign.rsi/empty.png new file mode 100644 index 00000000000..6dda58df47b Binary files /dev/null and b/Resources/Textures/_Encore/Structures/City/club_rezz_sign.rsi/empty.png differ diff --git a/Resources/Textures/_Encore/Structures/City/club_rezz_sign.rsi/glow.png b/Resources/Textures/_Encore/Structures/City/club_rezz_sign.rsi/glow.png new file mode 100644 index 00000000000..c0f74e5e6c4 Binary files /dev/null and b/Resources/Textures/_Encore/Structures/City/club_rezz_sign.rsi/glow.png differ diff --git a/Resources/Textures/_Encore/Structures/City/club_rezz_sign.rsi/meta.json b/Resources/Textures/_Encore/Structures/City/club_rezz_sign.rsi/meta.json new file mode 100644 index 00000000000..c560284982b --- /dev/null +++ b/Resources/Textures/_Encore/Structures/City/club_rezz_sign.rsi/meta.json @@ -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" + } + ] +} diff --git a/Resources/Textures/_Encore/Structures/Walls/tall/metal.rsi/full.png b/Resources/Textures/_Encore/Structures/Walls/tall/metal.rsi/full.png new file mode 100644 index 00000000000..7ef3ee242ae Binary files /dev/null and b/Resources/Textures/_Encore/Structures/Walls/tall/metal.rsi/full.png differ diff --git a/Resources/Textures/_Encore/Structures/Walls/tall/metal.rsi/meta.json b/Resources/Textures/_Encore/Structures/Walls/tall/metal.rsi/meta.json new file mode 100644 index 00000000000..99893680566 --- /dev/null +++ b/Resources/Textures/_Encore/Structures/Walls/tall/metal.rsi/meta.json @@ -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" + } + ] +} diff --git a/Resources/Textures/_Encore/Structures/Walls/tall/metal.rsi/reinf_construct-0.png b/Resources/Textures/_Encore/Structures/Walls/tall/metal.rsi/reinf_construct-0.png new file mode 100644 index 00000000000..6483a7c935f Binary files /dev/null and b/Resources/Textures/_Encore/Structures/Walls/tall/metal.rsi/reinf_construct-0.png differ diff --git a/Resources/Textures/_Encore/Structures/Walls/tall/metal.rsi/reinf_construct-1.png b/Resources/Textures/_Encore/Structures/Walls/tall/metal.rsi/reinf_construct-1.png new file mode 100644 index 00000000000..18422e33424 Binary files /dev/null and b/Resources/Textures/_Encore/Structures/Walls/tall/metal.rsi/reinf_construct-1.png differ diff --git a/Resources/Textures/_Encore/Structures/Walls/tall/metal.rsi/reinf_construct-2.png b/Resources/Textures/_Encore/Structures/Walls/tall/metal.rsi/reinf_construct-2.png new file mode 100644 index 00000000000..d16dade0a46 Binary files /dev/null and b/Resources/Textures/_Encore/Structures/Walls/tall/metal.rsi/reinf_construct-2.png differ diff --git a/Resources/Textures/_Encore/Structures/Walls/tall/metal.rsi/reinf_construct-3.png b/Resources/Textures/_Encore/Structures/Walls/tall/metal.rsi/reinf_construct-3.png new file mode 100644 index 00000000000..74145ebc573 Binary files /dev/null and b/Resources/Textures/_Encore/Structures/Walls/tall/metal.rsi/reinf_construct-3.png differ diff --git a/Resources/Textures/_Encore/Structures/Walls/tall/metal.rsi/reinf_construct-4.png b/Resources/Textures/_Encore/Structures/Walls/tall/metal.rsi/reinf_construct-4.png new file mode 100644 index 00000000000..f22d11d0cbc Binary files /dev/null and b/Resources/Textures/_Encore/Structures/Walls/tall/metal.rsi/reinf_construct-4.png differ diff --git a/Resources/Textures/_Encore/Structures/Walls/tall/metal.rsi/reinf_construct-5.png b/Resources/Textures/_Encore/Structures/Walls/tall/metal.rsi/reinf_construct-5.png new file mode 100644 index 00000000000..b91b135a416 Binary files /dev/null and b/Resources/Textures/_Encore/Structures/Walls/tall/metal.rsi/reinf_construct-5.png differ diff --git a/Resources/Textures/_Encore/Structures/Walls/tall/metal.rsi/reinf_cult.png b/Resources/Textures/_Encore/Structures/Walls/tall/metal.rsi/reinf_cult.png new file mode 100644 index 00000000000..69a48de92d1 Binary files /dev/null and b/Resources/Textures/_Encore/Structures/Walls/tall/metal.rsi/reinf_cult.png differ diff --git a/Resources/Textures/_Encore/Structures/Walls/tall/metal.rsi/reinf_over0.png b/Resources/Textures/_Encore/Structures/Walls/tall/metal.rsi/reinf_over0.png new file mode 100644 index 00000000000..3de7bad81a5 Binary files /dev/null and b/Resources/Textures/_Encore/Structures/Walls/tall/metal.rsi/reinf_over0.png differ diff --git a/Resources/Textures/_Encore/Structures/Walls/tall/metal.rsi/reinf_over1.png b/Resources/Textures/_Encore/Structures/Walls/tall/metal.rsi/reinf_over1.png new file mode 100644 index 00000000000..30c4912f890 Binary files /dev/null and b/Resources/Textures/_Encore/Structures/Walls/tall/metal.rsi/reinf_over1.png differ diff --git a/Resources/Textures/_Encore/Structures/Walls/tall/metal.rsi/reinf_over2.png b/Resources/Textures/_Encore/Structures/Walls/tall/metal.rsi/reinf_over2.png new file mode 100644 index 00000000000..05cec905c60 Binary files /dev/null and b/Resources/Textures/_Encore/Structures/Walls/tall/metal.rsi/reinf_over2.png differ diff --git a/Resources/Textures/_Encore/Structures/Walls/tall/metal.rsi/reinf_over3.png b/Resources/Textures/_Encore/Structures/Walls/tall/metal.rsi/reinf_over3.png new file mode 100644 index 00000000000..e83e169741f Binary files /dev/null and b/Resources/Textures/_Encore/Structures/Walls/tall/metal.rsi/reinf_over3.png differ diff --git a/Resources/Textures/_Encore/Structures/Walls/tall/metal.rsi/reinf_over4.png b/Resources/Textures/_Encore/Structures/Walls/tall/metal.rsi/reinf_over4.png new file mode 100644 index 00000000000..b304be5782d Binary files /dev/null and b/Resources/Textures/_Encore/Structures/Walls/tall/metal.rsi/reinf_over4.png differ diff --git a/Resources/Textures/_Encore/Structures/Walls/tall/metal.rsi/reinf_over5.png b/Resources/Textures/_Encore/Structures/Walls/tall/metal.rsi/reinf_over5.png new file mode 100644 index 00000000000..72d90036780 Binary files /dev/null and b/Resources/Textures/_Encore/Structures/Walls/tall/metal.rsi/reinf_over5.png differ diff --git a/Resources/Textures/_Encore/Structures/Walls/tall/metal.rsi/reinf_over6.png b/Resources/Textures/_Encore/Structures/Walls/tall/metal.rsi/reinf_over6.png new file mode 100644 index 00000000000..54d3ff5f1b3 Binary files /dev/null and b/Resources/Textures/_Encore/Structures/Walls/tall/metal.rsi/reinf_over6.png differ diff --git a/Resources/Textures/_Encore/Structures/Walls/tall/metal.rsi/reinf_over7.png b/Resources/Textures/_Encore/Structures/Walls/tall/metal.rsi/reinf_over7.png new file mode 100644 index 00000000000..b0e788d56e8 Binary files /dev/null and b/Resources/Textures/_Encore/Structures/Walls/tall/metal.rsi/reinf_over7.png differ diff --git a/Resources/Textures/_Encore/Structures/Walls/tall/metal.rsi/reinforced_wall_girder.png b/Resources/Textures/_Encore/Structures/Walls/tall/metal.rsi/reinforced_wall_girder.png new file mode 100644 index 00000000000..041e5f2254c Binary files /dev/null and b/Resources/Textures/_Encore/Structures/Walls/tall/metal.rsi/reinforced_wall_girder.png differ diff --git a/Resources/Textures/_Encore/Structures/Walls/tall/metal.rsi/rgeneric.png b/Resources/Textures/_Encore/Structures/Walls/tall/metal.rsi/rgeneric.png new file mode 100644 index 00000000000..a5f14eb11f7 Binary files /dev/null and b/Resources/Textures/_Encore/Structures/Walls/tall/metal.rsi/rgeneric.png differ diff --git a/Resources/Textures/_Encore/Structures/Walls/tall/metal.rsi/solid0.png b/Resources/Textures/_Encore/Structures/Walls/tall/metal.rsi/solid0.png new file mode 100644 index 00000000000..afdfcd5c15b Binary files /dev/null and b/Resources/Textures/_Encore/Structures/Walls/tall/metal.rsi/solid0.png differ diff --git a/Resources/Textures/_Encore/Structures/Walls/tall/metal.rsi/solid1.png b/Resources/Textures/_Encore/Structures/Walls/tall/metal.rsi/solid1.png new file mode 100644 index 00000000000..26274f1f800 Binary files /dev/null and b/Resources/Textures/_Encore/Structures/Walls/tall/metal.rsi/solid1.png differ diff --git a/Resources/Textures/_Encore/Structures/Walls/tall/metal.rsi/solid2.png b/Resources/Textures/_Encore/Structures/Walls/tall/metal.rsi/solid2.png new file mode 100644 index 00000000000..a9ef0efaed7 Binary files /dev/null and b/Resources/Textures/_Encore/Structures/Walls/tall/metal.rsi/solid2.png differ diff --git a/Resources/Textures/_Encore/Structures/Walls/tall/metal.rsi/solid3.png b/Resources/Textures/_Encore/Structures/Walls/tall/metal.rsi/solid3.png new file mode 100644 index 00000000000..85e76075942 Binary files /dev/null and b/Resources/Textures/_Encore/Structures/Walls/tall/metal.rsi/solid3.png differ diff --git a/Resources/Textures/_Encore/Structures/Walls/tall/metal.rsi/solid4.png b/Resources/Textures/_Encore/Structures/Walls/tall/metal.rsi/solid4.png new file mode 100644 index 00000000000..87d839d0107 Binary files /dev/null and b/Resources/Textures/_Encore/Structures/Walls/tall/metal.rsi/solid4.png differ diff --git a/Resources/Textures/_Encore/Structures/Walls/tall/metal.rsi/solid5.png b/Resources/Textures/_Encore/Structures/Walls/tall/metal.rsi/solid5.png new file mode 100644 index 00000000000..beb8f2cf5dc Binary files /dev/null and b/Resources/Textures/_Encore/Structures/Walls/tall/metal.rsi/solid5.png differ diff --git a/Resources/Textures/_Encore/Structures/Walls/tall/metal.rsi/solid6.png b/Resources/Textures/_Encore/Structures/Walls/tall/metal.rsi/solid6.png new file mode 100644 index 00000000000..d48f9858dc4 Binary files /dev/null and b/Resources/Textures/_Encore/Structures/Walls/tall/metal.rsi/solid6.png differ diff --git a/Resources/Textures/_Encore/Structures/Walls/tall/metal.rsi/solid7.png b/Resources/Textures/_Encore/Structures/Walls/tall/metal.rsi/solid7.png new file mode 100644 index 00000000000..2b17f3da7f6 Binary files /dev/null and b/Resources/Textures/_Encore/Structures/Walls/tall/metal.rsi/solid7.png differ diff --git a/Resources/Textures/_Encore/Structures/Walls/tall/metal.rsi/wall_girder.png b/Resources/Textures/_Encore/Structures/Walls/tall/metal.rsi/wall_girder.png new file mode 100644 index 00000000000..3a85f70ae6b Binary files /dev/null and b/Resources/Textures/_Encore/Structures/Walls/tall/metal.rsi/wall_girder.png differ diff --git a/Resources/Textures/_Encore/Structures/Windows/tall/reinforced_window.rsi/full.png b/Resources/Textures/_Encore/Structures/Windows/tall/reinforced_window.rsi/full.png new file mode 100644 index 00000000000..eccf9d1e984 Binary files /dev/null and b/Resources/Textures/_Encore/Structures/Windows/tall/reinforced_window.rsi/full.png differ diff --git a/Resources/Textures/_Encore/Structures/Windows/tall/reinforced_window.rsi/meta.json b/Resources/Textures/_Encore/Structures/Windows/tall/reinforced_window.rsi/meta.json new file mode 100644 index 00000000000..ce2e76ec96b --- /dev/null +++ b/Resources/Textures/_Encore/Structures/Windows/tall/reinforced_window.rsi/meta.json @@ -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 + } + ] +} diff --git a/Resources/Textures/_Encore/Structures/Windows/tall/reinforced_window.rsi/rwindow0.png b/Resources/Textures/_Encore/Structures/Windows/tall/reinforced_window.rsi/rwindow0.png new file mode 100644 index 00000000000..093c59a2db6 Binary files /dev/null and b/Resources/Textures/_Encore/Structures/Windows/tall/reinforced_window.rsi/rwindow0.png differ diff --git a/Resources/Textures/_Encore/Structures/Windows/tall/reinforced_window.rsi/rwindow1.png b/Resources/Textures/_Encore/Structures/Windows/tall/reinforced_window.rsi/rwindow1.png new file mode 100644 index 00000000000..d13496b11bb Binary files /dev/null and b/Resources/Textures/_Encore/Structures/Windows/tall/reinforced_window.rsi/rwindow1.png differ diff --git a/Resources/Textures/_Encore/Structures/Windows/tall/reinforced_window.rsi/rwindow2.png b/Resources/Textures/_Encore/Structures/Windows/tall/reinforced_window.rsi/rwindow2.png new file mode 100644 index 00000000000..eac36d4ac4a Binary files /dev/null and b/Resources/Textures/_Encore/Structures/Windows/tall/reinforced_window.rsi/rwindow2.png differ diff --git a/Resources/Textures/_Encore/Structures/Windows/tall/reinforced_window.rsi/rwindow3.png b/Resources/Textures/_Encore/Structures/Windows/tall/reinforced_window.rsi/rwindow3.png new file mode 100644 index 00000000000..35e11eb3e3c Binary files /dev/null and b/Resources/Textures/_Encore/Structures/Windows/tall/reinforced_window.rsi/rwindow3.png differ diff --git a/Resources/Textures/_Encore/Structures/Windows/tall/reinforced_window.rsi/rwindow4.png b/Resources/Textures/_Encore/Structures/Windows/tall/reinforced_window.rsi/rwindow4.png new file mode 100644 index 00000000000..61f80f23afa Binary files /dev/null and b/Resources/Textures/_Encore/Structures/Windows/tall/reinforced_window.rsi/rwindow4.png differ diff --git a/Resources/Textures/_Encore/Structures/Windows/tall/reinforced_window.rsi/rwindow5.png b/Resources/Textures/_Encore/Structures/Windows/tall/reinforced_window.rsi/rwindow5.png new file mode 100644 index 00000000000..414bcf12c56 Binary files /dev/null and b/Resources/Textures/_Encore/Structures/Windows/tall/reinforced_window.rsi/rwindow5.png differ diff --git a/Resources/Textures/_Encore/Structures/Windows/tall/reinforced_window.rsi/rwindow6.png b/Resources/Textures/_Encore/Structures/Windows/tall/reinforced_window.rsi/rwindow6.png new file mode 100644 index 00000000000..41d04a15e55 Binary files /dev/null and b/Resources/Textures/_Encore/Structures/Windows/tall/reinforced_window.rsi/rwindow6.png differ diff --git a/Resources/Textures/_Encore/Structures/Windows/tall/reinforced_window.rsi/rwindow7.png b/Resources/Textures/_Encore/Structures/Windows/tall/reinforced_window.rsi/rwindow7.png new file mode 100644 index 00000000000..c9c963d7cc3 Binary files /dev/null and b/Resources/Textures/_Encore/Structures/Windows/tall/reinforced_window.rsi/rwindow7.png differ diff --git a/Resources/Textures/_Encore/Structures/Windows/tall/window.rsi/full.png b/Resources/Textures/_Encore/Structures/Windows/tall/window.rsi/full.png new file mode 100644 index 00000000000..eccf9d1e984 Binary files /dev/null and b/Resources/Textures/_Encore/Structures/Windows/tall/window.rsi/full.png differ diff --git a/Resources/Textures/_Encore/Structures/Windows/tall/window.rsi/meta.json b/Resources/Textures/_Encore/Structures/Windows/tall/window.rsi/meta.json new file mode 100644 index 00000000000..1dfa3bf1bff --- /dev/null +++ b/Resources/Textures/_Encore/Structures/Windows/tall/window.rsi/meta.json @@ -0,0 +1,46 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "by kyres1", + "size": { + "x": 32, + "y": 64 + }, + "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 + } + ] +} diff --git a/Resources/Textures/_Encore/Structures/Windows/tall/window.rsi/window0.png b/Resources/Textures/_Encore/Structures/Windows/tall/window.rsi/window0.png new file mode 100644 index 00000000000..093c59a2db6 Binary files /dev/null and b/Resources/Textures/_Encore/Structures/Windows/tall/window.rsi/window0.png differ diff --git a/Resources/Textures/_Encore/Structures/Windows/tall/window.rsi/window1.png b/Resources/Textures/_Encore/Structures/Windows/tall/window.rsi/window1.png new file mode 100644 index 00000000000..d13496b11bb Binary files /dev/null and b/Resources/Textures/_Encore/Structures/Windows/tall/window.rsi/window1.png differ diff --git a/Resources/Textures/_Encore/Structures/Windows/tall/window.rsi/window2.png b/Resources/Textures/_Encore/Structures/Windows/tall/window.rsi/window2.png new file mode 100644 index 00000000000..eac36d4ac4a Binary files /dev/null and b/Resources/Textures/_Encore/Structures/Windows/tall/window.rsi/window2.png differ diff --git a/Resources/Textures/_Encore/Structures/Windows/tall/window.rsi/window3.png b/Resources/Textures/_Encore/Structures/Windows/tall/window.rsi/window3.png new file mode 100644 index 00000000000..35e11eb3e3c Binary files /dev/null and b/Resources/Textures/_Encore/Structures/Windows/tall/window.rsi/window3.png differ diff --git a/Resources/Textures/_Encore/Structures/Windows/tall/window.rsi/window4.png b/Resources/Textures/_Encore/Structures/Windows/tall/window.rsi/window4.png new file mode 100644 index 00000000000..61f80f23afa Binary files /dev/null and b/Resources/Textures/_Encore/Structures/Windows/tall/window.rsi/window4.png differ diff --git a/Resources/Textures/_Encore/Structures/Windows/tall/window.rsi/window5.png b/Resources/Textures/_Encore/Structures/Windows/tall/window.rsi/window5.png new file mode 100644 index 00000000000..414bcf12c56 Binary files /dev/null and b/Resources/Textures/_Encore/Structures/Windows/tall/window.rsi/window5.png differ diff --git a/Resources/Textures/_Encore/Structures/Windows/tall/window.rsi/window6.png b/Resources/Textures/_Encore/Structures/Windows/tall/window.rsi/window6.png new file mode 100644 index 00000000000..41d04a15e55 Binary files /dev/null and b/Resources/Textures/_Encore/Structures/Windows/tall/window.rsi/window6.png differ diff --git a/Resources/Textures/_Encore/Structures/Windows/tall/window.rsi/window7.png b/Resources/Textures/_Encore/Structures/Windows/tall/window.rsi/window7.png new file mode 100644 index 00000000000..c9c963d7cc3 Binary files /dev/null and b/Resources/Textures/_Encore/Structures/Windows/tall/window.rsi/window7.png differ diff --git a/Resources/Textures/_Nuclear14/Tiles/attributions.yml b/Resources/Textures/_Nuclear14/Tiles/attributions.yml index 774c8927d32..1c0885c7d0b 100644 --- a/Resources/Textures/_Nuclear14/Tiles/attributions.yml +++ b/Resources/Textures/_Nuclear14/Tiles/attributions.yml @@ -10,8 +10,8 @@ - files: ["roadouterturns.png", "roadouterturnn.png", "roadouterturne.png", "roadouterturnw.png", "roadright.png", "roadtop.png", "roadleft.png", "roadbottom.png", "roadinnermiddle.png", "roadoutermiddle.png", "roadcorner1.png", "roadcorner2.png", "roadcorner3.png", "roadcorner4.png", "roadoutercorner1.png", "roadoutercorner2.png", "roadoutercorner3.png", "roadoutercorner4.png", "roadinnerturn1.png", "roadinnerturn2.png", "roadinnerturn3.png", "roadinnerturn4.png", "roadtinycornerhorizontal1.png", "roadtinycornerhorizontal2.png", "roadtinycornerhorizontal3.png", "roadtinycornerhorizontal4.png", "roadtinycornervertical1.png", "roadtinycornervertical2.png", "roadtinycornervertical3.png", "roadtinycornervertical4.png"] license: "CC-BY-NC-SA-3.0" - copyright: "Fortuna commit 2a9408a47e2f83d945335e4feeeeafb552173e6f, all modified by Peptide90." - source: "https://github.com/FortunaSS13/Fortuna" + copyright: "by kyres1" + source: "https://github.com/Encore-Server/Encore.2" # Attributions for tiles added to Nuclear 14 only. For all SS14 attributions see previous directory. @@ -19,7 +19,7 @@ license: "CC-BY-NC-SA-3.0" copyright: "Fortuna at commit/2a9408a47e2f83d945335e4feeeeafb552173e6f and edited to work with SS14 by Peptide" source: "https://github.com/FortunaSS13/Fortuna/" - + - files: ["maple.png", "oak.png", "oakbroken.png", "woodhouse.png", "woodhousebroken.png"] license: "CC-BY-NC-SA-3.0" copyright: "Fortuna at commit/2a9408a47e2f83d945335e4feeeeafb552173e6f and edited to work with SS14 by Peptide. Further tweaked by Zeta_Null to not look compressed." diff --git a/Resources/Textures/_Nuclear14/Tiles/ms13/Concrete/brickconcrete.png b/Resources/Textures/_Nuclear14/Tiles/ms13/Concrete/brickconcrete.png index dbd5741ed3d..353ebd04a2f 100644 Binary files a/Resources/Textures/_Nuclear14/Tiles/ms13/Concrete/brickconcrete.png and b/Resources/Textures/_Nuclear14/Tiles/ms13/Concrete/brickconcrete.png differ diff --git a/Resources/Textures/_Nuclear14/Tiles/ms13/Concrete/concrete_big.png b/Resources/Textures/_Nuclear14/Tiles/ms13/Concrete/concrete_big.png index fd9465b1edf..63bd9181342 100644 Binary files a/Resources/Textures/_Nuclear14/Tiles/ms13/Concrete/concrete_big.png and b/Resources/Textures/_Nuclear14/Tiles/ms13/Concrete/concrete_big.png differ diff --git a/Resources/Textures/_Nuclear14/Tiles/ms13/Concrete/tileconcretesmall.png b/Resources/Textures/_Nuclear14/Tiles/ms13/Concrete/tileconcretesmall.png index 5554c7a4e8a..0848c37d4b9 100644 Binary files a/Resources/Textures/_Nuclear14/Tiles/ms13/Concrete/tileconcretesmall.png and b/Resources/Textures/_Nuclear14/Tiles/ms13/Concrete/tileconcretesmall.png differ diff --git a/Resources/Textures/_Nuclear14/Tiles/ms13/Full/tileblackfull.png b/Resources/Textures/_Nuclear14/Tiles/ms13/Full/tileblackfull.png index 149ea35b2a3..c66d926eb8c 100644 Binary files a/Resources/Textures/_Nuclear14/Tiles/ms13/Full/tileblackfull.png and b/Resources/Textures/_Nuclear14/Tiles/ms13/Full/tileblackfull.png differ diff --git a/Resources/Textures/_Nuclear14/Tiles/ms13/Full/tilegreenfull.png b/Resources/Textures/_Nuclear14/Tiles/ms13/Full/tilegreenfull.png index 5fe7e79c13a..5e401b4ac7f 100644 Binary files a/Resources/Textures/_Nuclear14/Tiles/ms13/Full/tilegreenfull.png and b/Resources/Textures/_Nuclear14/Tiles/ms13/Full/tilegreenfull.png differ diff --git a/Resources/Textures/_Nuclear14/Tiles/ms13/Full/tilenavyfull.png b/Resources/Textures/_Nuclear14/Tiles/ms13/Full/tilenavyfull.png index ae8cddc53f0..bed2db3fc84 100644 Binary files a/Resources/Textures/_Nuclear14/Tiles/ms13/Full/tilenavyfull.png and b/Resources/Textures/_Nuclear14/Tiles/ms13/Full/tilenavyfull.png differ diff --git a/Resources/Textures/_Nuclear14/Tiles/ms13/Full/tilewhitefull.png b/Resources/Textures/_Nuclear14/Tiles/ms13/Full/tilewhitefull.png index f2f1701c9b6..d4a0e06c8da 100644 Binary files a/Resources/Textures/_Nuclear14/Tiles/ms13/Full/tilewhitefull.png and b/Resources/Textures/_Nuclear14/Tiles/ms13/Full/tilewhitefull.png differ diff --git a/Resources/Textures/_Nuclear14/Tiles/ms13/Small/tileblack.png b/Resources/Textures/_Nuclear14/Tiles/ms13/Small/tileblack.png index a3acee959b9..e2bdd82dcf1 100644 Binary files a/Resources/Textures/_Nuclear14/Tiles/ms13/Small/tileblack.png and b/Resources/Textures/_Nuclear14/Tiles/ms13/Small/tileblack.png differ diff --git a/Resources/Textures/_Nuclear14/Tiles/ms13/Small/tilebrown.png b/Resources/Textures/_Nuclear14/Tiles/ms13/Small/tilebrown.png index 941b105d08a..ab9a96e8e68 100644 Binary files a/Resources/Textures/_Nuclear14/Tiles/ms13/Small/tilebrown.png and b/Resources/Textures/_Nuclear14/Tiles/ms13/Small/tilebrown.png differ diff --git a/Resources/Textures/_Nuclear14/Tiles/ms13/Small/tilegrey.png b/Resources/Textures/_Nuclear14/Tiles/ms13/Small/tilegrey.png index 338dded94e3..69595eac938 100644 Binary files a/Resources/Textures/_Nuclear14/Tiles/ms13/Small/tilegrey.png and b/Resources/Textures/_Nuclear14/Tiles/ms13/Small/tilegrey.png differ diff --git a/Resources/Textures/_Nuclear14/Tiles/ms13/Small/tilenavy.png b/Resources/Textures/_Nuclear14/Tiles/ms13/Small/tilenavy.png index 584f907d453..cb16b58cacd 100644 Binary files a/Resources/Textures/_Nuclear14/Tiles/ms13/Small/tilenavy.png and b/Resources/Textures/_Nuclear14/Tiles/ms13/Small/tilenavy.png differ diff --git a/Resources/Textures/_Nuclear14/Tiles/ms13/Steel/steel_solid.png b/Resources/Textures/_Nuclear14/Tiles/ms13/Steel/steel_solid.png index 2a509804079..4b4956adea0 100644 Binary files a/Resources/Textures/_Nuclear14/Tiles/ms13/Steel/steel_solid.png and b/Resources/Textures/_Nuclear14/Tiles/ms13/Steel/steel_solid.png differ diff --git a/Resources/Textures/_Nuclear14/Tiles/roadbottom.png b/Resources/Textures/_Nuclear14/Tiles/roadbottom.png index 51d274f934a..fce842520f4 100644 Binary files a/Resources/Textures/_Nuclear14/Tiles/roadbottom.png and b/Resources/Textures/_Nuclear14/Tiles/roadbottom.png differ diff --git a/Resources/Textures/_Nuclear14/Tiles/roadcorner1.png b/Resources/Textures/_Nuclear14/Tiles/roadcorner1.png index 6af399c998c..b9b6518ea53 100644 Binary files a/Resources/Textures/_Nuclear14/Tiles/roadcorner1.png and b/Resources/Textures/_Nuclear14/Tiles/roadcorner1.png differ diff --git a/Resources/Textures/_Nuclear14/Tiles/roadcorner2.png b/Resources/Textures/_Nuclear14/Tiles/roadcorner2.png index a3b0ad0e2a6..b06c3ebea6f 100644 Binary files a/Resources/Textures/_Nuclear14/Tiles/roadcorner2.png and b/Resources/Textures/_Nuclear14/Tiles/roadcorner2.png differ diff --git a/Resources/Textures/_Nuclear14/Tiles/roadcorner3.png b/Resources/Textures/_Nuclear14/Tiles/roadcorner3.png index bff8b9e586e..140f3248d7c 100644 Binary files a/Resources/Textures/_Nuclear14/Tiles/roadcorner3.png and b/Resources/Textures/_Nuclear14/Tiles/roadcorner3.png differ diff --git a/Resources/Textures/_Nuclear14/Tiles/roadcorner4.png b/Resources/Textures/_Nuclear14/Tiles/roadcorner4.png index 97a27b8ad0f..7f6961a64cb 100644 Binary files a/Resources/Textures/_Nuclear14/Tiles/roadcorner4.png and b/Resources/Textures/_Nuclear14/Tiles/roadcorner4.png differ diff --git a/Resources/Textures/_Nuclear14/Tiles/roadinnermiddle.png b/Resources/Textures/_Nuclear14/Tiles/roadinnermiddle.png index 7f08c987fb5..0724cc98de6 100644 Binary files a/Resources/Textures/_Nuclear14/Tiles/roadinnermiddle.png and b/Resources/Textures/_Nuclear14/Tiles/roadinnermiddle.png differ diff --git a/Resources/Textures/_Nuclear14/Tiles/roadinnerturn1.png b/Resources/Textures/_Nuclear14/Tiles/roadinnerturn1.png index ef52d43fd46..c0d237569ad 100644 Binary files a/Resources/Textures/_Nuclear14/Tiles/roadinnerturn1.png and b/Resources/Textures/_Nuclear14/Tiles/roadinnerturn1.png differ diff --git a/Resources/Textures/_Nuclear14/Tiles/roadinnerturn2.png b/Resources/Textures/_Nuclear14/Tiles/roadinnerturn2.png index 71d02f289e2..fe9b70dae58 100644 Binary files a/Resources/Textures/_Nuclear14/Tiles/roadinnerturn2.png and b/Resources/Textures/_Nuclear14/Tiles/roadinnerturn2.png differ diff --git a/Resources/Textures/_Nuclear14/Tiles/roadinnerturn3.png b/Resources/Textures/_Nuclear14/Tiles/roadinnerturn3.png index 1ef65f098d4..fe7c0a3b628 100644 Binary files a/Resources/Textures/_Nuclear14/Tiles/roadinnerturn3.png and b/Resources/Textures/_Nuclear14/Tiles/roadinnerturn3.png differ diff --git a/Resources/Textures/_Nuclear14/Tiles/roadinnerturn4.png b/Resources/Textures/_Nuclear14/Tiles/roadinnerturn4.png index 8bea98273a8..ab4575ca868 100644 Binary files a/Resources/Textures/_Nuclear14/Tiles/roadinnerturn4.png and b/Resources/Textures/_Nuclear14/Tiles/roadinnerturn4.png differ diff --git a/Resources/Textures/_Nuclear14/Tiles/roadleft.png b/Resources/Textures/_Nuclear14/Tiles/roadleft.png index 135bbc11327..a88f094733e 100644 Binary files a/Resources/Textures/_Nuclear14/Tiles/roadleft.png and b/Resources/Textures/_Nuclear14/Tiles/roadleft.png differ diff --git a/Resources/Textures/_Nuclear14/Tiles/roadoutercorner1.png b/Resources/Textures/_Nuclear14/Tiles/roadoutercorner1.png index ef36bb26ecb..a34f1c07dc1 100644 Binary files a/Resources/Textures/_Nuclear14/Tiles/roadoutercorner1.png and b/Resources/Textures/_Nuclear14/Tiles/roadoutercorner1.png differ diff --git a/Resources/Textures/_Nuclear14/Tiles/roadoutercorner2.png b/Resources/Textures/_Nuclear14/Tiles/roadoutercorner2.png index 64d9a7fd8fc..96603e2ffc5 100644 Binary files a/Resources/Textures/_Nuclear14/Tiles/roadoutercorner2.png and b/Resources/Textures/_Nuclear14/Tiles/roadoutercorner2.png differ diff --git a/Resources/Textures/_Nuclear14/Tiles/roadoutercorner3.png b/Resources/Textures/_Nuclear14/Tiles/roadoutercorner3.png index 0a978c8cc88..319286a4733 100644 Binary files a/Resources/Textures/_Nuclear14/Tiles/roadoutercorner3.png and b/Resources/Textures/_Nuclear14/Tiles/roadoutercorner3.png differ diff --git a/Resources/Textures/_Nuclear14/Tiles/roadoutercorner4.png b/Resources/Textures/_Nuclear14/Tiles/roadoutercorner4.png index 00ea7da400d..3a4a6fc3668 100644 Binary files a/Resources/Textures/_Nuclear14/Tiles/roadoutercorner4.png and b/Resources/Textures/_Nuclear14/Tiles/roadoutercorner4.png differ diff --git a/Resources/Textures/_Nuclear14/Tiles/roadoutermiddle.png b/Resources/Textures/_Nuclear14/Tiles/roadoutermiddle.png index 4ff001eb130..2e177855647 100644 Binary files a/Resources/Textures/_Nuclear14/Tiles/roadoutermiddle.png and b/Resources/Textures/_Nuclear14/Tiles/roadoutermiddle.png differ diff --git a/Resources/Textures/_Nuclear14/Tiles/roadouterturne.png b/Resources/Textures/_Nuclear14/Tiles/roadouterturne.png index ce407cc98b0..7b93532aa2f 100644 Binary files a/Resources/Textures/_Nuclear14/Tiles/roadouterturne.png and b/Resources/Textures/_Nuclear14/Tiles/roadouterturne.png differ diff --git a/Resources/Textures/_Nuclear14/Tiles/roadouterturnn.png b/Resources/Textures/_Nuclear14/Tiles/roadouterturnn.png index 8c44c288d3a..c65f9c43efd 100644 Binary files a/Resources/Textures/_Nuclear14/Tiles/roadouterturnn.png and b/Resources/Textures/_Nuclear14/Tiles/roadouterturnn.png differ diff --git a/Resources/Textures/_Nuclear14/Tiles/roadouterturns.png b/Resources/Textures/_Nuclear14/Tiles/roadouterturns.png index 554be4a62b1..3ca84a4ec78 100644 Binary files a/Resources/Textures/_Nuclear14/Tiles/roadouterturns.png and b/Resources/Textures/_Nuclear14/Tiles/roadouterturns.png differ diff --git a/Resources/Textures/_Nuclear14/Tiles/roadouterturnw.png b/Resources/Textures/_Nuclear14/Tiles/roadouterturnw.png index faf96ee8ee7..ab06345bbed 100644 Binary files a/Resources/Textures/_Nuclear14/Tiles/roadouterturnw.png and b/Resources/Textures/_Nuclear14/Tiles/roadouterturnw.png differ diff --git a/Resources/Textures/_Nuclear14/Tiles/roadright.png b/Resources/Textures/_Nuclear14/Tiles/roadright.png index 05f037db8cd..c890988b0de 100644 Binary files a/Resources/Textures/_Nuclear14/Tiles/roadright.png and b/Resources/Textures/_Nuclear14/Tiles/roadright.png differ diff --git a/Resources/Textures/_Nuclear14/Tiles/roadtinycornerhorizontal1.png b/Resources/Textures/_Nuclear14/Tiles/roadtinycornerhorizontal1.png index 12adbcfea50..05a18b2c20c 100644 Binary files a/Resources/Textures/_Nuclear14/Tiles/roadtinycornerhorizontal1.png and b/Resources/Textures/_Nuclear14/Tiles/roadtinycornerhorizontal1.png differ diff --git a/Resources/Textures/_Nuclear14/Tiles/roadtinycornerhorizontal2.png b/Resources/Textures/_Nuclear14/Tiles/roadtinycornerhorizontal2.png index 51a89010e21..9aeb5a15464 100644 Binary files a/Resources/Textures/_Nuclear14/Tiles/roadtinycornerhorizontal2.png and b/Resources/Textures/_Nuclear14/Tiles/roadtinycornerhorizontal2.png differ diff --git a/Resources/Textures/_Nuclear14/Tiles/roadtinycornerhorizontal3.png b/Resources/Textures/_Nuclear14/Tiles/roadtinycornerhorizontal3.png index 2890fe38ce6..1f04f5339ec 100644 Binary files a/Resources/Textures/_Nuclear14/Tiles/roadtinycornerhorizontal3.png and b/Resources/Textures/_Nuclear14/Tiles/roadtinycornerhorizontal3.png differ diff --git a/Resources/Textures/_Nuclear14/Tiles/roadtinycornerhorizontal4.png b/Resources/Textures/_Nuclear14/Tiles/roadtinycornerhorizontal4.png index cbc45c85d4c..f6057c4ae81 100644 Binary files a/Resources/Textures/_Nuclear14/Tiles/roadtinycornerhorizontal4.png and b/Resources/Textures/_Nuclear14/Tiles/roadtinycornerhorizontal4.png differ diff --git a/Resources/Textures/_Nuclear14/Tiles/roadtinycornervertical1.png b/Resources/Textures/_Nuclear14/Tiles/roadtinycornervertical1.png index 9d99e621aed..2d4f4984735 100644 Binary files a/Resources/Textures/_Nuclear14/Tiles/roadtinycornervertical1.png and b/Resources/Textures/_Nuclear14/Tiles/roadtinycornervertical1.png differ diff --git a/Resources/Textures/_Nuclear14/Tiles/roadtinycornervertical2.png b/Resources/Textures/_Nuclear14/Tiles/roadtinycornervertical2.png index dffb155fd4b..69a79987b6e 100644 Binary files a/Resources/Textures/_Nuclear14/Tiles/roadtinycornervertical2.png and b/Resources/Textures/_Nuclear14/Tiles/roadtinycornervertical2.png differ diff --git a/Resources/Textures/_Nuclear14/Tiles/roadtinycornervertical3.png b/Resources/Textures/_Nuclear14/Tiles/roadtinycornervertical3.png index b7619eec457..5c138d954ac 100644 Binary files a/Resources/Textures/_Nuclear14/Tiles/roadtinycornervertical3.png and b/Resources/Textures/_Nuclear14/Tiles/roadtinycornervertical3.png differ diff --git a/Resources/Textures/_Nuclear14/Tiles/roadtinycornervertical4.png b/Resources/Textures/_Nuclear14/Tiles/roadtinycornervertical4.png index 2dee0f36559..3cb8266e74d 100644 Binary files a/Resources/Textures/_Nuclear14/Tiles/roadtinycornervertical4.png and b/Resources/Textures/_Nuclear14/Tiles/roadtinycornervertical4.png differ diff --git a/Resources/Textures/_Nuclear14/Tiles/roadtop.png b/Resources/Textures/_Nuclear14/Tiles/roadtop.png index 4c6ba84db78..62a8f994f9b 100644 Binary files a/Resources/Textures/_Nuclear14/Tiles/roadtop.png and b/Resources/Textures/_Nuclear14/Tiles/roadtop.png differ