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

ARES Change Holder #4224

Closed
wants to merge 105 commits into from
Closed

ARES Change Holder #4224

wants to merge 105 commits into from

Commits on Jun 28, 2023

  1. Code quality

    @realforest2001
    realforest2001 committed Jun 28, 2023
    Configuration menu
    Copy the full SHA
    02b9ae8 View commit details
    Browse the repository at this point in the history

  2. Started work on reports

    @realforest2001
    realforest2001 committed Jun 28, 2023
    Configuration menu
    Copy the full SHA
    14276e8 View commit details
    Browse the repository at this point in the history

Commits on Jul 2, 2023

  1. ID and ARES size

    @realforest2001
    realforest2001 committed Jul 2, 2023
    Configuration menu
    Copy the full SHA
    455ec58 View commit details
    Browse the repository at this point in the history

  2. 12.8.3 

    Makes maintenance tickets functional.
Adds two new maintenance reports.
Todo: Make it so WJs can view this from anywhere.
Todo: Access ticket functionality.
    @realforest2001
    realforest2001 committed Jul 2, 2023
    Configuration menu
    Copy the full SHA
    271d2c5 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' into project/apollo_controller

    @realforest2001
    realforest2001 committed Jul 2, 2023
    Configuration menu
    Copy the full SHA
    263e889 View commit details
    Browse the repository at this point in the history

  4. ARES punctuation & Fixes 

    x


x


access tweak


x
    @realforest2001
    realforest2001 committed Jul 2, 2023
    Configuration menu
    Copy the full SHA
    506254e View commit details
    Browse the repository at this point in the history

Commits on Jul 3, 2023

  1. ui icons

    @realforest2001
    realforest2001 committed Jul 3, 2023
    Configuration menu
    Copy the full SHA
    0713611 View commit details
    Browse the repository at this point in the history

Commits on Jul 4, 2023

  1. Apollo Follow 

    x


x
    @realforest2001
    realforest2001 committed Jul 4, 2023
    Configuration menu
    Copy the full SHA
    708a9df View commit details
    Browse the repository at this point in the history

  2. admin attempt

    @realforest2001
    realforest2001 committed Jul 4, 2023
    Configuration menu
    Copy the full SHA
    1896c2d View commit details
    Browse the repository at this point in the history

  3. x

    @realforest2001
    realforest2001 committed Jul 4, 2023
    Configuration menu
    Copy the full SHA
    8c2868f View commit details
    Browse the repository at this point in the history

  4. red 

    red
    @realforest2001
    realforest2001 committed Jul 4, 2023
    Configuration menu
    Copy the full SHA
    2c2e567 View commit details
    Browse the repository at this point in the history

Commits on Jul 12, 2023

  1. Merge remote-tracking branch 'cmss13-devs/master' into project/ares/a… 

    …dmin_console
    @realforest2001
    realforest2001 committed Jul 12, 2023
    Configuration menu
    Copy the full SHA
    ff25d01 View commit details
    Browse the repository at this point in the history

Commits on Aug 5, 2023

  1. Functional Access Tickets

    @realforest2001
    realforest2001 committed Aug 5, 2023
    Configuration menu
    Copy the full SHA
    156625c View commit details
    Browse the repository at this point in the history

  2. Map Element

    @realforest2001
    realforest2001 committed Aug 5, 2023
    Configuration menu
    Copy the full SHA
    b23f4e2 View commit details
    Browse the repository at this point in the history

Commits on Aug 7, 2023

  1. easier to file access ticket for self

    @Ben10083
    Ben10083 committed Aug 7, 2023
    Configuration menu
    Copy the full SHA
    2cb42dc View commit details
    Browse the repository at this point in the history

  2. changes to view status

    @Ben10083
    Ben10083 committed Aug 7, 2023
    Configuration menu
    Copy the full SHA
    cef0633 View commit details
    Browse the repository at this point in the history

  3. Now can see recipient for access request in access request tab

    @Ben10083
    Ben10083 committed Aug 7, 2023
    Configuration menu
    Copy the full SHA
    7a91fde View commit details
    Browse the repository at this point in the history

