Skip to content

Nature Overhaul, Infinite Trees - #5479

Merged
redmushie merged 10 commits into
ss14Starlight:starlight-devfrom
Conflee:crystal-edge-nature
Aug 9, 2026
Merged

Nature Overhaul, Infinite Trees#5479
redmushie merged 10 commits into
ss14Starlight:starlight-devfrom
Conflee:crystal-edge-nature

Conversation

@Conflee

@Conflee Conflee commented Aug 2, 2026

Copy link
Copy Markdown
Contributor

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)

image image image image image image image

Checks

  • I do not require assistance to complete the PR.
  • Before posting/requesting review of a PR, I have verified that the changes work.
  • I have added screenshots/videos of the changes, or this PR does not change in-game mechanics.
  • I affirm that my changes are licensed under the MIT License and grant permission for use in this repository under its conditions.

Changelog

🆑 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.

@Conflee
Conflee requested a review from a team August 2, 2026 22:28
@github-actions github-actions Bot added size/M S: Untriaged Status: Indicates an item has not been triaged and doesn't have appropriate labels. Changes: Sprites Changes: No C# Changes: Prototypes S: Needs Review Status: Requires additional reviews before being fully accepted. Not to be replaced by S: Approved. and removed S: Untriaged Status: Indicates an item has not been triaged and doesn't have appropriate labels. labels Aug 2, 2026
@coderabbitai

coderabbitai Bot commented Aug 2, 2026

Copy link
Copy Markdown
Contributor

Review Change Stack

Note

Reviews paused

It looks like this branch is under active development. To avoid overwhelming you with review comments due to an influx of new commits, CodeRabbit has automatically paused this review. You can configure this behavior by changing the reviews.auto_review.auto_pause_after_reviewed_commits setting.

Use the following commands to manage reviews:

  • @coderabbitai resume to resume automatic reviews.
  • @coderabbitai review to trigger a single review.

Use the checkboxes below for quick actions:

  • ▶️ Resume reviews
  • 🔍 Trigger review
📝 Walkthrough

Summary

This PR updates natural-area visuals with Crystal Punk grass and tree assets.

  • Adds six-variant grass and astro-grass sprites.
  • Adds mowed and unmowed grass tiles with directional edge blending.
  • Adds birch, conifer, snowy, dead, and vampire tree prototypes.
  • Updates random flora spawners to use the new Starlight tree variants.
  • Adds 19 Water Reeds decal variants.
  • Adds texture metadata and attribution for the new assets.
  • Adds English localization for grass tile names.

User impact

Mappers can combine mowed and unmowed astro-grass to control grass-edge blending. Players see more varied trees, grass, snowy vegetation, dead trees, and water-reed decorations in natural areas.

Notable upstream-file changes

  • Resources/Prototypes/Tiles/floors.yml now uses _CP14 grass assets and six visual variants.
  • Resources/Prototypes/Entities/Objects/Decoration/flora.yml rewires existing tree prototypes to alternate conifer and _CP14 resources.
  • Resources/Prototypes/Entities/Markers/Spawners/Random/flora.yml changes the regular and rare random tree pools.
  • New Starlight flora and tile prototypes define grass-edge behavior, deconstruction, drops, weather support, sounds, collision, offsets, and tree density.
  • New _CP14 texture metadata records licenses and source attribution.

Risk areas

  • Existing tree appearance and inheritance changed for conifers, snow trees, stumps, and Christmas trees.
  • Random flora generation now selects different tree prototypes and may alter biome composition.
  • Grass edge and variant changes can affect map appearance and tile transitions.
  • New tile inheritance, deconstruction, drops, and weather settings can affect mapper and gameplay behavior.
  • Several assets use mixed CC-BY-SA-3.0 and CC-BY-SA-4.0 licensing, so attribution must remain accurate.

Guideline gaps

  • The PR body does not state why the existing tree prototypes require the inheritance changes.
  • The PR body does not identify the intended ownership boundary between Shared resources and Starlight resources.
  • The PR body does not mention whether the new Starlight prototypes require ownership comments.
  • The PR body does not describe breaking changes for existing maps or tree spawner behavior.
  • The PR body does not explain the design rationale for the grass blending and tree variant changes.

