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

Contraband Updates #33975

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

Conversation

minus1over12
Copy link
Contributor

@minus1over12 minus1over12 commented Dec 21, 2024

About the PR

Numerous items have had contraband status added to them, or modified to reflect who actually uses them.

Why / Balance

  • Clothing: Players expect someone wearing a security officer uniform to be a security officer. That logic should be applicable to other roles. Hence, most department specific clothing has been restricted to their respective department.
    • Brigmedic gear has been marked as restricted to security and medical - brigmedic is currently disabled, so I'm not sure how to restrict this.
  • Restricted hardsuits and similar have had the restriction added to their integrated helmets. The helmets sometimes show up by themselves (chameleon), and I think it's reasonable for Nanotrasen to not want someone running around with a blood-red helmet.
  • Previously unmarked antagonist items were marked as contraband (holoparasite instructions, nuke codes, syndicate vendors, …).
  • A subset of the contraband posters were marked as contraband to give sec something to do while running through maints if no one is doing crime.
  • Singularity Generator, Tesla Generator, and Pulse Accelerator boards were marked as engineering contraband.
  • Some security gear was changed to allow civilian use, as the bartender gets it roundstart.
  • Improvised explosives should have been counted as improvised weapons.
  • Weapons ammo is security restricted, except the beanbag shotgun rounds, which are civilian & security restricted.
  • Every ID card, except passenger and visitor, have been restricted, as they are what gates access to other department restricted items.
  • Mindshields implanters were restricted to security and command, because they are the only ones that get issued them under normal operating conditions.
  • Departmental techfabs (such as sec techfab) were restricted to their departments.
  • PKA access was widened to include science. This allows science to deal with rock crabs and flesh monsters without needing to call for security or salvage every 5 minutes. Science is already able to make PKAs.
  • Centcomm exclusive equipment was restricted to Centcomm (Centcomm stamp, …)
  • Head bedsheets are now command restricted. I'm unsure if putting grand theft on them is reasonable or not.
  • Headsets were given restrictions that match their encryption keys.
  • Surgical tools were restricted to medical and science to discourage unlicensed surgeries (for when that eventually gets finished or upstreamed).
  • Centcomm level roles should not be carrying around contraband, so they have been given status as members of relevant departments. For Death Squad operatives, they have gotten a special version of some of the syndie items they used to have.

Technical details

New base contraband entities were added to accommodate restriction patterns that did not yet exist. Contraband statuses are applied by inheriting from the contraband bases, as has been the case. Death squad variants of 5 syndicate items were added to solve their contraband issues without marking certain standard Syndicate items (energy swords, nukie agent vest, …) as ok for CentComm. 2 new classes of contraband were added related to the Ninja - one for their equipment and one for their targets (currently just the R&D server, undecided on marking the criminal records computers). The CentComm roles (ERT, CBURN, Death Squad) have been added to their relevant departments to solve their contraband issues.

Media

Brigmedic Hardsuit on inspection
Nuke Codes on inspection
R&D server with Spider Clan warning

Requirements

Breaking changes

Changelog

🆑 WarPigeon

  • tweak: Numerous items across 90+ categories have had their contraband status updated.

@github-actions github-actions bot added S: Untriaged Status: Indicates an item has not been triaged and doesn't have appropriate labels. size/M Denotes a PR that changes 100-999 lines. Changes: No C# Changes: Requires no C# knowledge to review or fix this item. and removed size/M Denotes a PR that changes 100-999 lines. labels Dec 21, 2024
@minus1over12 minus1over12 changed the title Feature/contraband fixes Contraband Updates Dec 21, 2024
@github-actions github-actions bot added the size/M Denotes a PR that changes 100-999 lines. label Dec 22, 2024
@beck-thompson beck-thompson added P3: Standard Priority: Default priority for repository items. T: New Feature Type: New feature or content, or extending existing content S: Needs Review Status: Requires additional reviews before being fully accepted DB: Beginner Friendly Difficulty: Great for beginners. Unambiguous in scope, and explains how to achieve the result. A: Roundflow/Antag Area: Roundflow - "What happens in the game", including antagonist roles and their capabilities A: Security Area: Security department, including Detectives, HoS and removed S: Untriaged Status: Indicates an item has not been triaged and doesn't have appropriate labels. labels Dec 22, 2024
@github-actions github-actions bot added the S: Merge Conflict Status: Needs to resolve merge conflicts before it can be accepted label Dec 22, 2024
Copy link
Contributor

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

@minus1over12 minus1over12 force-pushed the feature/contraband-fixes branch from 725900f to fd5fb34 Compare December 23, 2024 02:59
@minus1over12 minus1over12 marked this pull request as ready for review December 23, 2024 03:00
@github-actions github-actions bot removed the S: Merge Conflict Status: Needs to resolve merge conflicts before it can be accepted label Dec 23, 2024
@minus1over12
Copy link
Contributor Author

I guess dealing with the ERT departments is going to be more difficult than I thought. I really didn't want to add CentComm as an allowed department to a bunch of items, but I'm not sure if there is a better way to get around the 1 primary department per role rule.

@minus1over12
Copy link
Contributor Author

Changed it so that CentComm is no longer a primary department, but I am not familiar enough with what @deltanedas wanted to do with those to say that I did not just break something for him.

@deltanedas
Copy link
Contributor

theres no centcomm roles roundstart and they probably wouldnt be turf taggers anyway

@Hrosts
Copy link
Contributor

Hrosts commented Dec 24, 2024

Should department-specific survival boxes be marked as contraband? The boxes often get thrown around and picked up by whoever, and unless you want to enforce people disposing of them properly, this will only give some officers stupid reasons to arrest somebody.

Is nukie survival box even outwardly marked as belonging to the Syndicate? The gas mask inside it is contraband, yes, but otherwise I'm not sure how a person would distinguish those.

Another thing, should you be arrested for carrying a wrong backpack? Should the officer be obligated by Space Law to take away your backpack if it doesn't match? Similarly with boxes, backpacks and duffels are often discarded with little care, or often even shared (e.g. engi bringing a duffel full of materials).

@minus1over12
Copy link
Contributor Author

Should department-specific survival boxes be marked as contraband? The boxes often get thrown around and picked up by whoever, and unless you want to enforce people disposing of them properly, this will only give some officers stupid reasons to arrest somebody.

You're right, I'll unmark those.

Is nukie survival box even outwardly marked as belonging to the Syndicate? The gas mask inside it is contraband, yes, but otherwise I'm not sure how a person would distinguish those.

The distinction is small enough that I also in hindsight think you are right. I will unmark their survivial box.

Another thing, should you be arrested for carrying a wrong backpack? Should the officer be obligated by Space Law to take away your backpack if it doesn't match? Similarly with boxes, backpacks and duffels are often discarded with little care, or often even shared (e.g. engi bringing a duffel full of materials).

I've personally only ever seen the botany plant bags shared, and that is with cargo, who handles large amounts of contraband anyway. My thought when restricting the bags was that a wrong backpack might indicate that it was stolen instead of borrowed with consent; think a Syndie with a steal objective that needed to make a quick getaway, so they just carry the bag with them instead of searching through it. Maybe an in the middle tier of contraband is needed, where having something makes you suspicious but is not criminal? Another possible compromise is restricting the command bags, which can contain high value targets, and leaving the other ones be, which are more likely to get shared around.

@Palladinium
Copy link
Contributor

Palladinium commented Dec 24, 2024

I like the idea that only command bags are contraband (maybe security?), because that reflects how security would generally behave without those markers. Most officers won't shake you down because you've got the wrong bag, but the captain's bag? That's super suspicious and is definitely getting you questioned or arrested.

@Hrosts
Copy link
Contributor

Hrosts commented Dec 24, 2024

I agree about command and security bags being restricted. As for the "suspicious" contraband tier I think sec should decide by themselves whether something is only suspicious but not illegal.

@@ -113,7 +113,7 @@
- WhitelistChameleon

- type: entity
parent: ClothingEyesBase
parent: [ClothingEyesBase, BaseSyndicateContraband]
Copy link
Contributor

Choose a reason for hiding this comment

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

The outlaw glasses are the ones with fake brows and nose. I am not sure if making them contraband is a good idea. They are a joke item, and this only makes them "bad" to ever buy. Technically, stuff like syndie pyjamas is considered contraband, so there's a precedent, but still.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

My thought with this was to mirror the change to cat ears that was made in #30930 and merged in. Those are also a joke item.

@Hrosts
Copy link
Contributor

Hrosts commented Dec 24, 2024

Another thing I might want to criticize this on is the sheer amount of contraband markers an officer will see on extremely mundane items. Like, the entirety of someone's outfit will be marked as contraband, making it harder to notice when it's actually something you should pay attention to. I fear this will just be a lot of visual noise, but let's see what maintainers will say.

Oh, and they might ask you to split the PR into several parts because of how many files it touches.

@minus1over12
Copy link
Contributor Author

I am going to drop the changes to most of the non-mindshield role clothing and come back to those in a different PR.

I have seen 2 rounds now where a traitor successfully lawyers their way out of getting their syndicats killed, which then unsurprisingly kill someone later.
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 S: Merge Conflict Status: Needs to resolve merge conflicts before it can be accepted label Jan 31, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A: Roundflow/Antag Area: Roundflow - "What happens in the game", including antagonist roles and their capabilities A: Security Area: Security department, including Detectives, HoS Changes: No C# Changes: Requires no C# knowledge to review or fix this item. DB: Beginner Friendly Difficulty: Great for beginners. Unambiguous in scope, and explains how to achieve the result. P3: Standard Priority: Default priority for repository items. S: Merge Conflict Status: Needs to resolve merge conflicts before it can be accepted S: Needs Review Status: Requires additional reviews before being fully accepted size/M Denotes a PR that changes 100-999 lines. T: New Feature Type: New feature or content, or extending existing content
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants