Cherrypicks & Fixes (2026/06/02) #342

Merged

LilithArson merged 30 commits from cherrypicks-20260602 into master 2026-06-02 14:44:27 +00:00

Conversation 0 Commits 30 Files changed 112 +5708 -962

LilithArson commented 2026-06-02 09:29:51 +00:00

Owner

Copy link

PR Changes

Cherrypicks the following PRs:

• Omu#984: Fix NCT time requirements
• Omu#993: Give CE an experimental RPD
• Omu#1006: Make IPC reboot use vital instead of total damage
• Omu#1007: Make pets allied with turrets
• Omu#1017: Ported cyan alert
• Omu#1037: Ported dragon antlers
• Omu#1045: Resomi markings + Shadowkin hair
• Wizden#39834: Fix vaping not working
• Wizden#40070: Better GasMixture serialization
• Starlight#641: Glowing markings

Reasons Behind Changes

none

Code & Technical details

none

Images; Sprites; Media

none

Checklist

• I read the Pull Request and Changelog Guidelines and Byrd Station's Contributor Ruleset am following them.
• I have added media to this PR, or it does not require an ingame showcase.

Breaking changes

Ingame Changelog

🆑

• fix: Fix NCT time requirements
• tweak: Give CE an experimental RPD
• fix: Make IPC reboot use vital instead of total damage
• fix: Make pets allied with turrets
• add: Ported cyan alert
• add: Ported dragon antlers
• add: Resomi markings + Shadowkin hair
• fix: Fix vaping not working
• add: Glowing markings

## PR Changes Cherrypicks the following PRs: - [Omu#984](https://github.com/ProjectOmu/OmuStation/pull/984): Fix NCT time requirements - [Omu#993](https://github.com/ProjectOmu/OmuStation/pull/993): Give CE an experimental RPD - [Omu#1006](https://github.com/ProjectOmu/OmuStation/pull/1006): Make IPC reboot use vital instead of total damage - [Omu#1007](https://github.com/ProjectOmu/OmuStation/pull/1007): Make pets allied with turrets - [Omu#1017](https://github.com/ProjectOmu/OmuStation/pull/1017): Ported cyan alert - [Omu#1037](https://github.com/ProjectOmu/OmuStation/pull/1037): Ported dragon antlers - [Omu#1045](https://github.com/ProjectOmu/OmuStation/pull/1045): Resomi markings + Shadowkin hair - [Wizden#39834](https://github.com/space-wizards/space-station-14/pull/39834): Fix vaping not working - [Wizden#40070](https://github.com/space-wizards/space-station-14/pull/40070): Better GasMixture serialization - [Starlight#641](https://github.com/ss14Starlight/space-station-14/pull/641): Glowing markings ## Reasons Behind Changes none ## Code & Technical details none ## Images; Sprites; Media none ## Checklist <!--Understand that not following all Contributor rule standards may get your PR closed at a maintainer’s discretion. Failure to follow the Contributor's ruleset may lead to your removal as a contributor.--> <!-- Confirm by placing an X in the brackets [X]: --> - [x] I read the [Pull Request and Changelog Guidelines](https://docs.spacestation14.com/en/general-development/codebase-info/pull-request-guidelines.html) and [Byrd Station's Contributor Ruleset](https://docs.google.com/document/d/1oxCSRBc_2IlrcykljB5SPt783uJX7rMHTT7cImxlKFM/edit?tab=t.0#heading=h.vigrxrnffwji) am following them. - [x] I have added media to this PR, or it does not require an ingame showcase. ## 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** <!-- Add a Changelog entry to make players ingame aware of new changes that could affect gameplay.--> :cl: - fix: Fix NCT time requirements - tweak: Give CE an experimental RPD - fix: Make IPC reboot use vital instead of total damage - fix: Make pets allied with turrets - add: Ported cyan alert - add: Ported dragon antlers - add: Resomi markings + Shadowkin hair - fix: Fix vaping not working - add: Glowing markings

LilithArson added 8 commits 2026-06-02 09:29:51 +00:00

Omu#1045 f313a3b5fe

Omu#1037 d77fedfe26

Omu#1017 bd5feda93c

Omu#1007 5529639540

Omu#1006 9a9dcdebd4

Omu#984 267a9dc133

Wizden#39834 96ef24147e

Remove leftover .rej d7540507d4

forgejo-actions added the

Changes: Audio

Changes: Sprites

size/M

labels 2026-06-02 09:30:12 +00:00

LilithArson added 1 commit 2026-06-02 10:03:44 +00:00

(Misc) Remove unused entity eb7c5a3ff4

LilithArson added 2 commits 2026-06-02 10:08:15 +00:00

Cut down some of the lengthier item descriptions to fit better in the loadout selection screen e991d96244

Make dogtags store mining points fbf5713a76

LilithArson added 1 commit 2026-06-02 10:26:36 +00:00

Fix wrong folder bf5d75f50d

LilithArson added 5 commits 2026-06-02 12:03:39 +00:00

Remove thunderstrike smite ... 4b3079b449

Ukulele's punishment

Starlight#641 97382c6a73

Fix errors from merging Starlight#641 e34647d256

Fix displacement system overwriting the glow shader 18a035be6d

Uncomment hypereutactic blade (unused) ab0ab12057

forgejo-actions added the

Changes: UI

label 2026-06-02 12:03:58 +00:00

LilithArson added 2 commits 2026-06-02 12:51:43 +00:00

Fix rsi pngs being directly referenced 18d7342930

Fix misc. wreck/dungeon entity errors 1a03cd2bc3

LilithArson added 3 commits 2026-06-02 13:21:03 +00:00

Wizden#40070 f1d036664c

We don't have dense ore 6745fa1b5b

Remove leftover .rej 6d6f789bc3

LilithArson added 1 commit 2026-06-02 13:28:52 +00:00

Fix more YAML errors bb65b7ad29

LilithArson added 1 commit 2026-06-02 13:36:16 +00:00

Fix YAML indent. Whoops. 15a96c7e9b

LilithArson added 1 commit 2026-06-02 13:45:57 +00:00

Fix GasMixture to use correct serializer efb0f2e80f

LilithArson changed title from Cherrypicks (2026/06/02) to Cherrypicks & Fixes (2026/06/02) 2026-06-02 13:49:00 +00:00

LilithArson added 1 commit 2026-06-02 13:51:44 +00:00

Fix incorrect alert prototype 9db2211d86

LilithArson added 1 commit 2026-06-02 14:01:24 +00:00

Migrate tgstation reactions to new serializer af4ddae679

LilithArson added 1 commit 2026-06-02 14:10:11 +00:00

Apply missing change from Wizden#40070 94045f3e08

LilithArson added 1 commit 2026-06-02 14:21:32 +00:00

Add deep fryer to adv. food svc. research db0bf012eb

LilithArson added 1 commit 2026-06-02 14:44:20 +00:00

Add more missing tags 73d4a3b820

LilithArson merged commit 69a07c63b3 into master 2026-06-02 14:44:27 +00:00

LilithArson deleted branch cherrypicks-20260602 2026-06-02 14:44:28 +00:00

LilithArson referenced this pull request from a commit 2026-06-02 14:44:29 +00:00

Cherrypicks & Fixes (2026/06/02) (#342)

byrdbot referenced this pull request from a commit 2026-06-02 14:45:04 +00:00

Automatic changelog update (#342)

Sign in to join this conversation.

Reviewers

No reviewers

Labels

Clear labels   

bug

Something isn't working

  

Changes: Audio

  

Changes: Map

  

Changes: No C#

  

Changes: Sprites

  

Changes: UI

  

documentation

Improvements or additions to documentation

  

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

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!342

No description provided.