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

Fix some contraband issues #31606

Merged
merged 21 commits into from
Sep 9, 2024
Merged

Conversation

Winkarst-cpu
Copy link
Contributor

@Winkarst-cpu Winkarst-cpu commented Aug 28, 2024

About the PR

Fixed some contraband issues.

Why / Balance

See #31047.

Technical details

Media

изображение
изображение
изображение
изображение
изображение
изображение

2024-08-29.13-11-14.mp4
2024-08-29.13-33-00.mp4
2024-08-29.14-14-15.mp4

Requirements

  • I have read and I am following the Pull Request Guidelines. I understand that not doing so may get my pr closed at maintainer’s discretion
  • I have added screenshots/videos to this PR showcasing its changes ingame, or this PR does not require an ingame showcase

Breaking changes

Changelog

🆑

  • fix: Now fire axe (the flaming one), and an advanced circular saw are Syndicate contraband.
  • fix: Now encryption keys are restricted according to their department.
  • fix: Now ERT, Deathsquad and Central Command Official items are restricted to the Central Command.
  • fix: Now acolyte armor, a thieving beacon and the thief's undetermined toolbox are minor contraband.
  • fix: Now bladed flatcaps are not a contraband (stealth item).
  • fix: Now mercenary clothes, magazines, speedloaders and cartridges are contraband.
  • fix: Now cleanades are restricted to the Service.
  • fix: Now metal foam grenades are restricted to the Engineering.
  • fix: Now flash, smoke, and tear gas grenades are restricted to the Security.
  • fix: Now combat gloves are restricted to Security and Cargo.
  • add: The Central Command restricted contraband group and department were added.

@Winkarst-cpu Winkarst-cpu marked this pull request as draft August 28, 2024 22:14
@github-actions github-actions bot added the Changes: No C# Changes: Requires no C# knowledge to review or fix this item. label Aug 28, 2024
@UbaserB
Copy link
Member

UbaserB commented Aug 28, 2024

#30960 already has bloodred magboots

@Winkarst-cpu
Copy link
Contributor Author

#30960 already has bloodred magboots

Will see who gets merged first :trollface:

@Winkarst-cpu Winkarst-cpu marked this pull request as ready for review August 29, 2024 12:11
@Winkarst-cpu Winkarst-cpu marked this pull request as draft August 29, 2024 12:20
@Winkarst-cpu Winkarst-cpu marked this pull request as ready for review August 29, 2024 12:36
@Graded5
Copy link

Graded5 commented Aug 29, 2024

Im fairly certain as AI gets more content science will lose their binary key, and binary translators will just be syndicate contraband. The only reason the RD got the key was due to a lack of AI. I don't think it'll be a problem yet because AI is MVP.

@github-actions github-actions bot added the S: Merge Conflict Status: Needs to resolve merge conflicts before it can be accepted label Sep 4, 2024
Copy link
Contributor

github-actions bot commented Sep 4, 2024

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

@github-actions github-actions bot removed the S: Merge Conflict Status: Needs to resolve merge conflicts before it can be accepted label Sep 7, 2024
@Plykiya
Copy link
Contributor

Plykiya commented Sep 7, 2024

acolyte armor is in the major contraband category isn't it? it's basically an evil ass cult web vest

@Emisse
Copy link
Contributor

Emisse commented Sep 9, 2024

contraband never ending battle

@Emisse Emisse merged commit 2263311 into space-wizards:master Sep 9, 2024
11 checks passed
@LittleNorthStar
Copy link
Contributor

Just saw the change log and I don't think the thief's round start stuff should be considered contraband as now if you mid join on blue alert as a thief you can be instantly searched stepping off the arrivals shuttle and lose everything+jail time through no fault of your own

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Changes: No C# Changes: Requires no C# knowledge to review or fix this item.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants