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

Upstream23102024 #32976

Closed
wants to merge 399 commits into from
Closed

Upstream23102024 #32976

wants to merge 399 commits into from
This pull request is big! We’re only showing the most recent 250 commits.

Commits on Sep 9, 2024

  1. Merge pull request #33 from TheCrimsonJupiter/midround-antag-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 #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 <66748890+KeldWolf@users.noreply.github.com>
    @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 #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 #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

  9. Added the instructor mantle. Can currently only be spawned in through… 

    … the entity menu.
    Tsawodi committed Sep 11, 2024
    Configuration menu
    Copy the full SHA
    f596333 View commit details
    Browse the repository at this point in the history

Commits on Sep 12, 2024

  1. Upstream merge for starting fresh

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

  2. Update Changelog.yml 

    Fix Changelog per usual.

Signed-off-by: Kelderan <66748890+KeldWolf@users.noreply.github.com>
    @KeldWolf
    KeldWolf authored Sep 12, 2024
    Configuration menu
    Copy the full SHA
    8c64ea3 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #40 from ss14-harmony/StartingFresh 

    Starting fresh
    @KeldWolf
    KeldWolf authored Sep 12, 2024
    Configuration menu
    Copy the full SHA
    692d340 View commit details
    Browse the repository at this point in the history

  4. fixed missing line

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

  5. Added the instructor mantle. Can only spawned in through the entity m… 

    …enu.

File Changes:

+ C:\CodeProjects\space-station-14\Resources\Textures\Harmony\Clothing\Neck\Misc\instructormantle.rsi
    + .\equipped-NECK.png
    + .\icon.png
    + .\meta.json
+ C:\CodeProjects\space-station-14\Resources\Prototypes\Harmony\Entities\Clothing\Neck\mantles.yml

Reasoning:

There is no real reason other than that it would be fun for the teach and learn day.
    Tsawodi committed Sep 12, 2024
    Configuration menu
    Copy the full SHA
    adcbbc7 View commit details
    Browse the repository at this point in the history

  6. Merge branch 'harmony_instructor_mantle' of https://github.com/Tsawod… 

    …i/space-station-14 into harmony_instructor_mantle
    Tsawodi committed Sep 12, 2024
    Configuration menu
    Copy the full SHA
    07cb61a View commit details
    Browse the repository at this point in the history

  7. Merge pull request #42 from ss14-harmony/gitmodules 

    fixed missing line
    @KeldWolf
    KeldWolf authored Sep 12, 2024
    Configuration menu
    Copy the full SHA
    48cd0b6 View commit details
    Browse the repository at this point in the history

  8. Maybe fixed it? Owe Null many thanks?

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

  9. Merge pull request #44 from ss14-harmony/AnotherRTAttempt 

    Maybe fixed it? Owe Null many thanks?
    @KeldWolf
    KeldWolf authored Sep 12, 2024
    Configuration menu
    Copy the full SHA
    f001ca0 View commit details
    Browse the repository at this point in the history

  10. Merge remote-tracking branch 'upstream/master' into upstream20240912N… 

    …ight

Upstream merge
    BuildTools committed Sep 12, 2024
    Configuration menu
    Copy the full SHA
    9608eac View commit details
    Browse the repository at this point in the history

  11. Merge pull request #45 from ss14-harmony/upstream20240912Night 

    Upstream20240912 night
    @KeldWolf
    KeldWolf authored Sep 12, 2024
    Configuration menu
    Copy the full SHA
    a778e1c View commit details
    Browse the repository at this point in the history

  12. Add button frames to build menu

    @FluffMe
    FluffMe committed Sep 12, 2024
    Configuration menu
    Copy the full SHA
    e0fb5a4 View commit details
    Browse the repository at this point in the history

  13. Add lockable buttons to build menu

    @FluffMe
    FluffMe committed Sep 12, 2024
    Configuration menu
    Copy the full SHA
    5ae498c View commit details
    Browse the repository at this point in the history

  14. Added ERT shuttles used on WizDen.

    @spanky-spanky
    spanky-spanky committed Sep 12, 2024
    Configuration menu
    Copy the full SHA
    f3b274e View commit details
    Browse the repository at this point in the history

  15. Fixed incorrect directory format causing YAML formatting check to fai… 

    …l. Windows moment.
    Tsawodi committed Sep 12, 2024
    Configuration menu
    Copy the full SHA
    826be25 View commit details
    Browse the repository at this point in the history

  16. Merge pull request #47 from ss14-harmony/spanky-test 

    Added Additional ERT Shuttles
    @spanky-spanky
    spanky-spanky authored Sep 12, 2024
    Configuration menu
    Copy the full SHA
    b426eb8 View commit details
    Browse the repository at this point in the history

  17. This is why you double check stuff

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

  18. Merge pull request #43 from Tsawodi/harmony_instructor_mantle 

    Harmony Instructor Mantle
    @FluffMe
    FluffMe authored Sep 12, 2024
    Configuration menu
    Copy the full SHA
    5e6834c View commit details
    Browse the repository at this point in the history

  19. Merge pull request #48 from FluffMe/constructable-buttons-and-frames 

    Harmony Craftable lockable buttons and button frames
    @KeldWolf
    KeldWolf authored Sep 12, 2024
    Configuration menu
    Copy the full SHA
    82add61 View commit details
    Browse the repository at this point in the history

Commits on Sep 13, 2024

  1. Added medium deathsquad shuttle and renamed other shuttles to standar… 

    …d convention.
    @spanky-spanky
    spanky-spanky committed Sep 13, 2024
    Configuration menu
    Copy the full SHA
    3f79d6b View commit details
    Browse the repository at this point in the history

  2. Fixes to deathsquad shuttle.

    @spanky-spanky
    spanky-spanky committed Sep 13, 2024
    Configuration menu
    Copy the full SHA
    840beef View commit details
    Browse the repository at this point in the history

  3. Merge pull request #49 from ss14-harmony/spanky-shuttles 

    Add Deathsquad Shuttle (and rename others)
    @KeldWolf
    KeldWolf authored Sep 13, 2024
    Configuration menu
    Copy the full SHA
    cd0f99c View commit details
    Browse the repository at this point in the history

  4. Adjusts minimum-pop of several maps.

    @spanky-spanky
    spanky-spanky committed Sep 13, 2024
    Configuration menu
    Copy the full SHA
    aef3757 View commit details
    Browse the repository at this point in the history

  5. Merge pull request #51 from ss14-harmony/spanky-mapweights 

    Adjusts minimum population of several maps.
    @KeldWolf
    KeldWolf authored Sep 13, 2024
    Configuration menu
    Copy the full SHA
    9aa4201 View commit details
    Browse the repository at this point in the history

  6. Add clipboard to Autolathe recipes

    @FluffMe
    FluffMe committed Sep 13, 2024
    Configuration menu
    Copy the full SHA
    12f7038 View commit details
    Browse the repository at this point in the history

Commits on Sep 14, 2024

  1. Merge pull request #53 from FluffMe/printable-clipboard 

    Add clipboard to Autolathe recipes
    @KeldWolf
    KeldWolf authored Sep 14, 2024
    Configuration menu
    Copy the full SHA
    be50845 View commit details
    Browse the repository at this point in the history

  2. upstream update for Sept. 14 2024

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

  3. Merge pull request #54 from ss14-harmony/upstream20240914 

    Upstream20240914
    @KeldWolf
    KeldWolf authored Sep 14, 2024
    Configuration menu
    Copy the full SHA
    3dbc528 View commit details
    Browse the repository at this point in the history

