Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Resprite wooden tiles and adds new decals #2344

Merged
merged 3 commits into from
Jun 26, 2024
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
118 changes: 118 additions & 0 deletions Resources/Prototypes/Corvax/Decals/wood_trim_thin_white.yml
Original file line number Diff line number Diff line change
@@ -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
9 changes: 9 additions & 0 deletions Resources/Prototypes/Corvax/Palettes/wood.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
- type: palette # Удалить, когда можно будет раскрывать декали по категориям
id: WoodColors
name: Wood
colors:
Light: "#a88661"
Default: "#55391a"
Dark: "#4b362b"
Black: "#2e211a"
Red: "#612620"
62 changes: 62 additions & 0 deletions Resources/Textures/Corvax/Decals/wood_trim_white.rsi/meta.json
Original file line number Diff line number Diff line change
@@ -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"
}
]
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion Resources/Textures/Corvax/Tiles/attributions.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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/"
Binary file modified Resources/Textures/Corvax/Tiles/wood_black.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/Corvax/Tiles/wood_chess_black.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/Corvax/Tiles/wood_chess_dark.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/Corvax/Tiles/wood_chess_light.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/Corvax/Tiles/wood_chess_red.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/Corvax/Tiles/wood_dark.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/Corvax/Tiles/wood_large_black.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/Corvax/Tiles/wood_large_dark.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/Corvax/Tiles/wood_large_light.png
Binary file modified Resources/Textures/Corvax/Tiles/wood_large_red.png
Binary file modified Resources/Textures/Corvax/Tiles/wood_light.png
Binary file modified Resources/Textures/Corvax/Tiles/wood_parquet.png
Binary file modified Resources/Textures/Corvax/Tiles/wood_parquet_black.png
Binary file modified Resources/Textures/Corvax/Tiles/wood_parquet_dark.png
Binary file modified Resources/Textures/Corvax/Tiles/wood_parquet_light.png
Binary file modified Resources/Textures/Corvax/Tiles/wood_parquet_red.png
Binary file modified Resources/Textures/Corvax/Tiles/wood_red.png
2 changes: 1 addition & 1 deletion Resources/Textures/Decals/wood_trim.rsi/meta.json
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Binary file modified Resources/Textures/Decals/wood_trim.rsi/thin_box.png
Binary file modified Resources/Textures/Decals/wood_trim.rsi/thin_corner_ne.png
Binary file modified Resources/Textures/Decals/wood_trim.rsi/thin_corner_nw.png
Binary file modified Resources/Textures/Decals/wood_trim.rsi/thin_corner_se.png
Binary file modified Resources/Textures/Decals/wood_trim.rsi/thin_corner_sw.png
Binary file modified Resources/Textures/Decals/wood_trim.rsi/thin_end_e.png
Binary file modified Resources/Textures/Decals/wood_trim.rsi/thin_end_n.png
Binary file modified Resources/Textures/Decals/wood_trim.rsi/thin_end_s.png
Binary file modified Resources/Textures/Decals/wood_trim.rsi/thin_end_w.png
Binary file modified Resources/Textures/Decals/wood_trim.rsi/thin_inner_ne.png
Binary file modified Resources/Textures/Decals/wood_trim.rsi/thin_inner_nw.png
Binary file modified Resources/Textures/Decals/wood_trim.rsi/thin_inner_se.png
Binary file modified Resources/Textures/Decals/wood_trim.rsi/thin_inner_sw.png
Binary file modified Resources/Textures/Decals/wood_trim.rsi/thin_line_e.png
Binary file modified Resources/Textures/Decals/wood_trim.rsi/thin_line_n.png
Binary file modified Resources/Textures/Decals/wood_trim.rsi/thin_line_s.png
Binary file modified Resources/Textures/Decals/wood_trim.rsi/thin_line_w.png
8 changes: 4 additions & 4 deletions Resources/Textures/Tiles/attributions.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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"]
Expand All @@ -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"]
Expand All @@ -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/"
Binary file modified Resources/Textures/Tiles/wood.png
Binary file modified Resources/Textures/Tiles/wood_broken.png
Binary file modified Resources/Textures/Tiles/wood_large.png
Binary file modified Resources/Textures/Tiles/wood_tile.png
Loading