Commit cd14551
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
- Resources
- Locale/en-US/_Starlight/tiles
- Prototypes
- Entities
- Markers/Spawners/Random
- Objects/Decoration
- Tiles
- _Starlight
- Decals
- Entities/Objects/Decoration
- Tiles
- Textures/_Starlight
- Decals/water_reeds.rsi
- Objects/Decoration/Flora
- flora_trees.rsi
- flora_treeslarge.rsi
- tree_birch_big.rsi
- tree_birch_medium.rsi
- tree_birch_small.rsi
- tree_died.rsi
- tree_died_small.rsi
- tree_snow.rsi
- tree_spruce_big.rsi
- tree_spruce_medium.rsi
- tree_spruce_medium_snow.rsi
- tree_spruce_small.rsi
- tree_vampire.rsi
- Tiles
- GrassDark
- GrassLight
- GrassTall
- Grass
Some content is hidden
Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
52 | 52 | | |
53 | 53 | | |
54 | 54 | | |
| 55 | + | |
| 56 | + | |
| 57 | + | |
| 58 | + | |
| 59 | + | |
| 60 | + | |
| 61 | + | |
| 62 | + | |
| 63 | + | |
55 | 64 | | |
56 | 65 | | |
57 | 66 | | |
| |||
Lines changed: 13 additions & 2 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
11 | 11 | | |
12 | 12 | | |
13 | 13 | | |
14 | | - | |
15 | | - | |
| 14 | + | |
| 15 | + | |
16 | 16 | | |
| 17 | + | |
| 18 | + | |
| 19 | + | |
| 20 | + | |
| 21 | + | |
| 22 | + | |
| 23 | + | |
| 24 | + | |
| 25 | + | |
| 26 | + | |
17 | 27 | | |
18 | 28 | | |
19 | 29 | | |
| 30 | + | |
20 | 31 | | |
Lines changed: 26 additions & 20 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
42 | 42 | | |
43 | 43 | | |
44 | 44 | | |
45 | | - | |
| 45 | + | |
46 | 46 | | |
47 | 47 | | |
48 | 48 | | |
| |||
99 | 99 | | |
100 | 100 | | |
101 | 101 | | |
102 | | - | |
| 102 | + | |
103 | 103 | | |
104 | 104 | | |
105 | 105 | | |
| |||
117 | 117 | | |
118 | 118 | | |
119 | 119 | | |
120 | | - | |
| 120 | + | |
121 | 121 | | |
122 | 122 | | |
123 | 123 | | |
| |||
135 | 135 | | |
136 | 136 | | |
137 | 137 | | |
138 | | - | |
| 138 | + | |
139 | 139 | | |
140 | 140 | | |
141 | 141 | | |
| |||
239 | 239 | | |
240 | 240 | | |
241 | 241 | | |
242 | | - | |
| 242 | + | |
243 | 243 | | |
244 | 244 | | |
245 | 245 | | |
246 | 246 | | |
247 | | - | |
248 | | - | |
249 | | - | |
250 | | - | |
251 | | - | |
252 | | - | |
| 247 | + | |
| 248 | + | |
| 249 | + | |
| 250 | + | |
| 251 | + | |
| 252 | + | |
| 253 | + | |
| 254 | + | |
253 | 255 | | |
254 | 256 | | |
255 | | - | |
| 257 | + | |
256 | 258 | | |
257 | 259 | | |
258 | 260 | | |
259 | 261 | | |
| 262 | + | |
260 | 263 | | |
261 | 264 | | |
262 | 265 | | |
| |||
279 | 282 | | |
280 | 283 | | |
281 | 284 | | |
282 | | - | |
| 285 | + | |
283 | 286 | | |
284 | 287 | | |
285 | 288 | | |
286 | 289 | | |
287 | 290 | | |
288 | | - | |
| 291 | + | |
289 | 292 | | |
290 | 293 | | |
291 | 294 | | |
292 | 295 | | |
293 | | - | |
294 | | - | |
295 | | - | |
| 296 | + | |
| 297 | + | |
| 298 | + | |
| 299 | + | |
| 300 | + | |
| 301 | + | |
296 | 302 | | |
297 | 303 | | |
298 | | - | |
| 304 | + | |
299 | 305 | | |
300 | 306 | | |
301 | 307 | | |
302 | 308 | | |
303 | 309 | | |
304 | 310 | | |
305 | 311 | | |
306 | | - | |
| 312 | + | |
307 | 313 | | |
308 | 314 | | |
309 | 315 | | |
| |||
351 | 357 | | |
352 | 358 | | |
353 | 359 | | |
354 | | - | |
| 360 | + | |
355 | 361 | | |
356 | 362 | | |
357 | 363 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1462 | 1462 | | |
1463 | 1463 | | |
1464 | 1464 | | |
1465 | | - | |
| 1465 | + | |
| 1466 | + | |
| 1467 | + | |
| 1468 | + | |
| 1469 | + | |
| 1470 | + | |
| 1471 | + | |
| 1472 | + | |
| 1473 | + | |
| 1474 | + | |
| 1475 | + | |
1466 | 1476 | | |
1467 | 1477 | | |
1468 | 1478 | | |
| |||
1474 | 1484 | | |
1475 | 1485 | | |
1476 | 1486 | | |
1477 | | - | |
| 1487 | + | |
| 1488 | + | |
| 1489 | + | |
| 1490 | + | |
| 1491 | + | |
| 1492 | + | |
| 1493 | + | |
| 1494 | + | |
| 1495 | + | |
| 1496 | + | |
| 1497 | + | |
1478 | 1498 | | |
1479 | 1499 | | |
1480 | 1500 | | |
| |||
1486 | 1506 | | |
1487 | 1507 | | |
1488 | 1508 | | |
1489 | | - | |
1490 | | - | |
| 1509 | + | |
| 1510 | + | |
1491 | 1511 | | |
1492 | 1512 | | |
1493 | 1513 | | |
1494 | 1514 | | |
1495 | 1515 | | |
| 1516 | + | |
| 1517 | + | |
1496 | 1518 | | |
1497 | 1519 | | |
1498 | 1520 | | |
| |||
1503 | 1525 | | |
1504 | 1526 | | |
1505 | 1527 | | |
1506 | | - | |
1507 | | - | |
| 1528 | + | |
| 1529 | + | |
1508 | 1530 | | |
1509 | 1531 | | |
1510 | 1532 | | |
1511 | 1533 | | |
1512 | 1534 | | |
| 1535 | + | |
| 1536 | + | |
1513 | 1537 | | |
1514 | 1538 | | |
1515 | 1539 | | |
| |||
1956 | 1980 | | |
1957 | 1981 | | |
1958 | 1982 | | |
1959 | | - | |
1960 | | - | |
| 1983 | + | |
| 1984 | + | |
1961 | 1985 | | |
1962 | 1986 | | |
1963 | 1987 | | |
1964 | 1988 | | |
1965 | 1989 | | |
| 1990 | + | |
| 1991 | + | |
1966 | 1992 | | |
1967 | 1993 | | |
1968 | | - | |
1969 | | - | |
1970 | | - | |
1971 | | - | |
1972 | | - | |
1973 | | - | |
1974 | | - | |
1975 | | - | |
| 1994 | + | |
| 1995 | + | |
| 1996 | + | |
| 1997 | + | |
| 1998 | + | |
| 1999 | + | |
| 2000 | + | |
| 2001 | + | |
1976 | 2002 | | |
1977 | 2003 | | |
1978 | 2004 | | |
| |||
1993 | 2019 | | |
1994 | 2020 | | |
1995 | 2021 | | |
1996 | | - | |
| 2022 | + | |
1997 | 2023 | | |
1998 | 2024 | | |
1999 | 2025 | | |
| |||
2004 | 2030 | | |
2005 | 2031 | | |
2006 | 2032 | | |
2007 | | - | |
| 2033 | + | |
2008 | 2034 | | |
2009 | 2035 | | |
2010 | 2036 | | |
| |||
2014 | 2040 | | |
2015 | 2041 | | |
2016 | 2042 | | |
2017 | | - | |
| 2043 | + | |
2018 | 2044 | | |
2019 | 2045 | | |
2020 | 2046 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
58 | 58 | | |
59 | 59 | | |
60 | 60 | | |
61 | | - | |
62 | | - | |
| 61 | + | |
| 62 | + | |
63 | 63 | | |
64 | 64 | | |
65 | 65 | | |
66 | 66 | | |
67 | 67 | | |
| 68 | + | |
| 69 | + | |
68 | 70 | | |
69 | 71 | | |
70 | | - | |
71 | | - | |
72 | | - | |
73 | | - | |
74 | | - | |
75 | | - | |
76 | | - | |
77 | | - | |
| 72 | + | |
| 73 | + | |
| 74 | + | |
| 75 | + | |
| 76 | + | |
| 77 | + | |
| 78 | + | |
| 79 | + | |
78 | 80 | | |
79 | 81 | | |
80 | 82 | | |
| |||
0 commit comments