ERT Overhaul 2 #645

Merged

LilithArson merged 15 commits from ert-part-two-20260715 into master 2026-07-18 15:03:11 +00:00

Conversation 0 Commits 15 Files changed 239 +25106 -18746

LilithArson commented 2026-07-17 22:55:35 +00:00

Owner

Copy link

Short description

Part 2 of an active ERT rework. This adds vendors that replace the kits.
Also changes how Listening Post works.

Checklist

• I do not require assistance to complete the PR.
• I have verified that the changes work before posting/requesting review of my PR.
• I have added screenshots/videos of the changes, or this PR does not change in-game mechanics.
• I have read the Pull Request and Changelog Guidelines and Byrd Station's Contributor Ruleset.

Breaking changes

Ingame Changelog

🆑

• fix: Fixed ERT breacher kit shell box being empty
• tweak: Rechambered the Atreides to .45 magnum
• tweak: Updated Listening Post

<!-- Link definitions, do not edit --> [guidelines]: https://docs.spacestation14.com/en/general-development/codebase-info/pull-request-guidelines.html [ruleset]: https://rules.byrdstation.space/#h.vigrxrnffwji ## Short description <!-- What do you propose to change with your PR? --> Part 2 of an active ERT rework. This adds vendors that replace the kits. Also changes how Listening Post works. ## Checklist <!-- Check boxes for faster reviewing of your PR --> - [x] I do not require assistance to complete the PR. - [x] I have verified that the changes work before posting/requesting review of my PR. - [x] I have added screenshots/videos of the changes, or this PR does not change in-game mechanics. - [x] I have read the [Pull Request and Changelog Guidelines][guidelines] and [Byrd Station's Contributor Ruleset][ruleset]. ## Breaking changes <!-- List any breaking changes, including namespaces, public class/method/field changes, prototype renames; and provide instructions for fixing them. This will be posted in #codebase-changes. --> ### Ingame Changelog <!--If you want the players to know about changes made in this PR, specify them using the template outside the comment. Short and informative.--> :cl: - fix: Fixed ERT breacher kit shell box being empty - tweak: Rechambered the Atreides to .45 magnum - tweak: Updated Listening Post

LilithArson added 8 commits 2026-07-17 22:55:35 +00:00

Ammo & proto fixes aba7a1f448

rechamber atreides to .45 4c3b179891

Rebalance and normalize the name of 8 gauge bd8e96c61d

RMC texture ports f3f65de212

Move stuff around 716f88da62

Vending machine system additions 6dbfaef4f9

Colmartechs and flare packs a9ae976ed1

ERT apply traits 7e73440ba1

forgejo-actions added the

Changes: Sprites

label 2026-07-17 22:55:40 +00:00

LilithArson changed title from Ert Pt. 2 to ERT Rework [2/?] 2026-07-17 22:56:01 +00:00

LilithArson added 1 commit 2026-07-17 23:12:31 +00:00

fix yml a8e5f544b0

LilithArson added 1 commit 2026-07-17 23:46:43 +00:00

tags cebdb65281

LilithArson added the

DON'T MERGE

label 2026-07-17 23:58:33 +00:00

LilithArson added 1 commit 2026-07-18 00:37:03 +00:00

bhugfnjdsvdfc 864a324784

LukeZurg22 changed title from ERT Rework [2/?] to ERT Overhaul #2 2026-07-18 00:51:34 +00:00

LukeZurg22 changed title from ERT Overhaul #2 to ERT Overhaul 2 2026-07-18 00:51:49 +00:00

LilithArson force-pushed ert-part-two-20260715 from 864a324784 to db10060ebe 2026-07-18 14:18:54 +00:00 Compare

forgejo-actions added the

Changes: Map

label 2026-07-18 14:19:00 +00:00

LilithArson force-pushed ert-part-two-20260715 from db10060ebe to e2984bec85 2026-07-18 14:19:57 +00:00 Compare

LilithArson added 1 commit 2026-07-18 14:43:27 +00:00

Vending machine autoequip fixes 4360a10043

LilithArson removed the

DON'T MERGE

label 2026-07-18 14:43:30 +00:00

LilithArson merged commit 96a33be64c into master 2026-07-18 15:03:11 +00:00

LilithArson deleted branch ert-part-two-20260715 2026-07-18 15:03:11 +00:00

LilithArson referenced this pull request from a commit 2026-07-18 15:03:12 +00:00

ERT Overhaul 2 (#645)

byrdbot referenced this pull request from a commit 2026-07-18 15:03:35 +00:00

Automatic changelog update (#645)

Sign in to join this conversation.

Reviewers

No reviewers

Labels

Clear labels   

bug

This is in regards to a bug.

  

Changes: Audio

  

Changes: Map

  

Changes: No C#

  

Changes: Sprites

  

Changes: UI

  

documentation

Improvements or additions to documentation

  

DON'T MERGE

This is under review, fixes, or needs significant changes.

  

duplicate

This issue or pull request already exists

  

enhancement

New feature or request

  

good first issue

Good for newcomers

  

help wanted

Extra attention is needed

  

holding to vote

This is currently being voted for by the Byrds.

  

invalid

This doesn't seem right

  

question

Further information is requested

  

size/L

  

size/M

  

size/S

  

size/XL

  

size/XS

  

S: Merge Conflict

  

S: Untriaged

  

wontfix

This will not be worked on

No labels

bug

Changes: Audio

Changes: Map

Changes: No C#

Changes: Sprites

Changes: UI

documentation

DON'T MERGE

duplicate

enhancement

good first issue

help wanted

holding to vote

invalid

question

size/L

size/M

size/S

size/XL

size/XS

S: Merge Conflict

S: Untriaged

wontfix

Milestone

Clear milestone

No items

No milestone

Projects

Clear projects

No items

No project

Assignees

Clear assignees

No assignees

1 participant

Notifications

Subscribe

Due date

The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference

Byrd-Station/Byrd!645

No description provided.