Upstream Merge: The Omega PR#1145
Merged
fenndragon merged 104 commits intoHardLightSector:masterfrom Apr 13, 2026
Merged
Conversation
…er-Refactor-&-Jet-Injectors
Contributor
|
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
Collaborator
Author
|
What, how. I haven’t done anything since the last merg- oh, for fuck’s sake. |
fenndragon
reviewed
Apr 9, 2026
fenndragon
reviewed
Apr 9, 2026
fenndragon
reviewed
Apr 9, 2026
xemeraldwingx-dot
added a commit
that referenced
this pull request
Apr 13, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
About the PR
Fuuuuuuuck me.
Ports:
space-wizards/space-station-14#30600
space-wizards/space-station-14#33370 - Xenoarcheology
space-wizards/space-station-14#33883
space-wizards/space-station-14#34039
space-wizards/space-station-14#34186 - Cyborg rebalance
space-wizards/space-station-14#34580 - Mob collisions
space-wizards/space-station-14#35344 - Minigun inhands & tweaks
space-wizards/space-station-14#35614 - EntityEffects to shared
space-wizards/space-station-14#36296 - Mob collision tweaks
space-wizards/space-station-14#36336
space-wizards/space-station-14#36358
space-wizards/space-station-14#36881 - The Knockdownening
space-wizards/space-station-14#36962
space-wizards/space-station-14#37020
space-wizards/space-station-14#37196 - Stun & stamina visuals
space-wizards/space-station-14#37199 - StaminaSystem<SharedStaminaSystem
space-wizards/space-station-14#37238 - New status effect systems
space-wizards/space-station-14#37426
space-wizards/space-station-14#37588
space-wizards/space-station-14#37640 - Predict flashes
space-wizards/space-station-14#37702 - Catchable items
space-wizards/space-station-14#38142 - Sloth accent
space-wizards/space-station-14#38164
space-wizards/space-station-14#38243
space-wizards/space-station-14#38289
space-wizards/space-station-14#38438 - HandsSystem refactor
space-wizards/space-station-14#38579
space-wizards/space-station-14#38617
space-wizards/space-station-14#38618 - Stunnable new status & cleanup
space-wizards/space-station-14#38620 - SeeingRainbows refactor
space-wizards/space-station-14#38660
space-wizards/space-station-14#38667 - Wirebrushes
space-wizards/space-station-14#38668 - Borg hands & hand whitelisting
space-wizards/space-station-14#38678 - New status effects systems
space-wizards/space-station-14#38690 - Predict healing & bloodstream
space-wizards/space-station-14#38749
space-wizards/space-station-14#38871
space-wizards/space-station-14#38915
space-wizards/space-station-14#38948 - Accents event to shared
space-wizards/space-station-14#38984
space-wizards/space-station-14#39025 - Rejuvenateable status effects component
space-wizards/space-station-14#39031 - Food/drink systems merge
space-wizards/space-station-14#39034 - Trigger refactor
space-wizards/space-station-14#39084 - Crawling fixes 1
space-wizards/space-station-14#39085 - Crawling fixes 2
space-wizards/space-station-14#39089 - Crawling fixes 3
space-wizards/space-station-14#39109 - Crawling fixes 5
space-wizards/space-station-14#39120 - Crawling cleanup
space-wizards/space-station-14#39341
space-wizards/space-station-14#39362
space-wizards/space-station-14#39364
space-wizards/space-station-14#39436
space-wizards/space-station-14#39437
space-wizards/space-station-14#39752
space-wizards/space-station-14#39773
space-wizards/space-station-14#39913
space-wizards/space-station-14#39933
space-wizards/space-station-14#39976
space-wizards/space-station-14#40076 - Jet injectors
space-wizards/space-station-14#40143 - Tennis balls
space-wizards/space-station-14#40312
space-wizards/space-station-14#40538 - Hypopen doafter
space-wizards/space-station-14#40990
space-wizards/space-station-14#41070 - FoodComponent<EdibleComponent
space-wizards/space-station-14#40185 - Predict identity
space-wizards/space-station-14#41646 - Status effect support for traits
space-wizards/space-station-14#41693 - Change ephe, desox, & hyperzine properties
space-wizards/space-station-14#41716 - Replace vestine-derivatives
space-wizards/space-station-14#41833 - Injector/hypospray systems & components merge
space-wizards/space-station-14#41932
space-wizards/space-station-14#42158 - Jet injector tweaks & cleanup
space-wizards/space-station-14#42330 - Janiborg tool cleanup
space-wizards/space-station-14#42534 - Hands UI code cleanup
space-wizards/space-station-14#43350 - Chat straight quotes to curly quotes
space-wizards/space-station-14#43392 - Lathe name populates lathe menu
space-wizards/space-station-14#43400 - Crew manifest load fail message
space-wizards/space-station-14#43411 - Fix ghost time of death
space-wizards/space-station-14#43466 - Make cameras react to AI eye
space-wizards/space-station-14#43483 - Radio straight quotes to curly quotes
I'm drafting this for now while I work on patching all of the everything, so other people can help test.
Why / Balance
It's all upstream content that we were massively behind on. It should make porting new content from upstream easier in the future.
Technical details
I can't be assed.
How to test
Play the game like normal and report any issues you see.
Media
Breaking changes
It remains to be seen.
Changelog
🆑