Harpy rework by Holorain4312 · Pull Request #646 · ProjectOmu/OmuStation

Holorain4312 · 2026-03-05T22:57:10Z

About the PR

Why / Balance

This PR makes it so that harpies are faster at using tools that their job requires them to use more often.
It lets medical harpies do surgery faster and and security harpies reload mags with bullet faster.

on the flipside it makes tools that they arent proficient in slower to use

the idea is that this isn't a flat out buff to harpies but a rework.

Technical details

Added a new prototype for proficiencies

Provided Access to ToolComponent and BallisticAmmoProviderComponent to the system made for this PR

Media

2026-03-06_08-09-26.mov

Requirements

I have read and am following the Pull Request and Changelog Guidelines.
I have added media to this PR or it does not require an ingame showcase.

Breaking changes

None to note

Changelog
🆑

tweak: Reworked harpies, they are now faster at using tools they are proficient in and slower at using other tools.

Holorain4312 · 2026-03-05T22:58:07Z

damn changelog broke it seems

Edit: Fixed it! :D

Thesia000

SO if I am reading this code correct you are setting the proficency GLOBALLY I recomend moving the proficency into the Proicency component instead of having it as a prototype that is saved as a variable inside a system

Holorain4312 · 2026-03-06T01:17:15Z

SO if I am reading this code correct you are setting the proficency GLOBALLY I recomend moving the proficency into the Proicency component instead of having it as a prototype that is saved as a variable inside a system

So like just save the variable to the component and just reference the component instead?

Thesia000

for the changes you need to read and save to the entities component not into a variable in the system itself. it will work for local tests but fails once we hit multiplayer as multiple entities will have this comp and override the variable in Proficency System

Holorain4312 · 2026-03-06T19:04:35Z

for the changes you need to read and save to the entities component not into a variable in the system itself. it will work for local tests but fails once we hit multiplayer as multiple entities will have this comp and override the variable in Proficency System

OHHHHH shi mb gang

NotActuallyMarty

ive not looked at the balance i can chud out later at that but you should omumod this instead of putting this in Content.Shared._Omu

Holorain4312 · 2026-03-06T23:52:54Z

ive not looked at the balance i can chud out later at that but you should omumod this instead of putting this in Content.Shared._Omu

good point for omumodding it, i'll do that when i'm free

balance has been approved by vivi

Holorain4312 · 2026-03-07T00:12:37Z

okay so @NotActuallyMarty it seems it actually HAS to be in the _Omu folder because otherwise the references to it ToolComponent and BallisticAmmoProviderComponent will not be able to access it

3PonPon3 · 2026-03-11T11:19:34Z

Does this mean non-med and non-sec harpies strictly get debuffs for it

Holorain4312 · 2026-03-11T11:22:31Z

Does this mean non-med and non-sec harpies strictly get debuffs for it

For reloading/surgery? Dont think i actually gave specific debuffs for those outside the fields, probably should have and can easily do at any point

3PonPon3 · 2026-03-11T11:24:36Z

Oh it ONLY affects surgert and reloading? For sll harpies I mean

I thought it would affect things ljkr prying, syringes, using tools, etc etc

Holorain4312 · 2026-03-11T11:28:40Z

Oh it ONLY affects surgert and reloading? For sll harpies I mean

I thought it would affect things ljkr prying, syringes, using tools, etc etc

So for tools, the way i have it setup:
If the job isnt specified in the yaml, this rework doesnt affect it.
If there is a modifier there, and the tool selected isnt one you are proficient in, you get a negative speed modifier to it; this REALLY comes into effect with med having debuffs to all traditional tools but buffs to surgery.
Also sci will get debuffs for jaws of life experimental welders and drills

3PonPon3 · 2026-03-11T11:31:05Z

So what does it affect?
I see tools, reloading, surgery tools

Holorain4312 · 2026-03-11T11:31:56Z

So what does it affect?
I see tools, reloading, surgery tools

Yeah thats it for now

3PonPon3 · 2026-03-11T11:33:18Z

So harpies in the specified jobs when non sec reload slower? >.>

Holorain4312 · 2026-03-11T11:35:52Z

So harpies in the specified jobs when non sec reload slower? >.>

I didnt actually specify debuffs for reload speed because it uses a slightly different system there afaik, basically i had to use a different value for reload speed and just didnt get around to giving literally every non combat role specified a debuff.

If there was a job i though specifically shouldnt be able to reload fast id have specified a negative modifier there tho

3PonPon3 · 2026-03-11T11:37:41Z

Eo for example hop is completely unnafected but for another example secharpy reload fast n what use base tools faster but surgery slower?

Holorain4312 · 2026-03-11T11:40:26Z

Eo for example hop is completely unnafected but for another example secharpy reload fast n what use base tools faster but surgery slower?

Probably shouldve given engi a negative surgery modifier LMAO
Engi gets base tools and upgrades faster, sec harpy reloads faster, sci harpy gets base tools and a small surgery buff cause robotics exists

HoP is completely unaffected though, yes

TLDR when i get around to it im giving engi a surgery and reload debuff because their buffs are kinda extremely powerful without

EctoplasmIsGood · 2026-03-16T14:58:44Z

“In today’s unique and cool PR I decided to buff harpies and made up a reason to do so”

Holorain4312 · 2026-03-16T18:25:40Z

“In today’s unique and cool PR I decided to buff harpies and made up a reason to do so”

Dude this is a bounty for vivi, i probably shoulve put that in the title but it is

rat-dot-net · 2026-03-16T23:33:05Z

“In today’s unique and cool PR I decided to buff harpies and made up a reason to do so”

🥜🥜🥜

ThanosDeGraf · 2026-03-17T13:24:36Z

Resources/ServerInfo/Guidebook/Mobs/Harpy.xml

+  ## Highly specialised
+
+  Harpies are extremely good at doing tasks they are familiar with. they can use most tools their job specialises in more efficiently than everyone else.
+


Can you specify here for the players that don't check github which tools they specialise in?

yeah, can do

little busy till like sunday tho so it'll take a lil bit

NotActuallyMarty

Did some code cleanup, I recommend giving it a once-over and make sure i didn't fuck something up. There were just too many nested statements making code hard to read. Kept functionality the same afaik, so give me a sec to re-review that.

Content.Omu.Shared/Proficiencies/Components/ProficiencyComponent.cs

Content.Omu.Shared/Proficiencies/Systems/ProficiencySystem.cs

Content.Omu.Shared/Proficiencies/ProficiencyPrototype.cs

Resources/Prototypes/_DV/Entities/Mobs/Species/harpy.yml

NotActuallyMarty · 2026-03-19T09:42:39Z

Resources/Prototypes/_Omu/Proficiencies/BaseProficiencies.yml

+- type: Proficiency
+  id: BaseTools
+  items:
+    - Crowbar
+    - Wrench
+    - Screwdriver
+    - Wirecutter
+    - Welder
+    - Multitool
+
+- type: Proficiency
+  id: advancedTools
+  items:
+    - WelderExperimental
+    - PowerDrill
+    - JawsOfLife
+
+- type: Proficiency
+  id: BaseSci
+  items:
+    - Crowbar
+    - Wrench
+    - Screwdriver
+    - Wirecutter
+    - Welder
+    - Multitool
+  proficiencyMultiplier: 1.2
+  # give sci a minor surgery speed buff, robotics exists and needs surgery to function
+  surgeryProficiency: 1.1
+
+- type: Proficiency
+  id: BaseEngi
+  items:
+    - Crowbar
+    - Wrench
+    - Screwdriver
+    - Wirecutter
+    - Welder
+    - WelderIndustrial
+    - Multitool
+    - WelderExperimental
+    - PowerDrill
+    - JawsOfLife
+  proficiencyMultiplier: 1.2


This is bad. You might want to consider some type of parenting system, or listing proficiencies based on some other factor, i.e. checking for a ToolQualityPrototype of a specific kind or such. That way you plan for future additions and don't have to manually add every tool to a list if somebody adds a new tool.

For example, abductor tools here are not supported.

i was planning on doing this, i couldn't find a way where i could make it work at that time, but i probably just forgot something; i'll have a look into it later

NotActuallyMarty · 2026-03-19T09:45:32Z

Resources/Prototypes/_Omu/Proficiencies/Cargo.yml

+- type: Proficiency
+  id: CargoTechnician
+  items:
+    - Crowbar
+    - Wrench
+    - Screwdriver
+    - Wirecutter
+    - Welder
+    - Multitool
+  proficiencyMultiplier: 1.1
+
+- type: Proficiency
+  id: ShaftMiner
+  items:
+    - Crowbar


See other Comment about changing the base proficiencies, that way you could add a singular thing here (i.e. - BasicTools for example) and wouldn't need to list out every item individually.

Ideally you should make the JobId of the respective job a datafield on the prototype rather than making the prototype name match the JobId.

Additionally, you could add more jobs to this datafield, that way you don't need multiple prototypes to set the same proficiency to multiple jobs.

Co-authored-by: NotActuallyMarty <27968892+NotActuallyMarty@users.noreply.github.com>

NotActuallyMarty

Math is bad and Prototype refactor.

NotActuallyMarty · 2026-03-19T09:54:14Z

Content.Omu.Shared/Proficiencies/Systems/ProficiencySystem.cs

+
+        if (TryComp<BallisticAmmoProviderComponent>(args.Unequipped, out var ammoComp))
+            ammoComp.FillDelay *= MathF.Pow(entity.Comp.ReloadSpeedProficiency, -1);
+


You should not just assume that setting SpeedModifier of the Item to SpeedModifier^(-1) thus setting it to 1 is the default, as tools can have negative or positive speed modifiers, and this would just set them to 1 permanently.

Check the prototype of the item, get its speedmod, and set it to that on unequip.

NotActuallyMarty · 2026-03-19T10:07:00Z

Content.Omu.Shared/Proficiencies/Systems/ProficiencySystem.cs

+        if (args.JobId == null)
+            return;
+
+        entity.Comp.ProficiencyID = args.JobId;
+
+        if (!_prototypeManager.TryIndex<ProficiencyPrototype>(entity.Comp.ProficiencyID, out var proficiencyPrototype))
+            return;


See other comment, You should support multiple JobIds per prototype so you don't need to make redundant prototypes for duplicate modifiers.

NotActuallyMarty

fixing

Content.Omu.Shared/Proficiencies/Systems/ProficiencySystem.cs

Co-authored-by: NotActuallyMarty <27968892+NotActuallyMarty@users.noreply.github.com>

Content.Omu.Shared/Proficiencies/Systems/ProficiencySystem.cs

Resources/Prototypes/_DV/Entities/Mobs/Species/harpy.yml

Holorain4312 added 6 commits March 6, 2026 10:57

Added proficiency system

affa18e

yamlmaxxing the proficiencies

caef65d

Add support for changing reload speed

555ccb8

added security proficiencies

38a157c

Added changes to guidebook

c6f124b

Merge branch 'ProjectOmu:master' into Harpy-rework-real

b528f1a

OmuStationBot added the size/M label Mar 5, 2026

github-actions bot added the S: Untriaged Has not been set a status; currently not labeled. label Mar 5, 2026

Cygnye approved these changes Mar 6, 2026

View reviewed changes

Thesia000 requested changes Mar 6, 2026

View reviewed changes

Integrate the component better

765e11e

Holorain4312 requested a review from Thesia000 March 6, 2026 01:31

github-actions bot added the S: Needs Review Needs review by a maintainer. label Mar 6, 2026

JustOrdinaryPao added A: Character/Species Area: Player characters and species features and content. Type: Balance Change Changes something in the game related to balancing. and removed S: Untriaged Has not been set a status; currently not labeled. labels Mar 6, 2026

Thesia000 requested changes Mar 6, 2026

View reviewed changes

Made EVERYTHING based off of the component

d6ed068

Holorain4312 requested a review from Thesia000 March 6, 2026 20:37

Merge branch 'master' into Harpy-rework-real

f009157

JustOrdinaryPao added Type: Enhancement New feature or request, change to game. S: Needs Second Approval Approved by another maintainer, just needs one more to check it. and removed S: Needs Review Needs review by a maintainer. labels Mar 6, 2026

im a stupid idiot who forgot to fix their code

0a2f782

NotActuallyMarty requested changes Mar 6, 2026

View reviewed changes

Thesia000 and others added 2 commits March 10, 2026 14:14

Merge branch 'master' into Harpy-rework-real

f689928

Merge branch 'master' into Harpy-rework-real

f86e144

Holorain4312 added 2 commits March 12, 2026 18:04

Merge branch 'master' into Harpy-rework-real

09d0b55

Merge branch 'master' into Harpy-rework-real

014dca3

Merge branch 'master' into Harpy-rework-real

32f2473

ThanosDeGraf reviewed Mar 17, 2026

View reviewed changes

Holorain4312 added 2 commits March 18, 2026 19:13

Merge branch 'master' into Harpy-rework-real

b89e933

Merge branch 'master' into Harpy-rework-real

a6057d0

NotActuallyMarty requested changes Mar 19, 2026

View reviewed changes

Apply suggestions from code review

9f1ebc2

Co-authored-by: NotActuallyMarty <27968892+NotActuallyMarty@users.noreply.github.com>

NotActuallyMarty requested changes Mar 19, 2026

View reviewed changes

NotActuallyMarty reviewed Mar 19, 2026

View reviewed changes

Content.Omu.Shared/Proficiencies/Systems/ProficiencySystem.cs Outdated Show resolved Hide resolved

Content.Omu.Shared/Proficiencies/Systems/ProficiencySystem.cs Show resolved Hide resolved

Apply suggestions from code review

97bfb41

Co-authored-by: NotActuallyMarty <27968892+NotActuallyMarty@users.noreply.github.com>

NotActuallyMarty reviewed Mar 19, 2026

View reviewed changes

Content.Omu.Shared/Proficiencies/Systems/ProficiencySystem.cs Show resolved Hide resolved

Apply suggestion from @NotActuallyMarty

4a5c020

NotActuallyMarty reviewed Mar 19, 2026

View reviewed changes

Resources/Prototypes/_DV/Entities/Mobs/Species/harpy.yml Show resolved Hide resolved

Apply suggestion from @NotActuallyMarty

d6124b4

		## Highly specialised

		Harpies are extremely good at doing tasks they are familiar with. they can use most tools their job specialises in more efficiently than everyone else.


		if (TryComp<BallisticAmmoProviderComponent>(args.Unequipped, out var ammoComp))
		ammoComp.FillDelay *= MathF.Pow(entity.Comp.ReloadSpeedProficiency, -1);

Conversation

Holorain4312 commented Mar 5, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

About the PR

Why / Balance

Technical details

Media

Requirements

Breaking changes

Uh oh!

Holorain4312 commented Mar 5, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Thesia000 left a comment

Choose a reason for hiding this comment

Uh oh!

Holorain4312 commented Mar 6, 2026

Uh oh!

Thesia000 left a comment

Choose a reason for hiding this comment

Uh oh!

Holorain4312 commented Mar 6, 2026

Uh oh!

NotActuallyMarty left a comment

Choose a reason for hiding this comment

Uh oh!

Holorain4312 commented Mar 6, 2026

Uh oh!

Holorain4312 commented Mar 7, 2026

Uh oh!

3PonPon3 commented Mar 11, 2026

Uh oh!

Holorain4312 commented Mar 11, 2026

Uh oh!

3PonPon3 commented Mar 11, 2026

Uh oh!

Holorain4312 commented Mar 11, 2026

Uh oh!

3PonPon3 commented Mar 11, 2026

Uh oh!

Holorain4312 commented Mar 11, 2026

Uh oh!

3PonPon3 commented Mar 11, 2026

Uh oh!

Holorain4312 commented Mar 11, 2026

Uh oh!

3PonPon3 commented Mar 11, 2026

Uh oh!

Holorain4312 commented Mar 11, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

EctoplasmIsGood commented Mar 16, 2026

Uh oh!

Holorain4312 commented Mar 16, 2026

Uh oh!

rat-dot-net commented Mar 16, 2026

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

NotActuallyMarty left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

NotActuallyMarty left a comment

Choose a reason for hiding this comment

Uh oh!

Holorain4312 commented Mar 5, 2026 •

edited

Loading

Holorain4312 commented Mar 5, 2026 •

edited

Loading

Holorain4312 commented Mar 11, 2026 •

edited

Loading