Skip to content

Commit cd14551

Browse files
authored
Nature Overhaul, Infinite Trees (#5479)
## Short description Resprites Grass, Light Grass, Dark Grass, and Jungle Grass to be usable to create gradients to blend patches of grass and make grassy areas look less flat. Ported from Crystal Punk Resprites and adds a fuck ton of new trees, including birch, non-snowy conifer trees, red vampiric 'gulthias' trees, etc. Ported from Crystal Punk crystallpunk-14/crystall-punk-14#1539 crystallpunk-14/crystall-punk-14#1672 crystallpunk-14/crystall-punk-14#1154 crystallpunk-14/crystall-punk-14#1172 Also added Water Reeds floral decals from Crystal Punk ## Why we need to add this Better grass and trees makes natural areas look way nicer. Mappers can use a clever mix of mowed and unmowed astro-grasses to control how the edges blend over each other depending on what they want. Takes a little tinkering but the effect is very pretty. ## Media (Video/Screenshots) <img width="773" height="768" alt="image" src="https://github.com/user-attachments/assets/b6e6cd12-766a-4f1e-972a-ada5c4990b75" /> <img width="1107" height="593" alt="image" src="https://github.com/user-attachments/assets/02e1e7a9-34e7-4737-860a-fd8d754748f5" /> <img width="1104" height="594" alt="image" src="https://github.com/user-attachments/assets/05745742-d5a6-434b-a2f2-fe37a8a3f828" /> <img width="1107" height="598" alt="image" src="https://github.com/user-attachments/assets/9aa052ca-ab8d-4694-a1f1-9dcf4b37cf77" /> <img width="1109" height="599" alt="image" src="https://github.com/user-attachments/assets/f401bdf9-8450-41de-aee1-c8683f445744" /> <img width="1111" height="598" alt="image" src="https://github.com/user-attachments/assets/7ef68364-ac1c-4e64-92d7-960c5a309980" /> <img width="1109" height="600" alt="image" src="https://github.com/user-attachments/assets/8df01b2c-226e-4e8c-bf94-34532035e185" /> ## Checks - [X] I do not require assistance to complete the PR. - [X] Before posting/requesting review of a PR, I have verified that the changes work. - [X] I have added screenshots/videos of the changes, or this PR does not change in-game mechanics. - [X] I affirm that my changes are licensed under the [MIT License](https://github.com/ss14Starlight/space-station-14/blob/Starlight/LICENSE.TXT) and grant permission for use in this repository under its conditions. **Changelog** :cl: Conflee - add: Added Gulthias, Birch, Snowy Oak, and non-snowy Conifer trees from Crystal Punk. - add: Added water reeds floral decals, from Crystal Punk. - tweak: Resprited Grass, Light Grass, Dark Grass, and Jungle Grass using sprites from Crystal Punk. - tweak: Resprited basic trees and Snowy Conifer Trees using sprites from Crystal Punk.
1 parent ab60f4f commit cd14551

116 files changed

Lines changed: 1249 additions & 51 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

Resources/Locale/en-US/_Starlight/tiles/tiles.ftl

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,15 @@ tiles-rusty-metal-floor = rusty metal floor
5252
tiles-steel-grate-floor = steel grate floor
5353
tiles-tech-greeb-floor = tech maints greeb floor
5454
55+
# Grass
56+
tiles-mowed-dark-astro-grass = mowed dark astro-grass
57+
tiles-mowed-light-astro-grass = mowed light astro-grass
58+
tiles-mowed-jungle-astro-grass = mowed jungle astro-grass
59+
tiles-grass-classic-planet-floor = classic grass planet
60+
tiles-planet-grass-classic-floor-mowed = mowed classic astro-grass
61+
tiles-planet-grass-classic-floor = classic astro-grass
62+
tiles-astro-grass-classic = classic astro-grass
63+
5564
# Developer tiles for mapping
5665
tiles-floor-dev-floor = [dev] floor
5766
tiles-floor-dev-door = [dev] door

Resources/Prototypes/Entities/Markers/Spawners/Random/flora.yml

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,21 @@
1111
- type: RandomSpawner
1212
prototypes:
1313
- FloraTreeLarge
14-
- FloraTreeConifer
15-
- FloraTreeSnow
14+
# - FloraTreeConifer #SL no snow
15+
# - FloraTreeSnow #SL no snow
1616
- FloraTree
17+
#Starlight Start
18+
- FloraBirchTreeLargeSL
19+
- FloraBirchTreeMediumSL
20+
- FloraBirchTreeSmallSL
21+
- FloraTreeConiferMediumSL
22+
- FloraTreeConiferBigSL
23+
- FloraTreeConiferSmallSL
24+
- FloraDeadTreeSL
25+
- FloraDeadTreeSmallSL
26+
#Starlight End
1727
chance: 0.95
1828
rarePrototypes:
1929
- ShadowTree
30+
- FloraTreeVampireSL #SL Edit
2031
rareChance: 0.05

Resources/Prototypes/Entities/Objects/Decoration/flora.yml

Lines changed: 26 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
- type: Clickable
4343
- type: Sprite
4444
noRot: true
45-
sprite: Objects/Decoration/Flora/flora_trees.rsi
45+
sprite: _Starlight/Objects/Decoration/Flora/flora_trees.rsi #SL Edit
4646
drawdepth: Overdoors
4747
offset: 0,0.9
4848
- type: Physics
@@ -99,7 +99,7 @@
9999
abstract: true
100100
components:
101101
- type: Sprite
102-
sprite: Objects/Decoration/Flora/flora_treessnow.rsi
102+
sprite: _Starlight/Objects/Decoration/Flora/tree_snow.rsi #SL Edit
103103
offset: 0,0.7
104104
- type: Fixtures
105105
fixtures:
@@ -117,7 +117,7 @@
117117
abstract: true
118118
components:
119119
- type: Sprite
120-
sprite: Objects/Decoration/Flora/flora_treeslarge.rsi
120+
sprite: _Starlight/Objects/Decoration/Flora/flora_treeslarge.rsi #SL Edit
121121
offset: 0,1.55
122122
- type: Fixtures
123123
fixtures:
@@ -135,7 +135,7 @@
135135
abstract: true
136136
components:
137137
- type: Sprite
138-
sprite: Objects/Decoration/Flora/flora_treesconifer.rsi
138+
sprite: _Starlight/Objects/Decoration/Flora/tree_spruce_medium.rsi #SL Edit
139139
offset: 0,1.15
140140
- type: Fixtures
141141
fixtures:
@@ -239,24 +239,27 @@
239239
components:
240240
- type: Sprite
241241
layers:
242-
- state: treesnow01
242+
- state: tree01 #SL Edit
243243
map: ["random"]
244244
- type: RandomSprite
245245
available:
246246
- random:
247-
treesnow01: ""
248-
treesnow02: ""
249-
treesnow03: ""
250-
treesnow04: ""
251-
treesnow05: ""
252-
treesnow06: ""
247+
#SL Start
248+
tree01: ""
249+
tree02: ""
250+
tree03: ""
251+
tree04: ""
252+
tree05: ""
253+
tree06: ""
254+
#SL End
253255

254256
- type: entity
255-
parent: BaseTreeSnow
257+
parent: BaseTreeConiferOld #SL Edit
256258
id: FloraTreeStump
257259
name: tree stump
258260
components:
259261
- type: Sprite
262+
sprite: Objects/Decoration/Flora/flora_treessnow.rsi #SL Edit
260263
state: treestump
261264

262265
- type: entity
@@ -279,31 +282,34 @@
279282
treelarge06: ""
280283

281284
- type: entity
282-
parent: BaseTreeConifer
285+
parent: BaseTreeConiferSnow #SL Edit
283286
id: FloraTreeConifer
284287
name: snowy conifer
285288
components:
286289
- type: Sprite
287290
layers:
288-
- state: treeconifer01
291+
- state: tree01 #SL Edit
289292
map: ["random"]
290293
- type: RandomSprite
291294
available:
292295
- random:
293-
treeconifer01: ""
294-
treeconifer02: ""
295-
treeconifer03: ""
296+
# Starlight Start
297+
tree01: ""
298+
tree02: ""
299+
tree03: ""
300+
tree04: ""
301+
# Starlight End
296302

297303
- type: entity
298-
parent: BaseTreeConifer
304+
parent: BaseTreeConiferOld #SL
299305
id: FloraTreeChristmas01
300306
name: christmas tree
301307
components:
302308
- type: Sprite
303309
state: treechristmas01
304310

305311
- type: entity
306-
parent: BaseTreeConifer
312+
parent: BaseTreeConiferOld #SL
307313
id: FloraTreeChristmas02
308314
suffix: Safe Presents
309315
name: christmas tree
@@ -351,7 +357,7 @@
351357
orGroup: present
352358

353359
- type: entity
354-
parent: BaseTreeConifer
360+
parent: BaseTreeConiferOld #SL
355361
id: FloraTreeStumpConifer
356362
name: tree stump
357363
components:

Resources/Prototypes/Tiles/floors.yml

Lines changed: 45 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1462,7 +1462,17 @@
14621462
- type: tile
14631463
id: FloorGrass
14641464
name: tiles-planet-grass-floor
1465-
sprite: /Textures/Tiles/grass.png
1465+
sprite: /Textures/_Starlight/Tiles/Grass/grass.png #SL Edit
1466+
#SL Start
1467+
variants: 6
1468+
placementVariants:
1469+
- 1.0
1470+
- 1.0
1471+
- 1.0
1472+
- 1.0
1473+
- 1.0
1474+
- 1.0
1475+
#SL End
14661476
baseTurf: FloorDirt
14671477
isSubfloor: true
14681478
footstepSounds:
@@ -1474,7 +1484,17 @@
14741484
- type: tile
14751485
id: FloorGrassJungle
14761486
name: tiles-jungle-grass-floor
1477-
sprite: /Textures/Tiles/grassjungle.png
1487+
sprite: /Textures/_Starlight/Tiles/GrassTall/grass.png #SL Edit
1488+
#SL Start
1489+
variants: 6
1490+
placementVariants:
1491+
- 1.0
1492+
- 1.0
1493+
- 1.0
1494+
- 1.0
1495+
- 1.0
1496+
- 1.0
1497+
#SL End
14781498
baseTurf: FloorDirt
14791499
isSubfloor: true
14801500
footstepSounds:
@@ -1486,13 +1506,15 @@
14861506
- type: tile
14871507
id: FloorGrassDark
14881508
name: tiles-dark-grass-floor
1489-
sprite: /Textures/Tiles/grassdark.png
1490-
variants: 4
1509+
sprite: /Textures/_Starlight/Tiles/GrassDark/grass.png #SL Edit
1510+
variants: 6 #SL
14911511
placementVariants:
14921512
- 1.0
14931513
- 1.0
14941514
- 1.0
14951515
- 1.0
1516+
- 1.0 #SL
1517+
- 1.0 #SL
14961518
baseTurf: FloorDirt
14971519
isSubfloor: true
14981520
footstepSounds:
@@ -1503,13 +1525,15 @@
15031525
- type: tile
15041526
id: FloorGrassLight
15051527
name: tiles-light-grass-floor
1506-
sprite: /Textures/Tiles/grasslight.png
1507-
variants: 4
1528+
sprite: /Textures/_Starlight/Tiles/GrassLight/grass.png #SL Edit
1529+
variants: 6 #SL
15081530
placementVariants:
15091531
- 1.0
15101532
- 1.0
15111533
- 1.0
15121534
- 1.0
1535+
- 1.0 #SL
1536+
- 1.0 #SL
15131537
baseTurf: FloorDirt
15141538
isSubfloor: true
15151539
footstepSounds:
@@ -1956,23 +1980,25 @@
19561980
- type: tile
19571981
id: FloorAstroGrass
19581982
name: tiles-astro-grass
1959-
sprite: /Textures/Tiles/Planet/Grass/grass.png
1960-
variants: 4
1983+
sprite: /Textures/_Starlight/Tiles/Grass/grass.png #SL Edit
1984+
variants: 6 #SL
19611985
placementVariants:
19621986
- 1.0
19631987
- 1.0
19641988
- 1.0
19651989
- 1.0
1990+
- 1.0 #SL
1991+
- 1.0 #SL
19661992
edgeSpritePriority: 1
19671993
edgeSprites:
1968-
SouthEast: /Textures/Tiles/Planet/Grass/single_edge.png
1969-
NorthEast: /Textures/Tiles/Planet/Grass/single_edge.png
1970-
NorthWest: /Textures/Tiles/Planet/Grass/single_edge.png
1971-
SouthWest: /Textures/Tiles/Planet/Grass/single_edge.png
1972-
South: /Textures/Tiles/Planet/Grass/double_edge.png
1973-
East: /Textures/Tiles/Planet/Grass/double_edge.png
1974-
North: /Textures/Tiles/Planet/Grass/double_edge.png
1975-
West: /Textures/Tiles/Planet/Grass/double_edge.png
1994+
SouthEast: /Textures/_Starlight/Tiles/Grass/single_edge.png #SL Edit
1995+
NorthEast: /Textures/_Starlight/Tiles/Grass/single_edge.png #SL Edit
1996+
NorthWest: /Textures/_Starlight/Tiles/Grass/single_edge.png #SL Edit
1997+
SouthWest: /Textures/_Starlight/Tiles/Grass/single_edge.png #SL Edit
1998+
South: /Textures/_Starlight/Tiles/Grass/double_edge.png #SL Edit
1999+
East: /Textures/_Starlight/Tiles/Grass/double_edge.png #SL Edit
2000+
North: /Textures/_Starlight/Tiles/Grass/double_edge.png #SL Edit
2001+
West: /Textures/_Starlight/Tiles/Grass/double_edge.png #SL Edit
19762002
baseTurf: Plating
19772003
isSubfloor: false
19782004
deconstructTools: [ Cutting ]
@@ -1993,7 +2019,7 @@
19932019

19942020
- type: tile
19952021
id: FloorJungleAstroGrass
1996-
name: tiles-jungle-astro-grass
2022+
name: tiles-mowed-jungle-astro-grass #sl edit
19972023
parent: FloorGrassJungle
19982024
baseTurf: Plating
19992025
isSubfloor: false
@@ -2004,7 +2030,7 @@
20042030
- type: tile
20052031
parent: FloorGrassDark
20062032
id: FloorDarkAstroGrass
2007-
name: tiles-dark-astro-grass
2033+
name: tiles-mowed-dark-astro-grass #sl edit
20082034
baseTurf: Plating
20092035
isSubfloor: false
20102036
deconstructTools: [ Cutting ]
@@ -2014,7 +2040,7 @@
20142040
- type: tile
20152041
parent: FloorGrassLight
20162042
id: FloorLightAstroGrass
2017-
name: tiles-light-astro-grass
2043+
name: tiles-mowed-light-astro-grass #sl edit
20182044
baseTurf: Plating
20192045
isSubfloor: false
20202046
deconstructTools: [ Cutting ]

Resources/Prototypes/Tiles/planet.yml

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -58,23 +58,25 @@
5858
- type: tile
5959
id: FloorPlanetGrass
6060
name: tiles-grass-planet-floor
61-
sprite: /Textures/Tiles/Planet/Grass/grass.png
62-
variants: 4
61+
sprite: /Textures/_Starlight/Tiles/Grass/grass.png #SL Edit
62+
variants: 6 #SL
6363
placementVariants:
6464
- 1.0
6565
- 1.0
6666
- 1.0
6767
- 1.0
68+
- 1.0 #SL
69+
- 1.0 #SL
6870
edgeSpritePriority: 1
6971
edgeSprites:
70-
SouthEast: /Textures/Tiles/Planet/Grass/single_edge.png
71-
NorthEast: /Textures/Tiles/Planet/Grass/single_edge.png
72-
NorthWest: /Textures/Tiles/Planet/Grass/single_edge.png
73-
SouthWest: /Textures/Tiles/Planet/Grass/single_edge.png
74-
South: /Textures/Tiles/Planet/Grass/double_edge.png
75-
East: /Textures/Tiles/Planet/Grass/double_edge.png
76-
North: /Textures/Tiles/Planet/Grass/double_edge.png
77-
West: /Textures/Tiles/Planet/Grass/double_edge.png
72+
SouthEast: /Textures/_Starlight/Tiles/Grass/single_edge.png #SL Edit
73+
NorthEast: /Textures/_Starlight/Tiles/Grass/single_edge.png #SL Edit
74+
NorthWest: /Textures/_Starlight/Tiles/Grass/single_edge.png #SL Edit
75+
SouthWest: /Textures/_Starlight/Tiles/Grass/single_edge.png #SL Edit
76+
South: /Textures/_Starlight/Tiles/Grass/double_edge.png #SL Edit
77+
East: /Textures/_Starlight/Tiles/Grass/double_edge.png #SL Edit
78+
North: /Textures/_Starlight/Tiles/Grass/double_edge.png #SL Edit
79+
West: /Textures/_Starlight/Tiles/Grass/double_edge.png #SL Edit
7880
baseTurf: FloorPlanetDirt
7981
isSubfloor: true
8082
footstepSounds:

0 commit comments

Comments
 (0)