Skip to content

Add sergeant#663

Merged
Thesia000 merged 14 commits intoProjectOmu:masterfrom
CliveOcelot:Sergeant
Mar 22, 2026
Merged

Add sergeant#663
Thesia000 merged 14 commits intoProjectOmu:masterfrom
CliveOcelot:Sergeant

Conversation

@CliveOcelot
Copy link
Member

@CliveOcelot CliveOcelot commented Mar 9, 2026 •
edited
Loading

About the PR

Adds sergeant

Why / Balance

Cyg asked me to.

Media

image

Requirements

Changelog
🆑

  • add: Added a new job to security, the Sergeant

@CliveOcelot CliveOcelot added the Note: DO NOT MERGE DO NOT MERGE THIS (YET)! label Mar 9, 2026
@github-actions github-actions bot added Changes: No C# Purely YAML/non-C#. S: Untriaged Has not been set a status; currently not labeled. labels Mar 9, 2026
@github-actions github-actions bot added the Changes: Sprites Makes changes to sprites/RSIs. label Mar 9, 2026
@github-actions
Copy link
Contributor

github-actions bot commented Mar 9, 2026 •
edited
Loading

RSI Diff Bot; head commit 0390428 merging into c1dc8a2
This PR makes changes to 1 or more RSIs. Here is a summary of all changes:

Resources/Textures/Objects/Devices/pda.rsi

State Old New Status
pda-securitysergeant Added

Resources/Textures/_Omu/Interface/Misc/job_icons.rsi

State Old New Status
securitysergeant Added

Resources/Textures/_Omu/Objects/Weapons/Guns/Snipers/ceremonial_rifle.rsi

State Old New Status
base Added
base1 Added
bolt-open Added
equipped-BACKPACK Added
equipped-SUITSTORAGE Added
equipped-backpack-fill-1 Added
equipped-suitstorage-fill-1 Added
inhand-left-fill-1 Added
inhand-left Added
inhand-right-fill-1 Added
inhand-right Added
wielded-inhand-left-fill-1 Added
wielded-inhand-left Added
wielded-inhand-right-fill-1 Added
wielded-inhand-right Added

Edit: diff updated after 0390428

@JustOrdinaryPao JustOrdinaryPao added Type: Feature Adds completely new stuff to the game. Type: Balance Change Changes something in the game related to balancing. A: Security Area: Security department, including Detectives, HoS labels Mar 9, 2026
@3PonPon3 3PonPon3 removed the S: Untriaged Has not been set a status; currently not labeled. label Mar 11, 2026
@CliveOcelot CliveOcelot requested a review from a team March 14, 2026 09:14
@github-actions github-actions bot added the S: Needs Review Needs review by a maintainer. label Mar 14, 2026
@CliveOcelot CliveOcelot changed the title [DRAFT] Add sergeant Add sergeant Mar 14, 2026
@CliveOcelot CliveOcelot removed the Note: DO NOT MERGE DO NOT MERGE THIS (YET)! label Mar 19, 2026
Cygnye
Cygnye approved these changes Mar 19, 2026
View reviewed changes
Copy link
Contributor

@Cygnye Cygnye left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good

@github-actions github-actions bot added the S: Needs Second Approval Approved by another maintainer, just needs one more to check it. label Mar 19, 2026
raincally
raincally reviewed Mar 19, 2026
View reviewed changes
Thesia000
Thesia000 previously requested changes Mar 21, 2026
View reviewed changes
Copy link
Member

@Thesia000 Thesia000 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

needs a SOP, cyg if you could write something it be grand

@Thesia000
Copy link
Member

Thesia000 commented Mar 21, 2026

@Cygnye

@OmuStationBot
Copy link
Collaborator

OmuStationBot commented Mar 21, 2026

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

@OmuStationBot OmuStationBot added the S: Merge Conflict There is a conflict in merging the files. label Mar 21, 2026
@OmuStationBot OmuStationBot removed the S: Merge Conflict There is a conflict in merging the files. label Mar 22, 2026
@Thesia000 Thesia000 merged commit 555abe6 into ProjectOmu:master Mar 22, 2026
16 checks passed
@github-actions github-actions bot added S: Approved This PR has been approved. and removed S: Needs Review Needs review by a maintainer. S: Needs Second Approval Approved by another maintainer, just needs one more to check it. labels Mar 22, 2026
OmuStationBot added a commit that referenced this pull request Mar 22, 2026
@OmuStationBot
Automated Changelog Update (#663)
56f4f54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@raincally raincally raincally left review comments

@Thesia000 Thesia000 Thesia000 approved these changes

@Cygnye Cygnye Cygnye approved these changes

Assignees

No one assigned

Labels

A: Security Area: Security department, including Detectives, HoS Changes: No C# Purely YAML/non-C#. Changes: Sprites Makes changes to sprites/RSIs. S: Approved This PR has been approved. size/M Type: Balance Change Changes something in the game related to balancing. Type: Feature Adds completely new stuff to the game.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

7 participants

@CliveOcelot @Thesia000 @OmuStationBot @Cygnye @raincally @JustOrdinaryPao @3PonPon3