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

Sec crate content rebalancing + box fills + box fill icon fix #29125

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

Conversation

K-Dynamic
Copy link
Contributor

@K-Dynamic K-Dynamic commented Jun 17, 2024

About the PR

  • Added new security crates
  • Changed security crate costs
  • Added new box fills; box of tear gas, box of stinger grenades
  • Minor grammar changes to crates
  • Corrected icon name from sechud to secglasses, corrected box fill from sechuds to secglasses
  • Changed ziptie box to have regular storage, reduced amount of zipties from 10 to 8

Why / 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.

  • Cost decreased from $4000 to $2200 as disablers are already prolific roundstart
  • No throwables; see nonlethal throwable crate reasoning
  • Renamed to differentiate from throwables crate, and indicates to buyers they may be missing restraints
  • Added bare minimum of two zipties to make the most out of stuns; crate is still best paired with restraints crate

(formerly Swat) Riot crate ($7500)

Contains two sets of riot armor, helmets, shields, protective masks, enforcers with beanbags shells, and beanbag shell boxes.

  • Renamed since SWAT equipment exists in-game, and Riot simply reuses existing ID 'SecurityRiot' name
  • Added two protective security masks per yaml comment (# - SecGasmask), otherwise mostly same

(formerly Security supplies) Officer gear crate ($800)

Contains two secglasses, security masks, empty security belts, combat boots and gloves.

  • Had to infer purpose from yaml comments as crate only had box of zipties and sechuds (# - SecBelt, # - SecGasmask, # - SpacelawBook), as well as extremely vague name
  • Reworked and expanded on comments; crate now equips two prospective security cadets, complete with belt, book and filled jackboots
  • No headset (too attractive for antags to tap sec comms)

Biosuit crate

  • Removed, fluff without diseases

Tweak: Restraints crate ($700)

Contains one box of (four) handcuffs and one box of (eight) zipties

  • Previously had unusually large number of restraints (eight cuffs, twenty 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 crate; throwables are single-use and should be separately purchasable, not placed with disablers and driving up price even further
  • Flashbangs moved from stun to throwables crate (flashbangs superseded by flashes with stun ability)

New: Shield crate ($800)

Contains two riot, bulletproof, and reflective shields.

  • New crate; new shields should be separately purchasable from SecTech
  • Needs discussion as reflect shields can deny a lot of NT weaponry

Tweak: Barrier ($800)

  • Cost decreased from $1000 to $800
  • Essentially glorified airlock; will seek to decrease doafter time or introduce unpacking/barrier grenades

Tweak: SecTech refill ($2500)

  • Cost increased from $2200 to $2500
  • Bulk order of sec items expected to be more expensive upfront and cheaper than ordering separately; previous price was too discounted

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

image
image
image

  • I have added screenshots/videos to this PR showcasing its changes ingame

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

🆑

  • add: Added new sec crates; Type I armor vest (standard), nonlethal throwables, shields
  • tweak: Rebalanced price and contents of several security crates and SecTech refill
  • tweak: Renamed sec crates; armor to Type III vest (bulletproof), SWAT to Riot
  • remove: Removed security biosuit crate
  • fix: secglasses box actually contains secglasses instead of sechuds

@github-actions github-actions bot added No C# For things that don't need code. Changes: Sprites Should be reviewed or fixed by people who are knowledgeable with spriting or visual design. labels Jun 17, 2024
Copy link
Contributor

github-actions bot commented Jun 17, 2024

RSI Diff Bot; head commit 7f6fa08 merging into 9f5b6af
This PR makes changes to 1 or more RSIs. Here is a summary of all changes:
Edit: diff updated after 7f6fa08

@K-Dynamic
Copy link
Contributor Author

I seriously need to set up screen recording for this PR and another one

@K-Dynamic
Copy link
Contributor Author

Test fail might be erroneous - depends on how people feel about gambling for a brain from a corpse at 5% probability

@github-actions github-actions bot added the Merge Conflict This PR currently has conflicts that need to be addressed. label Jun 19, 2024
Copy link
Contributor

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

@github-actions github-actions bot removed the Merge Conflict This PR currently has conflicts that need to be addressed. label Jun 19, 2024
@K-Dynamic
Copy link
Contributor Author

oh god I think I just cooked my branch hold on

@K-Dynamic K-Dynamic marked this pull request as ready for review June 19, 2024 10:41
@github-actions github-actions bot removed the Merge Conflict This PR currently has conflicts that need to be addressed. label Jun 19, 2024
@K-Dynamic
Copy link
Contributor Author

huzzah, merging 150 commits didn't cause my "files changed" to go from 11 files to 513 files

@github-actions github-actions bot added the Merge Conflict This PR currently has conflicts that need to be addressed. label Jun 22, 2024
Copy link
Contributor

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

@github-actions github-actions bot removed the Merge Conflict This PR currently has conflicts that need to be addressed. label Jun 23, 2024
Copy link
Member

@AJCM-git AJCM-git left a 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.

@AJCM-git AJCM-git added the Status: Awaiting Changes This PR needs its reviews addressed or changes to be made in order to be merged. label Jul 16, 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 Merge Conflict This PR currently has conflicts that need to be addressed. label Aug 19, 2024
@UbaserB
Copy link
Member

UbaserB commented Aug 27, 2024

You coming back to this?

@github-actions github-actions bot removed the Merge Conflict This PR currently has conflicts that need to be addressed. label Aug 27, 2024
@K-Dynamic
Copy link
Contributor Author

K-Dynamic commented Aug 27, 2024

@AJCM-git I've removed forensics crate, decreased barrier cost from $1000 to $850 now instead of $350

@UbaserB probably, I got lazy

@UbaserB UbaserB added Status: Needs Review This PR requires new reviews before it can be merged. Undergoing Maintainer Discussion This PR is currently going through an internal discussion by the maintainer team. and removed Status: Awaiting Changes This PR needs its reviews addressed or changes to be made in order to be merged. labels Sep 3, 2024
Copy link
Member

@UbaserB UbaserB left a 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 UbaserB added Status: Awaiting Changes This PR needs its reviews addressed or changes to be made in order to be merged. and removed Status: Needs Review This PR requires new reviews before it can be merged. labels Sep 13, 2024
@K-Dynamic
Copy link
Contributor Author

K-Dynamic commented Sep 21, 2024

@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).

@github-actions github-actions bot added Status: Needs Review This PR requires new reviews before it can be merged. and removed Status: Awaiting Changes This PR needs its reviews addressed or changes to be made in order to be merged. labels Oct 12, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Changes: Sprites Should be reviewed or fixed by people who are knowledgeable with spriting or visual design. No C# For things that don't need code. Status: Needs Review This PR requires new reviews before it can be merged. Undergoing Maintainer Discussion This PR is currently going through an internal discussion by the maintainer team.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants