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

Fixing ContrabandSystem to check for Syndicate and Centcomm explicitly #35098

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

Conversation

Coolsurf6
Copy link
Contributor

@Coolsurf6 Coolsurf6 commented Feb 12, 2025

About the PR

Syndicate items that inherit from other items that have contraband components seem to allow departments from that previously inherited item to "be able to carry the item". This now blanket bans all syndicate items to never be allowed to be on the station.

This also changes it so anyone who is centcomm is fully allowed to use all items, being that centcomm is a rare thing and they make all da rules

Why / Balance

Only a few items had this bug, this just fixes it and gives centcomm more power for those who may use them down stream.

Technical details

Edited ContrabandSystem to check if the severity is syndicate, and if so would always make the check fail to show the dis-allow string.

Added a seperate check that skips all others that if you are CentralCommand, always allow.

Media

Screenshot_20250212_181829

Requirements

Breaking changes

Those downstream who may rename CentralCommand may have this break.

Changelog
🆑

  • tweak: Central Command are now exempt from all Contraband.
  • fix: Syndicate Items that are based on other contraband items now display properly

@github-actions github-actions bot added size/S Denotes a PR that changes 10-99 lines. S: Untriaged Status: Indicates an item has not been triaged and doesn't have appropriate labels. labels Feb 12, 2025
# Conflicts:
#	Content.Shared/Contraband/ContrabandSystem.cs
@github-actions github-actions bot added size/XS Denotes a PR that changes 0-9 lines. and removed size/S Denotes a PR that changes 10-99 lines. labels Feb 12, 2025
@Coolsurf6
Copy link
Contributor Author

Should be fixed and cleaned up. I don't know if the hardcoded "CentralCommand" is the best way for this, or maybe making a group of high command that if you have that ID, you overwrite any contraband.

For Wizden, I don't see this being necessarily the case, but may be an option in the future for a downstream if they have that sort of thing.

@Coolsurf6 Coolsurf6 changed the title Fixing ContrabandSystem to check for Syndicate and Centcomm Fixing ContrabandSystem to check for Syndicate and Centcomm explicitly Feb 12, 2025
@ArtisticRoomba
Copy link
Contributor

Yeah, even though it works I'm not sure if this should be the solution here, as this is hardcoded. Iffy for forks and if we ever want to change this ourselves down the line.

@ArtisticRoomba ArtisticRoomba added T: Bugfix Type: Bugs and/or bugfixes P3: Standard Priority: Default priority for repository items. T: New Feature Type: New feature or content, or extending existing content D3: Low Difficulty: Some codebase knowledge required. S: Needs Review Status: Requires additional reviews before being fully accepted A: General Interactions Area: General in-game interactions that don't relate to another area. A: Security Area: Security department, including Detectives, HoS T: Of Admin Interest Type: Affects administration work a lot, and might require admins to weigh in on and removed S: Untriaged Status: Indicates an item has not been triaged and doesn't have appropriate labels. labels Feb 12, 2025
@Coolsurf6
Copy link
Contributor Author

I think a good way to do this is.

Severity: Minor, Moderate, High; seperate syndicate severity off this and make it its own job.

Make allowed departments have Syndicate which by default is not allowed, and any items that inherits that depsrtment comes up as the syndicate text.

This would make items like the Ninja gear not major, but high (maybe even extreme). I am tempted to classify all ninja equipment as syndicate as the syndicate as a term in my opinion is a label that NT places on opposing companies or people. Basically a label they have ingrained into their workers to tell them who is bad.

Forks can then make seperate listings for departments. We can make a positive override (if you are that job, you are allowed everything) and a negative one (if your item is allowed in that job, but is against NT/station, it is always disallowed).

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A: General Interactions Area: General in-game interactions that don't relate to another area. A: Security Area: Security department, including Detectives, HoS D3: Low Difficulty: Some codebase knowledge required. P3: Standard Priority: Default priority for repository items. S: Needs Review Status: Requires additional reviews before being fully accepted size/XS Denotes a PR that changes 0-9 lines. T: Bugfix Type: Bugs and/or bugfixes T: New Feature Type: New feature or content, or extending existing content T: Of Admin Interest Type: Affects administration work a lot, and might require admins to weigh in on
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants