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

Sorting departments. #42

Open
wants to merge 68 commits into
base: master
Choose a base branch
from
Open

Sorting departments. #42

wants to merge 68 commits into from

Commits on Jan 18, 2024

  1. Sorting departments. 

    TO-DO:
-Get rid of certain syndicate objectives
-Find out how to get rid of Logistics in department.yml
-Add service supervisor from parkstation
-probably adjust icons to what they were in parkstation
-get rid of shoukou when its time to actualy get this on review.
    @Adrian16199
    Adrian16199 committed Jan 18, 2024
    Configuration menu
    Copy the full SHA
    cc2f5f8 View commit details
    Browse the repository at this point in the history

Commits on Jan 25, 2024

  1. Merge branch 'master' into Sort-departments

    @Adrian16199
    Adrian16199 authored Jan 25, 2024
    Configuration menu
    Copy the full SHA
    2a5ccb5 View commit details
    Browse the repository at this point in the history

  2. Just bit of sortin prolly

    @Adrian16199
    Adrian16199 committed Jan 25, 2024
    Configuration menu
    Copy the full SHA
    4edf031 View commit details
    Browse the repository at this point in the history

Commits on Jan 30, 2024

  1. Merge branch 'master' into Sort-departments

    @Adrian16199
    Adrian16199 authored Jan 30, 2024
    Configuration menu
    Copy the full SHA
    631d949 View commit details
    Browse the repository at this point in the history

  2. Bit of a clean up.

    @Adrian16199
    Adrian16199 committed Jan 30, 2024
    Configuration menu
    Copy the full SHA
    76c11e3 View commit details
    Browse the repository at this point in the history

Commits on Feb 1, 2024

  1. Cleaning

    @Adrian16199
    Adrian16199 committed Feb 1, 2024
    Configuration menu
    Copy the full SHA
    671b5c6 View commit details
    Browse the repository at this point in the history

  2. A small detail.

    @Adrian16199
    Adrian16199 committed Feb 1, 2024
    Configuration menu
    Copy the full SHA
    7eae263 View commit details
    Browse the repository at this point in the history

  3. Update Resources/Locale/en-US/nyanotrasen/job/job-description.ftl 

    Co-authored-by: DEATHB4DEFEAT <[email protected]>
    @Adrian16199 @DEATHB4DEFEAT
    Adrian16199 and DEATHB4DEFEAT authored Feb 1, 2024
    Configuration menu
    Copy the full SHA
    d179a6c View commit details
    Browse the repository at this point in the history

  4. Update Resources/Prototypes/DeltaV/Catalog/Fills/Boxes/pda.yml 

    Co-authored-by: DEATHB4DEFEAT <[email protected]>
    @Adrian16199 @DEATHB4DEFEAT
    Adrian16199 and DEATHB4DEFEAT authored Feb 1, 2024
    Configuration menu
    Copy the full SHA
    72eaa00 View commit details
    Browse the repository at this point in the history

  5. Update Resources/Prototypes/Roles/Jobs/Cargo/salvage_specialist.yml 

    Co-authored-by: DEATHB4DEFEAT <[email protected]>
    @Adrian16199 @DEATHB4DEFEAT
    Adrian16199 and DEATHB4DEFEAT authored Feb 1, 2024
    Configuration menu
    Copy the full SHA
    df6666c View commit details
    Browse the repository at this point in the history

  6. Update Resources/Prototypes/Roles/Jobs/Cargo/salvage_specialist.yml 

    Co-authored-by: DEATHB4DEFEAT <[email protected]>
    @Adrian16199 @DEATHB4DEFEAT
    Adrian16199 and DEATHB4DEFEAT authored Feb 1, 2024
    Configuration menu
    Copy the full SHA
    56986be View commit details
    Browse the repository at this point in the history

  7. Update Resources/Prototypes/Nyanotrasen/Roles/Jobs/Cargo/mail_carrier… 

    ….yml

Co-authored-by: DEATHB4DEFEAT <[email protected]>
    @Adrian16199 @DEATHB4DEFEAT
    Adrian16199 and DEATHB4DEFEAT authored Feb 1, 2024
    Configuration menu
    Copy the full SHA
    e0a5719 View commit details
    Browse the repository at this point in the history

  8. Update Resources/Prototypes/Entities/Structures/Machines/salvage.yml 

    Co-authored-by: DEATHB4DEFEAT <[email protected]>
    @Adrian16199 @DEATHB4DEFEAT
    Adrian16199 and DEATHB4DEFEAT authored Feb 1, 2024
    Configuration menu
    Copy the full SHA
    100f12a View commit details
    Browse the repository at this point in the history

  9. Update Resources/Prototypes/Entities/Mobs/Cyborgs/borg_chassis.yml 

    Co-authored-by: DEATHB4DEFEAT <[email protected]>
    @Adrian16199 @DEATHB4DEFEAT
    Adrian16199 and DEATHB4DEFEAT authored Feb 1, 2024
    Configuration menu
    Copy the full SHA
    656931f View commit details
    Browse the repository at this point in the history

Commits on Feb 3, 2024

  1. Deletion of logistics

    @Adrian16199
    Adrian16199 committed Feb 3, 2024
    Configuration menu
    Copy the full SHA
    731f454 View commit details
    Browse the repository at this point in the history

  2. Re-enables forensic mantis.

    @Adrian16199
    Adrian16199 committed Feb 3, 2024
    Configuration menu
    Copy the full SHA
    b309633 View commit details
    Browse the repository at this point in the history

  3. No more captain

    @Adrian16199
    Adrian16199 committed Feb 3, 2024
    Configuration menu
    Copy the full SHA
    2b0f044 View commit details
    Browse the repository at this point in the history

  4. Buh

    @Adrian16199
    Adrian16199 committed Feb 3, 2024
    Configuration menu
    Copy the full SHA
    d4479d3 View commit details
    Browse the repository at this point in the history

Commits on Feb 4, 2024

  1. Update Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml 

    Co-authored-by: Pspritechologist <[email protected]>
    @Adrian16199 @Pspritechologist
    Adrian16199 and Pspritechologist authored Feb 4, 2024
    Configuration menu
    Copy the full SHA
    c847d9c View commit details
    Browse the repository at this point in the history

  2. Update Resources/Prototypes/Roles/Jobs/Cargo/salvage_specialist.yml 

    Co-authored-by: DEATHB4DEFEAT <[email protected]>
    @Adrian16199 @DEATHB4DEFEAT
    Adrian16199 and DEATHB4DEFEAT authored Feb 4, 2024
    Configuration menu
    Copy the full SHA
    899b49c View commit details
    Browse the repository at this point in the history

  3. get rid of debug changes 

    Do "get rid of captain" bit different
Give heads the CC supervisor
    @Adrian16199
    Adrian16199 committed Feb 4, 2024
    Configuration menu
    Copy the full SHA
    1041574 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'master' into Sort-departments

    @Adrian16199
    Adrian16199 authored Feb 4, 2024
    Configuration menu
    Copy the full SHA
    bc1f5d0 View commit details
    Browse the repository at this point in the history

  5. Decrease access

    @Adrian16199
    Adrian16199 committed Feb 4, 2024
    Configuration menu
    Copy the full SHA
    43ba09c View commit details
    Browse the repository at this point in the history

  6. Cargo technician instead of QM

    @Adrian16199
    Adrian16199 committed Feb 4, 2024
    Configuration menu
    Copy the full SHA
    886267c View commit details
    Browse the repository at this point in the history

  7. cleanin and fixin....

    @Adrian16199
    Adrian16199 committed Feb 4, 2024
    Configuration menu
    Copy the full SHA
    b479c49 View commit details
    Browse the repository at this point in the history

  8. Buh....

    @Adrian16199
    Adrian16199 committed Feb 4, 2024
    Configuration menu
    Copy the full SHA
    3841942 View commit details
    Browse the repository at this point in the history

  9. Headset just for salvage!

    @Adrian16199
    Adrian16199 committed Feb 4, 2024
    Configuration menu
    Copy the full SHA
    3ea3f47 View commit details
    Browse the repository at this point in the history

Commits on Feb 5, 2024

  1. salvage magnet speaks on Engineering comms

    @DEATHB4DEFEAT
    DEATHB4DEFEAT committed Feb 5, 2024
    Configuration menu
    Copy the full SHA
    b3e9156 View commit details
    Browse the repository at this point in the history

  2. some cleanup 

    I didn't want to review
    @DEATHB4DEFEAT
    DEATHB4DEFEAT committed Feb 5, 2024
    Configuration menu
    Copy the full SHA
    c24438d View commit details
    Browse the repository at this point in the history

  3. eradicate Logistics

    @DEATHB4DEFEAT
    DEATHB4DEFEAT committed Feb 5, 2024
    Configuration menu
    Copy the full SHA
    1a9d4d4 View commit details
    Browse the repository at this point in the history

  4. Applyin....

    @Adrian16199
    Adrian16199 committed Feb 5, 2024
    Configuration menu
    Copy the full SHA
    9b3db9e View commit details
    Browse the repository at this point in the history

  5. Removin specific.... 

    Disablin prison and whitespice thingy.....
Mail carrier..
    @Adrian16199
    Adrian16199 committed Feb 5, 2024
    Configuration menu
    Copy the full SHA
    87b4e95 View commit details
    Browse the repository at this point in the history

  6. Fixin.... whitespacin....

    @Adrian16199
    Adrian16199 committed Feb 5, 2024
    Configuration menu
    Copy the full SHA
    2035b41 View commit details
    Browse the repository at this point in the history

Commits on Feb 10, 2024

  1. Update Resources/Prototypes/DeltaV/Entities/Objects/Misc/first_bill.yml 

    Co-authored-by: DEATHB4DEFEAT <[email protected]>
    @Adrian16199 @DEATHB4DEFEAT
    Adrian16199 and DEATHB4DEFEAT authored Feb 10, 2024
    Configuration menu
    Copy the full SHA
    a1fffcf View commit details
    Browse the repository at this point in the history

  2. Update Content.Server/Salvage/SalvageSystem.Magnet.cs 

    Co-authored-by: DEATHB4DEFEAT <[email protected]>
    @Adrian16199 @DEATHB4DEFEAT
    Adrian16199 and DEATHB4DEFEAT authored Feb 10, 2024
    Configuration menu
    Copy the full SHA
    9ffec89 View commit details
    Browse the repository at this point in the history

  3. Update Resources/Prototypes/DeltaV/Objectives/stealTargetGroups.yml 

    Co-authored-by: DEATHB4DEFEAT <[email protected]>
    @Adrian16199 @DEATHB4DEFEAT
    Adrian16199 and DEATHB4DEFEAT authored Feb 10, 2024
    Configuration menu
    Copy the full SHA
    4ef613b View commit details
    Browse the repository at this point in the history

  4. Update Resources/Prototypes/Entities/Clothing/Ears/headsets.yml 

    Co-authored-by: DEATHB4DEFEAT <[email protected]>
    @Adrian16199 @DEATHB4DEFEAT
    Adrian16199 and DEATHB4DEFEAT authored Feb 10, 2024
    Configuration menu
    Copy the full SHA
    78c5f4d View commit details
    Browse the repository at this point in the history

  5. Update Resources/Prototypes/Entities/Clothing/Head/hoods.yml 

    Co-authored-by: DEATHB4DEFEAT <[email protected]>
    @Adrian16199 @DEATHB4DEFEAT
    Adrian16199 and DEATHB4DEFEAT authored Feb 10, 2024
    Configuration menu
    Copy the full SHA
    9b212e1 View commit details
    Browse the repository at this point in the history

  6. Update Resources/Prototypes/Entities/Objects/Misc/rubber_stamp.yml 

    Co-authored-by: DEATHB4DEFEAT <[email protected]>
    @Adrian16199 @DEATHB4DEFEAT
    Adrian16199 and DEATHB4DEFEAT authored Feb 10, 2024
    Configuration menu
    Copy the full SHA
    85010c7 View commit details
    Browse the repository at this point in the history

  7. Update Resources/Prototypes/Nyanotrasen/Roles/Jobs/Cargo/mail_carrier… 

    ….yml

Co-authored-by: DEATHB4DEFEAT <[email protected]>
    @Adrian16199 @DEATHB4DEFEAT
    Adrian16199 and DEATHB4DEFEAT authored Feb 10, 2024
    Configuration menu
    Copy the full SHA
    ecf2d34 View commit details
    Browse the repository at this point in the history

  8. Update Resources/Prototypes/Roles/Jobs/departments.yml 

    Co-authored-by: DEATHB4DEFEAT <[email protected]>
    @Adrian16199 @DEATHB4DEFEAT
    Adrian16199 and DEATHB4DEFEAT authored Feb 10, 2024
    Configuration menu
    Copy the full SHA
    8e149d2 View commit details
    Browse the repository at this point in the history

  9. Update Resources/Prototypes/Entities/Structures/Storage/Closets/Locke… 

    …rs/lockers.yml

Co-authored-by: DEATHB4DEFEAT <[email protected]>
    @Adrian16199 @DEATHB4DEFEAT
    Adrian16199 and DEATHB4DEFEAT authored Feb 10, 2024
    Configuration menu
    Copy the full SHA
    840cdf4 View commit details
    Browse the repository at this point in the history

  10. Update Resources/Prototypes/Entities/Structures/Decoration/banners.yml 

    Co-authored-by: DEATHB4DEFEAT <[email protected]>
    @Adrian16199 @DEATHB4DEFEAT
    Adrian16199 and DEATHB4DEFEAT authored Feb 10, 2024
    Configuration menu
    Copy the full SHA
    812efbf View commit details
    Browse the repository at this point in the history

  11. Update Resources/Prototypes/Entities/Clothing/Head/soft.yml 

    Co-authored-by: DEATHB4DEFEAT <[email protected]>
    @Adrian16199 @DEATHB4DEFEAT
    Adrian16199 and DEATHB4DEFEAT authored Feb 10, 2024
    Configuration menu
    Copy the full SHA
    3bc069d View commit details
    Browse the repository at this point in the history

  12. Update Resources/Prototypes/Entities/Clothing/Head/soft.yml 

    Co-authored-by: DEATHB4DEFEAT <[email protected]>
    @Adrian16199 @DEATHB4DEFEAT
    Adrian16199 and DEATHB4DEFEAT authored Feb 10, 2024
    Configuration menu
    Copy the full SHA
    a27219c View commit details
    Browse the repository at this point in the history

  13. Update Resources/Prototypes/Entities/Clothing/Neck/cloaks.yml 

    Co-authored-by: DEATHB4DEFEAT <[email protected]>
    @Adrian16199 @DEATHB4DEFEAT
    Adrian16199 and DEATHB4DEFEAT authored Feb 10, 2024
    Configuration menu
    Copy the full SHA
    e617984 View commit details
    Browse the repository at this point in the history

  14. Update Resources/Prototypes/Entities/Clothing/Neck/mantles.yml 

    Co-authored-by: DEATHB4DEFEAT <[email protected]>
    @Adrian16199 @DEATHB4DEFEAT
    Adrian16199 and DEATHB4DEFEAT authored Feb 10, 2024
    Configuration menu
    Copy the full SHA
    a0322c6 View commit details
    Browse the repository at this point in the history

  15. Update Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml 

    Co-authored-by: DEATHB4DEFEAT <[email protected]>
    @Adrian16199 @DEATHB4DEFEAT
    Adrian16199 and DEATHB4DEFEAT authored Feb 10, 2024
    Configuration menu
    Copy the full SHA
    3f589da View commit details
    Browse the repository at this point in the history

  16. Update Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoa… 

    …ts.yml

Co-authored-by: DEATHB4DEFEAT <[email protected]>
    @Adrian16199 @DEATHB4DEFEAT
    Adrian16199 and DEATHB4DEFEAT authored Feb 10, 2024
    Configuration menu
    Copy the full SHA
    1c62a34 View commit details
    Browse the repository at this point in the history

  17. Update Resources/Prototypes/Entities/Objects/Misc/identification_card… 

    …s.yml

Co-authored-by: DEATHB4DEFEAT <[email protected]>
    @Adrian16199 @DEATHB4DEFEAT
    Adrian16199 and DEATHB4DEFEAT authored Feb 10, 2024
    Configuration menu
    Copy the full SHA
    50d9c1b View commit details
    Browse the repository at this point in the history

  18. Update Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml 

    Co-authored-by: DEATHB4DEFEAT <[email protected]>
    @Adrian16199 @DEATHB4DEFEAT
    Adrian16199 and DEATHB4DEFEAT authored Feb 10, 2024
    Configuration menu
    Copy the full SHA
    1b0e7d4 View commit details
    Browse the repository at this point in the history

  19. Update Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml 

    Co-authored-by: DEATHB4DEFEAT <[email protected]>
    @Adrian16199 @DEATHB4DEFEAT
    Adrian16199 and DEATHB4DEFEAT authored Feb 10, 2024
    Configuration menu
    Copy the full SHA
    c9a8bc2 View commit details
    Browse the repository at this point in the history

  20. Update Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml 

    Co-authored-by: DEATHB4DEFEAT <[email protected]>
    @Adrian16199 @DEATHB4DEFEAT
    Adrian16199 and DEATHB4DEFEAT authored Feb 10, 2024
    Configuration menu
    Copy the full SHA
    6925434 View commit details
    Browse the repository at this point in the history

  21. Update Resources/Prototypes/Entities/Markers/Spawners/jobs.yml 

    Co-authored-by: DEATHB4DEFEAT <[email protected]>
    @Adrian16199 @DEATHB4DEFEAT
    Adrian16199 and DEATHB4DEFEAT authored Feb 10, 2024
    Configuration menu
    Copy the full SHA
    a519811 View commit details
    Browse the repository at this point in the history

  22. Update Resources/Prototypes/Entities/Objects/Devices/pda.yml 

    Co-authored-by: DEATHB4DEFEAT <[email protected]>
    @Adrian16199 @DEATHB4DEFEAT
    Adrian16199 and DEATHB4DEFEAT authored Feb 10, 2024
    Configuration menu
    Copy the full SHA
    338fd01 View commit details
    Browse the repository at this point in the history

  23. Update Resources/Prototypes/Entities/Objects/Devices/pda.yml 

    Co-authored-by: DEATHB4DEFEAT <[email protected]>
    @Adrian16199 @DEATHB4DEFEAT
    Adrian16199 and DEATHB4DEFEAT authored Feb 10, 2024
    Configuration menu
    Copy the full SHA
    b2549a3 View commit details
    Browse the repository at this point in the history

  24. Update Resources/Prototypes/Entities/Objects/Fun/figurines.yml 

    Co-authored-by: DEATHB4DEFEAT <[email protected]>
    @Adrian16199 @DEATHB4DEFEAT
    Adrian16199 and DEATHB4DEFEAT authored Feb 10, 2024
    Configuration menu
    Copy the full SHA
    756b004 View commit details
    Browse the repository at this point in the history

Commits on Feb 12, 2024

  1. Merge branch 'master' into Sort-departments

    @Adrian16199
    Adrian16199 authored Feb 12, 2024
    Configuration menu
    Copy the full SHA
    77698ea View commit details
    Browse the repository at this point in the history

Commits on Feb 14, 2024

  1. Apply suggestions from code review 

    Co-authored-by: Pspritechologist <[email protected]>
    @Adrian16199 @Pspritechologist
    Adrian16199 and Pspritechologist authored Feb 14, 2024
    Configuration menu
    Copy the full SHA
    ccd8637 View commit details
    Browse the repository at this point in the history

  2. applying

    @Adrian16199
    Adrian16199 committed Feb 14, 2024
    Configuration menu
    Copy the full SHA
    4ac4b1a View commit details
    Browse the repository at this point in the history

  3. Update head_of_personnel.yml

    @Adrian16199
    Adrian16199 committed Feb 14, 2024
    Configuration menu
    Copy the full SHA
    2296b8d View commit details
    Browse the repository at this point in the history

  4. Update head_of_personnel.yml

    @Adrian16199
    Adrian16199 committed Feb 14, 2024
    Configuration menu
    Copy the full SHA
    1d8429a View commit details
    Browse the repository at this point in the history

Commits on Mar 5, 2024

  1. Merge branch 'master' into Sort-departments

    @Adrian16199
    Adrian16199 authored Mar 5, 2024
    Configuration menu
    Copy the full SHA
    54ba5c9 View commit details
    Browse the repository at this point in the history

  2. B-buh

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

  3. Cargo

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

Commits on Mar 15, 2024

  1. hopefully fixes yml?

    @Adrian16199
    Adrian16199 committed Mar 15, 2024
    Configuration menu
    Copy the full SHA
    1b13541 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into Sort-departments

    @Adrian16199
    Adrian16199 authored Mar 15, 2024
    Configuration menu
    Copy the full SHA
    de5b4fc View commit details
    Browse the repository at this point in the history

Commits on Mar 17, 2024

  1. buh

    @Adrian16199
    Adrian16199 committed Mar 17, 2024
    Configuration menu
    Copy the full SHA
    4853d6d View commit details
    Browse the repository at this point in the history