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.

Sign up for GitHub

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

Jump to bottom

Adds the Justice Department #660

Merged
merged 132 commits into from
Jun 7, 2024
Merged

Adds the Justice Department #660

merged 132 commits into from
Jun 7, 2024

Commits on Jan 5, 2024

  1. legal departmant

    @leonardo-dabepis
    leonardo-dabepis committed Jan 5, 2024
    Configuration menu
    Copy the full SHA
    7137764 View commit details
    Browse the repository at this point in the history

Commits on Jan 10, 2024

  1. god i wish i knew what i was doing

    @leonardo-dabepis
    leonardo-dabepis committed Jan 10, 2024
    Configuration menu
    Copy the full SHA
    e3b49ae View commit details
    Browse the repository at this point in the history

  2. minor rsi fixes

    @leonardo-dabepis
    leonardo-dabepis committed Jan 10, 2024
    Configuration menu
    Copy the full SHA
    f1f0a8b View commit details
    Browse the repository at this point in the history

Commits on Jan 12, 2024

  1. i forgor the legal radio frequency

    @leonardo-dabepis
    leonardo-dabepis committed Jan 12, 2024
    Configuration menu
    Copy the full SHA
    8205d40 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into legal-department

    @leonardo-dabepis
    leonardo-dabepis authored Jan 12, 2024
    Configuration menu
    Copy the full SHA
    c7940e7 View commit details
    Browse the repository at this point in the history

Commits on Jan 23, 2024

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

    @leonardo-dabepis
    leonardo-dabepis committed Jan 23, 2024
    Configuration menu
    Copy the full SHA
    c70a695 View commit details
    Browse the repository at this point in the history

Commits on Feb 7, 2024

  1. add department 

    hehe
    @leonardo-dabepis
    leonardo-dabepis committed Feb 7, 2024
    Configuration menu
    Copy the full SHA
    0aca607 View commit details
    Browse the repository at this point in the history

Commits on Feb 28, 2024

  1. Merge remote-tracking branch 'origin/legal-department' into Legral

    @BurningRash
    BurningRash committed Feb 28, 2024
    Configuration menu
    Copy the full SHA
    f5a279e View commit details
    Browse the repository at this point in the history

  2. Edits from Velcroboy

    @BurningRash
    BurningRash committed Feb 28, 2024
    Configuration menu
    Copy the full SHA
    b961de0 View commit details
    Browse the repository at this point in the history

  3. Merge remote-tracking branch 'upstream/master' into Legral

    @BurningRash
    BurningRash committed Feb 28, 2024
    Configuration menu
    Copy the full SHA
    0c6038e View commit details
    Browse the repository at this point in the history

Commits on Mar 1, 2024

  1. Add trial timer

    @leonardo-dabepis
    leonardo-dabepis committed Mar 1, 2024
    Configuration menu
    Copy the full SHA
    8458d66 View commit details
    Browse the repository at this point in the history

Commits on Mar 4, 2024

  1. add department signs

    @leonardo-dabepis
    leonardo-dabepis committed Mar 4, 2024
    Configuration menu
    Copy the full SHA
    d95415f View commit details
    Browse the repository at this point in the history

Commits on Mar 5, 2024

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

    @BurningRash
    BurningRash committed Mar 5, 2024
    Configuration menu
    Copy the full SHA
    8dcede2 View commit details
    Browse the repository at this point in the history

  2. Missed one

    @BurningRash
    BurningRash committed Mar 5, 2024
    Configuration menu
    Copy the full SHA
    99c365e View commit details
    Browse the repository at this point in the history

  3. Adjust lawyer

    @BurningRash
    BurningRash committed Mar 5, 2024
    Configuration menu
    Copy the full SHA
    5438a6f View commit details
    Browse the repository at this point in the history

  4. Merge remote-tracking branch 'upstream/master' into Legral

    @BurningRash
    BurningRash committed Mar 5, 2024
    Configuration menu
    Copy the full SHA
    4de5712 View commit details
    Browse the repository at this point in the history

  5. update lawyer icon

    @BurningRash
    BurningRash committed Mar 5, 2024
    Configuration menu
    Copy the full SHA
    9720f91 View commit details
    Browse the repository at this point in the history

  6. temp to fix

    @BurningRash
    BurningRash committed Mar 5, 2024
    Configuration menu
    Copy the full SHA
    b7df6f2 View commit details
    Browse the repository at this point in the history

  7. revert to fix

    @BurningRash
    BurningRash committed Mar 5, 2024
    Configuration menu
    Copy the full SHA
    9a1bf9e View commit details
    Browse the repository at this point in the history

Commits on Mar 8, 2024

  1. add airlock texture 

    adds justice department airlock texture. Still need to do the yaml part of it but the texture's there.
    @leonardo-dabepis
    leonardo-dabepis committed Mar 8, 2024
    Configuration menu
    Copy the full SHA
    9627350 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'legal-department' of https://github.com/leonardo-dabepi… 

    …s/Delta-v-rebase into legal-department
    @leonardo-dabepis
    leonardo-dabepis committed Mar 8, 2024
    Configuration menu
    Copy the full SHA
    bd1a7ed View commit details
    Browse the repository at this point in the history

  3. Merge remote-tracking branch 'upstream/master' into Legral

    @BurningRash
    BurningRash committed Mar 8, 2024
    Configuration menu
    Copy the full SHA
    920bf75 View commit details
    Browse the repository at this point in the history

  4. fix bureaucracy meta

    @BurningRash
    BurningRash committed Mar 8, 2024
    Configuration menu
    Copy the full SHA
    9a49a7b View commit details
    Browse the repository at this point in the history

  5. More meta fixes

    @BurningRash
    BurningRash committed Mar 8, 2024
    Configuration menu
    Copy the full SHA
    585a411 View commit details
    Browse the repository at this point in the history

  6. Connect airlocks to yaml

    @BurningRash
    BurningRash committed Mar 8, 2024
    Configuration menu
    Copy the full SHA
    bf5cdd3 View commit details
    Browse the repository at this point in the history

  7. Fixes, tweaks, and last reference of "legal" maybe

    @BurningRash
    BurningRash committed Mar 8, 2024
    Configuration menu
    Copy the full SHA
    6a371c9 View commit details
    Browse the repository at this point in the history

Commits on Mar 9, 2024

  1. Add justice to airlock groups

    @BurningRash
    BurningRash committed Mar 9, 2024
    Configuration menu
    Copy the full SHA
    fb8525c View commit details
    Browse the repository at this point in the history

Commits on Mar 12, 2024

  1. add prosc. drip and fix prosecutor typos 

    adds prosecutor badge and suit, as well as fixes the spelling of "prosecuter" to "prosecutor"
    @leonardo-dabepis
    leonardo-dabepis committed Mar 12, 2024
    Configuration menu
    Copy the full SHA
    52f5e75 View commit details
    Browse the repository at this point in the history

Commits on Mar 13, 2024

  1. Changes prosecutor's supervisor to CJ 

    Signed-off-by: Timemaster99 <[email protected]>
    @Timemaster99
    Timemaster99 authored Mar 13, 2024
    Configuration menu
    Copy the full SHA
    0059203 View commit details
    Browse the repository at this point in the history

Commits on Mar 14, 2024

  1. Attorney <- Lawyer locale edit

    @Timemaster99
    Timemaster99 committed Mar 14, 2024
    Configuration menu
    Copy the full SHA
    962fc6b View commit details
    Browse the repository at this point in the history

  2. Removed modified shoukou file

    @Timemaster99
    Timemaster99 committed Mar 14, 2024
    Configuration menu
    Copy the full SHA
    3e6a65f View commit details
    Browse the repository at this point in the history

  3. 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
    @Timemaster99
    Timemaster99 committed Mar 14, 2024
    Configuration menu
    Copy the full SHA
    371a897 View commit details
    Browse the repository at this point in the history

  4. Attorney <- Lawyer, now including the PDA 

    Forgot this last commit
    @Timemaster99
    Timemaster99 committed Mar 14, 2024
    Configuration menu
    Copy the full SHA
    d8090b1 View commit details
    Browse the repository at this point in the history

  5. Fixed typo in Clerk Vest ID 

    Signed-off-by: Timemaster99 <[email protected]>
    @Timemaster99
    Timemaster99 authored Mar 14, 2024
    Configuration menu
    Copy the full SHA
    da6c192 View commit details
    Browse the repository at this point in the history

  6. Added Chief Justice locker, all of its contents, and a prosecutor PDA… 

    … (sprite pending)
    @Timemaster99
    Timemaster99 committed Mar 14, 2024
    Configuration menu
    Copy the full SHA
    702a789 View commit details
    Browse the repository at this point in the history

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

    @Timemaster99
    Timemaster99 committed Mar 14, 2024
    Configuration menu
    Copy the full SHA
    9949bc2 View commit details
    Browse the repository at this point in the history

  8. Merge branch 'legal-department' of https://github.com/leonardo-dabepi… 

    …s/Delta-v-rebase into legal-department
    @Timemaster99
    Timemaster99 committed Mar 14, 2024
    Configuration menu
    Copy the full SHA
    4f81ac1 View commit details
    Browse the repository at this point in the history

  9. Added CJ stamp and put it into CJ locker. Fixed notary stamp and put … 

    …the sprites in the correct RSI
    @Timemaster99
    Timemaster99 committed Mar 14, 2024
    Configuration menu
    Copy the full SHA
    b539e0f View commit details
    Browse the repository at this point in the history

Commits on Mar 18, 2024

  1. Attempt to resolve merge conflicts

    @Timemaster99
    Timemaster99 committed Mar 18, 2024
    Configuration menu
    Copy the full SHA
    d9fc30a View commit details
    Browse the repository at this point in the history

  2. Merge master to resolve conflicts

    @Timemaster99
    Timemaster99 committed Mar 18, 2024
    Configuration menu
    Copy the full SHA
    ea146c1 View commit details
    Browse the repository at this point in the history

  3. Remove conflict markers

    @Timemaster99
    Timemaster99 committed Mar 18, 2024
    Configuration menu
    Copy the full SHA
    1187d55 View commit details
    Browse the repository at this point in the history

  4. Added stamp sprite, implemented CJ cloak

    @Timemaster99
    Timemaster99 committed Mar 18, 2024
    Configuration menu
    Copy the full SHA
    b6c8c6f View commit details
    Browse the repository at this point in the history

Commits on Mar 19, 2024

  1. Merge branch 'master' into legal-department 

    Signed-off-by: Timemaster99 <[email protected]>
    @Timemaster99
    Timemaster99 authored Mar 19, 2024
    Configuration menu
    Copy the full SHA
    8daf03d View commit details
    Browse the repository at this point in the history

Commits on Mar 20, 2024

  1. Implemented Gavel Prototype and added to CJ locker

    @Timemaster99
    Timemaster99 committed Mar 20, 2024
    Configuration menu
    Copy the full SHA
    c3274ab View commit details
    Browse the repository at this point in the history

  2. Removed justice access from attorney as it will be used to secure Cle… 

    …rk's locker. Disabled antag for all justice besides attorney.
    @Timemaster99
    Timemaster99 committed Mar 20, 2024
    Configuration menu
    Copy the full SHA
    3612b2f View commit details
    Browse the repository at this point in the history

  3. Added Clerk locker and placed Notary Stamp into it. Uncommented gavel… 

    … in CJ locker
    @Timemaster99
    Timemaster99 committed Mar 20, 2024
    Configuration menu
    Copy the full SHA
    df9c522 View commit details
    Browse the repository at this point in the history

  4. Added lawyer's stamp to lawdrobe

    @Timemaster99
    Timemaster99 committed Mar 20, 2024
    Configuration menu
    Copy the full SHA
    a9e7ccb View commit details
    Browse the repository at this point in the history

  5. Added Prosecutor PDA, icon, and ID sprite

    @Timemaster99
    Timemaster99 committed Mar 20, 2024
    Configuration menu
    Copy the full SHA
    f4aeb98 View commit details
    Browse the repository at this point in the history

  6. Merge branch 'master' into legal-department

    @Timemaster99
    Timemaster99 authored Mar 20, 2024
    Configuration menu
    Copy the full SHA
    b8c1f55 View commit details
    Browse the repository at this point in the history

Commits on Mar 21, 2024

  1. Added gavel block and made gavel tap when clicking on it

    @Timemaster99
    Timemaster99 committed Mar 21, 2024
    Configuration menu
    Copy the full SHA
    698cb10 View commit details
    Browse the repository at this point in the history

  2. Add component, EmitSoundOnInteractUsing onto the gavel block

    @blueDev2
    blueDev2 committed Mar 21, 2024
    Configuration menu
    Copy the full SHA
    cac4e35 View commit details
    Browse the repository at this point in the history

  3. Added sprites for CJ and Clerk locker

    @Timemaster99
    Timemaster99 committed Mar 21, 2024
    Configuration menu
    Copy the full SHA
    4025925 View commit details
    Browse the repository at this point in the history

  4. Spell-checked and edited job descriptions slightly

    @Timemaster99
    Timemaster99 committed Mar 21, 2024
    Configuration menu
    Copy the full SHA
    6dc5c62 View commit details
    Browse the repository at this point in the history

Commits on Mar 24, 2024

  1. Merge pull request #1 from blueDev2/legal-department-Gavelblock-Compo… 

    …nent

Add component, EmitSoundOnInteractUsing onto the gavel block to make it play a sound when interacted by a player holding a gavel
    @leonardo-dabepis
    leonardo-dabepis authored Mar 24, 2024
    Configuration menu
    Copy the full SHA
    cf26379 View commit details
    Browse the repository at this point in the history

Commits on Mar 26, 2024

  1. Merge branch 'master' into legal-department

    @Timemaster99
    Timemaster99 authored Mar 26, 2024
    Configuration menu
    Copy the full SHA
    ecb7c7a View commit details
    Browse the repository at this point in the history

  2. Fixing missing type entity access.yml 

    Signed-off-by: Timemaster99 <[email protected]>
    @Timemaster99
    Timemaster99 authored Mar 26, 2024
    Configuration menu
    Copy the full SHA
    cd08f48 View commit details
    Browse the repository at this point in the history

Commits on Mar 27, 2024

  1. Adjusted rsi paths for gavel and gavel block to use forward slash

    @Timemaster99
    Timemaster99 committed Mar 27, 2024
    Configuration menu
    Copy the full SHA
    2d0df79 View commit details
    Browse the repository at this point in the history

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

    @Timemaster99
    Timemaster99 committed Mar 27, 2024
    Configuration menu
    Copy the full SHA
    79c6564 View commit details
    Browse the repository at this point in the history

  3. Added Lawyer access to Justice access group, fixed door_remote.yml ac… 

    …cess
    @Timemaster99
    Timemaster99 committed Mar 27, 2024
    Configuration menu
    Copy the full SHA
    ff23dcf View commit details
    Browse the repository at this point in the history

  4. Remove antagadvantage from chief justice 

    Signed-off-by: Timemaster99 <[email protected]>
    @Timemaster99
    Timemaster99 authored Mar 27, 2024
    Configuration menu
    Copy the full SHA
    32e6213 View commit details
    Browse the repository at this point in the history

  5. 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]>
    @Timemaster99 @DangerRevolution
    Timemaster99 and DangerRevolution authored Mar 27, 2024
    Configuration menu
    Copy the full SHA
    700de49 View commit details
    Browse the repository at this point in the history

  6. Hopefully remove shoukou.yml from the changed files 

    Signed-off-by: Timemaster99 <[email protected]>
    @Timemaster99
    Timemaster99 authored Mar 27, 2024
    Configuration menu
    Copy the full SHA
    a07f941 View commit details
    Browse the repository at this point in the history

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

    @Timemaster99
    Timemaster99 committed Mar 27, 2024
    Configuration menu
    Copy the full SHA
    d1a8709 View commit details
    Browse the repository at this point in the history

  8. Merge branch 'legal-department' of https://github.com/leonardo-dabepi… 

    …s/Delta-v-rebase into legal-department
    @Timemaster99
    Timemaster99 committed Mar 27, 2024
    Configuration menu
    Copy the full SHA
    b094bab View commit details
    Browse the repository at this point in the history

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

    @Timemaster99
    Timemaster99 committed Mar 27, 2024
    Configuration menu
    Copy the full SHA
    f1768ef View commit details
    Browse the repository at this point in the history

  10. Fixed justice pda box description 

    Signed-off-by: Timemaster99 <[email protected]>
    @Timemaster99
    Timemaster99 authored Mar 27, 2024
    Configuration menu
    Copy the full SHA
    629b10a View commit details
    Browse the repository at this point in the history

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

    @Timemaster99
    Timemaster99 committed Mar 27, 2024
    Configuration menu
    Copy the full SHA
    bafe122 View commit details
    Browse the repository at this point in the history

  12. Merge branch 'master' into legal-department

    @Timemaster99
    Timemaster99 authored Mar 27, 2024
    Configuration menu
    Copy the full SHA
    451fb72 View commit details
    Browse the repository at this point in the history

  13. Fixing prototype references pt1 

    Signed-off-by: Timemaster99 <[email protected]>
    @Timemaster99
    Timemaster99 authored Mar 27, 2024
    Configuration menu
    Copy the full SHA
    4364576 View commit details
    Browse the repository at this point in the history

Commits on Mar 28, 2024

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

    @Timemaster99
    Timemaster99 committed Mar 28, 2024
    Configuration menu
    Copy the full SHA
    83037d8 View commit details
    Browse the repository at this point in the history

  2. Added hyphen to chief justice localizations

    @Timemaster99
    Timemaster99 committed Mar 28, 2024
    Configuration menu
    Copy the full SHA
    6eaaa2e View commit details
    Browse the repository at this point in the history

  3. Ordered justice accesses alphabetically

    @Timemaster99
    Timemaster99 committed Mar 28, 2024
    Configuration menu
    Copy the full SHA
    8e949d7 View commit details
    Browse the repository at this point in the history

  4. Added prison key to justice headset

    @Timemaster99
    Timemaster99 committed Mar 28, 2024
    Configuration menu
    Copy the full SHA
    76a5eeb View commit details
    Browse the repository at this point in the history

  5. Various yaml fixes from review

    @Timemaster99
    Timemaster99 committed Mar 28, 2024
    Configuration menu
    Copy the full SHA
    fa8c79f View commit details
    Browse the repository at this point in the history

  6. Apply suggestions from code review 

    Co-authored-by: Danger Revolution! <[email protected]>
Signed-off-by: Timemaster99 <[email protected]>
    @Timemaster99 @DangerRevolution
    Timemaster99 and DangerRevolution authored Mar 28, 2024
    Configuration menu
    Copy the full SHA
    30bd9ad View commit details
    Browse the repository at this point in the history

  7. Localized changes to pdas and jobs

    @Timemaster99
    Timemaster99 committed Mar 28, 2024
    Configuration menu
    Copy the full SHA
    f43f6bc View commit details
    Browse the repository at this point in the history

  8. Merge branch 'legal-department' of https://github.com/leonardo-dabepi… 

    …s/Delta-v-rebase into legal-department
    @Timemaster99
    Timemaster99 committed Mar 28, 2024
    Configuration menu
    Copy the full SHA
    6180e8a View commit details
    Browse the repository at this point in the history

  9. Removed indents in locale

    @Timemaster99
    Timemaster99 committed Mar 28, 2024
    Configuration menu
    Copy the full SHA
    370c210 View commit details
    Browse the repository at this point in the history

  10. Fixed reference to chief justice stamp

    @Timemaster99
    Timemaster99 committed Mar 28, 2024
    Configuration menu
    Copy the full SHA
    85df660 View commit details
    Browse the repository at this point in the history

  11. Merge branch 'master' into legal-department

    @Timemaster99
    Timemaster99 authored Mar 28, 2024
    Configuration menu
    Copy the full SHA
    d319156 View commit details
    Browse the repository at this point in the history

  12. Apply suggestions from code review 

    Co-authored-by: Danger Revolution! <[email protected]>
Signed-off-by: Timemaster99 <[email protected]>
    @Timemaster99 @DangerRevolution
    Timemaster99 and DangerRevolution authored Mar 28, 2024
    Configuration menu
    Copy the full SHA
    4e7e0bd View commit details
    Browse the repository at this point in the history

Commits on Mar 29, 2024

  1. Renamed Lawyer to Attorney in locale, added deltav marker

    @Timemaster99
    Timemaster99 committed Mar 29, 2024
    Configuration menu
    Copy the full SHA
    250720a View commit details
    Browse the repository at this point in the history

  2. Merge branch 'legal-department' of https://github.com/leonardo-dabepi… 

    …s/Delta-v-rebase into legal-department
    @Timemaster99
    Timemaster99 committed Mar 29, 2024
    Configuration menu
    Copy the full SHA
    09c1853 View commit details
    Browse the repository at this point in the history

  3. Lawyer to Attorney, Warrant Document in Clerk and CJ locker

    @Timemaster99
    Timemaster99 committed Mar 29, 2024
    Configuration menu
    Copy the full SHA
    c35e9aa View commit details
    Browse the repository at this point in the history

  4. Apply suggestions from code review 

    Co-authored-by: Danger Revolution! <[email protected]>
Signed-off-by: Timemaster99 <[email protected]>
    @Timemaster99 @DangerRevolution
    Timemaster99 and DangerRevolution authored Mar 29, 2024
    Configuration menu
    Copy the full SHA
    45725e7 View commit details
    Browse the repository at this point in the history

  5. Replaced legal with justice in job-description.ftl 

    Signed-off-by: Timemaster99 <[email protected]>
    @Timemaster99
    Timemaster99 authored Mar 29, 2024
    Configuration menu
    Copy the full SHA
    9b50f50 View commit details
    Browse the repository at this point in the history

Commits on Apr 2, 2024

  1. Moved job-name-lawyer to DeltaV locale

    @Timemaster99
    Timemaster99 committed Apr 2, 2024
    Configuration menu
    Copy the full SHA
    01dde62 View commit details
    Browse the repository at this point in the history

  2. Remove added space in accesses.ftl 

    Signed-off-by: Timemaster99 <[email protected]>
    @Timemaster99
    Timemaster99 authored Apr 2, 2024
    Configuration menu
    Copy the full SHA
    ac36b2a View commit details
    Browse the repository at this point in the history

  3. Removed unneeded deletion of unneeded spaces in headsets.yml 

    Signed-off-by: Timemaster99 <[email protected]>
    @Timemaster99
    Timemaster99 authored Apr 2, 2024
    Configuration menu
    Copy the full SHA
    acc150e View commit details
    Browse the repository at this point in the history

  4. Changed Lawyer ID name to Attorney ID

    @Timemaster99
    Timemaster99 committed Apr 2, 2024
    Configuration menu
    Copy the full SHA
    8842f34 View commit details
    Browse the repository at this point in the history

Commits on Apr 3, 2024

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

    @Timemaster99
    Timemaster99 committed Apr 3, 2024
    Configuration menu
    Copy the full SHA
    d21606b View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into legal-department

    @Timemaster99
    Timemaster99 authored Apr 3, 2024
    Configuration menu
    Copy the full SHA
    1b1966a View commit details
    Browse the repository at this point in the history

  3. Added formal and white variants of CJ jumpsuit to locker

    @Timemaster99
    Timemaster99 committed Apr 3, 2024
    Configuration menu
    Copy the full SHA
    2f1b1e7 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'master' into legal-department

    @Timemaster99
    Timemaster99 authored Apr 3, 2024
    Configuration menu
    Copy the full SHA
    d57101c View commit details
    Browse the repository at this point in the history

Commits on Apr 6, 2024

  1. Merge branch 'master' into legal-department

    @Timemaster99
    Timemaster99 authored Apr 6, 2024
    Configuration menu
    Copy the full SHA
    d4db0e5 View commit details
    Browse the repository at this point in the history

Commits on Apr 9, 2024

  1. Updated to use upstream's EmitSoundOnInteractUsing

    @Timemaster99
    Timemaster99 committed Apr 9, 2024
    Configuration menu
    Copy the full SHA
    5d621a6 View commit details
    Browse the repository at this point in the history

  2. Removing old component stuff

    @Timemaster99
    Timemaster99 committed Apr 9, 2024
    Configuration menu
    Copy the full SHA
    f453d4e View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' into legal-department 

    Signed-off-by: Timemaster99 <[email protected]>
    @Timemaster99
    Timemaster99 authored Apr 9, 2024
    Configuration menu
    Copy the full SHA
    b5b370f View commit details
    Browse the repository at this point in the history

  4. Gave Prosecutor Filled Lawyer Backpack

    @Timemaster99
    Timemaster99 committed Apr 9, 2024
    Configuration menu
    Copy the full SHA
    f7302be View commit details
    Browse the repository at this point in the history

  5. Deleted old component 

    Signed-off-by: Timemaster99 <[email protected]>
    @Timemaster99
    Timemaster99 authored Apr 9, 2024
    Configuration menu
    Copy the full SHA
    80c4bcb View commit details
    Browse the repository at this point in the history

Commits on Apr 10, 2024

  1. Merge branch 'master' into legal-department

    @Timemaster99
    Timemaster99 authored Apr 10, 2024
    Configuration menu
    Copy the full SHA
    1e09479 View commit details
    Browse the repository at this point in the history

Commits on Apr 11, 2024

  1. Merge branch 'master' into legal-department 

    Signed-off-by: Timemaster99 <[email protected]>
    @Timemaster99
    Timemaster99 authored Apr 11, 2024
    Configuration menu
    Copy the full SHA
    df3f159 View commit details
    Browse the repository at this point in the history

Commits on Apr 17, 2024

  1. Merge branch 'master' into legal-department

    @Timemaster99
    Timemaster99 authored Apr 17, 2024
    Configuration menu
    Copy the full SHA
    7ac1951 View commit details
    Browse the repository at this point in the history

Commits on Apr 24, 2024

  1. Merge branch 'master' into legal-department 

    Signed-off-by: Timemaster99 <[email protected]>
    @Timemaster99
    Timemaster99 authored Apr 24, 2024
    Configuration menu
    Copy the full SHA
    6a4abf7 View commit details
    Browse the repository at this point in the history

Commits on May 6, 2024

  1. Merge branch 'master' into legal-department

    @A-z-z-y
    A-z-z-y authored May 6, 2024
    Configuration menu
    Copy the full SHA
    1ef0f92 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into legal-department

    @Timemaster99
    Timemaster99 authored May 6, 2024
    Configuration menu
    Copy the full SHA
    909ca3c View commit details
    Browse the repository at this point in the history

Commits on May 25, 2024

  1. Merge branch 'master' into legal-department 

    Signed-off-by: Timemaster99 <[email protected]>
    @Timemaster99
    Timemaster99 authored May 25, 2024
    Configuration menu
    Copy the full SHA
    88477ba View commit details
    Browse the repository at this point in the history

  2. Removed old comments

    @Timemaster99
    Timemaster99 committed May 25, 2024
    Configuration menu
    Copy the full SHA
    7546e16 View commit details
    Browse the repository at this point in the history

  3. Updated doors to electronics system, fixed courier spawner that I bot… 

    …ched
    @Timemaster99
    Timemaster99 committed May 25, 2024
    Configuration menu
    Copy the full SHA
    f0b33f3 View commit details
    Browse the repository at this point in the history

  4. Fixed door_access indentation 

    Signed-off-by: Timemaster99 <[email protected]>
    @Timemaster99
    Timemaster99 authored May 25, 2024
    Configuration menu
    Copy the full SHA
    8105f39 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'master' into legal-department

    @Timemaster99
    Timemaster99 authored May 25, 2024
    Configuration menu
    Copy the full SHA
    01037e5 View commit details
    Browse the repository at this point in the history

Commits on May 29, 2024

  1. Adding a little bit of loadouts

    @Timemaster99
    Timemaster99 committed May 29, 2024
    Configuration menu
    Copy the full SHA
    0934d73 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'legal-department' of https://github.com/leonardo-dabepi… 

    …s/Delta-v-rebase into legal-department
    @Timemaster99
    Timemaster99 committed May 29, 2024
    Configuration menu
    Copy the full SHA
    d223e53 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' into legal-department 

    Signed-off-by: Timemaster99 <[email protected]>
    @Timemaster99
    Timemaster99 authored May 29, 2024
    Configuration menu
    Copy the full SHA
    f36c722 View commit details
    Browse the repository at this point in the history

  4. Add loadouts for justice

    @Timemaster99
    Timemaster99 committed May 29, 2024
    Configuration menu
    Copy the full SHA
    5ad3c56 View commit details
    Browse the repository at this point in the history

  5. Removed accessreader from windoors

    @Timemaster99
    Timemaster99 committed May 29, 2024
    Configuration menu
    Copy the full SHA
    e491c22 View commit details
    Browse the repository at this point in the history

  6. Added job spawner icons

    @Timemaster99
    Timemaster99 committed May 29, 2024
    Configuration menu
    Copy the full SHA
    e9496ff View commit details
    Browse the repository at this point in the history

  7. Fixed spawner sprite layering

    @Timemaster99
    Timemaster99 committed May 29, 2024
    Configuration menu
    Copy the full SHA
    13be855 View commit details
    Browse the repository at this point in the history

  8. Merge branch 'master' into legal-department

    @Timemaster99
    Timemaster99 authored May 29, 2024
    Configuration menu
    Copy the full SHA
    563956d View commit details
    Browse the repository at this point in the history

  9. Added missing parent in ID cards

    @Timemaster99
    Timemaster99 committed May 29, 2024
    Configuration menu
    Copy the full SHA
    503e4a8 View commit details
    Browse the repository at this point in the history

  10. Merge branch 'legal-department' of https://github.com/leonardo-dabepi… 

    …s/Delta-v-rebase into legal-department
    @Timemaster99
    Timemaster99 committed May 29, 2024
    Configuration menu
    Copy the full SHA
    10ba7ee View commit details
    Browse the repository at this point in the history

Commits on May 31, 2024

  1. Merge branch 'master' into legal-department

    @Timemaster99
    Timemaster99 authored May 31, 2024
    Configuration menu
    Copy the full SHA
    3eef06e View commit details
    Browse the repository at this point in the history

Commits on Jun 1, 2024

  1. Merge branch 'master' into legal-department 

    Signed-off-by: Timemaster99 <[email protected]>
    @Timemaster99
    Timemaster99 authored Jun 1, 2024
    Configuration menu
    Copy the full SHA
    2233102 View commit details
    Browse the repository at this point in the history

  2. Removed redundant laceup shoes loadout 

    Signed-off-by: Timemaster99 <[email protected]>
    @Timemaster99
    Timemaster99 authored Jun 1, 2024
    Configuration menu
    Copy the full SHA
    6a31d03 View commit details
    Browse the repository at this point in the history

Commits on Jun 2, 2024

  1. Merge branch 'master' into legal-department

    @Timemaster99
    Timemaster99 authored Jun 2, 2024
    Configuration menu
    Copy the full SHA
    feb2b7a View commit details
    Browse the repository at this point in the history

Commits on Jun 4, 2024

  1. Merge branch 'master' into legal-department

    @Timemaster99
    Timemaster99 authored Jun 4, 2024
    Configuration menu
    Copy the full SHA
    9baf515 View commit details
    Browse the repository at this point in the history

Commits on Jun 5, 2024

  1. Added lawyer windoor, fixed spawner names, fixed locker names

    @Timemaster99
    Timemaster99 committed Jun 5, 2024
    Configuration menu
    Copy the full SHA
    e2a5a41 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into legal-department

    @Timemaster99
    Timemaster99 authored Jun 5, 2024
    Configuration menu
    Copy the full SHA
    df1b464 View commit details
    Browse the repository at this point in the history

  3. Added station beacons

    @Timemaster99
    Timemaster99 committed Jun 5, 2024
    Configuration menu
    Copy the full SHA
    375098d View commit details
    Browse the repository at this point in the history

Commits on Jun 6, 2024

  1. Softened justice dept palette 

    Signed-off-by: Timemaster99 <[email protected]>
    @Timemaster99
    Timemaster99 authored Jun 6, 2024
    Configuration menu
    Copy the full SHA
    fba6933 View commit details
    Browse the repository at this point in the history

Commits on Jun 7, 2024

  1. Added justice key to telecomms

    @Timemaster99
    Timemaster99 committed Jun 7, 2024
    Configuration menu
    Copy the full SHA
    5913cc8 View commit details
    Browse the repository at this point in the history

  2. Added deltaV comments to telecomms

    @Timemaster99
    Timemaster99 committed Jun 7, 2024
    Configuration menu
    Copy the full SHA
    b54a39a View commit details
    Browse the repository at this point in the history