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

Tag Override for Equipment Slot Clothing Dependency #32140

Closed
wants to merge 160 commits into from
Closed

Tag Override for Equipment Slot Clothing Dependency #32140

wants to merge 160 commits into from

Commits on Jun 2, 2024

  1. Update Rules.txt 

    Moved the Harmony rules over.
    @KeldWolf
    KeldWolf authored Jun 2, 2024
    Configuration menu
    Copy the full SHA
    9527389 View commit details
    Browse the repository at this point in the history

Commits on Jun 5, 2024

  1. Merge branch 'master' of https://github.com/ss14-harmony/space-statio… 

    …n-14

Pullin'
    BuildTools committed Jun 5, 2024
    Configuration menu
    Copy the full SHA
    56d67f4 View commit details
    Browse the repository at this point in the history

Commits on Jun 6, 2024

  1. Merged from upstream

    BuildTools committed Jun 6, 2024
    Configuration menu
    Copy the full SHA
    c29c7a6 View commit details
    Browse the repository at this point in the history

Commits on Jun 8, 2024

  1. Merge remote-tracking branch 'upstream/master' 

    Just mergin ol' upstream
    BuildTools committed Jun 8, 2024
    Configuration menu
    Copy the full SHA
    1c4b8b1 View commit details
    Browse the repository at this point in the history

Commits on Jun 9, 2024

  1. Merge remote-tracking branch 'upstream/master' 

    Nother commit from upstream. 6/8/2024
    BuildTools committed Jun 9, 2024
    Configuration menu
    Copy the full SHA
    724d34b View commit details
    Browse the repository at this point in the history

Commits on Jun 13, 2024

  1. Merge remote-tracking branch 'upstream/master' 

    More Upsteam mergy time
    BuildTools committed Jun 13, 2024
    Configuration menu
    Copy the full SHA
    1b8a2be View commit details
    Browse the repository at this point in the history

Commits on Jun 14, 2024

  1. Added server pins and make them starting trinkets.

    BuildTools committed Jun 14, 2024
    Configuration menu
    Copy the full SHA
    79aba26 View commit details
    Browse the repository at this point in the history

  2. Fixed a deleted section for golden autism pin

    BuildTools committed Jun 14, 2024
    Configuration menu
    Copy the full SHA
    911fcba View commit details
    Browse the repository at this point in the history

  3. Merge branch 'space-wizards:master' into server-pins

    @KeldWolf
    KeldWolf authored Jun 14, 2024
    Configuration menu
    Copy the full SHA
    6629195 View commit details
    Browse the repository at this point in the history

  4. Merge pull request space-wizards#1 from ss14-harmony/server-pins 

    Server pins
    @KeldWolf
    KeldWolf authored Jun 14, 2024
    Configuration menu
    Copy the full SHA
    30b0967 View commit details
    Browse the repository at this point in the history

Commits on Jun 17, 2024

  1. pins meta file update

    BuildTools committed Jun 17, 2024
    Configuration menu
    Copy the full SHA
    4481f51 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'upstream/master' 

    Big upstream merge
    BuildTools committed Jun 17, 2024
    Configuration menu
    Copy the full SHA
    a46d866 View commit details
    Browse the repository at this point in the history

  3. Update pins.yml 

    Fixed some bad spacing
    @KeldWolf
    KeldWolf authored Jun 17, 2024
    Configuration menu
    Copy the full SHA
    8b72df5 View commit details
    Browse the repository at this point in the history

  4. Update trinkets.yml 

    Added missing attributes
    @KeldWolf
    KeldWolf authored Jun 17, 2024
    Configuration menu
    Copy the full SHA
    126ef67 View commit details
    Browse the repository at this point in the history

Commits on Jun 21, 2024

  1. Update publish.yml 

    Removed the scheduled portion of the publish workflow
    @KeldWolf
    KeldWolf authored Jun 21, 2024
    Configuration menu
    Copy the full SHA
    8f74198 View commit details
    Browse the repository at this point in the history

  2. Remove schedule for publish

    @KeldWolf
    KeldWolf authored Jun 21, 2024
    Configuration menu
    Copy the full SHA
    8e3308b View commit details
    Browse the repository at this point in the history

Commits on Jun 22, 2024

  1. Spacing fix 

    Fixed a dumb spacing issue
    @KeldWolf
    KeldWolf authored Jun 22, 2024
    Configuration menu
    Copy the full SHA
    78bb4c5 View commit details
    Browse the repository at this point in the history

  2. Fixed Golden Autism Pin fail I made

    @KeldWolf
    KeldWolf authored Jun 22, 2024
    Configuration menu
    Copy the full SHA
    afdea87 View commit details
    Browse the repository at this point in the history

  3. Again... with the pins.

    @KeldWolf
    KeldWolf authored Jun 22, 2024
    Configuration menu
    Copy the full SHA
    f8b8d34 View commit details
    Browse the repository at this point in the history

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

    Merging 6/22/24 from upstream
    BuildTools committed Jun 22, 2024
    Configuration menu
    Copy the full SHA
    79e54b1 View commit details
    Browse the repository at this point in the history