Walkthrough

Changes

Adds CP14 grass tiles and flora sprites, defines Starlight tree and water-reed prototypes, updates existing tree resources, adds grass localization, and connects Starlight trees to random flora spawners.

Changes

CP14 flora and grass integration

Layer / File(s) Summary
Grass tile definitions and assets
Resources/Locale/en-US/_Starlight/tiles/tiles.ftl, Resources/Prototypes/Tiles/*, Resources/Prototypes/_Starlight/Tiles/*, Resources/Textures/_CP14/Tiles/*
Adds CP14 grass variants, classic grass tiles, directional edge tiles, localization keys, planet grass variants, and texture attribution metadata.
Flora prototypes and sprites
Resources/Prototypes/Entities/Objects/Decoration/flora.yml, Resources/Prototypes/_Starlight/Entities/Objects/Decoration/flora.yml, Resources/Textures/_CP14/Objects/Decoration/Flora/*
Adds Starlight tree prototypes, updates existing tree resource paths and inheritance, and adds metadata for tree sprite resources.
Water-reed decals and metadata
Resources/Prototypes/_Starlight/Decals/flora.yml, Resources/Textures/_CP14/Decals/water_reeds.rsi/meta.json
Adds 19 water-reed decal prototypes and metadata for their sprite states.
Random flora pool integration
Resources/Prototypes/Entities/Markers/Spawners/Random/flora.yml
Replaces standard random tree entries with Starlight variants and adds the vampire tree to the rare pool.

Estimated code review effort: 3 (Moderate) | ~25 minutes

Suggested reviewers: redspeeds

Sequence Diagram(s)

sequenceDiagram
  participant RandomTreeSpawner
  participant TreePrototypePool
  participant StarlightTreePrototype
  RandomTreeSpawner->>TreePrototypePool: Select a regular or rare tree prototype
  TreePrototypePool->>StarlightTreePrototype: Instantiate the selected Starlight tree
Loading
🚥 Pre-merge checks | ✅ 5
✅ Passed checks (5 passed)
Check name Status Explanation
Docstring Coverage ✅ Passed No functions found in the changed files to evaluate docstring coverage. Skipping docstring coverage check.
Linked Issues check ✅ Passed Check skipped because no linked issues were found for this pull request.
Out of Scope Changes check ✅ Passed Check skipped because no linked issues were found for this pull request.
Title check ✅ Passed The title clearly describes the nature-focused changes, especially the addition and respriting of many tree variants.
Description check ✅ Passed The description accurately covers the grass resprites, new trees, water reed decals, visual goals, source ports, and validation details.

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

Comment @coderabbitai help to get the list of available commands.

@coderabbitai coderabbitai Bot left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actionable comments posted: 3

🤖 Prompt for all review comments with AI agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.

Inline comments:
In `@Resources/Locale/en-US/_Starlight/tiles/tiles.ftl`:
- Around line 55-62: Add the missing `tiles-astro-grass-classic` localization
entry in the Grass section alongside the existing classic astro-grass keys,
using the appropriate classic astro-grass display text so
`FloorAstroGrassClassic` resolves without showing the raw key.

In `@Resources/Prototypes/_Starlight/Entities/Objects/Decoration/flora.yml`:
- Around line 298-301: Update the name field of FloraTreeConiferBigSL from
“medium conifer tree” to “large conifer tree” so it accurately identifies the
big conifer and differs from FloraTreeConiferMediumSL.

In `@Resources/Prototypes/Entities/Objects/Decoration/flora.yml`:
- Line 304: Remove the trailing whitespace after the `#SL` Starlight markers in
Resources/Prototypes/Entities/Objects/Decoration/flora.yml at lines 304, 312,
and 360, leaving the inheritance declarations otherwise unchanged.
🪄 Autofix (Beta)

Fix all unresolved CodeRabbit comments on this PR:

  • Push a commit to this branch (recommended)
  • Create a new PR with the fixes

ℹ️ Review info
⚙️ Run configuration

Configuration used: Repository UI (base), Organization UI (inherited)

Review profile: CHILL

Plan: Pro Plus

Run ID: 243702b9-9501-4039-b27f-44bd97192506

📥 Commits

Reviewing files that changed from the base of the PR and between fae63ce and 1787502.

⛔ Files ignored due to path filters (89)
  • Resources/Textures/_CP14/Decals/water_reeds.rsi/big1.png is excluded by !**/*.png
  • Resources/Textures/_CP14/Decals/water_reeds.rsi/big2.png is excluded by !**/*.png
  • Resources/Textures/_CP14/Decals/water_reeds.rsi/big3.png is excluded by !**/*.png
  • Resources/Textures/_CP14/Decals/water_reeds.rsi/big4.png is excluded by !**/*.png
  • Resources/Textures/_CP14/Decals/water_reeds.rsi/big5.png is excluded by !**/*.png
  • Resources/Textures/_CP14/Decals/water_reeds.rsi/big6.png is excluded by !**/*.png
  • Resources/Textures/_CP14/Decals/water_reeds.rsi/big7.png is excluded by !**/*.png
  • Resources/Textures/_CP14/Decals/water_reeds.rsi/big8.png is excluded by !**/*.png
  • Resources/Textures/_CP14/Decals/water_reeds.rsi/small1.png is excluded by !**/*.png
  • Resources/Textures/_CP14/Decals/water_reeds.rsi/small10.png is excluded by !**/*.png
  • Resources/Textures/_CP14/Decals/water_reeds.rsi/small11.png is excluded by !**/*.png
  • Resources/Textures/_CP14/Decals/water_reeds.rsi/small2.png is excluded by !**/*.png
  • Resources/Textures/_CP14/Decals/water_reeds.rsi/small3.png is excluded by !**/*.png
  • Resources/Textures/_CP14/Decals/water_reeds.rsi/small4.png is excluded by !**/*.png
  • Resources/Textures/_CP14/Decals/water_reeds.rsi/small5.png is excluded by !**/*.png
  • Resources/Textures/_CP14/Decals/water_reeds.rsi/small6.png is excluded by !**/*.png
  • Resources/Textures/_CP14/Decals/water_reeds.rsi/small7.png is excluded by !**/*.png
  • Resources/Textures/_CP14/Decals/water_reeds.rsi/small8.png is excluded by !**/*.png
  • Resources/Textures/_CP14/Decals/water_reeds.rsi/small9.png is excluded by !**/*.png
  • Resources/Textures/_CP14/Objects/Decoration/Flora/flora_trees.rsi/tree01.png is excluded by !**/*.png
  • Resources/Textures/_CP14/Objects/Decoration/Flora/flora_trees.rsi/tree02.png is excluded by !**/*.png
  • Resources/Textures/_CP14/Objects/Decoration/Flora/flora_trees.rsi/tree03.png is excluded by !**/*.png
  • Resources/Textures/_CP14/Objects/Decoration/Flora/flora_trees.rsi/tree04.png is excluded by !**/*.png
  • Resources/Textures/_CP14/Objects/Decoration/Flora/flora_trees.rsi/tree05.png is excluded by !**/*.png
  • Resources/Textures/_CP14/Objects/Decoration/Flora/flora_trees.rsi/tree06.png is excluded by !**/*.png
  • Resources/Textures/_CP14/Objects/Decoration/Flora/flora_treeslarge.rsi/treelarge01.png is excluded by !**/*.png
  • Resources/Textures/_CP14/Objects/Decoration/Flora/flora_treeslarge.rsi/treelarge02.png is excluded by !**/*.png
  • Resources/Textures/_CP14/Objects/Decoration/Flora/flora_treeslarge.rsi/treelarge03.png is excluded by !**/*.png
  • Resources/Textures/_CP14/Objects/Decoration/Flora/flora_treeslarge.rsi/treelarge04.png is excluded by !**/*.png
  • Resources/Textures/_CP14/Objects/Decoration/Flora/flora_treeslarge.rsi/treelarge05.png is excluded by !**/*.png
  • Resources/Textures/_CP14/Objects/Decoration/Flora/flora_treeslarge.rsi/treelarge06.png is excluded by !**/*.png
  • Resources/Textures/_CP14/Objects/Decoration/Flora/tree_birch_big.rsi/tree01.png is excluded by !**/*.png
  • Resources/Textures/_CP14/Objects/Decoration/Flora/tree_birch_big.rsi/tree02.png is excluded by !**/*.png
  • Resources/Textures/_CP14/Objects/Decoration/Flora/tree_birch_medium.rsi/tree01.png is excluded by !**/*.png
  • Resources/Textures/_CP14/Objects/Decoration/Flora/tree_birch_medium.rsi/tree02.png is excluded by !**/*.png
  • Resources/Textures/_CP14/Objects/Decoration/Flora/tree_birch_small.rsi/tree01.png is excluded by !**/*.png
  • Resources/Textures/_CP14/Objects/Decoration/Flora/tree_birch_small.rsi/tree02.png is excluded by !**/*.png
  • Resources/Textures/_CP14/Objects/Decoration/Flora/tree_died.rsi/tree01.png is excluded by !**/*.png
  • Resources/Textures/_CP14/Objects/Decoration/Flora/tree_died.rsi/tree02.png is excluded by !**/*.png
  • Resources/Textures/_CP14/Objects/Decoration/Flora/tree_died.rsi/tree03.png is excluded by !**/*.png
  • Resources/Textures/_CP14/Objects/Decoration/Flora/tree_died.rsi/tree04.png is excluded by !**/*.png
  • Resources/Textures/_CP14/Objects/Decoration/Flora/tree_died_small.rsi/tree01.png is excluded by !**/*.png
  • Resources/Textures/_CP14/Objects/Decoration/Flora/tree_died_small.rsi/tree02.png is excluded by !**/*.png
  • Resources/Textures/_CP14/Objects/Decoration/Flora/tree_died_small.rsi/tree03.png is excluded by !**/*.png
  • Resources/Textures/_CP14/Objects/Decoration/Flora/tree_died_small.rsi/tree04.png is excluded by !**/*.png
  • Resources/Textures/_CP14/Objects/Decoration/Flora/tree_snow.rsi/tree01.png is excluded by !**/*.png
  • Resources/Textures/_CP14/Objects/Decoration/Flora/tree_snow.rsi/tree02.png is excluded by !**/*.png
  • Resources/Textures/_CP14/Objects/Decoration/Flora/tree_snow.rsi/tree03.png is excluded by !**/*.png
  • Resources/Textures/_CP14/Objects/Decoration/Flora/tree_snow.rsi/tree04.png is excluded by !**/*.png
  • Resources/Textures/_CP14/Objects/Decoration/Flora/tree_snow.rsi/tree05.png is excluded by !**/*.png
  • Resources/Textures/_CP14/Objects/Decoration/Flora/tree_snow.rsi/tree06.png is excluded by !**/*.png
  • Resources/Textures/_CP14/Objects/Decoration/Flora/tree_spruce_big.rsi/tree01.png is excluded by !**/*.png
  • Resources/Textures/_CP14/Objects/Decoration/Flora/tree_spruce_big.rsi/tree02.png is excluded by !**/*.png
  • Resources/Textures/_CP14/Objects/Decoration/Flora/tree_spruce_medium.rsi/tree01.png is excluded by !**/*.png
  • Resources/Textures/_CP14/Objects/Decoration/Flora/tree_spruce_medium.rsi/tree02.png is excluded by !**/*.png
  • Resources/Textures/_CP14/Objects/Decoration/Flora/tree_spruce_medium.rsi/tree03.png is excluded by !**/*.png
  • Resources/Textures/_CP14/Objects/Decoration/Flora/tree_spruce_medium.rsi/tree04.png is excluded by !**/*.png
  • Resources/Textures/_CP14/Objects/Decoration/Flora/tree_spruce_medium_snow.rsi/tree01.png is excluded by !**/*.png
  • Resources/Textures/_CP14/Objects/Decoration/Flora/tree_spruce_medium_snow.rsi/tree02.png is excluded by !**/*.png
  • Resources/Textures/_CP14/Objects/Decoration/Flora/tree_spruce_medium_snow.rsi/tree03.png is excluded by !**/*.png
  • Resources/Textures/_CP14/Objects/Decoration/Flora/tree_spruce_medium_snow.rsi/tree04.png is excluded by !**/*.png
  • Resources/Textures/_CP14/Objects/Decoration/Flora/tree_spruce_small.rsi/tree01.png is excluded by !**/*.png
  • Resources/Textures/_CP14/Objects/Decoration/Flora/tree_spruce_small.rsi/tree02.png is excluded by !**/*.png
  • Resources/Textures/_CP14/Objects/Decoration/Flora/tree_spruce_small.rsi/tree03.png is excluded by !**/*.png
  • Resources/Textures/_CP14/Objects/Decoration/Flora/tree_spruce_small.rsi/tree04.png is excluded by !**/*.png
  • Resources/Textures/_CP14/Objects/Decoration/Flora/tree_spruce_small.rsi/tree05.png is excluded by !**/*.png
  • Resources/Textures/_CP14/Objects/Decoration/Flora/tree_spruce_small.rsi/tree06.png is excluded by !**/*.png
  • Resources/Textures/_CP14/Objects/Decoration/Flora/tree_vampire.rsi/1.png is excluded by !**/*.png
  • Resources/Textures/_CP14/Objects/Decoration/Flora/tree_vampire.rsi/2.png is excluded by !**/*.png
  • Resources/Textures/_CP14/Objects/Decoration/Flora/tree_vampire.rsi/3.png is excluded by !**/*.png
  • Resources/Textures/_CP14/Objects/Decoration/Flora/tree_vampire.rsi/4.png is excluded by !**/*.png
  • Resources/Textures/_CP14/Objects/Decoration/Flora/tree_vampire.rsi/5.png is excluded by !**/*.png
  • Resources/Textures/_CP14/Objects/Decoration/Flora/tree_vampire.rsi/6.png is excluded by !**/*.png
  • Resources/Textures/_CP14/Tiles/Grass/double_edge.png is excluded by !**/*.png
  • Resources/Textures/_CP14/Tiles/Grass/grass.png is excluded by !**/*.png
  • Resources/Textures/_CP14/Tiles/Grass/single_edge.png is excluded by !**/*.png
  • Resources/Textures/_CP14/Tiles/Grass/triple_edge.png is excluded by !**/*.png
  • Resources/Textures/_CP14/Tiles/GrassDark/double_edge.png is excluded by !**/*.png
  • Resources/Textures/_CP14/Tiles/GrassDark/grass.png is excluded by !**/*.png
  • Resources/Textures/_CP14/Tiles/GrassDark/single_edge.png is excluded by !**/*.png
  • Resources/Textures/_CP14/Tiles/GrassDark/triple_edge.png is excluded by !**/*.png
  • Resources/Textures/_CP14/Tiles/GrassLight/double_edge.png is excluded by !**/*.png
  • Resources/Textures/_CP14/Tiles/GrassLight/grass.png is excluded by !**/*.png
  • Resources/Textures/_CP14/Tiles/GrassLight/single_edge.png is excluded by !**/*.png
  • Resources/Textures/_CP14/Tiles/GrassLight/triple_edge.png is excluded by !**/*.png
  • Resources/Textures/_CP14/Tiles/GrassTall/double_edge.png is excluded by !**/*.png
  • Resources/Textures/_CP14/Tiles/GrassTall/grass.png is excluded by !**/*.png
  • Resources/Textures/_CP14/Tiles/GrassTall/single_edge.png is excluded by !**/*.png
  • Resources/Textures/_CP14/Tiles/GrassTall/triple_edge.png is excluded by !**/*.png
📒 Files selected for processing (26)
  • Resources/Locale/en-US/_Starlight/tiles/tiles.ftl
  • Resources/Prototypes/Entities/Markers/Spawners/Random/flora.yml
  • Resources/Prototypes/Entities/Objects/Decoration/flora.yml
  • Resources/Prototypes/Tiles/floors.yml
  • Resources/Prototypes/Tiles/planet.yml
  • Resources/Prototypes/_Starlight/Entities/Objects/Decoration/flora.yml
  • Resources/Prototypes/_Starlight/Tiles/floors.yml
  • Resources/Prototypes/_Starlight/Tiles/planet.yml
  • Resources/Textures/_CP14/Decals/water_reeds.rsi/meta.json
  • Resources/Textures/_CP14/Objects/Decoration/Flora/flora_trees.rsi/meta.json
  • Resources/Textures/_CP14/Objects/Decoration/Flora/flora_treeslarge.rsi/meta.json
  • Resources/Textures/_CP14/Objects/Decoration/Flora/tree_birch_big.rsi/meta.json
  • Resources/Textures/_CP14/Objects/Decoration/Flora/tree_birch_medium.rsi/meta.json
  • Resources/Textures/_CP14/Objects/Decoration/Flora/tree_birch_small.rsi/meta.json
  • Resources/Textures/_CP14/Objects/Decoration/Flora/tree_died.rsi/meta.json
  • Resources/Textures/_CP14/Objects/Decoration/Flora/tree_died_small.rsi/meta.json
  • Resources/Textures/_CP14/Objects/Decoration/Flora/tree_snow.rsi/meta.json
  • Resources/Textures/_CP14/Objects/Decoration/Flora/tree_spruce_big.rsi/meta.json
  • Resources/Textures/_CP14/Objects/Decoration/Flora/tree_spruce_medium.rsi/meta.json
  • Resources/Textures/_CP14/Objects/Decoration/Flora/tree_spruce_medium_snow.rsi/meta.json
  • Resources/Textures/_CP14/Objects/Decoration/Flora/tree_spruce_small.rsi/meta.json
  • Resources/Textures/_CP14/Objects/Decoration/Flora/tree_vampire.rsi/meta.json
  • Resources/Textures/_CP14/Tiles/Grass/attribution.yml
  • Resources/Textures/_CP14/Tiles/GrassDark/attribution.yml
  • Resources/Textures/_CP14/Tiles/GrassLight/attribution.yml
  • Resources/Textures/_CP14/Tiles/GrassTall/attribution.yml

Comment thread Resources/Locale/en-US/_Starlight/tiles/tiles.ftl
Comment thread Resources/Prototypes/Entities/Objects/Decoration/flora.yml Outdated
coderabbitai[bot]
coderabbitai Bot previously approved these changes Aug 2, 2026

@coderabbitai coderabbitai Bot left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actionable comments posted: 1

🤖 Prompt for all review comments with AI agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.

Inline comments:
In `@Resources/Prototypes/_Starlight/Decals/flora.yml`:
- Around line 127-134: Add a WaterReedsSmall7 decal prototype immediately before
WaterReedsSmall8, matching the neighboring reed entries’ flora tag, snapping
settings, sprite resource, and using state small7.
🪄 Autofix (Beta)

Fix all unresolved CodeRabbit comments on this PR:

  • Push a commit to this branch (recommended)
  • Create a new PR with the fixes

ℹ️ Review info
⚙️ Run configuration

Configuration used: Repository UI (base), Organization UI (inherited)

Review profile: CHILL

Plan: Pro Plus

Run ID: f1db11a2-89aa-4bce-9ae6-656fe3654fa5

📥 Commits

Reviewing files that changed from the base of the PR and between 1787502 and e953da1.

📒 Files selected for processing (6)
  • Resources/Locale/en-US/_Starlight/tiles/tiles.ftl
  • Resources/Prototypes/Entities/Objects/Decoration/flora.yml
  • Resources/Prototypes/Tiles/floors.yml
  • Resources/Prototypes/Tiles/planet.yml
  • Resources/Prototypes/_Starlight/Decals/flora.yml
  • Resources/Textures/_CP14/Objects/Decoration/Flora/tree_spruce_small.rsi/meta.json
🚧 Files skipped from review as they are similar to previous changes (5)
  • Resources/Locale/en-US/_Starlight/tiles/tiles.ftl
  • Resources/Prototypes/Tiles/planet.yml
  • Resources/Prototypes/Entities/Objects/Decoration/flora.yml
  • Resources/Textures/_CP14/Objects/Decoration/Flora/tree_spruce_small.rsi/meta.json
  • Resources/Prototypes/Tiles/floors.yml

Comment thread Resources/Prototypes/_Starlight/Decals/flora.yml
coderabbitai[bot]
coderabbitai Bot previously approved these changes Aug 3, 2026

@redmushie redmushie left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Stopping now because some major changes required; all files must move from _CP14 to _Starlight since the source fork is defunct and thus will inevitably no longer produce updates. Therefore we now maintain the content.

Comment thread Resources/Locale/en-US/_Starlight/tiles/tiles.ftl Outdated
Comment thread Resources/Prototypes/_Starlight/Decals/flora.yml
Comment thread Resources/Prototypes/_Starlight/Tiles/floors.yml
Comment thread Resources/Prototypes/_Starlight/Tiles/planet.yml
@starlightgithub starlightgithub Bot added S: Awaiting Changes Status: Changes are required before another review can happen and removed S: Needs Review Status: Requires additional reviews before being fully accepted. Not to be replaced by S: Approved. labels Aug 4, 2026
@redmushie redmushie self-assigned this Aug 4, 2026
@Littlemen07

Copy link
Copy Markdown
Contributor

Hell yeah we playing stardew valley now

@Conflee
Conflee requested a review from redmushie August 4, 2026 14:49
@github-actions github-actions Bot added S: Needs Review Status: Requires additional reviews before being fully accepted. Not to be replaced by S: Approved. and removed S: Awaiting Changes Status: Changes are required before another review can happen labels Aug 4, 2026

@coderabbitai coderabbitai Bot left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actionable comments posted: 1

Caution

Some comments are outside the diff and can’t be posted inline due to platform limitations.

⚠️ Outside diff range comments (1)
Resources/Prototypes/_Starlight/Decals/flora.yml (1)

154-161: 🎯 Functional Correctness | 🟡 Minor | ⚡ Quick win

Rename the WaterReedsSmall0 prototype.

The new WaterReedsSmall7 entry correctly fills the previous gap. However, Line 155 declares WaterReedsSmall0 while Line 161 uses state small10. This leaves WaterReedsSmall10 unavailable.

Proposed fix
-  id: WaterReedsSmall0
+  id: WaterReedsSmall10
🤖 Prompt for AI Agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.

In `@Resources/Prototypes/_Starlight/Decals/flora.yml` around lines 154 - 161,
Rename the decal prototype id from WaterReedsSmall0 to WaterReedsSmall10 in the
entry using sprite state small10, so the prototype id matches its state and
makes WaterReedsSmall10 available.
🤖 Prompt for all review comments with AI agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.

Inline comments:
In `@Resources/Prototypes/_Starlight/Decals/flora.yml`:
- Line 16: Remove the trailing whitespace after the *waterReeds value in the
sprite entry so the line ends immediately after the anchor reference.

---

Outside diff comments:
In `@Resources/Prototypes/_Starlight/Decals/flora.yml`:
- Around line 154-161: Rename the decal prototype id from WaterReedsSmall0 to
WaterReedsSmall10 in the entry using sprite state small10, so the prototype id
matches its state and makes WaterReedsSmall10 available.
🪄 Autofix

Fix all unresolved CodeRabbit comments on this PR:

  • Push a commit to this branch (recommended)
  • Create a new PR with the fixes

ℹ️ Review info
⚙️ Run configuration

Configuration used: Repository UI (base), Organization UI (inherited)

Review profile: CHILL

Plan: Pro Plus

Run ID: 2754e4f4-fb25-41fc-ac38-9b20f59e75ee

📥 Commits

Reviewing files that changed from the base of the PR and between e953da1 and c243beb.

📒 Files selected for processing (4)
  • Resources/Locale/en-US/_Starlight/tiles/tiles.ftl
  • Resources/Prototypes/_Starlight/Decals/flora.yml
  • Resources/Prototypes/_Starlight/Entities/Objects/Decoration/flora.yml
  • Resources/Prototypes/_Starlight/Tiles/floors.yml
🚧 Files skipped from review as they are similar to previous changes (3)
  • Resources/Prototypes/_Starlight/Tiles/floors.yml
  • Resources/Prototypes/_Starlight/Entities/Objects/Decoration/flora.yml
  • Resources/Locale/en-US/_Starlight/tiles/tiles.ftl

Comment thread Resources/Prototypes/_Starlight/Decals/flora.yml Outdated
@Conflee

Conflee commented Aug 5, 2026

Copy link
Copy Markdown
Contributor Author

r4r

Comment thread Resources/Textures/_Starlight/Decals/water_reeds.rsi/big4.png
@Conflee
Conflee requested a review from RedSpeeds August 6, 2026 15:17

@redmushie redmushie left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As stated previously:

Stopping now because some major changes required; all files must move from _CP14 to _Starlight since the source fork is defunct and thus will inevitably no longer produce updates. Therefore we now maintain the content.

This includes textures. Crystall Punk as an upstream is defunct, therefore we maintain it, therefore _Starlight.

@starlightgithub starlightgithub Bot added S: Awaiting Changes Status: Changes are required before another review can happen and removed S: Needs Review Status: Requires additional reviews before being fully accepted. Not to be replaced by S: Approved. labels Aug 7, 2026
@github-actions github-actions Bot added the S: Merge Conflict Status: Needs to resolve merge conflicts before it can be accepted label Aug 7, 2026
@github-actions

github-actions Bot commented Aug 7, 2026

Copy link
Copy Markdown
Contributor

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@github-actions github-actions Bot removed the S: Merge Conflict Status: Needs to resolve merge conflicts before it can be accepted label Aug 7, 2026
@coderabbitai

coderabbitai Bot commented Aug 7, 2026

Copy link
Copy Markdown
Contributor

Note

GitHub couldn't provide a complete incremental comparison for this pull request, so CodeRabbit is performing a full review instead. This review may take a little longer.

@Conflee

Conflee commented Aug 7, 2026

Copy link
Copy Markdown
Contributor Author

this is going to take a fucking hour i dont want to do this shit im sick of ten billion tiny changessssssss

@Conflee

Conflee commented Aug 7, 2026

Copy link
Copy Markdown
Contributor Author

moved everything i think if its still fucked im killing the pr

@Conflee
Conflee requested a review from redmushie August 7, 2026 14:43
@github-actions github-actions Bot added S: Needs Review Status: Requires additional reviews before being fully accepted. Not to be replaced by S: Approved. and removed S: Awaiting Changes Status: Changes are required before another review can happen labels Aug 7, 2026
@Conflee Conflee closed this Aug 7, 2026
@Conflee Conflee reopened this Aug 7, 2026

@RedSpeeds RedSpeeds left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Seems fine. Just a minor point of state based copyright but beyond that i dont see any issues

@starlightgithub starlightgithub Bot added S: Approved Status: Reviewed and approved by at least one maintainer or dev; a PR may require another approval. and removed S: Needs Review Status: Requires additional reviews before being fully accepted. Not to be replaced by S: Approved. labels Aug 9, 2026
@redmushie
redmushie added this pull request to the merge queue Aug 9, 2026
Merged via the queue into ss14Starlight:starlight-dev with commit cd14551 Aug 9, 2026
24 checks passed
starlightgithub Bot added a commit that referenced this pull request Aug 9, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Changes: No C# Changes: Prototypes Changes: Sprites S: Approved Status: Reviewed and approved by at least one maintainer or dev; a PR may require another approval. size/M

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants