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

Fixes Failed to Cherry-Pick PR #25986: Return Detective to Security #145 #656

Merged

Conversation

Tmanzxd
Copy link
Contributor

@Tmanzxd Tmanzxd commented Aug 3, 2024

Partial fix to #145, as the changes in inventory will need reflected in the Security Loadout system which will be in another PR.

Made so Detective has the same access as Security Officers.

@github-actions github-actions bot added the Changes: YML Changes any yml files label Aug 3, 2024
@SimpleStation14 SimpleStation14 changed the title Fixes Failed to cherry-pick PR #25986: Return Detective to Security #145 Fixes Failed to Cherry-Pick PR #25986: Return Detective to Security #145 Aug 3, 2024
@github-actions github-actions bot added the Status: Needs Review Someone please review this label Aug 3, 2024
Copy link
Member

@VMSolidus VMSolidus left a comment

Choose a reason for hiding this comment

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

Utterly baffled why Security Officers have Cryogenics access? Unless that refers to Arrivals cryo. But oh well.

@VMSolidus VMSolidus merged commit fb7c4d9 into Simple-Station:master Aug 4, 2024
19 checks passed
VMSolidus added a commit that referenced this pull request Aug 11, 2024
Leadup to PR #656. The Loadout fix for #145. Adds and makes a lot of
loadout options for Security. Full Change Log Below:

**Change Notes:**

- Changed Wizden Security Vest sprites to DeltaV Sprites.

- Removed Wizden Security Vests from loadouts (can be re-added later in
another PR if sentiment changes.)

- Added Plate Carriers and Durathread Vests to loadouts

- Made non-specialist Security apparel generic to Security. Charge
Batong with style now!

- Added Flashes to Security Loadouts.

- Added Security Armor Vests to Security Loadouts.

- Added Detective Coats and Vests to Security Loadouts.

- Added Warden Armored Jacket to Warden Loadouts.

- Added Head of Security's Trenchcoat to Loadouts.

- Added Security gear & accessories to Loadouts.

- Added Brigmedic and Corpsman items for Corpsman!

- Added SecGlasses to Loadouts!

---------

Signed-off-by: Tmanzxd <[email protected]>
Co-authored-by: VMSolidus <[email protected]>
Co-authored-by: Danger Revolution! <[email protected]>
Mnemotechnician pushed a commit to Mnemotechnician/Einstein-Engines that referenced this pull request Aug 12, 2024
Leadup to PR Simple-Station#656. The Loadout fix for Simple-Station#145. Adds and makes a lot of
loadout options for Security. Full Change Log Below:

**Change Notes:**

- Changed Wizden Security Vest sprites to DeltaV Sprites.

- Removed Wizden Security Vests from loadouts (can be re-added later in
another PR if sentiment changes.)

- Added Plate Carriers and Durathread Vests to loadouts

- Made non-specialist Security apparel generic to Security. Charge
Batong with style now!

- Added Flashes to Security Loadouts.

- Added Security Armor Vests to Security Loadouts.

- Added Detective Coats and Vests to Security Loadouts.

- Added Warden Armored Jacket to Warden Loadouts.

- Added Head of Security's Trenchcoat to Loadouts.

- Added Security gear & accessories to Loadouts.

- Added Brigmedic and Corpsman items for Corpsman!

- Added SecGlasses to Loadouts!

---------

Signed-off-by: Tmanzxd <[email protected]>
Co-authored-by: VMSolidus <[email protected]>
Co-authored-by: Danger Revolution! <[email protected]>
tmcqueen pushed a commit to tmcqueen/Syndicate-Station that referenced this pull request Aug 24, 2024
Leadup to PR Simple-Station#656. The Loadout fix for Simple-Station#145. Adds and makes a lot of
loadout options for Security. Full Change Log Below:

**Change Notes:**

- Changed Wizden Security Vest sprites to DeltaV Sprites.

- Removed Wizden Security Vests from loadouts (can be re-added later in
another PR if sentiment changes.)

- Added Plate Carriers and Durathread Vests to loadouts

- Made non-specialist Security apparel generic to Security. Charge
Batong with style now!

- Added Flashes to Security Loadouts.

- Added Security Armor Vests to Security Loadouts.

- Added Detective Coats and Vests to Security Loadouts.

- Added Warden Armored Jacket to Warden Loadouts.

- Added Head of Security's Trenchcoat to Loadouts.

- Added Security gear & accessories to Loadouts.

- Added Brigmedic and Corpsman items for Corpsman!

- Added SecGlasses to Loadouts!

---------

Signed-off-by: Tmanzxd <[email protected]>
Co-authored-by: VMSolidus <[email protected]>
Co-authored-by: Danger Revolution! <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Changes: YML Changes any yml files Status: Needs Review Someone please review this
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants