Skip to content

Upstream Merge: The Omega PR#1145

Merged
fenndragon merged 104 commits intoHardLightSector:masterfrom
NotLivyathan:Port-WizDen-Trigger-Refactor-&-Jet-Injectors
Apr 13, 2026
Merged

Upstream Merge: The Omega PR#1145
fenndragon merged 104 commits intoHardLightSector:masterfrom
NotLivyathan:Port-WizDen-Trigger-Refactor-&-Jet-Injectors

Conversation

@NotLivyathan
Copy link
Copy Markdown
Collaborator

@NotLivyathan NotLivyathan commented Apr 6, 2026

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

🆑

  • add: Jet injectors are now available to medical staff and may be crafted at a medical techfab.
  • add: Parrots are now better at remembering things said around them, but only slightly.
  • add: Stamina damage now has a visual effect both before and during stam crit.
  • add: Certain items may now be caught when thrown should the receiving entity's skill be sufficient.
  • add: Tennis balls now exist conceptually and may be found where other toys could be.
  • add: Cameras will now react to the AI-eye and change states to show they are being used.
  • add: Added status-effect relay events.
  • add: Miniguns now have in-hand visuals.
  • add: New modules and tools are now available to Cyborgs.
  • add: Janitors now have access to wirebrushes, allowing for the derusting of metal walls.
  • add: Sloths now have a dedicated accent that makes them... talk... real... slow...
  • remove: Removed height trait hand restrictions.
  • remove: Vestine-based chems may no longer be randomly mutated from plants, and instead require vestine to mutate.
  • tweak: Refactored the way triggers work.
  • tweak: Refactored the way injectors work and merged the injector/hypospray systems into one system.
  • tweak: Refactored the way research works, specifically around artifacts.
  • tweak: Refactored the way hands work, especially Borg hands.
  • tweak: Refactored the way flashes work.
  • tweak: Many entity effects have been refactored to be status effects instead.
  • tweak: Replaced crawling and knockdown with a newer, smoother system that should feel better.
  • tweak: Replaced FoodComponent with EdibleComponent and merged food/drink systems into one system.
  • tweak: Entity effect definitions have been moved to shared handling.
  • tweak: Identity handling has been moved to support a predicted structure.
  • tweak: Bloodstream and certain healing handling has been moved to support a predicted structure.
  • tweak: Accent and certain speech-effect handling has been moved to support a predicted structure.
  • tweak: Mob collision has been slightly tweaked, but left disabled.
  • tweak: Ephedrine, desoxyephedrine and hyperzine have been tweaked.
  • tweak: Lathe menus now populate with the name of the lathe, instead of simply "lathe menu".
  • tweak: Quotation marks in the chat panel should now appear italicized.
  • tweak: Attempting to open the crew manifest when not on an appropriate grid now returns a fail message, instead of loading indefinitely.
  • tweak: Hypopens now have a short doafter when attempting to refill them.
  • fix: Ghosts should now correctly state time since death.

@NotLivyathan NotLivyathan changed the title [DO NOT MERGE] Upstream Merge: The Omega PR Upstream Merge: The Omega PR Apr 9, 2026
@github-actions
Copy link
Copy Markdown
Contributor

github-actions bot commented Apr 9, 2026

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@NotLivyathan
Copy link
Copy Markdown
Collaborator Author

What, how. I haven’t done anything since the last merg- oh, for fuck’s sake.

@fenndragon fenndragon merged commit 4408d88 into HardLightSector:master Apr 13, 2026
10 of 11 checks passed
xemeraldwingx-dot added a commit that referenced this pull request Apr 13, 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.

5 participants