Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Secborg Module Overhaul, Small Borg Buff #2059

Open
wants to merge 49 commits into
base: master
Choose a base branch
from

Conversation

Avalon-Proto
Copy link
Contributor

@Avalon-Proto Avalon-Proto commented Oct 27, 2024

A total rework of secborg modules, and gives all borgs roundstart tools

About the PR

A rework of all the items contained within the modules of the secborg, as well as granting all borgs roundstart tools as not having tools as a borg is just pain

Why / Balance

The pax hypo was an extremely overpowered option, allowing secborgs to completely nullify any chance someone had of fighting back. So, I removed it, moved things around, and now I think the modules are in afar better state

Technical details

Bastion Module- Now contains the Non-lethal launcher and a flash, whistle too
Patrol Module- Contains Seclite, Holobarrier, whistle
De-Escalation- Lost Pax Hypo, Gained a whistle + Seclite
Escalation- Gained Riot shotgun, a 4 shot beanbag shotgun, a combat knife, and a whistle
Chase- Gained Seclite, Whistle, Lost MEG, Gained Disabler.
All borgs gained tools

Media

De-Escalation
image
Patrol
image
Chase
image
Bastion
image
Escalation
image

Requirements

Breaking changes

Changelog

🆑

  • tweak: Secborg equipment has been reassessed and redesigned, go out there and show em what you're made of peacekeepers!
    🆑
  • tweak: ALl borgs have been outfitted with tool modules at base

A total rewqwork of secborg modules
@github-actions github-actions bot added Changes: YML Changes any yml files S: Merge Conflict Fix your PR! labels Oct 27, 2024
Copy link
Contributor

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

Removed patrol module fully
@Avalon-Proto
Copy link
Contributor Author

Patrol Module fried, bastion remains for later repurposing

Copy link
Contributor

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

Copy link
Contributor

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

@Avalon-Proto
Copy link
Contributor Author

Hey Milon. Gonna help me fix the GLs anytime soon? I wanna see this in action

@github-actions github-actions bot added the S: Merge Conflict Fix your PR! label Nov 24, 2024
Copy link
Contributor

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

@github-actions github-actions bot added the size/M 64-255 lines label Dec 25, 2024
@Avalon-Proto
Copy link
Contributor Author

Why is the commented out bastion causing a conflict I'm getting rid of it :elp:

@Avalon-Proto Avalon-Proto marked this pull request as ready for review December 25, 2024 01:16
@Avalon-Proto Avalon-Proto requested a review from a team as a code owner December 25, 2024 01:16
@MadiMadsen
Copy link

something i was curious about was that there were plans to add a module for zip ties for security borgs. I'm wondering if that could be part of this overhaul or if that's out of scope of your current plans.

@Bonktrauma
Copy link
Contributor

something i was curious about was that there were plans to add a module for zip ties for security borgs. I'm wondering if that could be part of this overhaul or if that's out of scope of your current plans.

Secborgs won't be given any form of restraints iirc

@Avalon-Proto
Copy link
Contributor Author

something i was curious about was that there were plans to add a module for zip ties for security borgs. I'm wondering if that could be part of this overhaul or if that's out of scope of your current plans.

Secborgs won't be given any form of restraints iirc

Correction. If I knew how to I'd give them zip ties. At one point @IamVelcroboy had a working ziptie module

@Radezolid
Copy link
Contributor

something i was curious about was that there were plans to add a module for zip ties for security borgs. I'm wondering if that could be part of this overhaul or if that's out of scope of your current plans.

Secborgs won't be given any form of restraints iirc

Correction. If I knew how to I'd give them zip ties. At one point @IamVelcroboy had a working ziptie module

Pretty much you would need to do this https://github.com/DeltaV-Station/Delta-v/blob/master/Resources/Prototypes/Entities/Objects/Materials/Sheets/glass.yml#L111

@Bonktrauma
Copy link
Contributor

Correction. If I knew how to I'd give them zip ties. At one point @IamVelcroboy had a working ziptie module

https://discord.com/channels/968983104247185448/1206353544186171482/1268113845705244813

I dont think danger wanted them to have cuffs

Signed-off-by: Avalon <[email protected]>
@ThataKat
Copy link
Contributor

Reviewing, get back to you in 24 hours or so. Should be quicker this time around

Copy link
Contributor

@ThataKat ThataKat left a comment

Choose a reason for hiding this comment

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

Direction here, all the changes to secborg modules themselves are approved. Requesting that you move the round start tools to a separate PR, though. Can discuss the merits of that there.

@Avalon-Proto
Copy link
Contributor Author

Right this is all set @deltanedas ... just not sure why the tests are failing

@deltanedas
Copy link
Member

because the png is uppercase I it has to be lowercase i

@Avalon-Proto
Copy link
Contributor Author

because the png is uppercase I it has to be lowercase i

In my files it IS lowercase so i dont know why its not here

@deltanedas
Copy link
Member

Resources/Textures/_DV/Objects/Weapons/Guns/Launchers/nonlethal_launcher.rsi/Icon.png

move it then git add -A and commit push, rtfm :trollface:

@Avalon-Proto
Copy link
Contributor Author

So I remove the file by cutting it out or something, make a commit, then put it back and commit again?

@Avalon-Proto
Copy link
Contributor Author

The linter is STILL broken :elp:

@deltanedas
Copy link
Member

Security not Secrutiy

@Avalon-Proto
Copy link
Contributor Author

I.. have no idea whats broken now

@deltanedas
Copy link
Member

add bastion module to one of the secfab or exofab packs

@Avalon-Proto
Copy link
Contributor Author

ITS GOOD! THANK GOD... i resolved all changes though so why does it say i have more to fix

@Avalon-Proto Avalon-Proto requested a review from ThataKat March 3, 2025 04:41
@@ -1,4 +1,4 @@
# Generic borg
# Generic borg
Copy link
Member

Choose a reason for hiding this comment

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

revert changes to this file

Copy link
Contributor Author

Choose a reason for hiding this comment

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

How do I checkout again, been a bit

Copy link
Member

Choose a reason for hiding this comment

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

git checkout origin/master Resources/Prototypes/borg_types.yml

- FlashRecharging
- CombatKnife # Anti-fauna for blunt resistant slimes
- WeaponRiotShotgunBorg
- SecurityWhistle
Copy link
Member

Choose a reason for hiding this comment

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

direction doesnt want lethal module at all, remove escalation from research and recipes (maybe it can be used in the future so keep the module itself)

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Kat said the escalation module was fine though?

Copy link
Member

Choose a reason for hiding this comment

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

#3060 says borgs shouldnt be killing or lethally fighting anyone

@@ -1,4 +1,4 @@
# Generic borg
# Generic borg
Copy link
Member

Choose a reason for hiding this comment

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

git checkout origin/master Resources/Prototypes/borg_types.yml

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Changes: Sprite Changes any png or json in an rsi Changes: YML Changes any yml files S: Needs Review size/M 64-255 lines
Projects
None yet
Development

Successfully merging this pull request may close these issues.