Upstream Merge: The Omega PR by NotLivyathan · Pull Request #1145 · HardLightSector/HardLight

NotLivyathan · 2026-04-06T19:36:46Z

About the PR

Fuuuuuuuck me.

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.

…er-Refactor-&-Jet-Injectors

github-actions · 2026-04-09T19:55:46Z

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

NotLivyathan · 2026-04-09T20:09:25Z

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

…//github.com/NotLivyathan/HardLight into THE-OMEGA-PR

@fenndragon

* Start Port WizDen Trigger Refactor #39034 * Start Port WizDen Parroting Parrots Part 1 #38243 * Port WizDen Animal Spawner Reorganization + Xeno Spawners #36962 * Finish Port WizDen Parroting Parrots Part 1 #38243 & PR #38984 * Port WizDen Shared ParrotMemory PR #39341 * Continue Port WizDen Trigger Refactor #39034 * Port WizDen Land Mine Armament #33883 * Continue Port WizDen Trigger Refactor #39034 (Again) * Continue Port WizDen Trigger Refactor #39034 (Still) * Port WizDen 3MO Xeno Archeology (First Phase) #33370 * Finish Port WizDen Trigger Refactor #39034 * Port WizDen Turn Some Implants Into Triggers #39364 * Port WizDen Predict InjectSystem * Port WizDen PR #30600 & #38749 * Port WizDen PR #38871 & #39752 * Port WizDen Merge Injector & Hypospray Systems & Components #41833 * commit missed files * Port WizDen Add Jet Injectors #40076 & PR #41932 * Port WizDen Move Entity Effects Definitions to Shared #35614 * Port WizDen Pepper Makes You Cough #36358 * Port WizDen PR #38164 * Port WizDen Predict Healing & Bloodstream #38690 * Port WizDen PopupOnTrigger #39913 * commit skipped foodcomponent migration * Port WizDen PR #39362 * Start Port WizDen Debody Food & Systems #39031 * Finish Port WizDen Debody Food & Drink Systems #39031 * Port WizDen Delete FoodComponent PR #41070 * Port WizDen Fix Burgers #39773 * Port WizDen Fix Puncturase Cauterizing Bleeding #38289 * Port WizDen StaminaSystem to SharedStaminaSystem #37199 * Port WizDen PR #36336 & Stun & Stamina Visuals #37196 * Start Port WizDen Crawling Part 1: The Knockdownening #36881 * Start Port WizDen HandsSystem Refactor #38438 + Several Prerequisite PR * Continue Port WizDen HandsSystem Refactor #38438 * Finish Port WizDen HandsSystem Refactor #38438 + Several More Prerequisite PR * Port WizDen Fix #38576, #38578, & #38605 * Continue Port WizDen Crawling Part 1: The Knockdownening #36881 + Fix Mob Collisions * Port WizDen SSD Sleep Take 2 #34049 & New Status Effect System #37238 * Port WizDen New Status Effects System: Relay Events #38579 * Finish Port WizDen Crawling Part 1: The Knockdownening #36881 * Port WizDen Refactor SeeingRainbows to New Status Effect System #38620 * Port WizDen PR #38617, #38660, & #38915 * fix incompatibilities pass 1 * Port WizDen Better Godmode #37020 * Port WizDen Catchable Items, Playable Basketball #37702 & Start Port PR #40990 * Port WizDen Predict Identity #40185 * Port WizDen PR #36803 & Move Some Station Methods Into Shared #38976 * fix incompatibilities pass 2 * fix incompatibilities pass 3 * quick fix to make it playable * Port WizDen Reverse Hand Swapping PR #37588 * Port WizDen Borg Hands & Hand Whitelisting #38668 * fix remaining borg hands incompatibilities & various tweaks * Port WizDen No Take; Only Throw #40143 * Port WizDen Mob Collision Tweaks #36296 * Port WizDen Vestine Changes PR #41693 & #41716 * Port WizDen Drunkenness, Stuttering, Slurring, & Bloodloss Status Systems PR #38678 * Port WizDen Sloth Accent PR #38142 & Accent Events to Shared #38948 * fix accent incompatibilities * Port WizDen Rejuvenateable Status Effects PR #39025 * Start Port WizDen Stunnable New Status & Cleanup #38618 * Port WizDen Predict Flashes #37640 * Finish Port Stunnable New Status & Cleanup #38618 * fix incompatibilities pass 4 * Port WizDen Traits Status Effect Support & PainNumbness Status Effect PR #41646 * fix to make it playable round 2 * Port WizDen Curl Quotes PR #43350 & #43483 * Port WizDen Make Cameras React to the AI Eye Nearby #43466 * Port WizDen PR #43392, #43400, & #43411 * Port WizDen Minigun Inhands PR #35344 * fix/tweak a handful of things * fix cameras/holopads providing ai vision without power * Port WizDen Cyborg Rebalance #34186 & Janiborg Module Cleanup #42330 * Port WizDen Janitor Tool: Wire Brush #38667 * Port WizDen Add Doafter to Filling the Hypopen #40538 * Port WizDen Fix PR #39436, #39437, #39933, & #40312 * fix linter fails pass 1 * Port WizDen Jet Injector Tweaks & Cleanup #42158 * fix linter fails pass 2 * fix linter fails pass 3 * final linter fail fixes * fuck * Apply suggestion from @fenndragon * Apply suggestion from @fenndragon * Apply suggestion from @fenndragon * fix linter fail that I did and didn't cause * oops, all food * port various WizDen post hands refactor fixes * Port WizDen Simplify Hands UI Code #42534 * Port WizDen PR #39084, #39085 #39089, #39109, & #39120 * fix to make it playable again * it is time * TONIGHT IS THE NIGHT * TONIGHT WILL BE THE NIGHT --------- Co-authored-by: fenndragon <fenndragon@gmail.com>

NotLivyathan added 30 commits March 30, 2026 00:10

Start Port WizDen Trigger Refactor #39034

9ea12ca

Start Port WizDen Parroting Parrots Part 1 #38243

7f94a7b

Port WizDen Animal Spawner Reorganization + Xeno Spawners #36962

247d0cd

Finish Port WizDen Parroting Parrots Part 1 #38243 & PR #38984

10103c2

Port WizDen Shared ParrotMemory PR #39341

258fd22

Continue Port WizDen Trigger Refactor #39034

48c0e14

Port WizDen Land Mine Armament #33883

cea570d

Continue Port WizDen Trigger Refactor #39034 (Again)

57f682e

Continue Port WizDen Trigger Refactor #39034 (Still)

e04aa6d

Port WizDen 3MO Xeno Archeology (First Phase) #33370

9e6c100

Finish Port WizDen Trigger Refactor #39034

a5e5d87

Port WizDen Turn Some Implants Into Triggers #39364

fd5b0c3

Port WizDen Predict InjectSystem

e23a202

Port WizDen PR #30600 & #38749

65a63ba

Port WizDen PR #38871 & #39752

ee16382

Port WizDen Merge Injector & Hypospray Systems & Components #41833

3dfd2cc

commit missed files

b2ae0bb

Port WizDen Add Jet Injectors #40076 & PR #41932

5d800ae

Merge remote-tracking branch 'upstream/master' into Port-WizDen-Trigg…

930a896

…er-Refactor-&-Jet-Injectors

Port WizDen Move Entity Effects Definitions to Shared #35614

6354cc1

Port WizDen Pepper Makes You Cough #36358

b7aa5fc

Port WizDen PR #38164

9e7407b

Port WizDen Predict Healing & Bloodstream #38690

c1c8723

Port WizDen PopupOnTrigger #39913

d0ba88e

commit skipped foodcomponent migration

8c47a49

Port WizDen PR #39362

40c090f

Start Port WizDen Debody Food & Systems #39031

c6a0108

Finish Port WizDen Debody Food & Drink Systems #39031

5617cbb

Port WizDen Delete FoodComponent PR #41070

190b22a

Port WizDen Fix Burgers #39773

d59b47d

NotLivyathan changed the title ~~[DO NOT MERGE] Upstream Merge: The Omega PR~~ Upstream Merge: The Omega PR Apr 9, 2026

github-actions Bot added the S: Merge Conflict label Apr 9, 2026

Merge branch 'master' into Port-WizDen-Trigger-Refactor-&-Jet-Injectors

22e12c5

github-actions Bot removed the S: Merge Conflict label Apr 9, 2026

fenndragon reviewed Apr 9, 2026

View reviewed changes

Comment thread Content.Server/Salvage/SalvageSystem.Runner.cs

Apply suggestion from @fenndragon

3b40b1d

fenndragon reviewed Apr 9, 2026

View reviewed changes

Comment thread Content.Server/Salvage/SalvageSystem.Runner.cs

Apply suggestion from @fenndragon

6cfb6c7

fenndragon reviewed Apr 9, 2026

View reviewed changes

Comment thread Content.Server/Salvage/SalvageSystem.Runner.cs Outdated

fenndragon and others added 14 commits April 9, 2026 15:11

Apply suggestion from @fenndragon

c17c2b4

Merge remote-tracking branch 'upstream/master' into THE-OMEGA-PR

e128d64

fix linter fail that I did and didn't cause

e5e4a1f

oops, all food

ffc1238

port various WizDen post hands refactor fixes

399a938

Port WizDen Simplify Hands UI Code #42534

c15e186

Port WizDen PR #39084, #39085 #39089, #39109, & #39120

fc8ae9a

fix to make it playable again

0242547

Merge branch 'master' into Port-WizDen-Trigger-Refactor-&-Jet-Injectors

480b84f

Merge remote-tracking branch 'upstream/master' into THE-OMEGA-PR

971dfef

Merge branch 'Port-WizDen-Trigger-Refactor-&-Jet-Injectors' of https:…

9b72586

…//github.com/NotLivyathan/HardLight into THE-OMEGA-PR

it is time

7cb0603

TONIGHT IS THE NIGHT

503aa58

TONIGHT WILL BE THE NIGHT

c20bdae

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

Automated Changelog Update (#1145)

1076728

B3CKDOOR referenced this pull request in SandwichStation/SandwichStation-HL Apr 16, 2026

Automated Changelog Update (#1145)

6bbe1e4

SquishyEmmaaaa mentioned this pull request Apr 22, 2026

Restore plant random chemicals&gasses removed by #1288 #1360

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Upstream Merge: The Omega PR#1145

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

NotLivyathan commented Apr 6, 2026 •

edited

Loading

Uh oh!

github-actions Bot commented Apr 9, 2026

Uh oh!

NotLivyathan commented Apr 9, 2026

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

Conversation

NotLivyathan commented Apr 6, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

About the PR

Why / Balance

Technical details

How to test

Media

Breaking changes

Uh oh!

github-actions Bot commented Apr 9, 2026

Uh oh!

NotLivyathan commented Apr 9, 2026

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

NotLivyathan commented Apr 6, 2026 •

edited

Loading