-
Notifications
You must be signed in to change notification settings - Fork 422
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
base: master
Are you sure you want to change the base?
Secborg Module Overhaul, Small Borg Buff #2059
Conversation
A total rewqwork of secborg modules
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
Resources/Prototypes/DeltaV/Entities/Objects/Specific/Robotics/borg_modules.yml
Outdated
Show resolved
Hide resolved
Removed patrol module fully
Patrol Module fried, bastion remains for later repurposing |
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
Signed-off-by: deltanedas <[email protected]>
Hey Milon. Gonna help me fix the GLs anytime soon? I wanna see this in action |
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
Why is the commented out bastion causing a conflict I'm getting rid of it :elp: |
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 |
https://discord.com/channels/968983104247185448/1206353544186171482/1268113845705244813 I dont think danger wanted them to have cuffs |
Signed-off-by: Avalon <[email protected]>
Reviewing, get back to you in 24 hours or so. Should be quicker this time around |
Resources/Textures/_DV/Objects/Weapons/Guns/Launchers/nonlethal_launcher.rsi/Icon.png
Outdated
Show resolved
Hide resolved
There was a problem hiding this 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.
Right this is all set @deltanedas ... just not sure why the tests are failing |
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 |
move it then git add -A and commit push, rtfm |
So I remove the file by cutting it out or something, make a commit, then put it back and commit again? |
The linter is STILL broken :elp: |
Security not Secrutiy |
I.. have no idea whats broken now |
add bastion module to one of the secfab or exofab packs |
…Delta-v into Secborg-Adjustment
ITS GOOD! THANK GOD... i resolved all changes though so why does it say i have more to fix |
Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml
Outdated
Show resolved
Hide resolved
Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/Launchers/launchers.yml
Outdated
Show resolved
Hide resolved
Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml
Outdated
Show resolved
Hide resolved
@@ -1,4 +1,4 @@ | |||
# Generic borg | |||
# Generic borg |
There was a problem hiding this comment.
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
There was a problem hiding this comment.
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
There was a problem hiding this comment.
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 |
There was a problem hiding this comment.
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)
There was a problem hiding this comment.
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?
There was a problem hiding this comment.
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 |
There was a problem hiding this comment.
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
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





Patrol
Chase
Bastion
Escalation
Requirements
Breaking changes
Changelog
🆑
🆑