Commits on Sep 16, 2024

  1. Improvements to Omega station.

    @spanky-spanky
    spanky-spanky committed Sep 16, 2024
    Configuration menu
    Copy the full SHA
    2c5ab78 View commit details
    Browse the repository at this point in the history

  2. Add "Harmony Station" poster 

    Co-authored-by: Emii-olii <176297497+Emii-olii@users.noreply.github.com>
    @FluffMe @Emii-olii
    FluffMe and Emii-olii committed Sep 16, 2024
    Configuration menu
    Copy the full SHA
    8c7ed52 View commit details
    Browse the repository at this point in the history

  3. Add "Salazar says WEH!" poster 

    Co-authored-by: BodenPflanze <noel291205@gmail.com>
    @FluffMe @BodenPlfanze
    FluffMe and BodenPlfanze committed Sep 16, 2024
    Configuration menu
    Copy the full SHA
    f6eae87 View commit details
    Browse the repository at this point in the history

  4. Add Harmony posters metadata

    @FluffMe
    FluffMe committed Sep 16, 2024
    Configuration menu
    Copy the full SHA
    76a7ad3 View commit details
    Browse the repository at this point in the history

  5. Add Harmony posters entities

    @FluffMe
    FluffMe committed Sep 16, 2024
    Configuration menu
    Copy the full SHA
    08df71b View commit details
    Browse the repository at this point in the history

  6. Modify legal poster spawner upstream

    @FluffMe
    FluffMe committed Sep 16, 2024
    Configuration menu
    Copy the full SHA
    fb6c622 View commit details
    Browse the repository at this point in the history

  7. Added mandatory copyright

    @FluffMe
    FluffMe committed Sep 16, 2024
    Configuration menu
    Copy the full SHA
    7a874e2 View commit details
    Browse the repository at this point in the history

  8. Merge pull request #55 from ss14-harmony/spanky-omega 

    Improvements to Omega station.
    @KeldWolf
    KeldWolf authored Sep 16, 2024
    Configuration menu
    Copy the full SHA
    c433271 View commit details
    Browse the repository at this point in the history

  9. Merge pull request #57 from FluffMe/harmony-posters 

    First Harmony posters and chance to spawn on maps via random legit poster spawner
    @KeldWolf
    KeldWolf authored Sep 16, 2024
    Configuration menu
    Copy the full SHA
    0d63386 View commit details
    Browse the repository at this point in the history

  10. Upstream for Sept, 16, 2024

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

  11. Merge pull request #58 from ss14-harmony/upstream20240914 

    Upstream20240914
    @KeldWolf
    KeldWolf authored Sep 16, 2024
    Configuration menu
    Copy the full SHA
    93b1348 View commit details
    Browse the repository at this point in the history

  12. Adds A Man of Weh poster by eli_sarek.

    @spanky-spanky
    spanky-spanky committed Sep 16, 2024
    Configuration menu
    Copy the full SHA
    a626fa6 View commit details
    Browse the repository at this point in the history

  13. Update meta.json 

    Signed-off-by: spanky-spanky <scott@wearejacob.com>
    @spanky-spanky
    spanky-spanky authored Sep 16, 2024
    Configuration menu
    Copy the full SHA
    32e5838 View commit details
    Browse the repository at this point in the history

  14. Second round of Omega changes.

    @spanky-spanky
    spanky-spanky committed Sep 16, 2024
    Configuration menu
    Copy the full SHA
    600b72c View commit details
    Browse the repository at this point in the history

  15. Merge pull request #59 from ss14-harmony/spanky-poster 

    Adds A Man of Weh poster
    @FluffMe
    FluffMe authored Sep 16, 2024
    Configuration menu
    Copy the full SHA
    b0d1b68 View commit details
    Browse the repository at this point in the history

Commits on Sep 17, 2024

  1. Rat King Solo Antag Status

    @DieselMohawk
    DieselMohawk authored Sep 17, 2024
    Configuration menu
    Copy the full SHA
    4cbf773 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #60 from ss14-harmony/spanky-omega 

    Second round of Omega changes.
    @KeldWolf
    KeldWolf authored Sep 17, 2024
    Configuration menu
    Copy the full SHA
    c077521 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #61 from ss14-harmony/Rat-King-Antag-Status 

    Rat King Solo Antag Status
    @KeldWolf
    KeldWolf authored Sep 17, 2024
    Configuration menu
    Copy the full SHA
    e848681 View commit details
    Browse the repository at this point in the history

Commits on Sep 18, 2024

  1. Latest round of Omega changes.

    @spanky-spanky
    spanky-spanky committed Sep 18, 2024
    Configuration menu
    Copy the full SHA
    f581cfd View commit details
    Browse the repository at this point in the history

  2. Update evac shuttle path. 

    Signed-off-by: spanky-spanky <scott@wearejacob.com>
    @spanky-spanky
    spanky-spanky authored Sep 18, 2024
    Configuration menu
    Copy the full SHA
    8614487 View commit details
    Browse the repository at this point in the history

  3. Add "HarMoney" poster by Denneth

    @FluffMe
    FluffMe committed Sep 18, 2024
    Configuration menu
    Copy the full SHA
    60534ec View commit details
    Browse the repository at this point in the history

  4. Add "Work Hard" poster by LevitatingTree

    @FluffMe
    FluffMe committed Sep 18, 2024
    Configuration menu
    Copy the full SHA
    7cbefcc View commit details
    Browse the repository at this point in the history

  5. Add "Makeshift Clown Poster" by LevitatingTree

    @FluffMe
    FluffMe committed Sep 18, 2024
    Configuration menu
    Copy the full SHA
    f6fdb7e View commit details
    Browse the repository at this point in the history

  6. Merge pull request #63 from FluffMe/new-harmony-posters 

    Add "HarMoney", "Work Hard", and "Makeshift Clown Poster" community posters by Denetth and LevitatingTree
    @KeldWolf
    KeldWolf authored Sep 18, 2024
    Configuration menu
    Copy the full SHA
    b24b53e View commit details
    Browse the repository at this point in the history

  7. new hud theme

    @jack-thedragon95
    jack-thedragon95 committed Sep 18, 2024
    Configuration menu
    Copy the full SHA
    88b08c5 View commit details
    Browse the repository at this point in the history

  8. Add "The Floodlight" communnity poster by sevount 

    Co-authored-by: sevount <181983841+sevount@users.noreply.github.com>
    @FluffMe @sevount
    FluffMe and sevount committed Sep 18, 2024
    Configuration menu
    Copy the full SHA
    278f04f View commit details
    Browse the repository at this point in the history

Commits on Sep 19, 2024

  1. Fix "AllMapsTested" failed assertion. Add OmegaSpanky to PostMapInitT… 

    …est.
    @FluffMe
    FluffMe committed Sep 19, 2024
    Configuration menu
    Copy the full SHA
    968785c View commit details
    Browse the repository at this point in the history

  2. Add OmegaSpanky into rotation and derotate original 

    Signed-off-by: spanky-spanky <scott@wearejacob.com>
    @spanky-spanky
    spanky-spanky authored Sep 19, 2024
    Configuration menu
    Copy the full SHA
    559d1c5 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #62 from ss14-harmony/spanky-omega 

    Latest Omega Updates
    @spanky-spanky
    spanky-spanky authored Sep 19, 2024
    Configuration menu
    Copy the full SHA
    a35067a View commit details
    Browse the repository at this point in the history

  4. Fix "NonGameMapsLoadableTest" for ERT-chaplain-medium.yml

    @FluffMe
    FluffMe committed Sep 19, 2024
    Configuration menu
    Copy the full SHA
    a1e5c88 View commit details
    Browse the repository at this point in the history

  5. Fix "NonGameMapsLoadableTest" for deathsquad-medium.yml

    @FluffMe
    FluffMe committed Sep 19, 2024
    Configuration menu
    Copy the full SHA
    2c235bb View commit details
    Browse the repository at this point in the history

  6. Fix "NonGameMapsLoadableTest" for ERT-janitor-small.yml

    @FluffMe
    FluffMe committed Sep 19, 2024
    Configuration menu
    Copy the full SHA
    2b83fd9 View commit details
    Browse the repository at this point in the history

  7. Fix "NonGameMapsLoadableTest" for janitor-small.yml

    @FluffMe
    FluffMe committed Sep 19, 2024
    Configuration menu
    Copy the full SHA
    5cade5a View commit details
    Browse the repository at this point in the history

  8. Fix "NonGameMapsLoadableTest" for WizDen-ERT-Shuttles/ERT-Large-Med-S… 

    …ec.yml
    @FluffMe
    FluffMe committed Sep 19, 2024
    Configuration menu
    Copy the full SHA
    9eb9e7c View commit details
    Browse the repository at this point in the history

  9. Fix "NonGameMapsLoadableTest" for WizDen-ERT-Shuttles/ERT-Medium-Base… 

    …Plus.yml
    @FluffMe
    FluffMe committed Sep 19, 2024
    Configuration menu
    Copy the full SHA
    aaab708 View commit details
    Browse the repository at this point in the history

  10. Fix "NonGameMapsLoadableTest" for WizDen-ERT-Shuttles/ERT-Medium-Base… 

    ….yml
    @FluffMe
    FluffMe committed Sep 19, 2024
    Configuration menu
    Copy the full SHA
    a599f76 View commit details
    Browse the repository at this point in the history

  11. Merge pull request #66 from ss14-harmony/fix-integration-tests 

    Fix integration tests
    @KeldWolf
    KeldWolf authored Sep 19, 2024
    Configuration menu
    Copy the full SHA
    c7ec6cb View commit details
    Browse the repository at this point in the history

  12. Upstream merge for the last 3 days

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

  13. Update Changelog.yml 

    Signed-off-by: Kelderan <66748890+KeldWolf@users.noreply.github.com>
    @KeldWolf
    KeldWolf authored Sep 19, 2024
    Configuration menu
    Copy the full SHA
    92b66fa View commit details
    Browse the repository at this point in the history

  14. Merge pull request #67 from ss14-harmony/upstream20240919 

    Upstream20240919
    @KeldWolf
    KeldWolf authored Sep 19, 2024
    Configuration menu
    Copy the full SHA
    88a008c View commit details
    Browse the repository at this point in the history

  15. Update publish.yml 

    Signed-off-by: Kelderan <66748890+KeldWolf@users.noreply.github.com>
    @KeldWolf
    KeldWolf authored Sep 19, 2024
    Configuration menu
    Copy the full SHA
    11bf4fe View commit details
    Browse the repository at this point in the history

  16. Update publish_multi_request.py 

    Signed-off-by: Kelderan <66748890+KeldWolf@users.noreply.github.com>
    @KeldWolf
    KeldWolf authored Sep 19, 2024
    Configuration menu
    Copy the full SHA
    7cd5f85 View commit details
    Browse the repository at this point in the history

  17. Update publish_multi_request.py 

    Signed-off-by: Kelderan <66748890+KeldWolf@users.noreply.github.com>
    @KeldWolf
    KeldWolf authored Sep 19, 2024
    Configuration menu
    Copy the full SHA
    1763787 View commit details
    Browse the repository at this point in the history

  18. Update publish.yml 

    Rolling back to old publish.yml for now.

Signed-off-by: Kelderan <66748890+KeldWolf@users.noreply.github.com>
    @KeldWolf
    KeldWolf authored Sep 19, 2024
    Configuration menu
    Copy the full SHA
    42de253 View commit details
    Browse the repository at this point in the history

Commits on Sep 20, 2024

  1. Removes omega-spanky and fixes all files.

    @spanky-spanky
    spanky-spanky committed Sep 20, 2024
    Configuration menu
    Copy the full SHA
    49c07ba View commit details
    Browse the repository at this point in the history

  2. Remove "OmegaSpanky" from PostMapInitTests

    @FluffMe
    FluffMe committed Sep 20, 2024
    Configuration menu
    Copy the full SHA
    b39f883 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'ss14-harmony:master' into new-harmony-posters

    @FluffMe
    FluffMe authored Sep 20, 2024
    Configuration menu
    Copy the full SHA
    3828820 View commit details
    Browse the repository at this point in the history

  4. Change "Work Hard" poster sprite and description.

    @FluffMe
    FluffMe committed Sep 20, 2024
    Configuration menu
    Copy the full SHA
    c959505 View commit details
    Browse the repository at this point in the history

  5. Change "Makeshift Clown Poster" poster sprite and description.

    @FluffMe
    FluffMe committed Sep 20, 2024
    Configuration menu
    Copy the full SHA
    6003f77 View commit details
    Browse the repository at this point in the history

  6. Merge pull request #69 from ss14-harmony/LevitatingTree-posters-fixes 

    Change "Work Hard" and "Makeshift Clown Poster" sprites and descriptions (by LevitatingTree)
    @KeldWolf
    KeldWolf authored Sep 20, 2024
    Configuration menu
    Copy the full SHA
    bf98925 View commit details
    Browse the repository at this point in the history

  7. Merge pull request #68 from ss14-harmony/spanky-remove 

    Remove Custom Omega
    @KeldWolf
    KeldWolf authored Sep 20, 2024
    Configuration menu
    Copy the full SHA
    eabf745 View commit details
    Browse the repository at this point in the history

  8. Add 5 new posters by LevitatingTree

    @FluffMe
    FluffMe committed Sep 20, 2024
    Configuration menu
    Copy the full SHA
    3398475 View commit details
    Browse the repository at this point in the history

  9. Merge remote-tracking branch 'origin/master' into harmony-purple-hud

    @FluffMe
    FluffMe committed Sep 20, 2024
    Configuration menu
    Copy the full SHA
    110c4b1 View commit details
    Browse the repository at this point in the history

  10. Merge branch 'ss14-harmony:master' into new-harmony-posters

    @FluffMe
    FluffMe authored Sep 20, 2024
    Configuration menu
    Copy the full SHA
    37601a5 View commit details
    Browse the repository at this point in the history

  11. Change namespace to "Harmony". Change id to HarmonyPurple where appli… 

    …cable.
    @FluffMe
    FluffMe committed Sep 20, 2024
    Configuration menu
    Copy the full SHA
    e1dc1e1 View commit details
    Browse the repository at this point in the history

  12. Remove comment from options-menu.ftl because linter hates me

    @FluffMe
    FluffMe committed Sep 20, 2024
    Configuration menu
    Copy the full SHA
    7d660d9 View commit details
    Browse the repository at this point in the history

  13. Change the apostrophe. Just in case.

    @FluffMe
    FluffMe committed Sep 20, 2024
    Configuration menu
    Copy the full SHA
    ee02929 View commit details
    Browse the repository at this point in the history

Commits on Sep 21, 2024

  1. Merge pull request #64 from FluffMe/new-harmony-posters 

    Add "The Floodlight" community poster by sevount
    @KeldWolf
    KeldWolf authored Sep 21, 2024
    Configuration menu
    Copy the full SHA
    3643ecf View commit details
    Browse the repository at this point in the history

  2. Remove "Cool S"

    @FluffMe
    FluffMe committed Sep 21, 2024
    Configuration menu
    Copy the full SHA
    ae0dab5 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' into LevitatingTree-new-posters-2 

    Signed-off-by: FluffMe <dex.stb@gmail.com>
    @FluffMe
    FluffMe authored Sep 21, 2024
    Configuration menu
    Copy the full SHA
    753e8f3 View commit details
    Browse the repository at this point in the history

  4. Update capitalization on "Fallen Can" poster

    @FluffMe
    FluffMe committed Sep 21, 2024
    Configuration menu
    Copy the full SHA
    e8fcffc View commit details
    Browse the repository at this point in the history

  5. Upstream merge for Sept. 21, 2024

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

  6. Merge pull request #72 from ss14-harmony/upstream20240921 

    Upstream20240921
    @KeldWolf
    KeldWolf authored Sep 21, 2024
    Configuration menu
    Copy the full SHA
    e83bb59 View commit details
    Browse the repository at this point in the history

Commits on Sep 22, 2024

  1. New options menu name for hud 

    changes theme name in options-menu.ftl to some thing more

Signed-off-by: jack-thedragon95 <dankbooty66@gmail.com>
    @jack-thedragon95
    jack-thedragon95 authored Sep 22, 2024
    Configuration menu
    Copy the full SHA
    e6ba367 View commit details
    Browse the repository at this point in the history

  2. wrong name guh 

    Signed-off-by: jack-thedragon95 <dankbooty66@gmail.com>
    @jack-thedragon95
    jack-thedragon95 authored Sep 22, 2024
    Configuration menu
    Copy the full SHA
    3be3172 View commit details
    Browse the repository at this point in the history

  3. Update hud.yml 

    Signed-off-by: jack-thedragon95 <dankbooty66@gmail.com>
    @jack-thedragon95
    jack-thedragon95 authored Sep 22, 2024
    Configuration menu
    Copy the full SHA
    fdf2442 View commit details
    Browse the repository at this point in the history

  4. Update themes.yml 

    Signed-off-by: jack-thedragon95 <dankbooty66@gmail.com>
    @jack-thedragon95
    jack-thedragon95 authored Sep 22, 2024
    Configuration menu
    Copy the full SHA
    cde366e View commit details
    Browse the repository at this point in the history

  5. Merge pull request #65 from ss14-harmony/harmony-purple-hud 

    new hud theme
    @jack-thedragon95
    jack-thedragon95 authored Sep 22, 2024
    Configuration menu
    Copy the full SHA
    34d7906 View commit details
    Browse the repository at this point in the history

  6. Delete misspelled folder "Loadlouts"

    @FluffMe
    FluffMe committed Sep 22, 2024
    Configuration menu
    Copy the full SHA
    a3693c6 View commit details
    Browse the repository at this point in the history

  7. Add "brown bandana" as a headwear option for Cargo Techs

    @FluffMe
    FluffMe committed Sep 22, 2024
    Configuration menu
    Copy the full SHA
    654d9a3 View commit details
    Browse the repository at this point in the history

  8. Add "red bandana" as a headwear option for Security Officers

    @FluffMe
    FluffMe committed Sep 22, 2024
    Configuration menu
    Copy the full SHA
    eee0948 View commit details
    Browse the repository at this point in the history

  9. Add "noir trenchcoat" as a outer clothing option for Detectives

    @FluffMe
    FluffMe committed Sep 22, 2024
    Configuration menu
    Copy the full SHA
    4595214 View commit details
    Browse the repository at this point in the history

  10. Add "Harmony" to all IDs just in case

    @FluffMe
    FluffMe committed Sep 22, 2024
    Configuration menu
    Copy the full SHA
    c81f82d View commit details
    Browse the repository at this point in the history

Commits on Sep 23, 2024

  1. Merge pull request #71 from ss14-harmony/LevitatingTree-new-posters-2 

     Add 4 more posters by LevitatingTree
    @KeldWolf
    KeldWolf authored Sep 23, 2024
    Configuration menu
    Copy the full SHA
    6667dbc View commit details
    Browse the repository at this point in the history

  2. Merge pull request #73 from ss14-harmony/adjust-loadouts 

    Add Drobe-available items to Loadouts -- red bandana for SecOff, brown bandana for CargoTech, noir coat for Det
    @KeldWolf
    KeldWolf authored Sep 23, 2024
    Configuration menu
    Copy the full SHA
    d695cbd View commit details
    Browse the repository at this point in the history

  3. Upstream merge for Sept. 23, 2024

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

  4. Merge pull request #74 from ss14-harmony/upstream20240923 

    Upstream20240923
    @KeldWolf
    KeldWolf authored Sep 23, 2024
    Configuration menu
    Copy the full SHA
    84484b7 View commit details
    Browse the repository at this point in the history

Commits on Sep 25, 2024

  1. Sunset soda, Aviation, Espresso martini

    @Unisol
    Unisol committed Sep 25, 2024
    Configuration menu
    Copy the full SHA
    38c7228 View commit details
    Browse the repository at this point in the history

  2. copyright update

    @Unisol
    Unisol committed Sep 25, 2024
    Configuration menu
    Copy the full SHA
    21406b1 View commit details
    Browse the repository at this point in the history

  3. Moving changes to harmony subfolders

    @Unisol
    Unisol committed Sep 25, 2024
    Configuration menu
    Copy the full SHA
    0663208 View commit details
    Browse the repository at this point in the history

  4. Second pass at moving files to harmony subfolders

    @Unisol
    Unisol committed Sep 25, 2024
    Configuration menu
    Copy the full SHA
    2cb4cad View commit details
    Browse the repository at this point in the history

  5. reverting whitespace changes in soda.ftl

    @Unisol
    Unisol committed Sep 25, 2024
    Configuration menu
    Copy the full SHA
    32333e3 View commit details
    Browse the repository at this point in the history

  6. reverting whitespace changes in soda.ftl, for real this time

    @Unisol
    Unisol committed Sep 25, 2024
    Configuration menu
    Copy the full SHA
    72d32c3 View commit details
    Browse the repository at this point in the history

  7. Delete alcohol.ftl

    @FluffMe
    FluffMe authored Sep 25, 2024
    Configuration menu
    Copy the full SHA
    7ba8481 View commit details
    Browse the repository at this point in the history

  8. Delete soda.ftl

    @FluffMe
    FluffMe authored Sep 25, 2024
    Configuration menu
    Copy the full SHA
    e1a3b8b View commit details
    Browse the repository at this point in the history

  9. Update alcohol.yml

    @FluffMe
    FluffMe authored Sep 25, 2024
    Configuration menu
    Copy the full SHA
    3ae9dcd View commit details
    Browse the repository at this point in the history

  10. Update soda.yml

    @FluffMe
    FluffMe authored Sep 25, 2024
    Configuration menu
    Copy the full SHA
    14b38e3 View commit details
    Browse the repository at this point in the history

  11. Re-create soda.ftl

    @FluffMe
    FluffMe authored Sep 25, 2024
    Configuration menu
    Copy the full SHA
    c128006 View commit details
    Browse the repository at this point in the history

  12. Recreate alcohol.ftl

    @FluffMe
    FluffMe authored Sep 25, 2024
    Configuration menu
    Copy the full SHA
    dc84ed5 View commit details
    Browse the repository at this point in the history

  13. Readd locale string to soda.yml

    @FluffMe
    FluffMe authored Sep 25, 2024
    Configuration menu
    Copy the full SHA
    e5e9217 View commit details
    Browse the repository at this point in the history

  14. Readd locale strings to alcohol.yml

    @FluffMe
    FluffMe authored Sep 25, 2024
    Configuration menu
    Copy the full SHA
    6579871 View commit details
    Browse the repository at this point in the history

  15. Label for Harmony Changelog

    @FluffMe
    FluffMe committed Sep 25, 2024
    Configuration menu
    Copy the full SHA
    99a6c92 View commit details
    Browse the repository at this point in the history

  16. Add Harmony changelog (parsed from GitHub API)

    @FluffMe
    FluffMe committed Sep 25, 2024
    Configuration menu
    Copy the full SHA
    1a338b1 View commit details
    Browse the repository at this point in the history

Commits on Sep 26, 2024

  1. Update drinks_glass.yml -- readded to spawner with proper comment

    @FluffMe
    FluffMe authored Sep 26, 2024
    Configuration menu
    Copy the full SHA
    b5e491c View commit details
    Browse the repository at this point in the history

  2. Merge pull request #76 from Unisol/feature/cocktails-pass-1 

    Cocktail set #1
    @KeldWolf
    KeldWolf authored Sep 26, 2024
    Configuration menu
    Copy the full SHA
    27c251e View commit details
    Browse the repository at this point in the history

  3. Update publish_github_artifact.py 

    No more ugly port specification for Harmoy's CDN

Signed-off-by: Kelderan <66748890+KeldWolf@users.noreply.github.com>
    @KeldWolf
    KeldWolf authored Sep 26, 2024
    Configuration menu
    Copy the full SHA
    bc19e9d View commit details
    Browse the repository at this point in the history

  4. Update publish_multi_request.py 

    Also removing the port from the new publish script when we start using it. 

Signed-off-by: Kelderan <66748890+KeldWolf@users.noreply.github.com>
    @KeldWolf
    KeldWolf authored Sep 26, 2024
    Configuration menu
    Copy the full SHA
    8056140 View commit details
    Browse the repository at this point in the history

  5. Merge pull request #77 from ss14-harmony/harmony-changelog 

    Add in-game Harmony changelog
    @KeldWolf
    KeldWolf authored Sep 26, 2024
    Configuration menu
    Copy the full SHA
    bf201d8 View commit details
    Browse the repository at this point in the history

  6. Upstream merge for Sept, 25, 2024

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

  7. Merge pull request #78 from ss14-harmony/upstream20240925 

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

  8. Changelog update

    @FluffMe
    FluffMe committed Sep 26, 2024
    Configuration menu
    Copy the full SHA
    0e7a0e5 View commit details
    Browse the repository at this point in the history

  9. Merge pull request #79 from ss14-harmony/changelog20240924 

    Changelog update
    @KeldWolf
    KeldWolf authored Sep 26, 2024
    Configuration menu
    Copy the full SHA
    6d737cc View commit details
    Browse the repository at this point in the history

  10. Upstream merge for Sept. 26, 2024

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

  11. Remove BaseAdvancedPen proto in deathsquad-medium.yml

    @FluffMe
    FluffMe committed Sep 26, 2024
    Configuration menu
    Copy the full SHA
    92a2fe5 View commit details
    Browse the repository at this point in the history

  12. Merge pull request #80 from ss14-harmony/upstream9262024 

    Upstream9262024
    @FluffMe
    FluffMe authored Sep 26, 2024
    Configuration menu
    Copy the full SHA
    0c07f4e View commit details
    Browse the repository at this point in the history

  13. Change harmony_poster2_legit.png

    @FluffMe
    FluffMe committed Sep 26, 2024
    Configuration menu
    Copy the full SHA
    8e39b81 View commit details
    Browse the repository at this point in the history

  14. Change "Work Hard" poster

    @FluffMe
    FluffMe committed Sep 26, 2024
    Configuration menu
    Copy the full SHA
    8724d7f View commit details
    Browse the repository at this point in the history

  15. Merge pull request #81 from ss14-harmony/fix-poster 

    Change "Harmony" poster by Emii-olii
    @FluffMe
    FluffMe authored Sep 26, 2024
    Configuration menu
    Copy the full SHA
    6167e33 View commit details
    Browse the repository at this point in the history

  16. Add 4 more posters by LevitatingTree -- "Always Watching", "Space Ass… 

    …hole", "Smoke Break", "Wall Meat"
    @FluffMe
    FluffMe committed Sep 26, 2024
    Configuration menu
    Copy the full SHA
    37941f2 View commit details
    Browse the repository at this point in the history

  17. Adds SecretNukeops gamemode.

    @spanky-spanky
    spanky-spanky committed Sep 26, 2024
    Configuration menu
    Copy the full SHA
    a8cfea2 View commit details
    Browse the repository at this point in the history

  18. Moved to Harmony subfolder.

    @spanky-spanky
    spanky-spanky committed Sep 26, 2024
    Configuration menu
    Copy the full SHA
    36f1bd0 View commit details
    Browse the repository at this point in the history

Commits on Sep 27, 2024

  1. Merge pull request #83 from ss14-harmony/spanky-secretnukies 

    Secret Nukies Gamemode
    @FluffMe
    FluffMe authored Sep 27, 2024
    Configuration menu
    Copy the full SHA
    e4cd749 View commit details
    Browse the repository at this point in the history

  2. Remove Noir Coat from detective loadout.

    @FluffMe
    FluffMe committed Sep 27, 2024
    Configuration menu
    Copy the full SHA
    c04d3a3 View commit details
    Browse the repository at this point in the history

  3. Modify ingame Space Law to be Harmony Space Law

    @FluffMe
    FluffMe committed Sep 27, 2024
    Configuration menu
    Copy the full SHA
    64ac2e5 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #82 from ss14-harmony/LevitatingTree-posters 

    Add 4 more posters by LevitatingTree
    @FluffMe
    FluffMe authored Sep 27, 2024
    Configuration menu
    Copy the full SHA
    a899ccb View commit details
    Browse the repository at this point in the history

  5. Merge pull request #84 from ss14-harmony/loadout-remove-trenchcoat 

    Remove "noir coat" from Det loadout due to upstream change
    @KeldWolf
    KeldWolf authored Sep 27, 2024
    Configuration menu
    Copy the full SHA
    5daf302 View commit details
    Browse the repository at this point in the history

  6. Merge pull request #85 from ss14-harmony/harmony-space-law 

    Change in-game Space Law guidebooks to reflect Harmony Space Law
    @KeldWolf
    KeldWolf authored Sep 27, 2024
    Configuration menu
    Copy the full SHA
    501c76a View commit details
    Browse the repository at this point in the history

  7. Upstream merge for Sept. 9,2024

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

  8. Changelog update

    @FluffMe
    FluffMe committed Sep 27, 2024
    Configuration menu
    Copy the full SHA
    f2c92ca View commit details
    Browse the repository at this point in the history

  9. Merge pull request #86 from ss14-harmony/upstream20240927 

    Upstream20240927
    @KeldWolf
    KeldWolf authored Sep 27, 2024
    Configuration menu
    Copy the full SHA
    3e55445 View commit details
    Browse the repository at this point in the history

  10. Merge pull request #87 from ss14-harmony/changelog20240927 

    Changelog20240927
    @KeldWolf
    KeldWolf authored Sep 27, 2024
    Configuration menu
    Copy the full SHA
    5b6b126 View commit details
    Browse the repository at this point in the history

Commits on Sep 28, 2024

  1. Upstream merge for Sept, 28, 2024

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

  2. Merge pull request #88 from ss14-harmony/upstream20240928 

    Upstream20240928
    @KeldWolf
    KeldWolf authored Sep 28, 2024
    Configuration menu
    Copy the full SHA
    fa1cd6c View commit details
    Browse the repository at this point in the history

  3. Revise Server rules; Add Silicon rules

    @FluffMe
    FluffMe committed Sep 28, 2024
    Configuration menu
    Copy the full SHA
    3952567 View commit details
    Browse the repository at this point in the history

  4. Unnerf the Frezon price

    @FluffMe
    FluffMe committed Sep 28, 2024
    Configuration menu
    Copy the full SHA
    3ca44e3 View commit details
    Browse the repository at this point in the history

  5. Reduced the price after feedback

    @FluffMe
    FluffMe committed Sep 28, 2024
    Configuration menu
    Copy the full SHA
    07bbc18 View commit details
    Browse the repository at this point in the history

Commits on Sep 29, 2024

  1. Merge pull request #89 from ss14-harmony/rules-update 

    Ingame server rules rework and update
    @KeldWolf
    KeldWolf authored Sep 29, 2024
    Configuration menu
    Copy the full SHA
    fb3f1f7 View commit details
    Browse the repository at this point in the history

Commits on Sep 30, 2024

  1. Disable fuckrules command

    @FluffMe
    FluffMe committed Sep 30, 2024
    Configuration menu
    Copy the full SHA
    0b385d0 View commit details
    Browse the repository at this point in the history

  2. Change Harmony directory to _Harmony

    @FluffMe
    FluffMe committed Sep 30, 2024
    Configuration menu
    Copy the full SHA
    06f53f8 View commit details
    Browse the repository at this point in the history

  3. Change paths in YAMLs

    @FluffMe
    FluffMe committed Sep 30, 2024
    Configuration menu
    Copy the full SHA
    0c73b14 View commit details
    Browse the repository at this point in the history

  4. Adds two syndicate admin event shuttles.

    @spanky-spanky
    spanky-spanky committed Sep 30, 2024
    Configuration menu
    Copy the full SHA
    a111c5e View commit details
    Browse the repository at this point in the history

  5. Merge pull request #91 from ss14-harmony/disable-fuckrules 

    Disable fuckrules command
    @spanky-spanky
    spanky-spanky authored Sep 30, 2024
    Configuration menu
    Copy the full SHA
    217a0bd View commit details
    Browse the repository at this point in the history

  6. Add DO NOT MAP suffix to craftable button frames and lockable buttone

    @FluffMe
    FluffMe committed Sep 30, 2024
    Configuration menu
    Copy the full SHA
    f93706a View commit details
    Browse the repository at this point in the history

  7. Moved file location.

    @spanky-spanky
    spanky-spanky committed Sep 30, 2024
    Configuration menu
    Copy the full SHA
    7371626 View commit details
    Browse the repository at this point in the history

  8. Merge pull request #93 from ss14-harmony/spanky-namnash 

    Syndicate Event Shuttles
    @spanky-spanky
    spanky-spanky authored Sep 30, 2024
    Configuration menu
    Copy the full SHA
    1c484d2 View commit details
    Browse the repository at this point in the history

  9. Add a No EORG popup on round end

    @FluffMe
    FluffMe committed Sep 30, 2024
    Configuration menu
    Copy the full SHA
    1e3e7b0 View commit details
    Browse the repository at this point in the history

  10. Forgot MoveToFront()

    @FluffMe
    FluffMe committed Sep 30, 2024
    Configuration menu
    Copy the full SHA
    5d8ca50 View commit details
    Browse the repository at this point in the history

  11. change MoveToFront()

    @FluffMe
    FluffMe committed Sep 30, 2024
    Configuration menu
    Copy the full SHA
    5ff684b View commit details
    Browse the repository at this point in the history

  12. Merge pull request #96 from ss14-harmony/no-eorg-popup 

    Add No EORG popup on round end
    @KeldWolf
    KeldWolf authored Sep 30, 2024
    Configuration menu
    Copy the full SHA
    4ccc76e View commit details
    Browse the repository at this point in the history

  13. Merge pull request #92 from ss14-harmony/namespace-change 

    Namespace change to _Harmony
    @KeldWolf
    KeldWolf authored Sep 30, 2024
    Configuration menu
    Copy the full SHA
    28eabaf View commit details
    Browse the repository at this point in the history

  14. Changelog update

    @FluffMe
    FluffMe committed Sep 30, 2024
    Configuration menu
    Copy the full SHA
    e8310d2 View commit details
    Browse the repository at this point in the history

  15. Upstream merge for Sept. 30 2024

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

  16. Merge branch 'master' into fix-buttonframe-tags

    @FluffMe
    FluffMe committed Sep 30, 2024
    Configuration menu
    Copy the full SHA
    2342314 View commit details
    Browse the repository at this point in the history

  17. Merge pull request #97 from ss14-harmony/changelog20240930 

    Changelog update
    @KeldWolf
    KeldWolf authored Sep 30, 2024
    Configuration menu
    Copy the full SHA
    dd21550 View commit details
    Browse the repository at this point in the history

  18. Merge pull request #98 from ss14-harmony/upstream20240930 

    Upstream20240930
    @KeldWolf
    KeldWolf authored Sep 30, 2024
    Configuration menu
    Copy the full SHA
    f10c02c View commit details
    Browse the repository at this point in the history

  19. Merge pull request #94 from ss14-harmony/fix-buttonframe-tags 

    Add DO NOT MAP suffix to craftable button frames and lockable button
    @KeldWolf
    KeldWolf authored Sep 30, 2024
    Configuration menu
    Copy the full SHA
    22d0b81 View commit details
    Browse the repository at this point in the history

Commits on Oct 2, 2024

  1. Upstream merge for Oct. 2, 2024

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

  2. Merge pull request #100 from ss14-harmony/upstream20241002 

    Upstream20241002
    @KeldWolf
    KeldWolf authored Oct 2, 2024
    Configuration menu
    Copy the full SHA
    0dd5be8 View commit details
    Browse the repository at this point in the history

Commits on Oct 3, 2024

  1. Merge pull request #90 from ss14-harmony/frezon-price-bump 

    Unnerf the Frezon price
    @KeldWolf
    KeldWolf authored Oct 3, 2024
    Configuration menu
    Copy the full SHA
    82a401a View commit details
    Browse the repository at this point in the history

  2. Upstream Merge for Oct. 3, 2024

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

  3. Merge pull request #101 from ss14-harmony/upstream20241003 

    Upstream20241003
    @KeldWolf
    KeldWolf authored Oct 3, 2024
    Configuration menu
    Copy the full SHA
    524271b View commit details
    Browse the repository at this point in the history

  4. Changelog update

    @FluffMe
    FluffMe committed Oct 3, 2024
    Configuration menu
    Copy the full SHA
    3f35c3a View commit details
    Browse the repository at this point in the history

  5. Fixed bad format

    @FluffMe
    FluffMe committed Oct 3, 2024
    Configuration menu
    Copy the full SHA
    6474986 View commit details
    Browse the repository at this point in the history

  6. Added updated version of Packed.

    @spanky-spanky
    spanky-spanky committed Oct 3, 2024
    Configuration menu
    Copy the full SHA
    65a59da View commit details
    Browse the repository at this point in the history

  7. Merge pull request #102 from ss14-harmony/changelog20241003 

    Changelog20241003
    @FluffMe
    FluffMe authored Oct 3, 2024
    Configuration menu
    Copy the full SHA
    a99b956 View commit details
    Browse the repository at this point in the history

  8. Added to PostMapInitTest.cs

    @spanky-spanky
    spanky-spanky committed Oct 3, 2024
    Configuration menu
    Copy the full SHA
    b16eb25 View commit details
    Browse the repository at this point in the history

  9. skub

    @spanky-spanky
    spanky-spanky committed Oct 3, 2024
    Configuration menu
    Copy the full SHA
    fc7e6cc View commit details
    Browse the repository at this point in the history

Commits on Oct 4, 2024

  1. Merge pull request #103 from ss14-harmony/spanky-packed 

    Packed Update Test
    @spanky-spanky
    spanky-spanky authored Oct 4, 2024
    Configuration menu
    Copy the full SHA
    f414fc4 View commit details
    Browse the repository at this point in the history

  2. Add HoP Turtleneck and Change HoP Loadout (#104) 

    * Add HoP Turtleneck

* Add HoP shoes loadout with Brown shoes and Leather shoes

* Add HoP Turtleneck to Uniform printer

---------

Co-authored-by: FluffMe <1780586+FluffMe@users.noreply.github.com>
    @DieselMohawk @FluffMe
    DieselMohawk and FluffMe authored Oct 4, 2024
    Configuration menu
    Copy the full SHA
    bf417a1 View commit details
    Browse the repository at this point in the history

  3. Changelog update

    @FluffMe
    FluffMe committed Oct 4, 2024
    Configuration menu
    Copy the full SHA
    77de64f View commit details
    Browse the repository at this point in the history

  4. Merge pull request #105 from ss14-harmony/Changelog20241004 

    Changelog20241004
    @FluffMe
    FluffMe authored Oct 4, 2024
    Configuration menu
    Copy the full SHA
    a05397a View commit details
    Browse the repository at this point in the history

Commits on Oct 5, 2024

  1. Make red phone an Intercom with CentCom channel (#106) 

    * Added intercom version of red phone and took over original's ID

* Add ContainerContainer component to pass UninitializedSaveTest
    @FluffMe
    FluffMe authored Oct 5, 2024
    Configuration menu
    Copy the full SHA
    37bda7e View commit details
    Browse the repository at this point in the history

  2. Uplink item: Syndicate ID card (#95) 

    * added syndicate ID to uplink catalog, deception category for 1 TC

* Moved changes to harmony-specific subfolders

* limited syndicate ID stock to 1

* added text to description clarifying the limited nature of the item

* Resolving review issues
    @Unisol
    Unisol authored Oct 5, 2024
    Configuration menu
    Copy the full SHA
    e5e18e9 View commit details
    Browse the repository at this point in the history

  3. Add HoP Turtleneck With Skirt (#108) 

    * Sprites

* Entity Added

* Addition to loadouts

* Addition to Lathes
    @DieselMohawk
    DieselMohawk authored Oct 5, 2024
    Configuration menu
    Copy the full SHA
    dccf685 View commit details
    Browse the repository at this point in the history

Commits on Oct 6, 2024

  1. Adding Captain Armored Winter Coat (#109) 

    * Sprites and Entity

* Added "WinterCoats" folder in _Harmony

* Loadout Integration
    @DieselMohawk
    DieselMohawk authored Oct 6, 2024
    Configuration menu
    Copy the full SHA
    197c4ea View commit details
    Browse the repository at this point in the history

  2. Harmonica Loadout Integration (#110)

    @DieselMohawk
    DieselMohawk authored Oct 6, 2024
    Configuration menu
    Copy the full SHA
    5671b69 View commit details
    Browse the repository at this point in the history

  3. Harmony Xeno Beta v1.3 Playtest (#27) 

    * Xeno files

* beta v1.3

* Fix merge issues, non-adjusted for Harmony

* Beta v1.3, Harmony Version

* Small fixes

* Missed moving old thruster

* Slight xenomorph buff

* Linter fixes & movement of walls

* Fixes

* Move xeno map to _Harmony
    @SlamBamActionman
    SlamBamActionman authored Oct 6, 2024
    Configuration menu
    Copy the full SHA
    a46ece1 View commit details
    Browse the repository at this point in the history

  4. Changelog20241006 (#107) 

    * Changelog update

* PR 95 merged

* PR 108

* PRs 109, 110

* PR 27
    @FluffMe
    FluffMe authored Oct 6, 2024
    Configuration menu
    Copy the full SHA
    f5c625c View commit details
    Browse the repository at this point in the history

Commits on Oct 9, 2024

  1. Upstream merge for Oct. 9 2024

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

  2. More Packed changes.

    @spanky-spanky
    spanky-spanky committed Oct 9, 2024
    Configuration menu
    Copy the full SHA
    83c002f View commit details
    Browse the repository at this point in the history

  3. Invalid fix.

    @spanky-spanky
    spanky-spanky committed Oct 9, 2024
    Configuration menu
    Copy the full SHA
    de906cf View commit details
    Browse the repository at this point in the history

Commits on Oct 10, 2024

  1. Merge pull request #113 from ss14-harmony/upstream20241009 

    Upstream20241009
    @KeldWolf
    KeldWolf authored Oct 10, 2024
    Configuration menu
    Copy the full SHA
    2178ce6 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #112 from ss14-harmony/spanky-packed 

    Packed Update
    @KeldWolf
    KeldWolf authored Oct 10, 2024
    Configuration menu
    Copy the full SHA
    835729d View commit details
    Browse the repository at this point in the history

Commits on Oct 11, 2024

  1. Adds custom in-game logo.

    @spanky-spanky
    spanky-spanky committed Oct 11, 2024
    Configuration menu
    Copy the full SHA
    e5ebe75 View commit details
    Browse the repository at this point in the history

  2. Added custom end of round voice lines clipped from Lilten videos.

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

  3. Merge pull request #114 from ss14-harmony/spanky-logo 

    Harmony Logo
    @spanky-spanky
    spanky-spanky authored Oct 11, 2024
    Configuration menu
    Copy the full SHA
    0321e31 View commit details
    Browse the repository at this point in the history

  4. Update attributions.yml 

    Fixed sources to point to their respective YouTube videos. 

Signed-off-by: Kelderan <66748890+KeldWolf@users.noreply.github.com>
    @KeldWolf
    KeldWolf authored Oct 11, 2024
    Configuration menu
    Copy the full SHA
    ea3f940 View commit details
    Browse the repository at this point in the history

  5. Merge pull request #115 from ss14-harmony/RoundEndLinesv1 

    Added custom end of round voice lines clipped from Lilten videos.
    @KeldWolf
    KeldWolf authored Oct 11, 2024
    Configuration menu
    Copy the full SHA
    9d86265 View commit details
    Browse the repository at this point in the history

  6. Changes game window name. (#116)

    @spanky-spanky
    spanky-spanky authored Oct 11, 2024
    Configuration menu
    Copy the full SHA
    ac8415b View commit details
    Browse the repository at this point in the history

Commits on Oct 16, 2024

  1. Add Syndicate Diplomacy ship for Admin spawning (#118)

    @Dogbone10
    Dogbone10 authored Oct 16, 2024
    Configuration menu
    Copy the full SHA
    dbb80a6 View commit details
    Browse the repository at this point in the history

  2. Role timer fixes for lawyer, mime, bartender, chef, and ta

    @FluffMe
    FluffMe committed Oct 16, 2024
    Configuration menu
    Copy the full SHA
    51d6a21 View commit details
    Browse the repository at this point in the history

  3. More Packed changes.

    @spanky-spanky
    spanky-spanky committed Oct 16, 2024
    Configuration menu
    Copy the full SHA
    80f1e34 View commit details
    Browse the repository at this point in the history

  4. fix

    @spanky-spanky
    spanky-spanky committed Oct 16, 2024
    Configuration menu
    Copy the full SHA
    b3a4cbd View commit details
    Browse the repository at this point in the history

  5. Add Barratry.

    @spanky-spanky
    spanky-spanky committed Oct 16, 2024
    Configuration menu
    Copy the full SHA
    b0196be View commit details
    Browse the repository at this point in the history

  6. Merge pull request #121 from ss14-harmony/fix-role-timers 

    Role timer fixes for lawyer, mime, bartender, chef, and technical assistant
    @spanky-spanky
    spanky-spanky authored Oct 16, 2024
    Configuration menu
    Copy the full SHA
    0fd4253 View commit details
    Browse the repository at this point in the history

  7. Removes overflow job from prototype.

    @spanky-spanky
    spanky-spanky committed Oct 16, 2024
    Configuration menu
    Copy the full SHA
    9a87916 View commit details
    Browse the repository at this point in the history

Commits on Oct 17, 2024

  1. More map adjusts.

    @spanky-spanky
    spanky-spanky committed Oct 17, 2024
    Configuration menu
    Copy the full SHA
    e1ce65c View commit details
    Browse the repository at this point in the history

  2. Addition of four more posters (#120) 

    * Add files via upload

Signed-off-by: Denetth <117494542+Tofsel@users.noreply.github.com>

* Add files via upload

Signed-off-by: Denetth <117494542+Tofsel@users.noreply.github.com>

---------

Signed-off-by: Denetth <117494542+Tofsel@users.noreply.github.com>
    @Tofsel
    Tofsel authored Oct 17, 2024
    Configuration menu
    Copy the full SHA
    e3d7479 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #123 from ss14-harmony/spanky-detroit 

    Add Barratry
    @KeldWolf
    KeldWolf authored Oct 17, 2024
    Configuration menu
    Copy the full SHA
    0a78ca3 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #122 from ss14-harmony/spanky-packed 

    Packed Update
    @KeldWolf
    KeldWolf authored Oct 17, 2024
    Configuration menu
    Copy the full SHA
    808c310 View commit details
    Browse the repository at this point in the history

  5. Upstream merge for Oct. 16, 2024

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

  6. roolz change

    @liltenhead
    liltenhead committed Oct 17, 2024
    Configuration menu
    Copy the full SHA
    5330ce1 View commit details
    Browse the repository at this point in the history

  7. Merge pull request #125 from ss14-harmony/upstream20241016 

    Upstream20241016
    @KeldWolf
    KeldWolf authored Oct 17, 2024
    Configuration menu
    Copy the full SHA
    f61bfa4 View commit details
    Browse the repository at this point in the history

  8. changelog update

    @FluffMe
    FluffMe committed Oct 17, 2024
    Configuration menu
    Copy the full SHA
    5e31501 View commit details
    Browse the repository at this point in the history

  9. Merge pull request #126 from ss14-harmony/changelog-update17102024 

    Changelog update 17102024
    @KeldWolf
    KeldWolf authored Oct 17, 2024
    Configuration menu
    Copy the full SHA
    b99972f View commit details
    Browse the repository at this point in the history

  10. Merge pull request #124 from liltenhead/Roolz 

    Minor rule change and clarification
    @KeldWolf
    KeldWolf authored Oct 17, 2024
    Configuration menu
    Copy the full SHA
    d123422 View commit details
    Browse the repository at this point in the history

Commits on Oct 20, 2024

  1. Xeno Beta 1.3.2

    @SlamBamActionman
    SlamBamActionman committed Oct 20, 2024
    Configuration menu
    Copy the full SHA
    e06ec13 View commit details
    Browse the repository at this point in the history

  2. Fix invalid in map, update chapel

    @SlamBamActionman
    SlamBamActionman committed Oct 20, 2024
    Configuration menu
    Copy the full SHA
    c007d0d View commit details
    Browse the repository at this point in the history

Commits on Oct 21, 2024

  1. added labeler to nukie oupost

    @Unisol
    Unisol committed Oct 21, 2024
    Configuration menu
    Copy the full SHA
    f29630e View commit details
    Browse the repository at this point in the history

  2. Merge pull request #128 from SlamBamActionman/Harmony/xeno-update-1 

    Xeno Beta 1.3.2
    @spanky-spanky
    spanky-spanky authored Oct 21, 2024
    Configuration menu
    Copy the full SHA
    c2063b6 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #129 from Unisol/feature/nukie-labeler 

    Added labeler to nukie outpost
    @spanky-spanky
    spanky-spanky authored Oct 21, 2024
    Configuration menu
    Copy the full SHA
    ceace89 View commit details
    Browse the repository at this point in the history

  4. Add round end pacifist system and Cvar

    @FluffMe
    FluffMe committed Oct 21, 2024
    Configuration menu
    Copy the full SHA
    96a1a23 View commit details
    Browse the repository at this point in the history

  5. Xeno Beta v.1.3.3 (#132)

    @SlamBamActionman
    SlamBamActionman authored Oct 21, 2024
    Configuration menu
    Copy the full SHA
    6d2bbf6 View commit details
    Browse the repository at this point in the history

Commits on Oct 22, 2024

  1. Fix Rat King Solo Antag popup

    @FluffMe
    FluffMe committed Oct 22, 2024
    Configuration menu
    Copy the full SHA
    dc2ca50 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #130 from ss14-harmony/anti-eorg-mode 

    Anti EORG measures (round end pacifist mode)
    @KeldWolf
    KeldWolf authored Oct 22, 2024
    Configuration menu
    Copy the full SHA
    6e161cf View commit details
    Browse the repository at this point in the history

  3. Merge pull request #133 from ss14-harmony/fix-ratking-description 

    Fix Rat King Solo Antag popup
    @KeldWolf
    KeldWolf authored Oct 22, 2024
    Configuration menu
    Copy the full SHA
    5fd6052 View commit details
    Browse the repository at this point in the history

  4. PRs 124, 129, 130

    @FluffMe
    FluffMe committed Oct 22, 2024
    Configuration menu
    Copy the full SHA
    8be2259 View commit details
    Browse the repository at this point in the history

Commits on Oct 23, 2024

  1. Removes Packed2 in prep for upstream merge.

    @spanky-spanky
    spanky-spanky committed Oct 23, 2024
    Configuration menu
    Copy the full SHA
    e6779a3 View commit details
    Browse the repository at this point in the history

Commits on Oct 24, 2024

  1. Revert "Add No EORG popup on round end" (#131) 

    * Revert "Add No EORG popup on round end"

* Remove EORG popup CVar
    @FluffMe
    FluffMe authored Oct 24, 2024
    Configuration menu
    Copy the full SHA
    60a963c View commit details
    Browse the repository at this point in the history

  2. Merge pull request #135 from ss14-harmony/remove-packed2 

    Remove Packed2
    @KeldWolf
    KeldWolf authored Oct 24, 2024
    Configuration menu
    Copy the full SHA
    51d462b View commit details
    Browse the repository at this point in the history

  3. Merge pull request #134 from ss14-harmony/changelog22102024 

    Changelog22102024
    @KeldWolf
    KeldWolf authored Oct 24, 2024
    Configuration menu
    Copy the full SHA
    6e7fa74 View commit details
    Browse the repository at this point in the history

  4. Upstream merge for 20241023

    BuildTools committed Oct 24, 2024
    Configuration menu
    Copy the full SHA
    57ddfee View commit details
    Browse the repository at this point in the history