From a60d7187d623ce8cd262f4841ae4c4877628b685 Mon Sep 17 00:00:00 2001 From: NotSoDana Date: Fri, 21 Jun 2024 01:49:17 +0200 Subject: [PATCH] conflicts --- Resources/Textures/Corvax/Tiles/attributions.yml | 7 ++++++- Resources/Textures/Tiles/attributions.yml | 4 ++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/Resources/Textures/Corvax/Tiles/attributions.yml b/Resources/Textures/Corvax/Tiles/attributions.yml index 7ac89f63d8f..874067eace1 100644 --- a/Resources/Textures/Corvax/Tiles/attributions.yml +++ b/Resources/Textures/Corvax/Tiles/attributions.yml @@ -1,4 +1,9 @@ +- files: ["mowed_grass.png"] + license: "CC-BY-SA-3.0" + copyright: "Created by Ko4erga (discord)" + source: "https://github.com/space-syndicate/space-station-14/pull/2282" + - 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_tile_light.png", "wood_tile_dark.png", "wood_tile_black.png", "wood_tile_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." - source: "https://github.com/tgstation/tgstation/" \ No newline at end of file + source: "https://github.com/tgstation/tgstation/" diff --git a/Resources/Textures/Tiles/attributions.yml b/Resources/Textures/Tiles/attributions.yml index b41d4810634..4216876bcaa 100644 --- a/Resources/Textures/Tiles/attributions.yml +++ b/Resources/Textures/Tiles/attributions.yml @@ -21,9 +21,9 @@ copyright: "TauCetiStation commit 4cd533cf0a4243050364023af9a4fcaca209dce7" source: "https://github.com/TauCetiStation/TauCetiClassic/" -- files: ["blue_circuit.png", "cropped_parallax.png", "eighties.png", "gold.png", "grass.png", "ironsand1.png", "ironsand2.png", "ironsand3.png", "ironsand4.png", "junglegrass.png", "lattice.png", "plating.png", "reinforced.png", "silver.png", "snow.png", "wood.png", "wood_tile.png", "wood_broken.png", "wood_large.png"] +- 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", "wood_tile.png", "wood_broken.png", "wood_large.png"] license: "CC-BY-SA-3.0" - copyright: "tgstation commit 8abb19545828230d92ba18827feeb42a67a55d49, cropped_parallax modified from parallax, reinforced modified by Ko4erga (discord). Wood tiles are new tg tiles, resprited by Meowstushka." + copyright: "tgstation commit 8abb19545828230d92ba18827feeb42a67a55d49, cropped_parallax modified from parallax, reinforced modified by Ko4erga (discord). Wood tiles are new tg tiles, resprited by Meowstushka & Dezzzix." source: "https://github.com/tgstation/tgstation/" - files: ["super_reinforced.png"]