-
Notifications
You must be signed in to change notification settings - Fork 3.4k
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
Sec crate content rebalancing + box fills + box fill icon fix #29125
base: master
Are you sure you want to change the base?
Conversation
I seriously need to set up screen recording for this PR and another one |
Test fail might be erroneous - depends on how people feel about gambling for a brain from a corpse at 5% probability |
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
oh god I think I just cooked my branch hold on |
huzzah, merging 150 commits didn't cause my "files changed" to go from 11 files to 513 files |
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
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.
The barriers are supposed to be expensive, they are not glorified airlocks as they offer a way more specialized use-case for security (vaulting, easily deployability, etc), they are pretty well used already so dont decrease the price this much, the lowest they can prob go without starting to be constantly spammed is like 800
The forensics crate is a bad idea since the forensic scanner and stuff are supposed to be unique gear to the detective, as well as being basically the only thing they get in order to actually do detective work with. With that crate you can just spend $1500 and completely trivialize a pretty specialized role. The cases where there are no detectives are already covered by the fact that the detective locker has a scanner and stuff.
Apart from that this is a good pr.
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
You coming back to this? |
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.
Can you remove the ability to purchase strait jackets?
@UbaserB restraint jackets removed Small story: I made changes to the ziptie box early on without documenting it and forgot. After looking at it again, I now made it hold 8 zipties and lose its special storage (removed arbitrary grid shape and whitelist). |
About the PR
sechud
tosecglasses
, corrected box fill from sechuds to secglassesWhy / Balance
Adds new crates to obtain items outside of SecDrobe and SecTech restocks at higher costs, as well as normally unobtainable items such as straitjackets.
Crates fills were updated to reflect new content and per YAML comments such as security gas masks, tear gas grenades and Security 101 books (which contains space law guidance). This has affected crate pricing as well, so please leave feedback below on what the crate prices should be (item utility value =/= cost).
Duplication between crates was minimised to avoid waste. (This meant unusual situations where bolas were added to a separate nonlethal throwables crate, rather than the existing nonlethal crate.)
Overall, the PR should should make cargo orders to security more flexible, as well as providing a much-needed boost for security.
Regarding the fills, this should save time for mappers to add multiple throwables to security, as well as being needed for the throwables crate.
Some grammar changes were made to each security crate for consistency.
Cargo gifts were also adjusted to reflect new crates, such as adding Type I crate to lethal weapons gift event, as well as throwables to riot gift event.
The sechud icon did not reflect the actual appearnce as they looked closer to glasses, hence the rename. This should be less confusing to anyone looking at the boxes.
Ziptie box was adjusted to become a regular 3x3 box instead of having internal 1x10 storage for zipties only. I have no idea why it had special storage properties just to hold one extra ziptie, so I made it the same as any other box with no whitelist.
New: (formerly armor) Type I Armor vest crate ($800), Type III Armor vest crate ($725)
Basic armor crate: Contains three well-rounded Type I vests
Bulletproof armor crate: Contains three bulletproof Type III vests
Crates now specify vest instead of just armor; orders were confused as helmets had to be ordered separately, despite also falling under 'armor'
Cost of buying both helmets and a set of basic or bulletproof armour remains the same.
Vest crate did not specify if it contained Type I or Type III vests; both now available for purchase to fit threat profiles better, and let security restock Type I armor without SecDrobe refill
Tweak: Nonlethal stun crate ($2200)
Contains two disablers, stunbatons, flashes, and zipties.
(formerly Swat) Riot crate ($7500)
Contains two sets of riot armor, helmets, shields, protective masks, enforcers with beanbags shells, and beanbag shell boxes.
# - SecGasmask
), otherwise mostly same(formerly Security supplies) Officer gear crate ($800)
Contains two secglasses, security masks, empty security belts, combat boots and gloves.
# - SecBelt
,# - SecGasmask
,# - SpacelawBook
), as well as extremely vague nameBiosuit crateTweak: Restraints crate ($700)
Contains one box of (four) handcuffs and one box of (eight) zipties
New: Nonlethal throwables crate ($800)
Contains one box of (four) stinger grenades, one box of (four) flashbangs, one box of (four) tear gas grenades, and four bolas.
New: Shield crate ($800)
Contains two riot, bulletproof, and reflective shields.
Tweak: Barrier ($800)
Tweak: SecTech refill ($2500)
Technical details
yaml changes
Resources/Prototypes/Catalog/Cargo/cargo_security.yml
(crates and prices for cargo catalog)Resources/Prototypes/Catalog/Cargo/cargo_vending.yml
(price for SecTech refill)Resources/Prototypes/Catalog/Fills/Boxes/security.yml
(box fills for grenades and secglasses)Resources/Prototypes/Catalog/Fills/Crates/security.yml
(security crate contents)Resources/Prototypes/Entities/Markers/Spawners/Random/crates.yml
(sec biosuit removal)Resources/Prototypes/GameRules/cargo_gifts.yml
(added new crates to gifts)Resources/migration.yml
(replaces instances of mislabelled secglasses boxes)rsi changes (renamed 'sechud' to 'secglasses' because icon didn't match name)
Resources/Textures/Objects/Storage/boxes.rsi/meta.json
Resources/Textures/Objects/Storage/boxes.rsi/secglasses.png
Resources/Textures/Objects/Storage/boxicons.rsi/meta.json
Resources/Textures/Objects/Storage/boxicons.rsi/secglasses.png
Media
Breaking changes
Sec crate IDs kept same whenever possible as changing could break maps. PR will commit migrations.yml file for any map fails.
Changelog
🆑