diff --git a/Resources/Prototypes/Corvax/Decals/wood_trim_thin_white.yml b/Resources/Prototypes/Corvax/Decals/wood_trim_thin_white.yml new file mode 100644 index 00000000000..a91292ea06f --- /dev/null +++ b/Resources/Prototypes/Corvax/Decals/wood_trim_thin_white.yml @@ -0,0 +1,118 @@ +- type: decal + id: WoodTrimThinBoxWhite + tags: ["station", "markings"] + sprite: + sprite: Corvax/Decals/wood_trim_white.rsi + state: thin_box + +- type: decal + id: WoodTrimThinCornerNeWhite + tags: ["station", "markings"] + sprite: + sprite: Corvax/Decals/wood_trim_white.rsi + state: thin_corner_ne + +- type: decal + id: WoodTrimThinCornerSeWhite + tags: ["station", "markings"] + sprite: + sprite: Corvax/Decals/wood_trim_white.rsi + state: thin_corner_se + +- type: decal + id: WoodTrimThinCornerNwWhite + tags: ["station", "markings"] + sprite: + sprite: Corvax/Decals/wood_trim_white.rsi + state: thin_corner_nw + +- type: decal + id: WoodTrimThinCornerSwWhite + tags: ["station", "markings"] + sprite: + sprite: Corvax/Decals/wood_trim_white.rsi + state: thin_corner_sw + +- type: decal + id: WoodTrimThinInnerNeWhite + tags: ["station", "markings"] + sprite: + sprite: Corvax/Decals/wood_trim_white.rsi + state: thin_inner_ne + +- type: decal + id: WoodTrimThinInnerSeWhite + tags: ["station", "markings"] + sprite: + sprite: Corvax/Decals/wood_trim_white.rsi + state: thin_inner_se + +- type: decal + id: WoodTrimThinInnerNwWhite + tags: ["station", "markings"] + sprite: + sprite: Corvax/Decals/wood_trim_white.rsi + state: thin_inner_nw + +- type: decal + id: WoodTrimThinInnerSwWhite + tags: ["station", "markings"] + sprite: + sprite: Corvax/Decals/wood_trim_white.rsi + state: thin_inner_sw + +- type: decal + id: WoodTrimThinEndNWhite + tags: ["station", "markings"] + sprite: + sprite: Corvax/Decals/wood_trim_white.rsi + state: thin_end_n + +- type: decal + id: WoodTrimThinEndEWhite + tags: ["station", "markings"] + sprite: + sprite: Corvax/Decals/wood_trim_white.rsi + state: thin_end_e + +- type: decal + id: WoodTrimThinEndSWhite + tags: ["station", "markings"] + sprite: + sprite: Corvax/Decals/wood_trim_white.rsi + state: thin_end_s + +- type: decal + id: WoodTrimThinEndWWhite + tags: ["station", "markings"] + sprite: + sprite: Corvax/Decals/wood_trim_white.rsi + state: thin_end_w + +- type: decal + id: WoodTrimThinLineNWhite + tags: ["station", "markings"] + sprite: + sprite: Corvax/Decals/wood_trim_white.rsi + state: thin_line_n + +- type: decal + id: WoodTrimThinLineEWhite + tags: ["station", "markings"] + sprite: + sprite: Corvax/Decals/wood_trim_white.rsi + state: thin_line_e + +- type: decal + id: WoodTrimThinLineSWhite + tags: ["station", "markings"] + sprite: + sprite: Corvax/Decals/wood_trim_white.rsi + state: thin_line_s + +- type: decal + id: WoodTrimThinLineWWhite + tags: ["station", "markings"] + sprite: + sprite: Corvax/Decals/wood_trim_white.rsi + state: thin_line_w diff --git a/Resources/Prototypes/Corvax/Palettes/wood.yml b/Resources/Prototypes/Corvax/Palettes/wood.yml new file mode 100644 index 00000000000..365b22f8b49 --- /dev/null +++ b/Resources/Prototypes/Corvax/Palettes/wood.yml @@ -0,0 +1,9 @@ +- type: palette # Удалить, когда можно будет раскрывать декали по категориям + id: WoodColors + name: Wood + colors: + Light: "#a88661" + Default: "#55391a" + Dark: "#4b362b" + Black: "#2e211a" + Red: "#612620" diff --git a/Resources/Textures/Corvax/Decals/wood_trim_white.rsi/meta.json b/Resources/Textures/Corvax/Decals/wood_trim_white.rsi/meta.json new file mode 100644 index 00000000000..8cec763770c --- /dev/null +++ b/Resources/Textures/Corvax/Decals/wood_trim_white.rsi/meta.json @@ -0,0 +1,62 @@ +{ + "version": 1, + "license": "CC0-1.0", + "copyright": "Made by github user @moonheart08, white ver by Ko4erga (discord)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "thin_box" + }, + { + "name": "thin_corner_ne" + }, + { + "name": "thin_corner_se" + }, + { + "name": "thin_corner_nw" + }, + { + "name": "thin_corner_sw" + }, + { + "name": "thin_end_n" + }, + { + "name": "thin_end_e" + }, + { + "name": "thin_end_s" + }, + { + "name": "thin_end_w" + }, + { + "name": "thin_line_n" + }, + { + "name": "thin_line_e" + }, + { + "name": "thin_line_s" + }, + { + "name": "thin_line_w" + }, + { + "name": "thin_inner_ne" + }, + { + "name": "thin_inner_se" + }, + { + "name": "thin_inner_nw" + }, + { + "name": "thin_inner_sw" + } + ] +} diff --git a/Resources/Textures/Corvax/Decals/wood_trim_white.rsi/thin_box.png b/Resources/Textures/Corvax/Decals/wood_trim_white.rsi/thin_box.png new file mode 100644 index 00000000000..c7acbba44e6 Binary files /dev/null and b/Resources/Textures/Corvax/Decals/wood_trim_white.rsi/thin_box.png differ diff --git a/Resources/Textures/Corvax/Decals/wood_trim_white.rsi/thin_corner_ne.png b/Resources/Textures/Corvax/Decals/wood_trim_white.rsi/thin_corner_ne.png new file mode 100644 index 00000000000..fd02086789a Binary files /dev/null and b/Resources/Textures/Corvax/Decals/wood_trim_white.rsi/thin_corner_ne.png differ diff --git a/Resources/Textures/Corvax/Decals/wood_trim_white.rsi/thin_corner_nw.png b/Resources/Textures/Corvax/Decals/wood_trim_white.rsi/thin_corner_nw.png new file mode 100644 index 00000000000..d56c02ecd2a Binary files /dev/null and b/Resources/Textures/Corvax/Decals/wood_trim_white.rsi/thin_corner_nw.png differ diff --git a/Resources/Textures/Corvax/Decals/wood_trim_white.rsi/thin_corner_se.png b/Resources/Textures/Corvax/Decals/wood_trim_white.rsi/thin_corner_se.png new file mode 100644 index 00000000000..49e2e01fad3 Binary files /dev/null and b/Resources/Textures/Corvax/Decals/wood_trim_white.rsi/thin_corner_se.png differ diff --git a/Resources/Textures/Corvax/Decals/wood_trim_white.rsi/thin_corner_sw.png b/Resources/Textures/Corvax/Decals/wood_trim_white.rsi/thin_corner_sw.png new file mode 100644 index 00000000000..1037e66b52e Binary files /dev/null and b/Resources/Textures/Corvax/Decals/wood_trim_white.rsi/thin_corner_sw.png differ diff --git a/Resources/Textures/Corvax/Decals/wood_trim_white.rsi/thin_end_e.png b/Resources/Textures/Corvax/Decals/wood_trim_white.rsi/thin_end_e.png new file mode 100644 index 00000000000..aa1b264c5fb Binary files /dev/null and b/Resources/Textures/Corvax/Decals/wood_trim_white.rsi/thin_end_e.png differ diff --git a/Resources/Textures/Corvax/Decals/wood_trim_white.rsi/thin_end_n.png b/Resources/Textures/Corvax/Decals/wood_trim_white.rsi/thin_end_n.png new file mode 100644 index 00000000000..153d7614a18 Binary files /dev/null and b/Resources/Textures/Corvax/Decals/wood_trim_white.rsi/thin_end_n.png differ diff --git a/Resources/Textures/Corvax/Decals/wood_trim_white.rsi/thin_end_s.png b/Resources/Textures/Corvax/Decals/wood_trim_white.rsi/thin_end_s.png new file mode 100644 index 00000000000..efa6744f19a Binary files /dev/null and b/Resources/Textures/Corvax/Decals/wood_trim_white.rsi/thin_end_s.png differ diff --git a/Resources/Textures/Corvax/Decals/wood_trim_white.rsi/thin_end_w.png b/Resources/Textures/Corvax/Decals/wood_trim_white.rsi/thin_end_w.png new file mode 100644 index 00000000000..e7702b11bc5 Binary files /dev/null and b/Resources/Textures/Corvax/Decals/wood_trim_white.rsi/thin_end_w.png differ diff --git a/Resources/Textures/Corvax/Decals/wood_trim_white.rsi/thin_inner_ne.png b/Resources/Textures/Corvax/Decals/wood_trim_white.rsi/thin_inner_ne.png new file mode 100644 index 00000000000..de3985a839d Binary files /dev/null and b/Resources/Textures/Corvax/Decals/wood_trim_white.rsi/thin_inner_ne.png differ diff --git a/Resources/Textures/Corvax/Decals/wood_trim_white.rsi/thin_inner_nw.png b/Resources/Textures/Corvax/Decals/wood_trim_white.rsi/thin_inner_nw.png new file mode 100644 index 00000000000..14ea4ba7fd4 Binary files /dev/null and b/Resources/Textures/Corvax/Decals/wood_trim_white.rsi/thin_inner_nw.png differ diff --git a/Resources/Textures/Corvax/Decals/wood_trim_white.rsi/thin_inner_se.png b/Resources/Textures/Corvax/Decals/wood_trim_white.rsi/thin_inner_se.png new file mode 100644 index 00000000000..7bf9eac5ffa Binary files /dev/null and b/Resources/Textures/Corvax/Decals/wood_trim_white.rsi/thin_inner_se.png differ diff --git a/Resources/Textures/Corvax/Decals/wood_trim_white.rsi/thin_inner_sw.png b/Resources/Textures/Corvax/Decals/wood_trim_white.rsi/thin_inner_sw.png new file mode 100644 index 00000000000..a7913584e57 Binary files /dev/null and b/Resources/Textures/Corvax/Decals/wood_trim_white.rsi/thin_inner_sw.png differ diff --git a/Resources/Textures/Corvax/Decals/wood_trim_white.rsi/thin_line_e.png b/Resources/Textures/Corvax/Decals/wood_trim_white.rsi/thin_line_e.png new file mode 100644 index 00000000000..a4b7e220d64 Binary files /dev/null and b/Resources/Textures/Corvax/Decals/wood_trim_white.rsi/thin_line_e.png differ diff --git a/Resources/Textures/Corvax/Decals/wood_trim_white.rsi/thin_line_n.png b/Resources/Textures/Corvax/Decals/wood_trim_white.rsi/thin_line_n.png new file mode 100644 index 00000000000..fb8bd52922b Binary files /dev/null and b/Resources/Textures/Corvax/Decals/wood_trim_white.rsi/thin_line_n.png differ diff --git a/Resources/Textures/Corvax/Decals/wood_trim_white.rsi/thin_line_s.png b/Resources/Textures/Corvax/Decals/wood_trim_white.rsi/thin_line_s.png new file mode 100644 index 00000000000..55342750c9c Binary files /dev/null and b/Resources/Textures/Corvax/Decals/wood_trim_white.rsi/thin_line_s.png differ diff --git a/Resources/Textures/Corvax/Decals/wood_trim_white.rsi/thin_line_w.png b/Resources/Textures/Corvax/Decals/wood_trim_white.rsi/thin_line_w.png new file mode 100644 index 00000000000..13e4d42e06f Binary files /dev/null and b/Resources/Textures/Corvax/Decals/wood_trim_white.rsi/thin_line_w.png differ diff --git a/Resources/Textures/Corvax/Tiles/attributions.yml b/Resources/Textures/Corvax/Tiles/attributions.yml index 92fe0b2f1d5..05b3fa261be 100644 --- a/Resources/Textures/Corvax/Tiles/attributions.yml +++ b/Resources/Textures/Corvax/Tiles/attributions.yml @@ -5,5 +5,5 @@ - files: ["wood_light.png", "wood_dark.png", "wood_black.png", "wood_red.png", "wood_large_light.png", "wood_large_dark.png", "wood_large_black.png", "wood_large_red.png", "wood_chess.png", "wood_chess_light.png", "wood_chess_dark.png", "wood_chess_black.png", "wood_chess_red.png", "wood_parquet.png", "wood_parquet_light.png", "wood_parquet_dark.png", "wood_parquet_black.png", "wood_parquet_red.png"] license: "CC-BY-SA-3.0" - copyright: "tgstation commit 8abb19545828230d92ba18827feeb42a67a55d49, Wood tiles are new tg tiles, resprited by Meowstushka." + copyright: "tgstation commit 8abb19545828230d92ba18827feeb42a67a55d49, Wood tiles are new tg tiles, resprited by Meowstushka, modified by Ko4erga (discord)" source: "https://github.com/tgstation/tgstation/" diff --git a/Resources/Textures/Corvax/Tiles/wood_black.png b/Resources/Textures/Corvax/Tiles/wood_black.png index 0bc42202031..0eb2f9fc533 100644 Binary files a/Resources/Textures/Corvax/Tiles/wood_black.png and b/Resources/Textures/Corvax/Tiles/wood_black.png differ diff --git a/Resources/Textures/Corvax/Tiles/wood_chess_black.png b/Resources/Textures/Corvax/Tiles/wood_chess_black.png index 220c440f7c4..7ea98eca416 100644 Binary files a/Resources/Textures/Corvax/Tiles/wood_chess_black.png and b/Resources/Textures/Corvax/Tiles/wood_chess_black.png differ diff --git a/Resources/Textures/Corvax/Tiles/wood_chess_dark.png b/Resources/Textures/Corvax/Tiles/wood_chess_dark.png index ce3cc56676b..5ce4ff8e6bf 100644 Binary files a/Resources/Textures/Corvax/Tiles/wood_chess_dark.png and b/Resources/Textures/Corvax/Tiles/wood_chess_dark.png differ diff --git a/Resources/Textures/Corvax/Tiles/wood_chess_light.png b/Resources/Textures/Corvax/Tiles/wood_chess_light.png index 6cb627554be..1bc5eb3d034 100644 Binary files a/Resources/Textures/Corvax/Tiles/wood_chess_light.png and b/Resources/Textures/Corvax/Tiles/wood_chess_light.png differ diff --git a/Resources/Textures/Corvax/Tiles/wood_chess_red.png b/Resources/Textures/Corvax/Tiles/wood_chess_red.png index 4057c7bbd8d..8295c04e3b6 100644 Binary files a/Resources/Textures/Corvax/Tiles/wood_chess_red.png and b/Resources/Textures/Corvax/Tiles/wood_chess_red.png differ diff --git a/Resources/Textures/Corvax/Tiles/wood_dark.png b/Resources/Textures/Corvax/Tiles/wood_dark.png index 50ec7941144..544739be79b 100644 Binary files a/Resources/Textures/Corvax/Tiles/wood_dark.png and b/Resources/Textures/Corvax/Tiles/wood_dark.png differ diff --git a/Resources/Textures/Corvax/Tiles/wood_large_black.png b/Resources/Textures/Corvax/Tiles/wood_large_black.png index 416a992854c..645e7175ff8 100644 Binary files a/Resources/Textures/Corvax/Tiles/wood_large_black.png and b/Resources/Textures/Corvax/Tiles/wood_large_black.png differ diff --git a/Resources/Textures/Corvax/Tiles/wood_large_dark.png b/Resources/Textures/Corvax/Tiles/wood_large_dark.png index bffb527efc1..1c64065dc79 100644 Binary files a/Resources/Textures/Corvax/Tiles/wood_large_dark.png and b/Resources/Textures/Corvax/Tiles/wood_large_dark.png differ diff --git a/Resources/Textures/Corvax/Tiles/wood_large_light.png b/Resources/Textures/Corvax/Tiles/wood_large_light.png index d821a409496..b55c7c4c4f9 100644 Binary files a/Resources/Textures/Corvax/Tiles/wood_large_light.png and b/Resources/Textures/Corvax/Tiles/wood_large_light.png differ diff --git a/Resources/Textures/Corvax/Tiles/wood_large_red.png b/Resources/Textures/Corvax/Tiles/wood_large_red.png index f26ec992776..24cb1085a33 100644 Binary files a/Resources/Textures/Corvax/Tiles/wood_large_red.png and b/Resources/Textures/Corvax/Tiles/wood_large_red.png differ diff --git a/Resources/Textures/Corvax/Tiles/wood_light.png b/Resources/Textures/Corvax/Tiles/wood_light.png index 4435b4a52e4..37f1a3f9af4 100644 Binary files a/Resources/Textures/Corvax/Tiles/wood_light.png and b/Resources/Textures/Corvax/Tiles/wood_light.png differ diff --git a/Resources/Textures/Corvax/Tiles/wood_parquet.png b/Resources/Textures/Corvax/Tiles/wood_parquet.png index beb3fe48694..a7001645db6 100644 Binary files a/Resources/Textures/Corvax/Tiles/wood_parquet.png and b/Resources/Textures/Corvax/Tiles/wood_parquet.png differ diff --git a/Resources/Textures/Corvax/Tiles/wood_parquet_black.png b/Resources/Textures/Corvax/Tiles/wood_parquet_black.png index fadb2051648..509a5e2146a 100644 Binary files a/Resources/Textures/Corvax/Tiles/wood_parquet_black.png and b/Resources/Textures/Corvax/Tiles/wood_parquet_black.png differ diff --git a/Resources/Textures/Corvax/Tiles/wood_parquet_dark.png b/Resources/Textures/Corvax/Tiles/wood_parquet_dark.png index fa1f4d7902f..6929933ee1e 100644 Binary files a/Resources/Textures/Corvax/Tiles/wood_parquet_dark.png and b/Resources/Textures/Corvax/Tiles/wood_parquet_dark.png differ diff --git a/Resources/Textures/Corvax/Tiles/wood_parquet_light.png b/Resources/Textures/Corvax/Tiles/wood_parquet_light.png index 2f37632a8ca..75d934481ed 100644 Binary files a/Resources/Textures/Corvax/Tiles/wood_parquet_light.png and b/Resources/Textures/Corvax/Tiles/wood_parquet_light.png differ diff --git a/Resources/Textures/Corvax/Tiles/wood_parquet_red.png b/Resources/Textures/Corvax/Tiles/wood_parquet_red.png index bdec5d04c2a..4df7f69f60d 100644 Binary files a/Resources/Textures/Corvax/Tiles/wood_parquet_red.png and b/Resources/Textures/Corvax/Tiles/wood_parquet_red.png differ diff --git a/Resources/Textures/Corvax/Tiles/wood_red.png b/Resources/Textures/Corvax/Tiles/wood_red.png index bbd5135ef2b..bf5e3a2de9e 100644 Binary files a/Resources/Textures/Corvax/Tiles/wood_red.png and b/Resources/Textures/Corvax/Tiles/wood_red.png differ diff --git a/Resources/Textures/Decals/wood_trim.rsi/meta.json b/Resources/Textures/Decals/wood_trim.rsi/meta.json index 3f4fd3e9f94..68ab991e7cf 100644 --- a/Resources/Textures/Decals/wood_trim.rsi/meta.json +++ b/Resources/Textures/Decals/wood_trim.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC0-1.0", - "copyright": "Made by github user @moonheart08", + "copyright": "Made by github user @moonheart08, modified by Ko4erga (discord)", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Decals/wood_trim.rsi/thin_box.png b/Resources/Textures/Decals/wood_trim.rsi/thin_box.png index dc1386e18de..fc382610ed0 100644 Binary files a/Resources/Textures/Decals/wood_trim.rsi/thin_box.png and b/Resources/Textures/Decals/wood_trim.rsi/thin_box.png differ diff --git a/Resources/Textures/Decals/wood_trim.rsi/thin_corner_ne.png b/Resources/Textures/Decals/wood_trim.rsi/thin_corner_ne.png index b297876ee3a..2900868b4ec 100644 Binary files a/Resources/Textures/Decals/wood_trim.rsi/thin_corner_ne.png and b/Resources/Textures/Decals/wood_trim.rsi/thin_corner_ne.png differ diff --git a/Resources/Textures/Decals/wood_trim.rsi/thin_corner_nw.png b/Resources/Textures/Decals/wood_trim.rsi/thin_corner_nw.png index 40f94519658..ea051fdc5b6 100644 Binary files a/Resources/Textures/Decals/wood_trim.rsi/thin_corner_nw.png and b/Resources/Textures/Decals/wood_trim.rsi/thin_corner_nw.png differ diff --git a/Resources/Textures/Decals/wood_trim.rsi/thin_corner_se.png b/Resources/Textures/Decals/wood_trim.rsi/thin_corner_se.png index d15d38127dc..94036bb7c24 100644 Binary files a/Resources/Textures/Decals/wood_trim.rsi/thin_corner_se.png and b/Resources/Textures/Decals/wood_trim.rsi/thin_corner_se.png differ diff --git a/Resources/Textures/Decals/wood_trim.rsi/thin_corner_sw.png b/Resources/Textures/Decals/wood_trim.rsi/thin_corner_sw.png index 5f168e30ea1..a63748307a3 100644 Binary files a/Resources/Textures/Decals/wood_trim.rsi/thin_corner_sw.png and b/Resources/Textures/Decals/wood_trim.rsi/thin_corner_sw.png differ diff --git a/Resources/Textures/Decals/wood_trim.rsi/thin_end_e.png b/Resources/Textures/Decals/wood_trim.rsi/thin_end_e.png index 982859c26ec..82736daddb8 100644 Binary files a/Resources/Textures/Decals/wood_trim.rsi/thin_end_e.png and b/Resources/Textures/Decals/wood_trim.rsi/thin_end_e.png differ diff --git a/Resources/Textures/Decals/wood_trim.rsi/thin_end_n.png b/Resources/Textures/Decals/wood_trim.rsi/thin_end_n.png index b97089ea625..b3d0e5e0ed0 100644 Binary files a/Resources/Textures/Decals/wood_trim.rsi/thin_end_n.png and b/Resources/Textures/Decals/wood_trim.rsi/thin_end_n.png differ diff --git a/Resources/Textures/Decals/wood_trim.rsi/thin_end_s.png b/Resources/Textures/Decals/wood_trim.rsi/thin_end_s.png index 36b0869b253..75b76900780 100644 Binary files a/Resources/Textures/Decals/wood_trim.rsi/thin_end_s.png and b/Resources/Textures/Decals/wood_trim.rsi/thin_end_s.png differ diff --git a/Resources/Textures/Decals/wood_trim.rsi/thin_end_w.png b/Resources/Textures/Decals/wood_trim.rsi/thin_end_w.png index 5ee96b16a98..bdde643361c 100644 Binary files a/Resources/Textures/Decals/wood_trim.rsi/thin_end_w.png and b/Resources/Textures/Decals/wood_trim.rsi/thin_end_w.png differ diff --git a/Resources/Textures/Decals/wood_trim.rsi/thin_inner_ne.png b/Resources/Textures/Decals/wood_trim.rsi/thin_inner_ne.png index bdba4f2134d..2c13b965b98 100644 Binary files a/Resources/Textures/Decals/wood_trim.rsi/thin_inner_ne.png and b/Resources/Textures/Decals/wood_trim.rsi/thin_inner_ne.png differ diff --git a/Resources/Textures/Decals/wood_trim.rsi/thin_inner_nw.png b/Resources/Textures/Decals/wood_trim.rsi/thin_inner_nw.png index 5c01b3f12e5..2e2d8139079 100644 Binary files a/Resources/Textures/Decals/wood_trim.rsi/thin_inner_nw.png and b/Resources/Textures/Decals/wood_trim.rsi/thin_inner_nw.png differ diff --git a/Resources/Textures/Decals/wood_trim.rsi/thin_inner_se.png b/Resources/Textures/Decals/wood_trim.rsi/thin_inner_se.png index f7d5d7ff3f8..75aaa780b65 100644 Binary files a/Resources/Textures/Decals/wood_trim.rsi/thin_inner_se.png and b/Resources/Textures/Decals/wood_trim.rsi/thin_inner_se.png differ diff --git a/Resources/Textures/Decals/wood_trim.rsi/thin_inner_sw.png b/Resources/Textures/Decals/wood_trim.rsi/thin_inner_sw.png index 5885cf2b945..eb3f95f5a0f 100644 Binary files a/Resources/Textures/Decals/wood_trim.rsi/thin_inner_sw.png and b/Resources/Textures/Decals/wood_trim.rsi/thin_inner_sw.png differ diff --git a/Resources/Textures/Decals/wood_trim.rsi/thin_line_e.png b/Resources/Textures/Decals/wood_trim.rsi/thin_line_e.png index 68109155fc2..674cc0ae36f 100644 Binary files a/Resources/Textures/Decals/wood_trim.rsi/thin_line_e.png and b/Resources/Textures/Decals/wood_trim.rsi/thin_line_e.png differ diff --git a/Resources/Textures/Decals/wood_trim.rsi/thin_line_n.png b/Resources/Textures/Decals/wood_trim.rsi/thin_line_n.png index 2674126eae6..d13885049d1 100644 Binary files a/Resources/Textures/Decals/wood_trim.rsi/thin_line_n.png and b/Resources/Textures/Decals/wood_trim.rsi/thin_line_n.png differ diff --git a/Resources/Textures/Decals/wood_trim.rsi/thin_line_s.png b/Resources/Textures/Decals/wood_trim.rsi/thin_line_s.png index 21250807b66..51078eecb97 100644 Binary files a/Resources/Textures/Decals/wood_trim.rsi/thin_line_s.png and b/Resources/Textures/Decals/wood_trim.rsi/thin_line_s.png differ diff --git a/Resources/Textures/Decals/wood_trim.rsi/thin_line_w.png b/Resources/Textures/Decals/wood_trim.rsi/thin_line_w.png index b0b818ca336..27201f16e67 100644 Binary files a/Resources/Textures/Decals/wood_trim.rsi/thin_line_w.png and b/Resources/Textures/Decals/wood_trim.rsi/thin_line_w.png differ diff --git a/Resources/Textures/Tiles/attributions.yml b/Resources/Textures/Tiles/attributions.yml index 35438286df6..6e63932b4e3 100644 --- a/Resources/Textures/Tiles/attributions.yml +++ b/Resources/Textures/Tiles/attributions.yml @@ -23,7 +23,7 @@ - files: ["blue_circuit.png", "cropped_parallax.png", "eighties.png", "gold.png", "ironsand1.png", "ironsand2.png", "ironsand3.png", "ironsand4.png", "lattice.png", "plating.png", "reinforced.png", "silver.png", "snow.png", "wood.png"] license: "CC-BY-SA-3.0" - copyright: "tgstation commit 8abb19545828230d92ba18827feeb42a67a55d49, cropped_parallax modified from parallax, reinforced modified by Ko4erga (discord), wood resprited by Meowstushka" + copyright: "tgstation commit 8abb19545828230d92ba18827feeb42a67a55d49, cropped_parallax modified from parallax, reinforced modified by Ko4erga (discord), wood resprited by Meowstushka and modified by Ko4erga (discord)" source: "https://github.com/tgstation/tgstation/" - files: ["grass.png", "junglegrass.png", "grassdark.png", "grassjungle.png", "grasslight.png"] #Corvax @@ -103,7 +103,7 @@ - files: ["steel_maint.png", "grating_maint.png", "wood_tile.png"] license: "CC-BY-SA-3.0" - copyright: "by brainfood for space-station-14; wood tile resprited by Dezzzix." + copyright: "by brainfood for space-station-14; wood tile resprited by Dezzzix and modified by Ko4erga (discord)" source: "https://github.com/space-wizards/space-station-14/pull/12193" - files: ["meat.png"] @@ -113,7 +113,7 @@ - files: ["wood_broken.png"] license: "CC-BY-SA-3.0" - copyright: "taken at https://github.com/ParadiseSS13/Paradise/blob/8b7f4c8b69c74c6de5a755272eb8d3520f3d87c7/icons/turf/floors.dmi; resprited by Meowstushka" + copyright: "taken at https://github.com/ParadiseSS13/Paradise/blob/8b7f4c8b69c74c6de5a755272eb8d3520f3d87c7/icons/turf/floors.dmi; resprited by Meowstushka and modified by Ko4erga (discord)" source: "https://github.com/ParadiseSS13/Paradise" - files: ["chromite.png"] @@ -133,5 +133,5 @@ - files: ["wood_large.png"] license: "CC0-1.0" - copyright: "Created by ps3moira (github) for space-station-14; resprited by Meowstushka." + copyright: "Created by ps3moira (github) for space-station-14; resprited by Meowstushka and modified by Ko4erga (discord)" source: "https://github.com/space-wizards/space-station-14/" diff --git a/Resources/Textures/Tiles/wood.png b/Resources/Textures/Tiles/wood.png index 5c9e7738466..a37d36cf326 100644 Binary files a/Resources/Textures/Tiles/wood.png and b/Resources/Textures/Tiles/wood.png differ diff --git a/Resources/Textures/Tiles/wood_broken.png b/Resources/Textures/Tiles/wood_broken.png index b0b5553ca26..30c48e78424 100644 Binary files a/Resources/Textures/Tiles/wood_broken.png and b/Resources/Textures/Tiles/wood_broken.png differ diff --git a/Resources/Textures/Tiles/wood_large.png b/Resources/Textures/Tiles/wood_large.png index f836a987748..49fe0311579 100644 Binary files a/Resources/Textures/Tiles/wood_large.png and b/Resources/Textures/Tiles/wood_large.png differ diff --git a/Resources/Textures/Tiles/wood_tile.png b/Resources/Textures/Tiles/wood_tile.png index a93eef55a9e..abd084878a9 100644 Binary files a/Resources/Textures/Tiles/wood_tile.png and b/Resources/Textures/Tiles/wood_tile.png differ