Skip to content

Cherry Pick and Rule Update#12

Merged
Triad-Sector merged 7 commits intomainfrom
changes2
Apr 25, 2026
Merged

Cherry Pick and Rule Update#12
Triad-Sector merged 7 commits intomainfrom
changes2

Conversation

@Triad-Sector
Copy link
Copy Markdown
Owner

@Triad-Sector Triad-Sector commented Apr 25, 2026 •
edited
Loading

About the PR

Multiple cherry picks from mono

Why / Balance

Helps with some current issues

Media

Requirements

  • I have read relevant guidelines/documentation to this PR found on our devwiki.
  • I have added media to this PR or it does not require an ingame showcase.
  • I can confirm this PR contains either no AI-generated content, or AI-generated content that meets our guidelines.

How to test

Load dev env

Breaking changes

Your mom, my lap
Changelog

🆑

  • fix: Flatpacks now use the collision of the flatpacked entity, so they can be opened on tables and aren't blocked by ghosts.
  • tweak: Changed Sultan's shotgun sell price!
  • fix: Fixed a really easy little effort cash flow method!
  • fix: ASM-220 torpedoes should be less likely to blow themselves or their own launcher up now.
  • tweak: Sultan Pulsar no longer uses a static price, instead based off materials
  • tweak: Autopulser capacity reduced, ADM version maxangle increased to match asakim version
  • tweak: Tarantula update again, used the wrong file
  • tweak: Rules updated once again

@DDrakov
Copy link
Copy Markdown
Collaborator

DDrakov commented Apr 25, 2026

Okay glad there's a changelog now

VividPups
VividPups reviewed Apr 25, 2026
View reviewed changes
Comment thread Resources/Prototypes/_Mono/Entities/Objects/Weapons/Guns/Battery/asakim.yml
VividPups
VividPups reviewed Apr 25, 2026
View reviewed changes
Comment thread Resources/Prototypes/_Mono/Entities/Objects/Weapons/Guns/Battery/asakim.yml
VividPups
VividPups reviewed Apr 25, 2026
View reviewed changes
Comment thread Resources/Prototypes/_Mono/Entities/Objects/Weapons/Guns/Battery/asakim.yml
VividPups
VividPups reviewed Apr 25, 2026
View reviewed changes
Comment thread Resources/Prototypes/_Mono/Entities/Objects/Weapons/Guns/Battery/asakim.yml
VividPups
VividPups reviewed Apr 25, 2026
View reviewed changes
Comment thread Resources/Prototypes/_Mono/Entities/Objects/Weapons/Guns/Battery/asakim.yml
@Triad-Sector
Copy link
Copy Markdown
Owner Author

Triad-Sector commented Apr 25, 2026

these are mono changes

@VividPups
Copy link
Copy Markdown
Contributor

VividPups commented Apr 25, 2026

thats lame

@DDrakov
Copy link
Copy Markdown
Collaborator

DDrakov commented Apr 25, 2026

He's cherry-picking my guy

@Triad-Sector Triad-Sector changed the title Changes2 Cherry pick and rule update Apr 25, 2026
@Triad-Sector Triad-Sector changed the title Cherry pick and rule update Cherry Pick and Rule Update Apr 25, 2026
@TheRealMasterChief117
Copy link
Copy Markdown
Contributor

TheRealMasterChief117 commented Apr 25, 2026

changelog needs CL

@Triad-Sector Triad-Sector merged commit 4ffcc16 into main Apr 25, 2026
14 checks passed
Triad-Sector added a commit that referenced this pull request Apr 25, 2026
@Triad-Sector
Automated Changelog (#12)
f86776a
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

1 more reviewer

@VividPups VividPups VividPups left review comments

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

C# Docs S: Untriaged size/S YML

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

7 participants

@Triad-Sector @DDrakov @VividPups @TheRealMasterChief117 @Redrover1760 @SixplyDev @kasature90