Commits on Jun 23, 2024

  1. pins loadout

    @liltenhead
    liltenhead committed Jun 23, 2024
    Configuration menu
    Copy the full SHA
    965af99 View commit details
    Browse the repository at this point in the history

Commits on Jun 30, 2024

  1. Merge remote-tracking branch 'upstream/master' 

    20240630 merge
    BuildTools committed Jun 30, 2024
    Configuration menu
    Copy the full SHA
    1e1b2f3 View commit details
    Browse the repository at this point in the history

Commits on Jul 1, 2024

  1. Merge pull request space-wizards#2 from ss14-harmony/pins 

    pins loadout
    @KeldWolf
    KeldWolf authored Jul 1, 2024
    Configuration menu
    Copy the full SHA
    754567f View commit details
    Browse the repository at this point in the history

Commits on Jul 4, 2024

  1. Merge remote-tracking branch 'upstream/master' 

    Fourth of July upstream merge
    BuildTools committed Jul 4, 2024
    Configuration menu
    Copy the full SHA
    a8cdd7a View commit details
    Browse the repository at this point in the history

Commits on Jul 7, 2024

  1. Merge remote-tracking branch 'upstream/master' 

    7/6/2024 upstream merge
    BuildTools committed Jul 7, 2024
    Configuration menu
    Copy the full SHA
    be5c6cc View commit details
    Browse the repository at this point in the history

Commits on Jul 8, 2024

  1. Attempting some proper workflow for CDN and Manifest update stuff.

    BuildTools committed Jul 8, 2024
    Configuration menu
    Copy the full SHA
    0836b5c View commit details
    Browse the repository at this point in the history

  2. Merge pull request space-wizards#3 from ss14-harmony/publish-stuff 

    Attempting some proper workflow for CDN and Manifest update stuff.
    @KeldWolf
    KeldWolf authored Jul 8, 2024
    Configuration menu
    Copy the full SHA
    276e003 View commit details
    Browse the repository at this point in the history

  3. Update gen_build_info.py 

    Added a missing :
    @KeldWolf
    KeldWolf authored Jul 8, 2024
    Configuration menu
    Copy the full SHA
    966b49c View commit details
    Browse the repository at this point in the history

  4. removed not needed part of the gen script

    BuildTools committed Jul 8, 2024
    Configuration menu
    Copy the full SHA
    8a8a0c2 View commit details
    Browse the repository at this point in the history

  5. Update publish.yml 

    Changed from key to password for the SCP. Not great for security. But, for testing we'll stick with it.
    @KeldWolf
    KeldWolf authored Jul 8, 2024
    Configuration menu
    Copy the full SHA
    c1f844f View commit details
    Browse the repository at this point in the history

  6. Update publish.yml 

    Fixed part of the Update Manifest JSON action
    @KeldWolf
    KeldWolf authored Jul 8, 2024
    Configuration menu
    Copy the full SHA
    04e3232 View commit details
    Browse the repository at this point in the history

  7. Update publish.yml 

    Fixed directory where the builds should land.
    @KeldWolf
    KeldWolf authored Jul 8, 2024
    Configuration menu
    Copy the full SHA
    b5717be View commit details
    Browse the repository at this point in the history

Commits on Jul 9, 2024

  1. Update gen_build_info.py 

    Update port for the CDN. Ask me why it's 1212 still some time.
    @KeldWolf
    KeldWolf authored Jul 9, 2024
    Configuration menu
    Copy the full SHA
    eb09b86 View commit details
    Browse the repository at this point in the history

Commits on Jul 11, 2024

  1. Update gen_build_info.py

    @KeldWolf
    KeldWolf authored Jul 11, 2024
    Configuration menu
    Copy the full SHA
    d19fdbc View commit details
    Browse the repository at this point in the history

Commits on Jul 14, 2024

  1. Big upstream update

    BuildTools committed Jul 14, 2024
    Configuration menu
    Copy the full SHA
    0a9aca0 View commit details
    Browse the repository at this point in the history

  2. Update publish_github_artifact.py

    @KeldWolf
    KeldWolf authored Jul 14, 2024
    Configuration menu
    Copy the full SHA
    92011d7 View commit details
    Browse the repository at this point in the history

  3. Re-added publish.

    BuildTools committed Jul 14, 2024
    Configuration menu
    Copy the full SHA
    3a108e1 View commit details
    Browse the repository at this point in the history

Commits on Jul 15, 2024

  1. Just moving the rules to the new location. This isn't taking into aco… 

    …unt any of the new formatting. But, it's better than players being presented with a completely blank rules screen.
    BuildTools committed Jul 15, 2024
    Configuration menu
    Copy the full SHA
    f7e7136 View commit details
    Browse the repository at this point in the history

  2. Merge pull request space-wizards#4 from ss14-harmony/add_rules 

    Just moving the rules to the new location. This isn't taking into aco…
    @KeldWolf
    KeldWolf authored Jul 15, 2024
    Configuration menu
    Copy the full SHA
    0f4c900 View commit details
    Browse the repository at this point in the history

Commits on Jul 18, 2024

  1. Merge remote-tracking branch 'upstream/master' 

    meging upstream and master
    BuildTools committed Jul 18, 2024
    Configuration menu
    Copy the full SHA
    7bcd838 View commit details
    Browse the repository at this point in the history

Commits on Jul 22, 2024

  1. Merge remote-tracking branch 'upstream/master' 

    7-22-2024 upstream merge
    BuildTools committed Jul 22, 2024
    Configuration menu
    Copy the full SHA
    2860040 View commit details
    Browse the repository at this point in the history

Commits on Jul 23, 2024

  1. Merge remote-tracking branch 'upstream/master' 

    7-23-2024 Upstream Merge
    BuildTools committed Jul 23, 2024
    Configuration menu
    Copy the full SHA
    60b51a6 View commit details
    Browse the repository at this point in the history

Commits on Jul 27, 2024

  1. Merge remote-tracking branch 'upstream/master' into upstream20242707 

    Merge the thing
    BuildTools committed Jul 27, 2024
    Configuration menu
    Copy the full SHA
    3e46e38 View commit details
    Browse the repository at this point in the history

  2. Merge pull request space-wizards#5 from ss14-harmony/upstream20242707 

    Upstream20242707
    @KeldWolf
    KeldWolf authored Jul 27, 2024
    Configuration menu
    Copy the full SHA
    b3e1bd0 View commit details
    Browse the repository at this point in the history

Commits on Jul 28, 2024

  1. Added new lobby art and took revs out of rotation.

    BuildTools committed Jul 28, 2024
    Configuration menu
    Copy the full SHA
    09b8ffe View commit details
    Browse the repository at this point in the history

  2. Update attributions.yml 

    Fixed missing quotes around license
    @KeldWolf
    KeldWolf authored Jul 28, 2024
    Configuration menu
    Copy the full SHA
    7bf2d81 View commit details
    Browse the repository at this point in the history

  3. Update attributions.yml 

    Missing "
    @KeldWolf
    KeldWolf authored Jul 28, 2024
    Configuration menu
    Copy the full SHA
    da7b37d View commit details
    Browse the repository at this point in the history

  4. Update attributions.yml 

    Added valid license
    @KeldWolf
    KeldWolf authored Jul 28, 2024
    Configuration menu
    Copy the full SHA
    f2d3cbe View commit details
    Browse the repository at this point in the history

  5. Update attributions.yml 

    Updated license AGAIN
    @KeldWolf
    KeldWolf authored Jul 28, 2024
    Configuration menu
    Copy the full SHA
    eff0bb1 View commit details
    Browse the repository at this point in the history

  6. Merge pull request space-wizards#6 from ss14-harmony/art-and-revs 

    Added new lobby art and took revs out of rotation.
    @KeldWolf
    KeldWolf authored Jul 28, 2024
    Configuration menu
    Copy the full SHA
    c92b407 View commit details
    Browse the repository at this point in the history

Commits on Aug 2, 2024

  1. Merge remote-tracking branch 'upstream/master'

    BuildTools committed Aug 2, 2024
    Configuration menu
    Copy the full SHA
    b771603 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' of https://github.com/ss14-harmony/space-statio… 

    …n-14

Fixing merge
    BuildTools committed Aug 2, 2024
    Configuration menu
    Copy the full SHA
    f030e61 View commit details
    Browse the repository at this point in the history

Commits on Aug 3, 2024

  1. Merge remote-tracking branch 'upstream/master' 

    20240802 Merge
    BuildTools committed Aug 3, 2024
    Configuration menu
    Copy the full SHA
    31b65d2 View commit details
    Browse the repository at this point in the history

Commits on Aug 5, 2024

  1. Merge remote-tracking branch 'upstream/master' 

    20240804 Merge
    BuildTools committed Aug 5, 2024
    Configuration menu
    Copy the full SHA
    6584514 View commit details
    Browse the repository at this point in the history

Commits on Aug 8, 2024

  1. Merge remote-tracking branch 'upstream/master' 

    20240807 Merge
    BuildTools committed Aug 8, 2024
    Configuration menu
    Copy the full SHA
    501fc19 View commit details
    Browse the repository at this point in the history

Commits on Aug 9, 2024

  1. Removed clown and syndi evac shuttle from rotation. Updated lobby art… 

    … to webp instead of big PNG
    BuildTools committed Aug 9, 2024
    Configuration menu
    Copy the full SHA
    42b90d5 View commit details
    Browse the repository at this point in the history

  2. Merge pull request space-wizards#7 from ss14-harmony/de-clown-shuttle 

    Removed clown and syndi evac shuttle from rotation. Updated lobby art…
    @KeldWolf
    KeldWolf authored Aug 9, 2024
    Configuration menu
    Copy the full SHA
    3dc3ef3 View commit details
    Browse the repository at this point in the history

Commits on Aug 13, 2024

  1. Merge for 20240812

    BuildTools committed Aug 13, 2024
    Configuration menu
    Copy the full SHA
    432b07d View commit details
    Browse the repository at this point in the history

