Skip to content

New Corpses and Spawner Reorganization#36762

Closed
southbridge-fur wants to merge 8 commits into
space-wizards:masterfrom
southbridge-fur:new-corpses
Closed

New Corpses and Spawner Reorganization#36762
southbridge-fur wants to merge 8 commits into
space-wizards:masterfrom
southbridge-fur:new-corpses

Conversation

@southbridge-fur
Copy link
Copy Markdown
Contributor

@southbridge-fur southbridge-fur commented Apr 20, 2025

About the PR

  • Adds new corpses for Syndicates, Pirates, and Mercenaries.
  • Added spawners for those corpses
  • Also reorganized the mob spawners so they're not all in one file.

Why / Balance

New spawners are always nice.

Technical details

All yaml changes except for the new icons I made for the syndicate, pirate, and mercenary spawners

Media

Requirements

Breaking changes

Changelog

No CL for mapping stuff

@github-actions github-actions Bot added size/XL Denotes a PR that changes 5000+ lines. S: Untriaged Status: Indicates an item has not been triaged and doesn't have appropriate labels. Changes: No C# Changes: Requires no C# knowledge to review or fix this item. Changes: Map Changes: Might require knowledge of mapping. Changes: Sprites Changes: Might require knowledge of spriting or visual design. labels Apr 20, 2025
@github-actions
Copy link
Copy Markdown
Contributor

github-actions Bot commented Apr 20, 2025 •
edited
Loading

RSI Diff Bot; head commit 01ab0f5 merging into 79a76e4
This PR makes changes to 1 or more RSIs. Here is a summary of all changes:

Resources/Textures/Markers/jobs.rsi

State Old New Status
mercenary Added
pirate Added
syndicate Added

Edit: diff updated after 01ab0f5

@murphyneko murphyneko added P3: Standard Priority: Default priority for repository items. T: New Feature Type: New feature or content, or extending existing content S: Needs Review Status: Requires additional reviews before being fully accepted. Not to be replaced by S: Approved. DB: Beginner Friendly Difficulty: Great for beginners. Unambiguous in scope, and explains how to achieve the result. A: Mapping Area: Maps, or tools used for mapping D3: Low Difficulty: Some codebase knowledge required. and removed S: Untriaged Status: Indicates an item has not been triaged and doesn't have appropriate labels. DB: Beginner Friendly Difficulty: Great for beginners. Unambiguous in scope, and explains how to achieve the result. labels Apr 20, 2025
ArtisticRoomba
ArtisticRoomba suggested changes Apr 21, 2025
View reviewed changes
Comment thread Resources/Prototypes/Entities/Markers/Spawners/Mobs/animals.yml
Comment thread Resources/Prototypes/Entities/Markers/Spawners/Mobs/animals.yml Outdated
Comment thread Resources/Prototypes/Entities/Markers/Spawners/Mobs/animals.yml Outdated
Comment thread Resources/Textures/Markers/jobs.rsi/meta.json
@ArtisticRoomba ArtisticRoomba self-assigned this Apr 21, 2025
@ArtisticRoomba ArtisticRoomba 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 Apr 21, 2025
southbridge-fur and others added 2 commits April 21, 2025 01:45
@southbridge-fur @ArtisticRoomba
Update Resources/Prototypes/Entities/Markers/Spawners/Mobs/animals.yml
df87772 
Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>
@southbridge-fur
We matching yaml conventions now
1582596
@TytosB
Copy link
Copy Markdown
Contributor

TytosB commented Apr 22, 2025

pls someone merge this i beg i need those corpse spawners

@ArtisticRoomba ArtisticRoomba added S: Approved Status: Reviewed and approved by at least one maintainer; a PR may require another approval. and removed S: Awaiting Changes Status: Changes are required before another review can happen labels Apr 22, 2025
EmoGarbage404
EmoGarbage404 suggested changes Apr 23, 2025
View reviewed changes
Copy link
Copy Markdown
Contributor