Commits on Aug 13, 2023

  1. Merge remote-tracking branch 'cmss13-devs/master' into project/ares/a… 

    …dmin_console
    @realforest2001
    realforest2001 committed Aug 13, 2023
    Configuration menu
    Copy the full SHA
    038c520 View commit details
    Browse the repository at this point in the history

  2. Working Admin Console

    @realforest2001
    realforest2001 committed Aug 13, 2023
    Configuration menu
    Copy the full SHA
    a5d6274 View commit details
    Browse the repository at this point in the history

  3. logging

    @realforest2001
    realforest2001 committed Aug 13, 2023
    Configuration menu
    Copy the full SHA
    a155d37 View commit details
    Browse the repository at this point in the history

  4. Fix

    @realforest2001
    realforest2001 committed Aug 13, 2023
    Configuration menu
    Copy the full SHA
    a2adfbd View commit details
    Browse the repository at this point in the history

Commits on Aug 14, 2023

  1. fixes

    @realforest2001
    realforest2001 committed Aug 14, 2023
    Configuration menu
    Copy the full SHA
    e6e9e36 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #11 from Ben10083/project/ares/access_tickets 

    Access Ticket Tweaks
    @realforest2001
    realforest2001 committed Aug 14, 2023
    Configuration menu
    Copy the full SHA
    27bf422 View commit details
    Browse the repository at this point in the history

  3. accurate fix

    @realforest2001
    realforest2001 committed Aug 14, 2023
    Configuration menu
    Copy the full SHA
    e0d7378 View commit details
    Browse the repository at this point in the history

Commits on Aug 18, 2023

  1. Merge remote-tracking branch 'cmss13-devs/master' into project/ares/a… 

    …dmin_console
    @realforest2001
    realforest2001 committed Aug 18, 2023
    Configuration menu
    Copy the full SHA
    c2e3595 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'cmss13-devs/master' into project/ares/a… 

    …ccess_tickets
    @realforest2001
    realforest2001 committed Aug 18, 2023
    Configuration menu
    Copy the full SHA
    87bd994 View commit details
    Browse the repository at this point in the history

  3. attempted conflict resolution

    @realforest2001
    realforest2001 committed Aug 18, 2023
    Configuration menu
    Copy the full SHA
    d992f96 View commit details
    Browse the repository at this point in the history

  4. attempted conflict resolution

    @realforest2001
    realforest2001 committed Aug 18, 2023
    Configuration menu
    Copy the full SHA
    cb4d971 View commit details
    Browse the repository at this point in the history

  5. partial revert

    @realforest2001
    realforest2001 committed Aug 18, 2023
    Configuration menu
    Copy the full SHA
    da5106e View commit details
    Browse the repository at this point in the history

Commits on Aug 19, 2023

  1. Adds more APOLLO consoles

    @realforest2001
    realforest2001 committed Aug 19, 2023
    Configuration menu
    Copy the full SHA
    6a77df6 View commit details
    Browse the repository at this point in the history

Commits on Aug 21, 2023

  1. Merge branch 'project/ares/access_tickets' into project/ares/tm_holder

    @realforest2001
    realforest2001 committed Aug 21, 2023
    Configuration menu
    Copy the full SHA
    316c98d View commit details
    Browse the repository at this point in the history

  2. Merge branch 'project/ares/admin_console' into project/ares/tm_holder

    @realforest2001
    realforest2001 committed Aug 21, 2023
    Configuration menu
    Copy the full SHA
    1cc2b12 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'project/ares/more_consoles' into project/ares/tm_holder

    @realforest2001
    realforest2001 committed Aug 21, 2023
    Configuration menu
    Copy the full SHA
    59a9bbe View commit details
    Browse the repository at this point in the history

  4. Merge remote-tracking branch 'cmss13-devs/master' into project/ares/t… 

    …m_holder
    @realforest2001
    realforest2001 committed Aug 21, 2023
    Configuration menu
    Copy the full SHA
    57e404c View commit details
    Browse the repository at this point in the history

  5. Merge AA and Sec logs. Also fixes Sec logs.

    @realforest2001
    realforest2001 committed Aug 21, 2023
    Configuration menu
    Copy the full SHA
    9eafb52 View commit details
    Browse the repository at this point in the history

  6. Flight records & user fix

    @realforest2001
    realforest2001 committed Aug 21, 2023
    Configuration menu
    Copy the full SHA
    dee12ef View commit details
    Browse the repository at this point in the history

  7. Updates the delete buttons

    @realforest2001
    realforest2001 committed Aug 21, 2023
    Configuration menu
    Copy the full SHA
    c404aff View commit details
    Browse the repository at this point in the history

  8. flight records

    @realforest2001
    realforest2001 committed Aug 21, 2023
    Configuration menu
    Copy the full SHA
    da3d3f4 View commit details
    Browse the repository at this point in the history

  9. undo delete tweak

    @realforest2001
    realforest2001 committed Aug 21, 2023
    Configuration menu
    Copy the full SHA
    d792166 View commit details
    Browse the repository at this point in the history

  10. re-orders buttons

    @realforest2001
    realforest2001 committed Aug 21, 2023
    Configuration menu
    Copy the full SHA
    d193222 View commit details
    Browse the repository at this point in the history

  11. sec fix

    @realforest2001
    realforest2001 committed Aug 21, 2023
    Configuration menu
    Copy the full SHA
    2bcb065 View commit details
    Browse the repository at this point in the history

  12. fixes

    @realforest2001
    realforest2001 committed Aug 21, 2023
    Configuration menu
    Copy the full SHA
    45c71c1 View commit details
    Browse the repository at this point in the history

  13. Merge branch 'project/ares/admin_console' into project/ares/tm_holder

    @realforest2001
    realforest2001 committed Aug 21, 2023
    Configuration menu
    Copy the full SHA
    0d8c2c3 View commit details
    Browse the repository at this point in the history

  14. Merge branch 'project/ares/logging_changes' into project/ares/tm_holder

    @realforest2001
    realforest2001 committed Aug 21, 2023
    Configuration menu
    Copy the full SHA
    097b3d6 View commit details
    Browse the repository at this point in the history

  15. Update code/game/machinery/ARES/ARES_records.dm

    @realforest2001
    realforest2001 committed Aug 21, 2023
    Configuration menu
    Copy the full SHA
    bb8ba8c View commit details
    Browse the repository at this point in the history

Commits on Aug 22, 2023

  1. admin flight log

    @realforest2001
    realforest2001 committed Aug 22, 2023
    Configuration menu
    Copy the full SHA
    d630f96 View commit details
    Browse the repository at this point in the history

  2. admin flight log

    @realforest2001
    realforest2001 committed Aug 22, 2023
    Configuration menu
    Copy the full SHA
    baaa305 View commit details
    Browse the repository at this point in the history

  3. Merge remote-tracking branch 'cmss13-devs/master' into project/ares/a… 

    …ccess_tickets
    @realforest2001
    realforest2001 committed Aug 22, 2023
    Configuration menu
    Copy the full SHA
    63195e8 View commit details
    Browse the repository at this point in the history

  4. Merge remote-tracking branch 'cmss13-devs/master' into project/ares/a… 

    …dmin_console
    @realforest2001
    realforest2001 committed Aug 22, 2023
    Configuration menu
    Copy the full SHA
    4df1507 View commit details
    Browse the repository at this point in the history

  5. Merge remote-tracking branch 'cmss13-devs/master' into project/ares/l… 

    …ogging_changes
    @realforest2001
    realforest2001 committed Aug 22, 2023
    Configuration menu
    Copy the full SHA
    d264e65 View commit details
    Browse the repository at this point in the history

  6. Merge remote-tracking branch 'cmss13-devs/master' into project/ares/m… 

    …ore_consoles
    @realforest2001
    realforest2001 committed Aug 22, 2023
    Configuration menu
    Copy the full SHA
    91807c5 View commit details
    Browse the repository at this point in the history

  7. Merge remote-tracking branch 'cmss13-devs/master' into project/ares/t… 

    …m_holder
    @realforest2001
    realforest2001 committed Aug 22, 2023
    Configuration menu
    Copy the full SHA
    06e5019 View commit details
    Browse the repository at this point in the history

Commits on Aug 24, 2023

  1. Merge remote-tracking branch 'cmss13-devs/master' into project/ares/a… 

    …ccess_tickets
    @realforest2001
    realforest2001 committed Aug 24, 2023
    Configuration menu
    Copy the full SHA
    0305203 View commit details
    Browse the repository at this point in the history

  2. Surrender button and procedure cleanup 

    x
    @realforest2001
    realforest2001 committed Aug 24, 2023
    Configuration menu
    Copy the full SHA
    003cbe4 View commit details
    Browse the repository at this point in the history

  3. Merge remote-tracking branch 'cmss13-devs/master' into project/ares/a… 

    …dmin_console
    @realforest2001
    realforest2001 committed Aug 24, 2023
    Configuration menu
    Copy the full SHA
    50e761f View commit details
    Browse the repository at this point in the history

  4. Merge remote-tracking branch 'cmss13-devs/master' into project/ares/l… 

    …ogging_changes
    @realforest2001
    realforest2001 committed Aug 24, 2023
    Configuration menu
    Copy the full SHA
    9a5fa2a View commit details
    Browse the repository at this point in the history

  5. Merge remote-tracking branch 'cmss13-devs/master' into project/ares/m… 

    …ore_consoles
    @realforest2001
    realforest2001 committed Aug 24, 2023
    Configuration menu
    Copy the full SHA
    b5f7ba2 View commit details
    Browse the repository at this point in the history

  6. reception offset

    @realforest2001
    realforest2001 committed Aug 24, 2023
    Configuration menu
    Copy the full SHA
    6d6b93f View commit details
    Browse the repository at this point in the history

  7. Merge branch 'project/ares/access_tickets' into project/ares/tm_holder

    @realforest2001
    realforest2001 committed Aug 24, 2023
    Configuration menu
    Copy the full SHA
    67e0a63 View commit details
    Browse the repository at this point in the history

  8. Merge branch 'project/ares/admin_console' into project/ares/tm_holder

    @realforest2001
    realforest2001 committed Aug 24, 2023
    Configuration menu
    Copy the full SHA
    442a99d View commit details
    Browse the repository at this point in the history

  9. Merge branch 'project/ares/logging_changes' into project/ares/tm_holder

    @realforest2001
    realforest2001 committed Aug 24, 2023
    Configuration menu
    Copy the full SHA
    1101f7d View commit details
    Browse the repository at this point in the history

  10. Merge branch 'project/ares/more_consoles' into project/ares/tm_holder

    @realforest2001
    realforest2001 committed Aug 24, 2023
    Configuration menu
    Copy the full SHA
    c7db9b4 View commit details
    Browse the repository at this point in the history

Commits on Aug 28, 2023

  1. Remote Access Updates 

    remote surrender
    @realforest2001
    realforest2001 committed Aug 28, 2023
    Configuration menu
    Copy the full SHA
    2ad7eea View commit details
    Browse the repository at this point in the history

  2. surrender tweak

    @realforest2001
    realforest2001 committed Aug 28, 2023
    Configuration menu
    Copy the full SHA
    b14d11d View commit details
    Browse the repository at this point in the history

  3. Merge remote-tracking branch 'cmss13-devs/master' into project/ares/a… 

    …ccess_tickets
    @realforest2001
    realforest2001 committed Aug 28, 2023
    Configuration menu
    Copy the full SHA
    a40f023 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'project/ares/access_tickets' into project/ares/tm_holder

    @realforest2001
    realforest2001 committed Aug 28, 2023
    Configuration menu
    Copy the full SHA
    95169af View commit details
    Browse the repository at this point in the history

  5. Merge remote-tracking branch 'cmss13-devs/master' into project/ares/l… 

    …ogging_changes
    @realforest2001
    realforest2001 committed Aug 28, 2023
    Configuration menu
    Copy the full SHA
    3e16335 View commit details
    Browse the repository at this point in the history

  6. Merge remote-tracking branch 'cmss13-devs/master' into project/ares/a… 

    …dmin_console
    @realforest2001
    realforest2001 committed Aug 28, 2023
    Configuration menu
    Copy the full SHA
    d5275c5 View commit details
    Browse the repository at this point in the history

  7. forgot to remove behalf requests

    @realforest2001
    realforest2001 committed Aug 28, 2023
    Configuration menu
    Copy the full SHA
    c803742 View commit details
    Browse the repository at this point in the history

  8. Merge branch 'project/ares/access_tickets' into project/ares/tm_holder

    @realforest2001
    realforest2001 committed Aug 28, 2023
    Configuration menu
    Copy the full SHA
    eeb44eb View commit details
    Browse the repository at this point in the history

  9. fixes missing level defines 

    x
    @realforest2001
    realforest2001 committed Aug 28, 2023
    Configuration menu
    Copy the full SHA
    2b13e65 View commit details
    Browse the repository at this point in the history

Commits on Aug 30, 2023

  1. Fixes 4289

    @realforest2001
    realforest2001 committed Aug 30, 2023
    Configuration menu
    Copy the full SHA
    71d86d6 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'project/ares/access_tickets' into project/ares/tm_holder

    @realforest2001
    realforest2001 committed Aug 30, 2023
    Configuration menu
    Copy the full SHA
    91f2c69 View commit details
    Browse the repository at this point in the history

Commits on Aug 31, 2023

  1. removes mobs from ares logs (didn't I do this already?)

    @realforest2001
    realforest2001 committed Aug 31, 2023
    Configuration menu
    Copy the full SHA
    473132c View commit details
    Browse the repository at this point in the history

  2. 10% chance to read blackmarket item name

    @realforest2001
    realforest2001 committed Aug 31, 2023
    Configuration menu
    Copy the full SHA
    097333b View commit details
    Browse the repository at this point in the history

  3. Merge remote-tracking branch 'cmss13-devs/master' into project/ares/l… 

    …ogging_changes
    @realforest2001
    realforest2001 committed Aug 31, 2023
    Configuration menu
    Copy the full SHA
    33682bd View commit details
    Browse the repository at this point in the history

  4. Merge branch 'project/ares/logging_changes' into project/ares/tm_holder

    @realforest2001
    realforest2001 committed Aug 31, 2023
    Configuration menu
    Copy the full SHA
    e6c2207 View commit details
    Browse the repository at this point in the history

  5. proc var rename for easy read

    @realforest2001
    realforest2001 committed Aug 31, 2023
    Configuration menu
    Copy the full SHA
    91ebfd9 View commit details
    Browse the repository at this point in the history

Commits on Sep 4, 2023

  1. Merge remote-tracking branch 'cmss13-devs/master' into project/ares/a… 

    …dmin_console
    @realforest2001
    realforest2001 committed Sep 4, 2023
    Configuration menu
    Copy the full SHA
    0e41a1a View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'cmss13-devs/master' into project/ares/a… 

    …ccess_tickets
    @realforest2001
    realforest2001 committed Sep 4, 2023
    Configuration menu
    Copy the full SHA
    f178c4f View commit details
    Browse the repository at this point in the history

  3. Merge remote-tracking branch 'cmss13-devs/master' into project/ares/t… 

    …m_holder
    @realforest2001
    realforest2001 committed Sep 4, 2023
    Configuration menu
    Copy the full SHA
    0205c4e View commit details
    Browse the repository at this point in the history

  4. Access Ticket Management 

    stuff

implement
    @realforest2001
    realforest2001 committed Sep 4, 2023
    Configuration menu
    Copy the full SHA
    653e643 View commit details
    Browse the repository at this point in the history

  5. ticket log

    @realforest2001
    realforest2001 committed Sep 4, 2023
    Configuration menu
    Copy the full SHA
    eb8f181 View commit details
    Browse the repository at this point in the history

  6. span fix

    @realforest2001
    realforest2001 committed Sep 4, 2023
    Configuration menu
    Copy the full SHA
    2ba9163 View commit details
    Browse the repository at this point in the history

  7. Merge branch 'project/ares/access_tickets' into project/ares/tm_holder

    @realforest2001
    realforest2001 committed Sep 4, 2023
    Configuration menu
    Copy the full SHA
    ec59276 View commit details
    Browse the repository at this point in the history

  8. Merge branch 'project/ares/admin_console' into project/ares/tm_holder

    @realforest2001
    realforest2001 committed Sep 4, 2023
    Configuration menu
    Copy the full SHA
    6513e74 View commit details
    Browse the repository at this point in the history

  9. button size

    @realforest2001
    realforest2001 committed Sep 4, 2023
    Configuration menu
    Copy the full SHA
    ea7d269 View commit details
    Browse the repository at this point in the history

  10. button size

    @realforest2001
    realforest2001 committed Sep 4, 2023
    Configuration menu
    Copy the full SHA
    9f23d87 View commit details
    Browse the repository at this point in the history

  11. fixes the claim button

    @realforest2001
    realforest2001 committed Sep 4, 2023
    Configuration menu
    Copy the full SHA
    f35b700 View commit details
    Browse the repository at this point in the history

  12. Merge branch 'project/ares/admin_console' into project/ares/tm_holder

    @realforest2001
    realforest2001 committed Sep 4, 2023
    Configuration menu
    Copy the full SHA
    e572062 View commit details
    Browse the repository at this point in the history

  13. fixes the claim button 

    fix mark lock
    @realforest2001
    realforest2001 committed Sep 4, 2023
    Configuration menu
    Copy the full SHA
    3594385 View commit details
    Browse the repository at this point in the history

  14. Merge branch 'project/ares/admin_console' into project/ares/tm_holder

    @realforest2001
    realforest2001 committed Sep 4, 2023
    Configuration menu
    Copy the full SHA
    714e7e7 View commit details
    Browse the repository at this point in the history

  15. auto-revoke ticket fix

    @realforest2001
    realforest2001 committed Sep 4, 2023
    Configuration menu
    Copy the full SHA
    0edf9a8 View commit details
    Browse the repository at this point in the history

  16. Merge branch 'project/ares/access_tickets' into project/ares/tm_holder

    @realforest2001
    realforest2001 committed Sep 4, 2023
    Configuration menu
    Copy the full SHA
    087ab2a View commit details
    Browse the repository at this point in the history

Commits on Sep 7, 2023

  1. Gas Update

    @realforest2001
    realforest2001 committed Sep 7, 2023
    Configuration menu
    Copy the full SHA
    f87a482 View commit details
    Browse the repository at this point in the history

  2. Gas Update

    @realforest2001
    realforest2001 committed Sep 7, 2023
    Configuration menu
    Copy the full SHA
    e78b760 View commit details
    Browse the repository at this point in the history

  3. blind fix

    @realforest2001
    realforest2001 committed Sep 7, 2023
    Configuration menu
    Copy the full SHA
    9e78d2c View commit details
    Browse the repository at this point in the history

  4. blind fix

    @realforest2001
    realforest2001 committed Sep 7, 2023
    Configuration menu
    Copy the full SHA
    cb40a49 View commit details
    Browse the repository at this point in the history

  5. Core vent

    @realforest2001
    realforest2001 committed Sep 7, 2023
    Configuration menu
    Copy the full SHA
    13949f1 View commit details
    Browse the repository at this point in the history

  6. Merge branch 'project/ares/gas_update' into project/ares/tm_holder

    @realforest2001
    realforest2001 committed Sep 7, 2023
    Configuration menu
    Copy the full SHA
    1a51892 View commit details
    Browse the repository at this point in the history

Commits on Sep 9, 2023

  1. logging

    @realforest2001
    realforest2001 committed Sep 9, 2023
    Configuration menu
    Copy the full SHA
    da8fdc0 View commit details
    Browse the repository at this point in the history

  2. gas log

    @realforest2001
    realforest2001 committed Sep 9, 2023
    Configuration menu
    Copy the full SHA
    1821da9 View commit details
    Browse the repository at this point in the history

  3. Merge remote-tracking branch 'cmss13-devs/master' into project/ares/t… 

    …m_holder
    @realforest2001
    realforest2001 committed Sep 9, 2023
    Configuration menu
    Copy the full SHA
    d67adb8 View commit details
    Browse the repository at this point in the history

  4. gas grenades

    @realforest2001
    realforest2001 committed Sep 9, 2023
    Configuration menu
    Copy the full SHA
    a2abda2 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'project/ares/gas_update' into project/ares/tm_holder

    @realforest2001
    realforest2001 committed Sep 9, 2023
    Configuration menu
    Copy the full SHA
    e1e38bd View commit details
    Browse the repository at this point in the history