Skip to content

Spray Painter Rework and Predicted Internals#17

Merged
DDrakov merged 10 commits intoTriad-Sector:mainfrom
TheRealMasterChief117:spray-painter-rework-and-fixes
Apr 27, 2026
Merged

Spray Painter Rework and Predicted Internals#17
DDrakov merged 10 commits intoTriad-Sector:mainfrom
TheRealMasterChief117:spray-painter-rework-and-fixes

Conversation

@TheRealMasterChief117
Copy link
Copy Markdown
Contributor

@TheRealMasterChief117 TheRealMasterChief117 commented Apr 26, 2026

About the PR

Ports a multitude of PRs:

The reason why this PR is so massive is because the spray painter PR required all of these as dependencies
Spray painter capacity is buffed from 15 to 75 to assist ship builders

Media

Screenshot_20260426_143207

Technical details

Everything that would be effected by the limited charges changes like RCDs and SRds have been tested and they work
All related to charges on the instant action component has been removed
It is split into AutoRechargeComponent and LimitedChargesComponent

Changelog
🆑

  • fix: Internals and gas canisters are now predicted. There should be no delay when you use the canister UI or enable internals.
  • tweak: Ported the spray painter rework from Wizden, allowing you to paint way more objects.
  • fix: Maybe fix self-recharging weapons breaking on ship load

whatston3 and others added 5 commits April 26, 2026 11:07
* port wizden#37341

* Frontier-specific spray paintable types

* update to head of wizden#37341

* fix merc secure crate loc reference

* Fix gas canister loc strings

* no locked wall lockers, biodegradable fix

* remove wall locker group from lockers category

* Fix the gas canister appearance system
Co-authored-by: Copilot <copilot@github.com>
* Action charges refactor

- Fixes the slight godmoding of baseactioncomponent.
- Gets back 1ms of server time.

* chorg

* Remove FrameUpdate

* Fixes

* More fixes

* Combine

* Fixes

* Updates

* weh

* Last fixes

* weh

* Fix naughty

* YAML fixes

* This one too

* Merge conflicts

* This thing

* Review

* Fix this as well

* Icon fix

* weh

* Review

* Review

* seamless

* Review
* Predicted gas pumps

I wanted to try out atmos and first thing I found.

* a

* Atmos device prediction

- Canisters
- Tanks
- Internals

AirMixes aren't predicted so nothing on that front but all the UIs should be a lot closer.

* Remove details range

* Gas tank prediction

* Even more sweeping changes

* Alerts

* rehg

* Popup fix

* Fix merge conflicts

* Fix

* Review

* Merge fixes
@Triad-Sector Triad-Sector changed the title Spray painter rework and predicted internals Spray Painter Rework and Predicted Internals Apr 26, 2026
@github-actions
Copy link
Copy Markdown

github-actions Bot commented Apr 26, 2026

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

Resources/Textures/Objects/Tools/spray_painter.rsi

State Old New Status
ammo-inhand-left Added
ammo-inhand-right Added
ammo Added
inhand-left Added
inhand-right Added

Edit: diff updated after e4b6879

Co-authored-by: Copilot <copilot@github.com>
@DDrakov
Copy link
Copy Markdown
Collaborator

DDrakov commented Apr 27, 2026

Tested and works? haven't got time to test it out

@TheRealMasterChief117
Copy link
Copy Markdown
Contributor Author

Yeah

@DDrakov DDrakov merged commit b0a16ee into Triad-Sector:main Apr 27, 2026
18 checks passed
Triad-Sector added a commit that referenced this pull request Apr 27, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants