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

Make Security Dripped Out Again #660

Merged
merged 66 commits into from
Aug 11, 2024

Conversation

Tmanzxd
Copy link
Contributor

@Tmanzxd Tmanzxd commented Aug 3, 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!

@github-actions github-actions bot added Changes: Sprite Changes any png or json in an RSI Changes: YML Changes any yml files labels Aug 3, 2024
Copy link
Contributor

github-actions bot commented Aug 3, 2024

RSI Diff Bot; head commit 33e5159 merging into 9c74822
This PR makes changes to 1 or more RSIs. Here is a summary of all changes:

Resources/Textures/Clothing/OuterClothing/Vests/security.rsi

State Old New Status
equipped-OUTERCLOTHING Added
icon Added

Resources/Textures/Clothing/OuterClothing/Vests/security_slim.rsi

State Old New Status
equipped-OUTERCLOTHING Added
icon Added

Edit: diff updated after 33e5159

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.

Looks fine other than screwing the Corpsman out of his medical supplies if he buys this item. Also, this item doesn't actually need to be here anyway because Corpsman already spawns with the Filled Webbing, making this a trap option.

image

Comment on lines 428 to 429
items:
- ClothingBeltCorpsmanWebbing
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
items:
- ClothingBeltCorpsmanWebbing
items:
- ClothingBeltCorpsmanWebbingFilled

@DangerRevolution
Copy link
Contributor

BrigMedic backpack test fail.

@Tmanzxd
Copy link
Contributor Author

Tmanzxd commented Aug 3, 2024

Guh I can check it out once I clock off work

@DangerRevolution
Copy link
Contributor

balance changes like this really shouldn't be in a loadouts PR

Copy link
Contributor

@DangerRevolution DangerRevolution left a comment

Choose a reason for hiding this comment

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

This seems to be missing most of the items from the description being added into loadouts

@github-actions github-actions bot removed the Changes: Sprite Changes any png or json in an RSI label Aug 10, 2024
@github-actions github-actions bot added the Changes: Sprite Changes any png or json in an RSI label Aug 10, 2024
@github-actions github-actions bot removed the Changes: Sprite Changes any png or json in an RSI label Aug 10, 2024
…el.yml

Co-authored-by: Danger Revolution! <[email protected]>
Signed-off-by: Tmanzxd <[email protected]>
Copy link
Contributor

@DangerRevolution DangerRevolution left a comment

Choose a reason for hiding this comment

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

merge when tests pass

@VMSolidus VMSolidus merged commit 8b0c754 into Simple-Station:master Aug 11, 2024
11 checks passed
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]>
VMSolidus pushed a commit to VMSolidus/Einstein-Engines that referenced this pull request Aug 14, 2024
* legal departmant

* god i wish i knew what i was doing

* minor rsi fixes

* i forgor the legal radio frequency

* Minor fixes to radio, stamp, PDA, etc...

* add department

hehe

* Edits from Velcroboy

* Add trial timer

* add department signs

* Changes all references of legal -> justice and adds prosecutor access

* Missed one

* Adjust lawyer

* update lawyer icon

* temp to fix

* revert to fix

* add airlock texture

adds justice department airlock texture. Still need to do the yaml part of it but the texture's there.

* fix bureaucracy meta

* More meta fixes

* Connect airlocks to yaml

* Fixes, tweaks, and last reference of "legal" maybe

* Add justice to airlock groups

* add prosc. drip and fix prosecutor typos

adds prosecutor badge and suit, as well as fixes the spelling of "prosecuter" to "prosecutor"

* Changes prosecutor's supervisor to CJ

Signed-off-by: Timemaster99 <[email protected]>

* Attorney <- Lawyer locale edit

* Removed modified shoukou file

* Added antag objective and touched up yaml
Fixed Clerk PDA and CJ jumpsuit error. Additionally moved notary stamp from paper.yml to rubber-stamp.yml, and fixed some indentation in the meta.json of the pda.rsi file

* Attorney <- Lawyer, now including the PDA
Forgot this last commit

* Fixed typo in Clerk Vest ID

Signed-off-by: Timemaster99 <[email protected]>

* Added Chief Justice locker, all of its contents, and a prosecutor PDA (sprite pending)

* lockers 2, electric boogaloo. Committing files I forgot to commit

* Added CJ stamp and put it into CJ locker. Fixed notary stamp and put the sprites in the correct RSI

* Attempt to resolve merge conflicts

* Remove conflict markers

* Added stamp sprite, implemented CJ cloak

* Implemented Gavel Prototype and added to CJ locker

* Removed justice access from attorney as it will be used to secure Clerk's locker. Disabled antag for all justice besides attorney.

* Added Clerk locker and placed Notary Stamp into it. Uncommented gavel in CJ locker

* Added lawyer's stamp to lawdrobe

* Added Prosecutor PDA, icon, and ID sprite

* Added gavel block and made gavel tap when clicking on it

* Add component, EmitSoundOnInteractUsing onto the gavel block

* Added sprites for CJ and Clerk locker

* Spell-checked and edited job descriptions slightly

* Fixing missing type entity access.yml

Signed-off-by: Timemaster99 <[email protected]>

* Adjusted rsi paths for gavel and gavel block to use forward slash

* Fixed a variety of invalid rsi references, and door remote yaml issue

* Added Lawyer access to Justice access group, fixed door_remote.yml access

* Remove antagadvantage from chief justice

Signed-off-by: Timemaster99 <[email protected]>

* Apply suggestions from code review

line at the end for readability & matching current standards... line at the end for readability & matching current standards...

Co-authored-by: Danger Revolution! <[email protected]>
Signed-off-by: Timemaster99 <[email protected]>

* Hopefully remove shoukou.yml from the changed files

Signed-off-by: Timemaster99 <[email protected]>

* Once again attempt to remove shoukou.yml from changed files

* Attempt once more to remove shoukou.yml from changed files

* Fixed justice pda box description

Signed-off-by: Timemaster99 <[email protected]>

* Please go home, shoukou. We don't want you here

* Fixing prototype references pt1

Signed-off-by: Timemaster99 <[email protected]>

* Renamed headsets/legal.rsi to headsets/justice.rsi

* Added hyphen to chief justice localizations

* Ordered justice accesses alphabetically

* Added prison key to justice headset

* Various yaml fixes from review

* Apply suggestions from code review

Co-authored-by: Danger Revolution! <[email protected]>
Signed-off-by: Timemaster99 <[email protected]>

* Localized changes to pdas and jobs

* Removed indents in locale

* Fixed reference to chief justice stamp

* Apply suggestions from code review

Co-authored-by: Danger Revolution! <[email protected]>
Signed-off-by: Timemaster99 <[email protected]>

* Renamed Lawyer to Attorney in locale, added deltav marker

* Lawyer to Attorney, Warrant Document in Clerk and CJ locker

* Apply suggestions from code review

Co-authored-by: Danger Revolution! <[email protected]>
Signed-off-by: Timemaster99 <[email protected]>

* Replaced legal with justice in job-description.ftl

Signed-off-by: Timemaster99 <[email protected]>

* Moved job-name-lawyer to DeltaV locale

* Remove added space in accesses.ftl

Signed-off-by: Timemaster99 <[email protected]>

* Removed unneeded deletion of unneeded spaces in headsets.yml

Signed-off-by: Timemaster99 <[email protected]>

* Changed Lawyer ID name to Attorney ID

* Updated copyrights in all of the meta.json files affected

* Added formal and white variants of CJ jumpsuit to locker

* Updated to use upstream's EmitSoundOnInteractUsing

* Removing old component stuff

* Gave Prosecutor Filled Lawyer Backpack

* Deleted old component

Signed-off-by: Timemaster99 <[email protected]>

* Removed old comments

* Updated doors to electronics system, fixed courier spawner that I botched

* Fixed door_access indentation

Signed-off-by: Timemaster99 <[email protected]>

* Adding a little bit of loadouts

* Add loadouts for justice

* Removed accessreader from windoors

* Added job spawner icons

* Fixed spawner sprite layering

* Added missing parent in ID cards

* Removed redundant laceup shoes loadout

Signed-off-by: Timemaster99 <[email protected]>

* Added lawyer windoor, fixed spawner names, fixed locker names

* Added station beacons

* Softened justice dept palette

Signed-off-by: Timemaster99 <[email protected]>

* Added justice key to telecomms

* Added deltaV comments to telecomms

---------

Signed-off-by: Timemaster99 <[email protected]>
Co-authored-by: Jeff <[email protected]>
Co-authored-by: Timemaster99 <[email protected]>
Co-authored-by: Timemaster99 <[email protected]>
Co-authored-by: [email protected] <[email protected]>
Co-authored-by: Danger Revolution! <[email protected]>
Co-authored-by: Azzy <[email protected]>
@Tmanzxd Tmanzxd deleted the FixUpSecLoadouts branch August 15, 2024 20:23
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.

4 participants