diff --git a/Resources/Prototypes/Tiles/floors.yml b/Resources/Prototypes/Tiles/floors.yml index 31742257b9..90e904fe82 100644 --- a/Resources/Prototypes/Tiles/floors.yml +++ b/Resources/Prototypes/Tiles/floors.yml @@ -1490,6 +1490,12 @@ id: FloorGrass name: tiles-planet-grass-floor sprite: /Textures/Tiles/grass.png + variants: 4 #Corvax + placementVariants: + - 1.0 + - 1.0 + - 1.0 + - 1.0 baseTurf: FloorDirt isSubfloor: false canShovel: true #DV @@ -1503,14 +1509,20 @@ id: FloorGrassJungle name: tiles-jungle-grass-floor sprite: /Textures/Tiles/grassjungle.png - baseTurf: FloorDirt + variants: 4 #Corvax + placementVariants: + - 1.0 + - 1.0 + - 1.0 + - 1.0 + baseTurf: FloorPlanetDirt isSubfloor: false - canShovel: true # Delta V footstepSounds: collection: FootstepGrass itemDrop: FloorTileItemGrassJungle heatCapacity: 10000 weather: true + indestructible: true - type: tile id: FloorGrassDark @@ -1927,7 +1939,8 @@ East: /Textures/Tiles/Planet/Grass/double_edge.png North: /Textures/Tiles/Planet/Grass/double_edge.png West: /Textures/Tiles/Planet/Grass/double_edge.png - baseTurf: Plating + baseTurf: FloorDirt + canShovel: true #Lost-Paradise isSubfloor: false deconstructTools: [ Cutting ] footstepSounds: @@ -1940,7 +1953,15 @@ id: FloorMowedAstroGrass name: tiles-mowed-astro-grass parent: FloorGrass - baseTurf: Plating + sprite: /Textures/Corvax/Tiles/mowed_grass.png #Corvax + variants: 4 + placementVariants: + - 1.0 + - 1.0 + - 1.0 + - 1.0 + baseTurf: FloorDirt + canShovel: true #Lost-Paradise isSubfloor: false deconstructTools: [ Cutting ] itemDrop: FloorTileItemMowedAstroGrass @@ -1950,7 +1971,8 @@ id: FloorJungleAstroGrass name: tiles-jungle-astro-grass parent: FloorGrassJungle - baseTurf: Plating + baseTurf: FloorDirt + canShovel: true #Lost-Paradise isSubfloor: false deconstructTools: [ Cutting ] itemDrop: FloorTileItemJungleAstroGrass diff --git a/Resources/Textures/Corvax/Tiles/attributions.yml b/Resources/Textures/Corvax/Tiles/attributions.yml new file mode 100644 index 0000000000..a23b082120 --- /dev/null +++ b/Resources/Textures/Corvax/Tiles/attributions.yml @@ -0,0 +1,4 @@ +- 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" diff --git a/Resources/Textures/Corvax/Tiles/mowed_grass.png b/Resources/Textures/Corvax/Tiles/mowed_grass.png new file mode 100644 index 0000000000..1545a375a6 Binary files /dev/null and b/Resources/Textures/Corvax/Tiles/mowed_grass.png differ diff --git a/Resources/Textures/Objects/Fun/Tabletop/Battlemaps/grassbm.rsi/icon.png b/Resources/Textures/Objects/Fun/Tabletop/Battlemaps/grassbm.rsi/icon.png index b2fea90bc1..2f042d0f26 100644 Binary files a/Resources/Textures/Objects/Fun/Tabletop/Battlemaps/grassbm.rsi/icon.png and b/Resources/Textures/Objects/Fun/Tabletop/Battlemaps/grassbm.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Fun/Tabletop/Battlemaps/grassbm.rsi/meta.json b/Resources/Textures/Objects/Fun/Tabletop/Battlemaps/grassbm.rsi/meta.json index bf6c485d5d..22c3183253 100644 --- a/Resources/Textures/Objects/Fun/Tabletop/Battlemaps/grassbm.rsi/meta.json +++ b/Resources/Textures/Objects/Fun/Tabletop/Battlemaps/grassbm.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Original by Visne, Assembled by Just-a-Unity-Dev on GitHub or eclips_e#0001 (728101795427254312) on Discord, texture from https://github.com/discordia-space/CEV-Eris/commit/026ee3250ac1de938b503e3eb46ad73dd9c3ca82", + "copyright": "Original by Visne, Assembled by Just-a-Unity-Dev on GitHub or eclips_e#0001 (728101795427254312) on Discord, texture by Ko4erga (discord)", "size": { "x": 18, "y": 18 diff --git a/Resources/Textures/Objects/Fun/Tabletop/Battlemaps/grassbm_tabletop.rsi/meta.json b/Resources/Textures/Objects/Fun/Tabletop/Battlemaps/grassbm_tabletop.rsi/meta.json index 5f3f5ea29e..59fd1c8ba0 100644 --- a/Resources/Textures/Objects/Fun/Tabletop/Battlemaps/grassbm_tabletop.rsi/meta.json +++ b/Resources/Textures/Objects/Fun/Tabletop/Battlemaps/grassbm_tabletop.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Assembled by Just-a-Unity-Dev on GitHub or eclips_e#0001 (728101795427254312) on Discord, texture from https://github.com/discordia-space/CEV-Eris/commit/026ee3250ac1de938b503e3eb46ad73dd9c3ca82", + "copyright": "Assembled by Just-a-Unity-Dev on GitHub or eclips_e#0001 (728101795427254312) on Discord, texture by Ko4erga (discord)", "size": { "x": 288, diff --git a/Resources/Textures/Objects/Fun/Tabletop/Battlemaps/grassbm_tabletop.rsi/tabletop.png b/Resources/Textures/Objects/Fun/Tabletop/Battlemaps/grassbm_tabletop.rsi/tabletop.png index 4e88b840d5..86afc25972 100644 Binary files a/Resources/Textures/Objects/Fun/Tabletop/Battlemaps/grassbm_tabletop.rsi/tabletop.png and b/Resources/Textures/Objects/Fun/Tabletop/Battlemaps/grassbm_tabletop.rsi/tabletop.png differ diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/astrograss.png b/Resources/Textures/Objects/Tiles/tile.rsi/astrograss.png index f548ef7ace..f83e2ba179 100644 Binary files a/Resources/Textures/Objects/Tiles/tile.rsi/astrograss.png and b/Resources/Textures/Objects/Tiles/tile.rsi/astrograss.png differ diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/grass.png b/Resources/Textures/Objects/Tiles/tile.rsi/grass.png index 696d0eb543..cfebf1b1f9 100644 Binary files a/Resources/Textures/Objects/Tiles/tile.rsi/grass.png and b/Resources/Textures/Objects/Tiles/tile.rsi/grass.png differ diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/grassjungle.png b/Resources/Textures/Objects/Tiles/tile.rsi/grassjungle.png index 8f3407369b..bf42c77ac8 100644 Binary files a/Resources/Textures/Objects/Tiles/tile.rsi/grassjungle.png and b/Resources/Textures/Objects/Tiles/tile.rsi/grassjungle.png differ diff --git a/Resources/Textures/Tiles/Planet/Grass/attributions.yml b/Resources/Textures/Tiles/Planet/Grass/attributions.yml index 1749225e1a..193dc2e76a 100644 --- a/Resources/Textures/Tiles/Planet/Grass/attributions.yml +++ b/Resources/Textures/Tiles/Planet/Grass/attributions.yml @@ -1,4 +1,4 @@ - files: ["grass.png", "triple_edge.png", "double_edge.png", "single_edge.png"] license: "CC-BY-SA-3.0" - copyright: "tgstation commit 8abb19545828230d92ba18827feeb42a67a55d49. double_edge, single_edge, and triple_edge modified from grass by github user @Flareguy" - source: "https://github.com/space-wizards/space-station-14/pull/27912" \ No newline at end of file + copyright: "Created by Ko4erga (discord)" + source: "https://github.com/space-wizards/space-station-14/pull/29134" \ No newline at end of file diff --git a/Resources/Textures/Tiles/Planet/Grass/double_edge.png b/Resources/Textures/Tiles/Planet/Grass/double_edge.png index 218751211c..804281db30 100644 Binary files a/Resources/Textures/Tiles/Planet/Grass/double_edge.png and b/Resources/Textures/Tiles/Planet/Grass/double_edge.png differ diff --git a/Resources/Textures/Tiles/Planet/Grass/grass.png b/Resources/Textures/Tiles/Planet/Grass/grass.png index b6d6e8b4db..425c1c5b79 100644 Binary files a/Resources/Textures/Tiles/Planet/Grass/grass.png and b/Resources/Textures/Tiles/Planet/Grass/grass.png differ diff --git a/Resources/Textures/Tiles/Planet/Grass/single_edge.png b/Resources/Textures/Tiles/Planet/Grass/single_edge.png index 60bbf65c79..e6fc903f28 100644 Binary files a/Resources/Textures/Tiles/Planet/Grass/single_edge.png and b/Resources/Textures/Tiles/Planet/Grass/single_edge.png differ diff --git a/Resources/Textures/Tiles/Planet/Grass/triple_edge.png b/Resources/Textures/Tiles/Planet/Grass/triple_edge.png index d19d64ba36..d1be035055 100644 Binary files a/Resources/Textures/Tiles/Planet/Grass/triple_edge.png and b/Resources/Textures/Tiles/Planet/Grass/triple_edge.png differ diff --git a/Resources/Textures/Tiles/Planet/dirt.rsi/dirt.png b/Resources/Textures/Tiles/Planet/dirt.rsi/dirt.png index 28d1862456..374df70cec 100644 Binary files a/Resources/Textures/Tiles/Planet/dirt.rsi/dirt.png and b/Resources/Textures/Tiles/Planet/dirt.rsi/dirt.png differ diff --git a/Resources/Textures/Tiles/Planet/dirt.rsi/meta.json b/Resources/Textures/Tiles/Planet/dirt.rsi/meta.json index c70bafbd1b..007f876b2e 100644 --- a/Resources/Textures/Tiles/Planet/dirt.rsi/meta.json +++ b/Resources/Textures/Tiles/Planet/dirt.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from https://github.com/discordia-space/CEV-Eris/blob/20d0b1fab9002c32e5267f16ba2b5cbf4b6f1e07/icons/turf/flooring/dirt.dmi", + "copyright": "Created by Ko4erga (discord)", "size": { "x": 32, "y": 32 @@ -11,4 +11,4 @@ "name": "dirt" } ] -} \ No newline at end of file +} diff --git a/Resources/Textures/Tiles/attributions.yml b/Resources/Textures/Tiles/attributions.yml index 6a6f545d1e..672620fd12 100644 --- a/Resources/Textures/Tiles/attributions.yml +++ b/Resources/Textures/Tiles/attributions.yml @@ -26,11 +26,16 @@ copyright: "Taken from /tg/station at commit 6665eec76c98a4f3f89bebcd10b34b47dcc0b8ae." source: "https://github.com/tgstation/tgstation/" -- 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", "reinforced.png", "silver.png", "snow.png", "wood.png"] +- files: ["blue_circuit.png", "cropped_parallax.png", "eighties.png", "gold.png", "ironsand1.png", "ironsand2.png", "ironsand3.png", "ironsand4.png", "lattice.png", "reinforced.png", "silver.png", "snow.png", "wood.png"] license: "CC-BY-SA-3.0" copyright: "tgstation commit 8abb19545828230d92ba18827feeb42a67a55d49, cropped_parallax modified from parallax." source: "https://github.com/tgstation/tgstation/" +- files: ["grass.png", "junglegrass.png", "grassdark.png", "grassjungle.png", "grasslight.png"] #Corvax + license: "CC-BY-SA-3.0" + copyright: "Created by Ko4erga (discord)" + source: "https://github.com/space-wizards/space-station-14/pull/29134" + - files: ["super_reinforced.png"] license: "CC-BY-SA-3.0" copyright: "Modified from reinforced.png by github user @Flareguy" @@ -86,9 +91,9 @@ copyright: "Mojave-Sun, taken at commit 0587dd16e28108bdf0b0a28e2caae4319845e861" source: "https://github.com/Mojave-Sun/mojave-sun-13" -- files: ["grassdark.png", "grasslight.png", "dirt.png"] +- files: ["dirt.png"] license: "CC-BY-SA-3.0" - copyright: "Fortuna commit 2a9408a47e2f83d945335e4feeeeafb552173e6f, grasslight and dirt by Peptide based on grassdark.png and dirt." + copyright: "Fortuna commit 2a9408a47e2f83d945335e4feeeeafb552173e6f, dirt by Peptide based on grassdark.png and dirt." source: "https://github.com/FortunaSS13/Fortuna" - files: ["steel_maint.png", "grating_maint.png", "wood_tile.png"] diff --git a/Resources/Textures/Tiles/grass.png b/Resources/Textures/Tiles/grass.png index 5c969fd869..2939d7e2f7 100644 Binary files a/Resources/Textures/Tiles/grass.png and b/Resources/Textures/Tiles/grass.png differ diff --git a/Resources/Textures/Tiles/grassdark.png b/Resources/Textures/Tiles/grassdark.png index 83236e1b80..854f3901e5 100644 Binary files a/Resources/Textures/Tiles/grassdark.png and b/Resources/Textures/Tiles/grassdark.png differ diff --git a/Resources/Textures/Tiles/grassjungle.png b/Resources/Textures/Tiles/grassjungle.png index 3cd34ffb64..d7a441bdc9 100644 Binary files a/Resources/Textures/Tiles/grassjungle.png and b/Resources/Textures/Tiles/grassjungle.png differ diff --git a/Resources/Textures/Tiles/grasslight.png b/Resources/Textures/Tiles/grasslight.png index 5993e91227..969ba21927 100644 Binary files a/Resources/Textures/Tiles/grasslight.png and b/Resources/Textures/Tiles/grasslight.png differ