@EmoGarbage404 EmoGarbage404 left a comment

Choose a reason for hiding this comment

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

paused while undergoing internal maintainer discussion

@Tayrtahn Tayrtahn added the S: Undergoing Discussion Status: Currently going through an extended discussion, as per procedure. label Apr 23, 2025
IProduceWidgets
IProduceWidgets suggested changes Apr 24, 2025
View reviewed changes
Comment thread Resources/Prototypes/Entities/Markers/Spawners/Random/guns.yml
Comment thread Resources/Prototypes/Entities/Markers/Spawners/Mobs/pets.yml
Comment thread Resources/Prototypes/Entities/Markers/Spawners/Mobs/hostile.yml
Comment thread Resources/Prototypes/Entities/Markers/Spawners/Random/guns.yml
@IProduceWidgets
Copy link
Copy Markdown
Contributor

IProduceWidgets commented Apr 24, 2025 •
edited
Loading

Oh uh, wait for a maint to tell you to proceed though, dont do my reviews until you know it wont be a waste. The alphabetizing will be a pain in the butt.

EmoGarbage404
EmoGarbage404 suggested changes Apr 24, 2025
View reviewed changes
Copy link
Copy Markdown
Contributor

@EmoGarbage404 EmoGarbage404 left a comment

Choose a reason for hiding this comment

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

Key things:

  • Map changes should be moved to a separate PR so they can be reviewed independently
  • Spawners shouldn't be reorganized in the same PR as adding new ones (see contrib. guidelines)
  • Mercenary corpse spawners are fine but the syndie one's probably need removing since they can spawn with various syndicate equipment like JoL, agent ID, etc.
  • Almost all of the guns in the spawner need removing. Pistols, weak shotguns, and the roundstart lasers are fine, but the rest shouldn't be available to salvagers.
  • Additionally, these guns should be combined with the existing salvage loot table in some way.

@EmoGarbage404 EmoGarbage404 added the S: Awaiting Changes Status: Changes are required before another review can happen label Apr 24, 2025
@TytosB
Copy link
Copy Markdown
Contributor

TytosB commented Apr 25, 2025 

* Mercenary corpse spawners are fine but the syndie one's probably need removing since they can spawn with various syndicate equipment like JoL, agent ID, etc.

but all of the items the syndie corpses can spawn with are already obtainable by salvagers on various different ruins though, so i dont see the problem?

@southbridge-fur southbridge-fur mentioned this pull request Apr 26, 2025
Merged
2 tasks
@southbridge-fur
Copy link
Copy Markdown
Contributor Author

southbridge-fur commented Apr 26, 2025

This PR has been split into the following three PRs and I'm gonna close this one

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

3 more reviewers

@EmoGarbage404 EmoGarbage404 EmoGarbage404 requested changes

@IProduceWidgets IProduceWidgets IProduceWidgets requested changes

@ArtisticRoomba ArtisticRoomba ArtisticRoomba approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

@ArtisticRoomba ArtisticRoomba

Labels

A: Mapping Area: Maps, or tools used for mapping Changes: Map Changes: Might require knowledge of mapping. Changes: No C# Changes: Requires no C# knowledge to review or fix this item. Changes: Sprites Changes: Might require knowledge of spriting or visual design. D3: Low Difficulty: Some codebase knowledge required. P3: Standard Priority: Default priority for repository items. S: Approved Status: Reviewed and approved by at least one maintainer; a PR may require another approval. S: Awaiting Changes Status: Changes are required before another review can happen S: Undergoing Discussion Status: Currently going through an extended discussion, as per procedure. size/XL Denotes a PR that changes 5000+ lines. T: New Feature Type: New feature or content, or extending existing content

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

7 participants

@southbridge-fur @TytosB @IProduceWidgets @EmoGarbage404 @ArtisticRoomba @Tayrtahn @murphyneko