Cherry-Pick Antag Refactor#734
Merged
OldDanceJacket merged 1 commit intoSimple-Station:masterfrom Aug 15, 2024
Merged
Conversation
* 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 <57200767+Timemaster99@users.noreply.github.com> * 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 <57200767+Timemaster99@users.noreply.github.com> * 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 <57200767+Timemaster99@users.noreply.github.com> * 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 <57200767+Timemaster99@users.noreply.github.com> * 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! <142105406+DangerRevolution@users.noreply.github.com> Signed-off-by: Timemaster99 <57200767+Timemaster99@users.noreply.github.com> * Hopefully remove shoukou.yml from the changed files Signed-off-by: Timemaster99 <57200767+Timemaster99@users.noreply.github.com> * 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 <57200767+Timemaster99@users.noreply.github.com> * Please go home, shoukou. We don't want you here * Fixing prototype references pt1 Signed-off-by: Timemaster99 <57200767+Timemaster99@users.noreply.github.com> * 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! <142105406+DangerRevolution@users.noreply.github.com> Signed-off-by: Timemaster99 <57200767+Timemaster99@users.noreply.github.com> * 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! <142105406+DangerRevolution@users.noreply.github.com> Signed-off-by: Timemaster99 <57200767+Timemaster99@users.noreply.github.com> * 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! <142105406+DangerRevolution@users.noreply.github.com> Signed-off-by: Timemaster99 <57200767+Timemaster99@users.noreply.github.com> * Replaced legal with justice in job-description.ftl Signed-off-by: Timemaster99 <57200767+Timemaster99@users.noreply.github.com> * Moved job-name-lawyer to DeltaV locale * Remove added space in accesses.ftl Signed-off-by: Timemaster99 <57200767+Timemaster99@users.noreply.github.com> * Removed unneeded deletion of unneeded spaces in headsets.yml Signed-off-by: Timemaster99 <57200767+Timemaster99@users.noreply.github.com> * 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 <57200767+Timemaster99@users.noreply.github.com> * Removed old comments * Updated doors to electronics system, fixed courier spawner that I botched * Fixed door_access indentation Signed-off-by: Timemaster99 <57200767+Timemaster99@users.noreply.github.com> * 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 <57200767+Timemaster99@users.noreply.github.com> * Added lawyer windoor, fixed spawner names, fixed locker names * Added station beacons * Softened justice dept palette Signed-off-by: Timemaster99 <57200767+Timemaster99@users.noreply.github.com> * Added justice key to telecomms * Added deltaV comments to telecomms --------- Signed-off-by: Timemaster99 <57200767+Timemaster99@users.noreply.github.com> Co-authored-by: Jeff <velcroboy333@hotmail.com> Co-authored-by: Timemaster99 <57200767+Timemaster99@users.noreply.github.com> Co-authored-by: Timemaster99 <elijahrobot@gmail.com> Co-authored-by: luckywill339@gmail.com <luckywill339@gmail.com> Co-authored-by: Danger Revolution! <142105406+DangerRevolution@users.noreply.github.com> Co-authored-by: Azzy <azzydev@icloud.com>
github-actions
bot
added
Changes: C#
DangerRevolution
requested review from
DEATHB4DEFEAT,
DangerRevolution,
OldDanceJacket,
Peptide90 and
Pspritechologist
DangerRevolution
approved these changes
Aug 15, 2024
Contributor
DangerRevolution
left a comment
DangerRevolution
left a comment
There was a problem hiding this comment.
I last checked this on WD, I assume VM ported it correctly
OldDanceJacket
approved these changes
Aug 15, 2024
Peptide90
approved these changes
Aug 15, 2024
VMSolidus
added a commit
to VMSolidus/Einstein-Engines
that referenced
this pull request
Aug 18, 2024
This reverts commit 08822e3.
OldDanceJacket
pushed a commit
that referenced
this pull request
Aug 19, 2024
tmcqueen
pushed a commit
to tmcqueen/Syndicate-Station
that referenced
this pull request
Aug 24, 2024
This cherry-pick's Wizden's Antag Refactor, which is needed for all future antag updates, as well as for me to cherry-pick over Cultists(Who are going to need some editing to fit the antag refactor), Changelings, Heretics, and Wizards. I actually selected the White-Dream-Public version of the Antag Refactor, due to it having commits made tailored to our repository, so it comes prepackaged with all the changes necessary for our repo-specific content. https://github.com/frosty-dev/ss14-wwdp/pull/10 Signed-off-by: Timemaster99 <57200767+Timemaster99@users.noreply.github.com> Co-authored-by: ThereDrD <88589686+ThereDrD0@users.noreply.github.com> Co-authored-by: Jeff <velcroboy333@hotmail.com> Co-authored-by: Timemaster99 <57200767+Timemaster99@users.noreply.github.com> Co-authored-by: Timemaster99 <elijahrobot@gmail.com> Co-authored-by: luckywill339@gmail.com <luckywill339@gmail.com> Co-authored-by: Danger Revolution! <142105406+DangerRevolution@users.noreply.github.com> Co-authored-by: Azzy <azzydev@icloud.com>
tmcqueen
pushed a commit
to tmcqueen/Syndicate-Station
that referenced
this pull request
Aug 24, 2024
This cherry-pick's Wizden's Antag Refactor, which is needed for all future antag updates, as well as for me to cherry-pick over Cultists(Who are going to need some editing to fit the antag refactor), Changelings, Heretics, and Wizards. I actually selected the White-Dream-Public version of the Antag Refactor, due to it having commits made tailored to our repository, so it comes prepackaged with all the changes necessary for our repo-specific content. https://github.com/frosty-dev/ss14-wwdp/pull/10 Signed-off-by: Timemaster99 <57200767+Timemaster99@users.noreply.github.com> Co-authored-by: ThereDrD <88589686+ThereDrD0@users.noreply.github.com> Co-authored-by: Jeff <velcroboy333@hotmail.com> Co-authored-by: Timemaster99 <57200767+Timemaster99@users.noreply.github.com> Co-authored-by: Timemaster99 <elijahrobot@gmail.com> Co-authored-by: luckywill339@gmail.com <luckywill339@gmail.com> Co-authored-by: Danger Revolution! <142105406+DangerRevolution@users.noreply.github.com> Co-authored-by: Azzy <azzydev@icloud.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This cherry-pick's Wizden's Antag Refactor, which is needed for all future antag updates, as well as for me to cherry-pick over Cultists(Who are going to need some editing to fit the antag refactor), Changelings, Heretics, and Wizards. I actually selected the White-Dream-Public version of the Antag Refactor, due to it having commits made tailored to our repository, so it comes prepackaged with all the changes necessary for our repo-specific content.
https://github.com/frosty-dev/ss14-wwdp/pull/10