Commits on Aug 15, 2024

  1. Merge remote-tracking branch 'upstream/master'

    BuildTools committed Aug 15, 2024
    Configuration menu
    Copy the full SHA
    dce928d View commit details
    Browse the repository at this point in the history

  2. Update FoodSequenceSystem.cs 

    Removed merge garbo

Signed-off-by: Kelderan <[email protected]>
    @KeldWolf
    KeldWolf authored Aug 15, 2024
    Configuration menu
    Copy the full SHA
    3b2c064 View commit details
    Browse the repository at this point in the history

  3. Update SliceableFoodSystem.cs 

    Signed-off-by: Kelderan <[email protected]>
    @KeldWolf
    KeldWolf authored Aug 15, 2024
    Configuration menu
    Copy the full SHA
    52e6a46 View commit details
    Browse the repository at this point in the history

  4. Update leaves.yml 

    Signed-off-by: Kelderan <[email protected]>
    @KeldWolf
    KeldWolf authored Aug 15, 2024
    Configuration menu
    Copy the full SHA
    7b5e105 View commit details
    Browse the repository at this point in the history

  5. Update toys.yml 

    Signed-off-by: Kelderan <[email protected]>
    @KeldWolf
    KeldWolf authored Aug 15, 2024
    Configuration menu
    Copy the full SHA
    58db5fc View commit details
    Browse the repository at this point in the history

  6. Update skewer.yml 

    Signed-off-by: Kelderan <[email protected]>
    @KeldWolf
    KeldWolf authored Aug 15, 2024
    Configuration menu
    Copy the full SHA
    dda9bdd View commit details
    Browse the repository at this point in the history

  7. Update produce.yml 

    Signed-off-by: Kelderan <[email protected]>
    @KeldWolf
    KeldWolf authored Aug 15, 2024
    Configuration menu
    Copy the full SHA
    33ae7e6 View commit details
    Browse the repository at this point in the history

  8. Update meat.yml 

    Signed-off-by: Kelderan <[email protected]>
    @KeldWolf
    KeldWolf authored Aug 15, 2024
    Configuration menu
    Copy the full SHA
    fdbac61 View commit details
    Browse the repository at this point in the history

  9. Update ingredients.yml 

    Signed-off-by: Kelderan <[email protected]>
    @KeldWolf
    KeldWolf authored Aug 15, 2024
    Configuration menu
    Copy the full SHA
    e50d973 View commit details
    Browse the repository at this point in the history

  10. Update burger.yml 

    Signed-off-by: Kelderan <[email protected]>
    @KeldWolf
    KeldWolf authored Aug 15, 2024
    Configuration menu
    Copy the full SHA
    d21209a View commit details
    Browse the repository at this point in the history

  11. Update mantles.yml 

    Signed-off-by: Kelderan <[email protected]>
    @KeldWolf
    KeldWolf authored Aug 15, 2024
    Configuration menu
    Copy the full SHA
    e507d57 View commit details
    Browse the repository at this point in the history

  12. Update human.yml 

    Signed-off-by: Kelderan <[email protected]>
    @KeldWolf
    KeldWolf authored Aug 15, 2024
    Configuration menu
    Copy the full SHA
    3b9e7a2 View commit details
    Browse the repository at this point in the history

  13. Update food-sequence.ftl 

    Signed-off-by: Kelderan <[email protected]>
    @KeldWolf
    KeldWolf authored Aug 15, 2024
    Configuration menu
    Copy the full SHA
    f829d8a View commit details
    Browse the repository at this point in the history

  14. Update bounties.ftl 

    Signed-off-by: Kelderan <[email protected]>
    @KeldWolf
    KeldWolf authored Aug 15, 2024
    Configuration menu
    Copy the full SHA
    3e2dec7 View commit details
    Browse the repository at this point in the history

  15. Update Changelog.yml 

    Signed-off-by: Kelderan <[email protected]>
    @KeldWolf
    KeldWolf authored Aug 15, 2024
    Configuration menu
    Copy the full SHA
    0b24ae5 View commit details
    Browse the repository at this point in the history

  16. Update FoodSequenceStartPointComponent.cs 

    Signed-off-by: Kelderan <[email protected]>
    @KeldWolf
    KeldWolf authored Aug 15, 2024
    Configuration menu
    Copy the full SHA
    b49632f View commit details
    Browse the repository at this point in the history

  17. Update FoodSequenceElementComponent.cs 

    Signed-off-by: Kelderan <[email protected]>
    @KeldWolf
    KeldWolf authored Aug 15, 2024
    Configuration menu
    Copy the full SHA
    fff73b6 View commit details
    Browse the repository at this point in the history

  18. Update ClientFoodSequenceSystem.cs 

    Signed-off-by: Kelderan <[email protected]>
    @KeldWolf
    KeldWolf authored Aug 15, 2024
    Configuration menu
    Copy the full SHA
    5a4679f View commit details
    Browse the repository at this point in the history

  19. Merge pull request space-wizards#8 from ss14-harmony/FixBadMerge 

    Fix bad merge
    @KeldWolf
    KeldWolf authored Aug 15, 2024
    Configuration menu
    Copy the full SHA
    651fd9d View commit details
    Browse the repository at this point in the history

  20. Create secret_weights.yml 

    Signed-off-by: Kelderan <[email protected]>
    @KeldWolf
    KeldWolf authored Aug 15, 2024
    Configuration menu
    Copy the full SHA
    7bd5702 View commit details
    Browse the repository at this point in the history

  21. Merge pull request space-wizards#9 from ss14-harmony/Remove_SecretBug 

    Create secret_weights.yml
    @KeldWolf
    KeldWolf authored Aug 15, 2024
    Configuration menu
    Copy the full SHA
    c22209a View commit details
    Browse the repository at this point in the history

  22. Update loadout_groups.yml 

    Signed-off-by: Kelderan <[email protected]>
    @KeldWolf
    KeldWolf authored Aug 15, 2024
    Configuration menu
    Copy the full SHA
    9703bee View commit details
    Browse the repository at this point in the history

  23. Merge pull request space-wizards#11 from ss14-harmony/KeldWolf-patch-1 

    Update loadout_groups.yml
    @KeldWolf
    KeldWolf authored Aug 15, 2024
    Configuration menu
    Copy the full SHA
    98f5f96 View commit details
    Browse the repository at this point in the history

  24. Update trinkets.yml 

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

  25. Update pins.yml 

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

  26. Create secret_weights.yml 

    Signed-off-by: Kelderan <[email protected]>
    @KeldWolf
    KeldWolf authored Aug 15, 2024
    Configuration menu
    Copy the full SHA
    8835755 View commit details
    Browse the repository at this point in the history

  27. Merge pull request space-wizards#12 from ss14-harmony/PinFixes 

    Pin fixes
    @KeldWolf
    KeldWolf authored Aug 15, 2024
    Configuration menu
    Copy the full SHA
    92e4ffe View commit details
    Browse the repository at this point in the history

Commits on Aug 22, 2024

  1. 202408252 Upstream merge

    BuildTools committed Aug 22, 2024
    Configuration menu
    Copy the full SHA
    4455b36 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' of https://github.com/ss14-harmony/space-statio… 

    …n-14
    BuildTools committed Aug 22, 2024
    Configuration menu
    Copy the full SHA
    af71048 View commit details
    Browse the repository at this point in the history

  3. Update publish.yml 

    Stopped the scheduled publish

Signed-off-by: Kelderan <[email protected]>
    @KeldWolf
    KeldWolf authored Aug 22, 2024
    Configuration menu
    Copy the full SHA
    91ab9fb View commit details
    Browse the repository at this point in the history

  4. Fixed the yaml... maybe

    BuildTools committed Aug 22, 2024
    Configuration menu
    Copy the full SHA
    722639a View commit details
    Browse the repository at this point in the history

Commits on Aug 23, 2024

  1. Found the stupid extra file. AHHHHHHH

    BuildTools committed Aug 23, 2024
    Configuration menu
    Copy the full SHA
    9be0b05 View commit details
    Browse the repository at this point in the history

  2. Merge pull request space-wizards#14 from ss14-harmony/keld-fixyml 

    Fixed the yaml... maybe
    @KeldWolf
    KeldWolf authored Aug 23, 2024
    Configuration menu
    Copy the full SHA
    e4c56f6 View commit details
    Browse the repository at this point in the history

  3. Pins but put in the right place.

    BuildTools committed Aug 23, 2024
    Configuration menu
    Copy the full SHA
    50d79c7 View commit details
    Browse the repository at this point in the history

  4. Fix Server Pins in wrong folder 

    Fix Server Pins in wrong folder causing RSI check issues. 

Signed-off-by: Kelderan <[email protected]>
    @KeldWolf
    KeldWolf authored Aug 23, 2024
    Configuration menu
    Copy the full SHA
    c5662dd View commit details
    Browse the repository at this point in the history

  5. Update loadout_groups.yml 

    Fixed a missing comment line. 

Signed-off-by: Kelderan <[email protected]>
    @KeldWolf
    KeldWolf authored Aug 23, 2024
    Configuration menu
    Copy the full SHA
    ed23f27 View commit details
    Browse the repository at this point in the history

  6. Update trinkets.yml 

    One... Fucking... space.

Signed-off-by: Kelderan <[email protected]>
    @KeldWolf
    KeldWolf authored Aug 23, 2024
    Configuration menu
    Copy the full SHA
    97855e9 View commit details
    Browse the repository at this point in the history

  7. Update trinkets.yml 

    Signed-off-by: Kelderan <[email protected]>
    @KeldWolf
    KeldWolf authored Aug 23, 2024
    Configuration menu
    Copy the full SHA
    69dfac2 View commit details
    Browse the repository at this point in the history

  8. Update loadout_groups.yml 

    Signed-off-by: Kelderan <[email protected]>
    @KeldWolf
    KeldWolf authored Aug 23, 2024
    Configuration menu
    Copy the full SHA
    53ae183 View commit details
    Browse the repository at this point in the history

  9. Merge pull request space-wizards#15 from ss14-harmony/keld-HarmonyFol… 

    …ders

Pins but put in the right place.
    @KeldWolf
    KeldWolf authored Aug 23, 2024
    Configuration menu
    Copy the full SHA
    9a217ba View commit details
    Browse the repository at this point in the history

  10. Madness grows

    BuildTools committed Aug 23, 2024
    Configuration menu
    Copy the full SHA
    72450dd View commit details
    Browse the repository at this point in the history

  11. Merge pull request space-wizards#16 from ss14-harmony/keld-pinhell 

    Madness grows
    @KeldWolf
    KeldWolf authored Aug 23, 2024
    Configuration menu
    Copy the full SHA
    3a288a4 View commit details
    Browse the repository at this point in the history

  12. Vulture Pins

    @DieselMohawk
    DieselMohawk authored Aug 23, 2024
    Configuration menu
    Copy the full SHA
    eb92846 View commit details
    Browse the repository at this point in the history

Commits on Aug 24, 2024

  1. Merge pull request space-wizards#17 from ss14-harmony/Vulture-Pin-Try-2 

    Vulture Pins
    @KeldWolf
    KeldWolf authored Aug 24, 2024
    Configuration menu
    Copy the full SHA
    b33fe33 View commit details
    Browse the repository at this point in the history

Commits on Aug 25, 2024

  1. Merge for 20240825

    BuildTools committed Aug 25, 2024
    Configuration menu
    Copy the full SHA
    edadce0 View commit details
    Browse the repository at this point in the history

Commits on Aug 26, 2024

  1. More merging

    BuildTools committed Aug 26, 2024
    Configuration menu
    Copy the full SHA
    1ab9782 View commit details
    Browse the repository at this point in the history

  2. submodule update

    BuildTools committed Aug 26, 2024
    Configuration menu
    Copy the full SHA
    11c5592 View commit details
    Browse the repository at this point in the history

  3. Removed all but Vulture pin. Also organized it more specifically inst… 

    …ead of grouped together with layers.
    BuildTools committed Aug 26, 2024
    Configuration menu
    Copy the full SHA
    fd904cf View commit details
    Browse the repository at this point in the history

  4. Even more simplification

    BuildTools committed Aug 26, 2024
    Configuration menu
    Copy the full SHA
    fe3e628 View commit details
    Browse the repository at this point in the history

  5. Update pins.yml 

    Removed an o

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

  6. Update pins.yml 

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

  7. Merge pull request space-wizards#19 from ss14-harmony/keld-onlyvulture 

    Removed all but Vulture pin. Also organized it more specifically inst…
    @KeldWolf
    KeldWolf authored Aug 26, 2024
    Configuration menu
    Copy the full SHA
    9ab7325 View commit details
    Browse the repository at this point in the history

Commits on Aug 27, 2024

  1. Removed all custom pin code

    BuildTools committed Aug 27, 2024
    Configuration menu
    Copy the full SHA
    0c8428f View commit details
    Browse the repository at this point in the history

  2. Merge pull request space-wizards#20 from ss14-harmony/keld-simplified 

    Removed all custom pin code
    @KeldWolf
    KeldWolf authored Aug 27, 2024
    Configuration menu
    Copy the full SHA
    f44caab View commit details
    Browse the repository at this point in the history

  3. 20240827 Merge

    BuildTools committed Aug 27, 2024
    Configuration menu
    Copy the full SHA
    6aa59a1 View commit details
    Browse the repository at this point in the history

Commits on Aug 28, 2024

  1. trying to fix master

    BuildTools committed Aug 28, 2024
    Configuration menu
    Copy the full SHA
    5384a15 View commit details
    Browse the repository at this point in the history

  2. Maybe fixed it now?

    BuildTools committed Aug 28, 2024
    Configuration menu
    Copy the full SHA
    af71b14 View commit details
    Browse the repository at this point in the history

  3. RobustToolbox nowe?

    BuildTools committed Aug 28, 2024
    Configuration menu
    Copy the full SHA
    f4abb56 View commit details
    Browse the repository at this point in the history

  4. Emergency merge to fix whitelist issue

    BuildTools committed Aug 28, 2024
    Configuration menu
    Copy the full SHA
    4347fd5 View commit details
    Browse the repository at this point in the history

Commits on Sep 1, 2024

  1. Made most timelocked clothing 1-3 hours to unlock with few exceptions

    BuildTools committed Sep 1, 2024
    Configuration menu
    Copy the full SHA
    b72110a View commit details
    Browse the repository at this point in the history

  2. Re-adding clown shuttle as it's less... aggro now. Also re-added synd… 

    …i escape pod. Mostly to throw something else in the mix. We can remove it again.
    BuildTools committed Sep 1, 2024
    Configuration menu
    Copy the full SHA
    aa65d52 View commit details
    Browse the repository at this point in the history

  3. Merge pull request space-wizards#22 from ss14-harmony/keld-reducetimers 

    Keld reducetimers
    @KeldWolf
    KeldWolf authored Sep 1, 2024
    Configuration menu
    Copy the full SHA
    02051e8 View commit details
    Browse the repository at this point in the history

  4. Merge for 20240901

    BuildTools committed Sep 1, 2024
    Configuration menu
    Copy the full SHA
    2d6943f View commit details
    Browse the repository at this point in the history

Commits on Sep 2, 2024

  1. Update Changelog.yml 

    Fixed a screwed up changelog file due to merge.

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

  2. Re-added the golden autism pin I accidentally blew away when messing … 

    …with server pins
    BuildTools committed Sep 2, 2024
    Configuration menu
    Copy the full SHA
    cb6c250 View commit details
    Browse the repository at this point in the history

  3. Re-adding the vulture pin while we're here.

    BuildTools committed Sep 2, 2024
    Configuration menu
    Copy the full SHA
    0262d99 View commit details
    Browse the repository at this point in the history

  4. Fuck it. All the servers pins are back now. We cocky today.

    BuildTools committed Sep 2, 2024
    Configuration menu
    Copy the full SHA
    da41f09 View commit details
    Browse the repository at this point in the history

  5. Merge pull request space-wizards#23 from ss14-harmony/keld-ymlfixin 

    Re-added the golden autism pin I accidentally blew away when messing …
    @KeldWolf
    KeldWolf authored Sep 2, 2024
    Configuration menu
    Copy the full SHA
    6a71b9d View commit details
    Browse the repository at this point in the history

Commits on Sep 4, 2024

  1. Adding two new shuttles to load in by spanky

    BuildTools committed Sep 4, 2024
    Configuration menu
    Copy the full SHA
    406c397 View commit details
    Browse the repository at this point in the history

  2. Merge pull request space-wizards#25 from ss14-harmony/SpankysShuttleE… 

    …xtravaganza

Adding two new shuttles to load in by spanky
    @KeldWolf
    KeldWolf authored Sep 4, 2024
    Configuration menu
    Copy the full SHA
    f791008 View commit details
    Browse the repository at this point in the history

  3. Merge for September 4, 2024

    BuildTools committed Sep 4, 2024
    Configuration menu
    Copy the full SHA
    3226ca4 View commit details
    Browse the repository at this point in the history

  4. Merge pull request space-wizards#26 from ss14-harmony/upstream20240904 

    Upstream20240904
    @KeldWolf
    KeldWolf authored Sep 4, 2024
    Configuration menu
    Copy the full SHA
    f928f8d View commit details
    Browse the repository at this point in the history

Commits on Sep 5, 2024

  1. Added more solid versions of the shuttles from feedback.

    BuildTools committed Sep 5, 2024
    Configuration menu
    Copy the full SHA
    e317b4c View commit details
    Browse the repository at this point in the history

Commits on Sep 6, 2024

  1. Got a fixed version of the CC Graniteflea as well.

    BuildTools committed Sep 6, 2024
    Configuration menu
    Copy the full SHA
    a622580 View commit details
    Browse the repository at this point in the history

  2. Merge pull request space-wizards#28 from ss14-harmony/SpankyShuttleFixes 

    Added more solid versions of the shuttles from feedback.
    @KeldWolf
    KeldWolf authored Sep 6, 2024
    Configuration menu
    Copy the full SHA
    bcff118 View commit details
    Browse the repository at this point in the history

  3. upstream merge for September 6, 2024

    BuildTools committed Sep 6, 2024
    Configuration menu
    Copy the full SHA
    cf93576 View commit details
    Browse the repository at this point in the history

  4. Update rsi-diff.yml 

    Not needed currently so removing from PR requirements. 

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

  5. Merge pull request space-wizards#29 from ss14-harmony/upstream20240906 

    Upstream20240906
    @KeldWolf
    KeldWolf authored Sep 6, 2024
    Configuration menu
    Copy the full SHA
    0a37aeb View commit details
    Browse the repository at this point in the history

Commits on Sep 7, 2024

  1. Set role timers for sensitive roles to 3 hours and Captain 3 hours of… 

    … command.
    BuildTools committed Sep 7, 2024
    Configuration menu
    Copy the full SHA
    7c74c15 View commit details
    Browse the repository at this point in the history

  2. Update borg.yml 

    Fixed a poor copy on my part. 

Signed-off-by: Kelderan <[email protected]>
    @KeldWolf
    KeldWolf authored Sep 7, 2024
    Configuration menu
    Copy the full SHA
    d8c3fb4 View commit details
    Browse the repository at this point in the history

  3. Merge pull request space-wizards#30 from ss14-harmony/timerRevamp 

    Set role timers for sensitive roles to 3 hours and Captain 3 hours of…
    @KeldWolf
    KeldWolf authored Sep 7, 2024
    Configuration menu
    Copy the full SHA
    d5cf8a0 View commit details
    Browse the repository at this point in the history

  4. Final touches on the shuttles based on feedback from WizDen mappers.

    BuildTools committed Sep 7, 2024
    Configuration menu
    Copy the full SHA
    9cbf5ca View commit details
    Browse the repository at this point in the history

  5. Merge pull request space-wizards#31 from ss14-harmony/SpankyShuttlesMk3 

    Final touches on the shuttles based on feedback from WizDen mappers.
    @KeldWolf
    KeldWolf authored Sep 7, 2024
    Configuration menu
    Copy the full SHA
    149206a View commit details
    Browse the repository at this point in the history

  6. Upsteam merge for September 7 2024

    BuildTools committed Sep 7, 2024
    Configuration menu
    Copy the full SHA
    029e3a5 View commit details
    Browse the repository at this point in the history

  7. Merge pull request space-wizards#32 from ss14-harmony/Upstream20240907 

    Upstream20240907
    @KeldWolf
    KeldWolf authored Sep 7, 2024
    Configuration menu
    Copy the full SHA
    85011b2 View commit details
    Browse the repository at this point in the history

  8. Modified weights for Dragon and Ninja 

    Signed-off-by: TheCrimsonJupiter <[email protected]>
    @TheCrimsonJupiter
    TheCrimsonJupiter authored Sep 7, 2024
    Configuration menu
    Copy the full SHA
    3e3c845 View commit details
    Browse the repository at this point in the history

  9. Update events.yml 

    Signed-off-by: TheCrimsonJupiter <[email protected]>
    @TheCrimsonJupiter
    TheCrimsonJupiter authored Sep 7, 2024
    Configuration menu
    Copy the full SHA
    76007f8 View commit details
    Browse the repository at this point in the history

Commits on Sep 9, 2024

  1. Upstream merge for September 9, 2024

    BuildTools committed Sep 9, 2024
    Configuration menu
    Copy the full SHA
    fece651 View commit details
    Browse the repository at this point in the history

  2. Merge pull request space-wizards#34 from ss14-harmony/upstream20240909 

    Upstream20240909
    @KeldWolf
    KeldWolf authored Sep 9, 2024
    Configuration menu
    Copy the full SHA
    c776256 View commit details
    Browse the repository at this point in the history

  3. Robust Changes

    BuildTools committed Sep 9, 2024
    Configuration menu
    Copy the full SHA
    87f3ca2 View commit details
    Browse the repository at this point in the history

  4. Merge pull request space-wizards#35 from ss14-harmony/upstream20240909 

    Robust Changes
    @KeldWolf
    KeldWolf authored Sep 9, 2024
    Configuration menu
    Copy the full SHA
    b2feaa8 View commit details
    Browse the repository at this point in the history

  5. Merge pull request space-wizards#33 from TheCrimsonJupiter/midround-a… 

    …ntag-weights

Midround antag weights
    @KeldWolf
    KeldWolf authored Sep 9, 2024
    Configuration menu
    Copy the full SHA
    a776b73 View commit details
    Browse the repository at this point in the history

Commits on Sep 11, 2024

  1. Upstream?

    BuildTools committed Sep 11, 2024
    Configuration menu
    Copy the full SHA
    8b7d71a View commit details
    Browse the repository at this point in the history

  2. Fixed maybe. Maybe...

    BuildTools committed Sep 11, 2024
    Configuration menu
    Copy the full SHA
    5a66906 View commit details
    Browse the repository at this point in the history

  3. Merge pull request space-wizards#36 from ss14-harmony/upstream20240910 

    Upstream?
    @KeldWolf
    KeldWolf authored Sep 11, 2024
    Configuration menu
    Copy the full SHA
    91c215b View commit details
    Browse the repository at this point in the history

  4. Upstream changes

    BuildTools committed Sep 11, 2024
    Configuration menu
    Copy the full SHA
    2c667d3 View commit details
    Browse the repository at this point in the history

  5. Update events.yml 

    Re-added Crimson's Changes

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

  6. Merge pull request space-wizards#37 from ss14-harmony/masterFixin 

    Master fixin
    @KeldWolf
    KeldWolf authored Sep 11, 2024
    Configuration menu
    Copy the full SHA
    821909c View commit details
    Browse the repository at this point in the history

  7. Robust?

    BuildTools committed Sep 11, 2024
    Configuration menu
    Copy the full SHA
    724756e View commit details
    Browse the repository at this point in the history

  8. Merge pull request space-wizards#38 from ss14-harmony/fixSubmodules 

    Robust?
    @KeldWolf
    KeldWolf authored Sep 11, 2024
    Configuration menu
    Copy the full SHA
    97a6731 View commit details
    Browse the repository at this point in the history

Commits on Sep 14, 2024

  1. Adds an entity tag to override clothing dependency for equiping an ob… 

    …ject into an inventory slot.
    Tsawodi committed Sep 14, 2024
    Configuration menu
    Copy the full SHA
    df22792 View commit details
    Browse the repository at this point in the history

  2. Removed redundant parentheses

    Tsawodi committed Sep 14, 2024
    Configuration menu
    Copy the full SHA
    4b8150e View commit details
    Browse the repository at this point in the history