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

Grass update #101

Merged
merged 1 commit into from
Sep 9, 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
32 changes: 27 additions & 5 deletions Resources/Prototypes/Tiles/floors.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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:
Expand All @@ -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
Expand All @@ -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
Expand Down
4 changes: 4 additions & 0 deletions Resources/Textures/Corvax/Tiles/attributions.yml
Original file line number Diff line number Diff line change
@@ -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"
Binary file added Resources/Textures/Corvax/Tiles/mowed_grass.png
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.
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -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,
Expand Down
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/Objects/Tiles/tile.rsi/astrograss.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/Objects/Tiles/tile.rsi/grass.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/Objects/Tiles/tile.rsi/grassjungle.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions Resources/Textures/Tiles/Planet/Grass/attributions.yml
Original file line number Diff line number Diff line change
@@ -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"
copyright: "Created by Ko4erga (discord)"
source: "https://github.com/space-wizards/space-station-14/pull/29134"
Binary file modified Resources/Textures/Tiles/Planet/Grass/double_edge.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/Tiles/Planet/Grass/grass.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/Tiles/Planet/Grass/single_edge.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/Tiles/Planet/Grass/triple_edge.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/Tiles/Planet/dirt.rsi/dirt.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions Resources/Textures/Tiles/Planet/dirt.rsi/meta.json
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -11,4 +11,4 @@
"name": "dirt"
}
]
}
}
11 changes: 8 additions & 3 deletions Resources/Textures/Tiles/attributions.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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"]
Expand Down
Binary file modified Resources/Textures/Tiles/grass.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/Tiles/grassdark.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/Tiles/grassjungle.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/Tiles/grasslight.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading