Skip to content

Cyborg jetpacks, Construction module rework, Salvage borg crushers and enchanted drills, Postal cyborg module, construction and mail bag improvements - #1325

Open
SirCannonFodder wants to merge 15 commits into
ProjectOmu:masterfrom
SirCannonFodder:engineer-borg-improvements-and-QoL
Open

Cyborg jetpacks, Construction module rework, Salvage borg crushers and enchanted drills, Postal cyborg module, construction and mail bag improvements#1325
SirCannonFodder wants to merge 15 commits into
ProjectOmu:masterfrom
SirCannonFodder:engineer-borg-improvements-and-QoL

Conversation

@SirCannonFodder

@SirCannonFodder SirCannonFodder commented Jul 30, 2026

Copy link
Copy Markdown
Contributor

About the PR

  • Cyborg thruster module now has a non-weapon infinite use jetpack in place of the fire extinguisher
  • Engineering construction bags now have a updated whitelist to hold all machine/computer boards, flatpaks, lights, upgrade kits, batteries, and floor tiles.
  • Engineering cyborg construction module now has two hands that can pick up anything the construction bag can
  • Comment out the now redundant 9 lingering mat hands from the construction module and added a Tray.
  • The PKA slot that salv borgs use can now use crushers and drills (useful since drills can be enchanted)
  • Salvage cyborgs now can have a postal module for delivering mail.
  • Mail bags can now hold mail capsules to better support the postal module while offering a little bit of QOL to mail couriers.

Why / Balance

  • Cyborgs really could use a better space movement option since the 200u fire extinguisher was very lack luster and only barely fill that role.
  • The jetpack in the space module can't be attacked with to help limit use in combat
  • Using filtered hands I not only made the construction module easier to use but also better at the things engineering cyborgs should already be good at.
  • Salvage borg player Ziggy D asked me to give a way for salv borgs to use crushers and enchanted drills. The whitelist change to borg PKA slots solves this.
  • We have a courier bug-Borg skin but no way for it to deliver mail till now thanks to the new postal module.
  • Construction bags now have a expanded whitelist to better support engi borgs. This change is also a nice little QOL for normal engineering players.
  • Mail bags can now hold mail capsules to better support the postal module while offering a little bit of QOL to mail couriers.

Technical details

Media

Screenshot_20260729_154702

Requirements

  • I have read and agree to the Contributor License Agreement.

Breaking changes

Changelog

🆑

  • add: Cyborg thruster module now has a infinite use jetpack in place of the fire extinguisher.
  • tweak: Construction bag whitelist has been updated to hold all machine/computer boards, flatpaks, lights, upgrade kits, batteries, and floor tiles.
  • tweak: Engineering cyborg construction module now has two hands that can pick up anything the construction bag can and added a Tray scanner.
  • remove: the now redundant 9 lingering material hands from the construction module.
  • tweak: The PKA slots for salvage cyborgs can now hold crusher weapons, drills, and pickaxes.
  • add: Cyborg postal module allowing salvage cyborgs to deliver mail. (The postal module whitelist hands can hold mail of both sizes and mail capsules)
  • tweak: Mail bags can now hold mail capsules.

@github-actions github-actions Bot added Changes: No C# Purely YAML/non-C#. Changes: Sprites Makes changes to sprites/RSIs. S: Untriaged Has not been set a status; currently not labeled. labels Jul 30, 2026
@github-actions

github-actions Bot commented Jul 30, 2026

Copy link
Copy Markdown
Contributor

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

Resources/Textures/_Omu/Interface/Actions/actions-borg.rsi

State Old New Status
postal-module Added

Resources/Textures/_Omu/Objects/Specific/Robotics/borgmodule.rsi

State Old New Status
icon-postal Added

Edit: diff updated after d9edcfa

@DuskTheSnep

Copy link
Copy Markdown
Contributor

mailborgs will finally be real

@Toaster-Box Toaster-Box added Type: Enhancement New feature or request, change to game. S: Needs Review Needs review by a maintainer. Priority: Low This isn't an immediate concern. A: Cargo Area: Cargo department and related mechanics. A: Engineering Area: Engineering department, doesn't include Atmospherics. A: Silicons Area: Relates to Silicon roles, including AI. and removed S: Untriaged Has not been set a status; currently not labeled. labels Jul 30, 2026

@Thesia000 Thesia000 left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

please replace the infinite jetpack with a borgslot that can pick upjetpacks and then give them a base mini jetpack to start

@github-actions github-actions Bot removed the S: Needs Review Needs review by a maintainer. label Aug 8, 2026
@SirCannonFodder

Copy link
Copy Markdown
Contributor Author

please replace the infinite jetpack with a borgslot that can pick upjetpacks and then give them a base mini jetpack to start

Can do just note allow cyborgs to be able to actively fly around beat people with the jetpack
I can also move it to it's own module that's locked behind tech.

@SirCannonFodder

Copy link
Copy Markdown
Contributor Author

please replace the infinite jetpack with a borgslot that can pick upjetpacks and then give them a base mini jetpack to start

I've tried to implement your change but ran into a critical issue.
If the jetpack is in a DroppableBorgModule slot the jetpack will fly out of its hand when used. unless there is a flag or something I can add to cyborgs to stop that from happening the infinite jetpack is the only possible implementation without getting into C#.

@Toaster-Box Toaster-Box added the S: Needs Changes Changes/Concerns have been brought up and should be made before review. label Aug 14, 2026
@Toaster-Box

Copy link
Copy Markdown
Contributor

@SirCannonFodder
staff are asking for the construction bag change to be split off into its own PR

@Toaster-Box

Copy link
Copy Markdown
Contributor

for the issue you're having with the jet pack a very small C# change will make it work
image
if you run into trouble with that, dont be afraid to ask for help on the contrib-mines chat in the discord
and if you do add the C# dont forget to put a comment on it

@Toaster-Box Toaster-Box added the S: Needs Discussion Discussion needed for changes, talk about it. label Aug 15, 2026
@Toaster-Box Toaster-Box added S: Admin Vote Passed Signifies an admin vote passed in favour of merging. and removed S: Needs Discussion Discussion needed for changes, talk about it. labels Aug 16, 2026

@Toaster-Box Toaster-Box left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Staff vote is to make this a researchable advanced module instead of round start
And if that's done Itll be good to review and merge

@OmuStationBot OmuStationBot added the S: Merge Conflict There is a conflict in merging the files. label Aug 21, 2026
@OmuStationBot

Copy link
Copy Markdown
Collaborator

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

…vements-and-QoL

# Conflicts:
#	Content.Goobstation.Server/Jetpack/GoobJetpackSystem.cs
#	Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml
#	Resources/Prototypes/Nyanotrasen/Entities/Objects/Specific/Mail/tools.yml
#	Resources/Prototypes/Recipes/Lathes/Packs/robotics.yml
#	Resources/Prototypes/_Goobstation/Entities/Objects/Specific/Robotics/borg_modules.yml
#	Resources/Prototypes/_Omu/Entities/Objects/Specific/Robotics/borg_modules.yml
@OmuStationBot OmuStationBot added size/S and removed S: Merge Conflict There is a conflict in merging the files. size/M labels Aug 27, 2026
@SirCannonFodder

Copy link
Copy Markdown
Contributor Author

still need to add the jetpack module and update the postal module to use the new hand system

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

A: Cargo Area: Cargo department and related mechanics. A: Engineering Area: Engineering department, doesn't include Atmospherics. A: Silicons Area: Relates to Silicon roles, including AI. Changes: No C# Purely YAML/non-C#. Changes: Sprites Makes changes to sprites/RSIs. Priority: Low This isn't an immediate concern. S: Admin Vote Passed Signifies an admin vote passed in favour of merging. S: Needs Changes Changes/Concerns have been brought up and should be made before review. size/S Type: Enhancement New feature or request, change to game.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants