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

Project ARES TM Holder (v5) #6039

Draft
wants to merge 285 commits into
base: master
Choose a base branch
from
Draft

Project ARES TM Holder (v5) #6039

wants to merge 285 commits into from
+5,006 −1,518
This pull request is big! We’re only showing the most recent 250 commits.

Commits on Aug 24, 2023

  1. 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

Commits on Aug 28, 2023

  1. 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

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. 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

  3. 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

  4. 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

  5. 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

Commits on Sep 11, 2023

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

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

Commits on Sep 17, 2023

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

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

  2. EXPERI-PATCH - HIJACK OBJECTIVES

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

  3. EXPERI-PATCH PATCH

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

Commits on Sep 19, 2023

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

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

Commits on Oct 9, 2023

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

    …dmin_console
    @realforest2001
    realforest2001 committed Oct 9, 2023
    Configuration menu
    Copy the full SHA
    016a752 View commit details
    Browse the repository at this point in the history

Commits on Oct 11, 2023

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

    …dmin_console
    @realforest2001
    realforest2001 committed Oct 11, 2023
    Configuration menu
    Copy the full SHA
    a3f99ad View commit details
    Browse the repository at this point in the history

Commits on Oct 19, 2023

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

    …dmin_console
    @realforest2001
    realforest2001 committed Oct 19, 2023
    Configuration menu
    Copy the full SHA
    14dd52a View commit details
    Browse the repository at this point in the history

  2. conflicts

    @realforest2001
    realforest2001 committed Oct 19, 2023
    Configuration menu
    Copy the full SHA
    057c3a7 View commit details
    Browse the repository at this point in the history

Commits on Oct 20, 2023

  1. Merge branch 'synth_bracer' into project/SIMI

    @realforest2001
    realforest2001 committed Oct 20, 2023
    Configuration menu
    Copy the full SHA
    eeaafe2 View commit details
    Browse the repository at this point in the history

  2. Conflicts 

    x

x

x
    @realforest2001
    realforest2001 committed Oct 20, 2023
    Configuration menu
    Copy the full SHA
    630a810 View commit details
    Browse the repository at this point in the history

  3. updates

    @realforest2001
    realforest2001 committed Oct 20, 2023
    Configuration menu
    Copy the full SHA
    539db35 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'master' into project/SIMIBracer

    @realforest2001
    realforest2001 committed Oct 20, 2023
    Configuration menu
    Copy the full SHA
    88dd47c View commit details
    Browse the repository at this point in the history

Commits on Oct 21, 2023

  1. Tweaks to phone, animations and module fixes

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

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

    …acer
    @realforest2001
    realforest2001 committed Oct 21, 2023
    Configuration menu
    Copy the full SHA
    f84fc32 View commit details
    Browse the repository at this point in the history

  3. code organising 

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

  4. Starting work on porting abilities

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

Commits on Oct 23, 2023

  1. monitor and actions proc

    @realforest2001
    realforest2001 committed Oct 23, 2023
    Configuration menu
    Copy the full SHA
    87a74ec View commit details
    Browse the repository at this point in the history

  2. This was throwing me errors, no idea why.

    @realforest2001
    realforest2001 committed Oct 23, 2023
    Configuration menu
    Copy the full SHA
    123e57a View commit details
    Browse the repository at this point in the history

  3. monitor works

    @realforest2001
    realforest2001 committed Oct 23, 2023
    Configuration menu
    Copy the full SHA
    32ea35d View commit details
    Browse the repository at this point in the history

  4. icons

    @realforest2001
    realforest2001 committed Oct 23, 2023
    Configuration menu
    Copy the full SHA
    e8f4f79 View commit details
    Browse the repository at this point in the history

  5. charging and subtypes (somehow broke hook)

    @realforest2001
    realforest2001 committed Oct 23, 2023
    Configuration menu
    Copy the full SHA
    28778ab 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 Oct 23, 2023
    Configuration menu
    Copy the full SHA
    ee6ca39 View commit details
    Browse the repository at this point in the history

Commits on Oct 25, 2023

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

    …dmin_console
    @realforest2001
    realforest2001 committed Oct 25, 2023
    Configuration menu
    Copy the full SHA
    d813ac1 View commit details
    Browse the repository at this point in the history

  2. tweaks and a fix from Drathek <3

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

  3. reverts temp patch for hijack objectives

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

  4. second revert

    @realforest2001
    realforest2001 committed Oct 25, 2023
    Configuration menu
    Copy the full SHA
    037f7ab View commit details
    Browse the repository at this point in the history

Commits on Oct 26, 2023

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

    …acer
    @realforest2001
    realforest2001 committed Oct 26, 2023
    Configuration menu
    Copy the full SHA
    422944a View commit details
    Browse the repository at this point in the history

Commits on Oct 30, 2023

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

    …acer
    @realforest2001
    realforest2001 committed Oct 30, 2023
    Configuration menu
    Copy the full SHA
    fc3ba75 View commit details
    Browse the repository at this point in the history

  2. circuit chips

    @realforest2001
    realforest2001 committed Oct 30, 2023
    Configuration menu
    Copy the full SHA
    02fc711 View commit details
    Browse the repository at this point in the history

  3. Fixed hook (I'm stupid) 

    checks tweak
    @realforest2001
    realforest2001 committed Oct 30, 2023
    Configuration menu
    Copy the full SHA
    fea1d59 View commit details
    Browse the repository at this point in the history

  4. Motion Detector 

    Also renames motiondetector/sg to motiondetector/integrated
    @realforest2001
    realforest2001 committed Oct 30, 2023
    Configuration menu
    Copy the full SHA
    8f8c9e4 View commit details
    Browse the repository at this point in the history

  5. chips in vendor

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

Commits on Oct 31, 2023

  1. anchor mode

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

  2. wear icons

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

  3. better white

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

  4. pmc preset

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

Commits on Nov 1, 2023

  1. power check

    @realforest2001
    realforest2001 committed Nov 1, 2023
    Configuration menu
    Copy the full SHA
    48f26ab View commit details
    Browse the repository at this point in the history

  2. lint fix 

    more lint fix
    @realforest2001
    realforest2001 committed Nov 1, 2023
    Configuration menu
    Copy the full SHA
    f5ad6e5 View commit details
    Browse the repository at this point in the history

  3. human adaptation 

    sounds

x
    @realforest2001
    realforest2001 committed Nov 1, 2023
    Configuration menu
    Copy the full SHA
    e1c485c View commit details
    Browse the repository at this point in the history

  4. charge report

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

  5. remove direct target hook 

    hook bug fix
    @realforest2001
    realforest2001 committed Nov 1, 2023
    Configuration menu
    Copy the full SHA
    64d0e32 View commit details
    Browse the repository at this point in the history

  6. sounds

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

  7. bugfixes and activation procs

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

  8. Apply suggestions from code review 

    Co-authored-by: fira <[email protected]>
    @realforest2001 @fira
    realforest2001 and fira committed Nov 1, 2023
    Configuration menu
    Copy the full SHA
    058c4dc View commit details
    Browse the repository at this point in the history

  9. Partial changes

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

  10. Cost tweaks

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

Commits on Nov 5, 2023

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

    …dmin_console
    @realforest2001
    realforest2001 committed Nov 5, 2023
    Configuration menu
    Copy the full SHA
    af978a6 View commit details
    Browse the repository at this point in the history

Commits on Nov 22, 2023

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

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

  2. SShijack

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

Commits on Nov 27, 2023

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

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

  2. fix

    @realforest2001
    realforest2001 committed Nov 27, 2023
    Configuration menu
    Copy the full SHA
    fa0e595 View commit details
    Browse the repository at this point in the history

Commits on Nov 29, 2023

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

    …dmin_console
    @realforest2001
    realforest2001 committed Nov 29, 2023
    Configuration menu
    Copy the full SHA
    5c593c7 View commit details
    Browse the repository at this point in the history

Commits on Dec 1, 2023

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

    …acerPublic
    @realforest2001
    realforest2001 committed Dec 1, 2023
    Configuration menu
    Copy the full SHA
    eecd640 View commit details
    Browse the repository at this point in the history

Commits on Dec 11, 2023

  1. file rename

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

  2. conflict tweak

    @realforest2001
    realforest2001 committed Dec 11, 2023
    Configuration menu
    Copy the full SHA
    8075845 View commit details
    Browse the repository at this point in the history

Commits on Dec 14, 2023

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

    …dmin_console
    @realforest2001
    realforest2001 committed Dec 14, 2023
    Configuration menu
    Copy the full SHA
    7beec8c View commit details
    Browse the repository at this point in the history

Commits on Dec 26, 2023

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

    …dmin_console
    @realforest2001
    realforest2001 committed Dec 26, 2023
    Configuration menu
    Copy the full SHA
    e558327 View commit details
    Browse the repository at this point in the history

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

    …acerPublic
    @realforest2001
    realforest2001 committed Dec 26, 2023
    Configuration menu
    Copy the full SHA
    7ef1235 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 Dec 26, 2023
    Configuration menu
    Copy the full SHA
    c01698a View commit details
    Browse the repository at this point in the history

Commits on Jan 2, 2024

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

    …dmin_console
    @realforest2001
    realforest2001 committed Jan 2, 2024
    Configuration menu
    Copy the full SHA
    d3c4173 View commit details
    Browse the repository at this point in the history

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

    …acerPublic
    @realforest2001
    realforest2001 committed Jan 2, 2024
    Configuration menu
    Copy the full SHA
    dd6ec46 View commit details
    Browse the repository at this point in the history

Commits on Jan 21, 2024

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

    …dmin_console
    @realforest2001
    realforest2001 committed Jan 21, 2024
    Configuration menu
    Copy the full SHA
    3ea1885 View commit details
    Browse the repository at this point in the history

Commits on Jan 24, 2024

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

    …dmin_console
    @realforest2001
    realforest2001 committed Jan 24, 2024
    Configuration menu
    Copy the full SHA
    333e575 View commit details
    Browse the repository at this point in the history

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

    …acerPublic
    @realforest2001
    realforest2001 committed Jan 24, 2024
    Configuration menu
    Copy the full SHA
    0634582 View commit details
    Browse the repository at this point in the history

  3. fixes 

    more fix
    @realforest2001
    realforest2001 committed Jan 24, 2024
    Configuration menu
    Copy the full SHA
    05080cc View commit details
    Browse the repository at this point in the history

  4. Gloves are back

    @realforest2001
    realforest2001 committed Jan 24, 2024
    Configuration menu
    Copy the full SHA
    6e59b72 View commit details
    Browse the repository at this point in the history

  5. tweaks 

    fix
    @realforest2001
    realforest2001 committed Jan 24, 2024
    Configuration menu
    Copy the full SHA
    2ae4864 View commit details
    Browse the repository at this point in the history

  6. w

    @realforest2001
    realforest2001 committed Jan 24, 2024
    Configuration menu
    Copy the full SHA
    3f6da82 View commit details
    Browse the repository at this point in the history

  7. Merge branch 'project/ares/admin_console' into project/ares/holderperk

    @realforest2001
    realforest2001 committed Jan 24, 2024
    Configuration menu
    Copy the full SHA
    e6a0c6d View commit details
    Browse the repository at this point in the history

  8. w

    @realforest2001
    realforest2001 committed Jan 24, 2024
    Configuration menu
    Copy the full SHA
    c703607 View commit details
    Browse the repository at this point in the history

  9. tweak

    @realforest2001
    realforest2001 committed Jan 24, 2024
    Configuration menu
    Copy the full SHA
    390e098 View commit details
    Browse the repository at this point in the history

  10. defaults

    @realforest2001
    realforest2001 committed Jan 24, 2024
    Configuration menu
    Copy the full SHA
    1c81feb View commit details
    Browse the repository at this point in the history

  11. Merge branch 'project/ares/admin_console' into project/ares/holderperk

    @realforest2001
    realforest2001 committed Jan 24, 2024
    Configuration menu
    Copy the full SHA
    d2f20ec View commit details
    Browse the repository at this point in the history

  12. f

    @realforest2001
    realforest2001 committed Jan 24, 2024
    Configuration menu
    Copy the full SHA
    14717de View commit details
    Browse the repository at this point in the history

Commits on Jan 27, 2024

  1. works 

    fr
    @realforest2001
    realforest2001 committed Jan 27, 2024
    Configuration menu
    Copy the full SHA
    78223d1 View commit details
    Browse the repository at this point in the history

  2. fn snowflake 

    Practical testing for hidden roles, alongside generally being a snowflake.
    @realforest2001
    realforest2001 committed Jan 27, 2024
    Configuration menu
    Copy the full SHA
    f3be533 View commit details
    Browse the repository at this point in the history

  3. fix emergency buttons

    @realforest2001
    realforest2001 committed Jan 27, 2024
    Configuration menu
    Copy the full SHA
    8d0fcbf View commit details
    Browse the repository at this point in the history

Commits on Jan 30, 2024

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

    …olderperk
    @realforest2001
    realforest2001 committed Jan 30, 2024
    Configuration menu
    Copy the full SHA
    2c18371 View commit details
    Browse the repository at this point in the history

  2. slot

    @realforest2001
    realforest2001 committed Jan 30, 2024
    Configuration menu
    Copy the full SHA
    3ca260a View commit details
    Browse the repository at this point in the history

Commits on Mar 9, 2024

  1. Merge branch 'master' into project/ares/holderperk

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

  2. f

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

Commits on Mar 27, 2024

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

    …olderperk
    @realforest2001
    realforest2001 committed Mar 27, 2024
    Configuration menu
    Copy the full SHA
    b1893e9 View commit details
    Browse the repository at this point in the history

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

    …acerPublic
    @realforest2001
    realforest2001 committed Mar 27, 2024
    Configuration menu
    Copy the full SHA
    819df27 View commit details
    Browse the repository at this point in the history

Commits on Mar 29, 2024

  1. office, hud icon and demotion

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

  2. Merge branch 'master' into project/ares/holderperk

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

  3. office decor

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

Commits on Apr 3, 2024

  1. x

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

  2. Merge branch 'master' into project/ares/holderperk

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

  3. Merge branch 'master' into project/SIMIBracerPublic

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

  4. test

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

Commits on Apr 7, 2024

  1. gas mask

    @realforest2001
    realforest2001 committed Apr 7, 2024
    Configuration menu
    Copy the full SHA
    a219d62 View commit details
    Browse the repository at this point in the history

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

    …olderperk
    @realforest2001
    realforest2001 committed Apr 7, 2024
    Configuration menu
    Copy the full SHA
    d1122d2 View commit details
    Browse the repository at this point in the history

  3. fix tech button & bioscan test

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

Commits on Apr 8, 2024

  1. audio

    @realforest2001
    realforest2001 committed Apr 8, 2024
    Configuration menu
    Copy the full SHA
    7329375 View commit details
    Browse the repository at this point in the history

  2. vendor 

    vendor contents

x
    @realforest2001
    realforest2001 committed Apr 8, 2024
    Configuration menu
    Copy the full SHA
    cf4f06f View commit details
    Browse the repository at this point in the history

  3. tech fix

    @realforest2001
    realforest2001 committed Apr 8, 2024
    Configuration menu
    Copy the full SHA
    0a67632 View commit details
    Browse the repository at this point in the history

  4. access

    @realforest2001
    realforest2001 committed Apr 8, 2024
    Configuration menu
    Copy the full SHA
    abeffc5 View commit details
    Browse the repository at this point in the history

  5. tada

    @realforest2001
    realforest2001 committed Apr 8, 2024
    Configuration menu
    Copy the full SHA
    e092a76 View commit details
    Browse the repository at this point in the history

  6. sudo fix

    @realforest2001
    realforest2001 committed Apr 8, 2024
    Configuration menu
    Copy the full SHA
    134ba69 View commit details
    Browse the repository at this point in the history

  7. tech delete fix

    @realforest2001
    realforest2001 committed Apr 8, 2024
    Configuration menu
    Copy the full SHA
    13f1d89 View commit details
    Browse the repository at this point in the history

  8. effect icosn

    @realforest2001
    realforest2001 committed Apr 8, 2024
    Configuration menu
    Copy the full SHA
    b7babc3 View commit details
    Browse the repository at this point in the history

Commits on Apr 15, 2024

  1. sudo tbt 

    x
    @realforest2001
    realforest2001 committed Apr 15, 2024
    Configuration menu
    Copy the full SHA
    d7c3540 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into project/ares/holderperk

    @realforest2001
    realforest2001 committed Apr 15, 2024
    Configuration menu
    Copy the full SHA
    b460000 View commit details
    Browse the repository at this point in the history

Commits on Apr 16, 2024

  1. Merge branch 'master' into project/ares/sparker

    @realforest2001
    realforest2001 committed Apr 16, 2024
    Configuration menu
    Copy the full SHA
    d09629c View commit details
    Browse the repository at this point in the history

Commits on Apr 17, 2024

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

    …olderperk
    @realforest2001
    realforest2001 committed Apr 17, 2024
    Configuration menu
    Copy the full SHA
    e637b80 View commit details
    Browse the repository at this point in the history

  2. Fix for stupid forest.

    @realforest2001
    realforest2001 committed Apr 17, 2024
    Configuration menu
    Copy the full SHA
    2bbf921 View commit details
    Browse the repository at this point in the history

Commits on Apr 22, 2024

  1. gas fix

    @realforest2001
    realforest2001 committed Apr 22, 2024
    Configuration menu
    Copy the full SHA
    740b4f8 View commit details
    Browse the repository at this point in the history

Commits on Apr 25, 2024

  1. wy version

    @realforest2001
    realforest2001 committed Apr 25, 2024
    Configuration menu
    Copy the full SHA
    a8b540a View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into project/ares/holderperk

    @realforest2001
    realforest2001 committed Apr 25, 2024
    Configuration menu
    Copy the full SHA
    13d95f4 View commit details
    Browse the repository at this point in the history

  3. doh

    @realforest2001
    realforest2001 committed Apr 25, 2024
    Configuration menu
    Copy the full SHA
    28ca3eb View commit details
    Browse the repository at this point in the history

  4. nerve gas fix 

    x
    @realforest2001
    realforest2001 committed Apr 25, 2024
    Configuration menu
    Copy the full SHA
    a6ddb19 View commit details
    Browse the repository at this point in the history

  5. wy gear

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

  6. access fix

    @realforest2001
    realforest2001 committed Apr 25, 2024
    Configuration menu
    Copy the full SHA
    e6aaa55 View commit details
    Browse the repository at this point in the history

  7. armor fix for AIST

    @realforest2001
    realforest2001 committed Apr 25, 2024
    Configuration menu
    Copy the full SHA
    e285fac View commit details
    Browse the repository at this point in the history

Commits on Apr 26, 2024

  1. log fix

    @realforest2001
    realforest2001 committed Apr 26, 2024
    Configuration menu
    Copy the full SHA
    635a445 View commit details
    Browse the repository at this point in the history

Commits on May 2, 2024

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

    …parker
    @realforest2001
    realforest2001 committed May 2, 2024
    Configuration menu
    Copy the full SHA
    1f58f55 View commit details
    Browse the repository at this point in the history

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

    …olderperk
    @realforest2001
    realforest2001 committed May 2, 2024
    Configuration menu
    Copy the full SHA
    e379f78 View commit details
    Browse the repository at this point in the history

Commits on May 8, 2024

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

    …parker
    @realforest2001
    realforest2001 committed May 8, 2024
    Configuration menu
    Copy the full SHA
    48b5e26 View commit details
    Browse the repository at this point in the history

  2. availability

    @realforest2001
    realforest2001 committed May 8, 2024
    Configuration menu
    Copy the full SHA
    e7ebecb View commit details
    Browse the repository at this point in the history

  3. icons

    @realforest2001
    realforest2001 committed May 8, 2024
    Configuration menu
    Copy the full SHA
    cc126fc View commit details
    Browse the repository at this point in the history

Commits on May 9, 2024

  1. fix

    @realforest2001
    realforest2001 committed May 9, 2024
    Configuration menu
    Copy the full SHA
    367be23 View commit details
    Browse the repository at this point in the history

  2. removes unusable thing

    @realforest2001
    realforest2001 committed May 9, 2024
    Configuration menu
    Copy the full SHA
    17f2816 View commit details
    Browse the repository at this point in the history

Commits on May 10, 2024

  1. fix

    @realforest2001
    realforest2001 committed May 10, 2024
    Configuration menu
    Copy the full SHA
    daba780 View commit details
    Browse the repository at this point in the history

Commits on May 19, 2024

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

    …parker
    @realforest2001
    realforest2001 committed May 19, 2024
    Configuration menu
    Copy the full SHA
    885ca71 View commit details
    Browse the repository at this point in the history

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

    …olderperk
    @realforest2001
    realforest2001 committed May 19, 2024
    Configuration menu
    Copy the full SHA
    9d26b08 View commit details
    Browse the repository at this point in the history

Commits on May 20, 2024

  1. PRETTY ENOUGH?

    @realforest2001
    realforest2001 committed May 20, 2024
    Configuration menu
    Copy the full SHA
    cc0ca6b View commit details
    Browse the repository at this point in the history

Commits on May 22, 2024

  1. fixes UI

    @realforest2001
    realforest2001 committed May 22, 2024
    Configuration menu
    Copy the full SHA
    c2644bd View commit details
    Browse the repository at this point in the history

  2. s

    @realforest2001
    realforest2001 committed May 22, 2024
    Configuration menu
    Copy the full SHA
    0e7b32a View commit details
    Browse the repository at this point in the history

  3. tooltips

    @realforest2001
    realforest2001 committed May 22, 2024
    Configuration menu
    Copy the full SHA
    d894321 View commit details
    Browse the repository at this point in the history

  4. delete fix

    @realforest2001
    realforest2001 committed May 22, 2024
    Configuration menu
    Copy the full SHA
    e852134 View commit details
    Browse the repository at this point in the history

Commits on May 25, 2024

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

    …olderperk
    @realforest2001
    realforest2001 committed May 25, 2024
    Configuration menu
    Copy the full SHA
    3291607 View commit details
    Browse the repository at this point in the history

Commits on May 27, 2024

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

    …parker
    @realforest2001
    realforest2001 committed May 27, 2024
    Configuration menu
    Copy the full SHA
    6b32315 View commit details
    Browse the repository at this point in the history

  2. ce vendor

    @realforest2001
    realforest2001 committed May 27, 2024
    Configuration menu
    Copy the full SHA
    bc672b3 View commit details
    Browse the repository at this point in the history

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

    …olderperk
    @realforest2001
    realforest2001 committed May 27, 2024
    Configuration menu
    Copy the full SHA
    542f934 View commit details
    Browse the repository at this point in the history

  4. sentry settings 

    sentries part 2

x

s
    @realforest2001
    realforest2001 committed May 27, 2024
    Configuration menu
    Copy the full SHA
    2bbe3da View commit details
    Browse the repository at this point in the history

  5. sentries in other UIs

    @realforest2001
    realforest2001 committed May 27, 2024
    Configuration menu
    Copy the full SHA
    e913a5e View commit details
    Browse the repository at this point in the history

  6. fix

    @realforest2001
    realforest2001 committed May 27, 2024
    Configuration menu
    Copy the full SHA
    0a2d726 View commit details
    Browse the repository at this point in the history

  7. logging

    @realforest2001
    realforest2001 committed May 27, 2024
    Configuration menu
    Copy the full SHA
    4c4293d View commit details
    Browse the repository at this point in the history

Commits on May 30, 2024

  1. oops

    @realforest2001
    realforest2001 committed May 30, 2024
    Configuration menu
    Copy the full SHA
    ca3f2d0 View commit details
    Browse the repository at this point in the history

  2. x

    @realforest2001
    realforest2001 committed May 30, 2024
    Configuration menu
    Copy the full SHA
    7265c72 View commit details
    Browse the repository at this point in the history

Commits on Jun 1, 2024

  1. tank compat

    @realforest2001
    realforest2001 committed Jun 1, 2024
    Configuration menu
    Copy the full SHA
    3004425 View commit details
    Browse the repository at this point in the history

Commits on Jun 3, 2024

  1. more buttons

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

  2. button accesses

    @realforest2001
    realforest2001 committed Jun 3, 2024
    Configuration menu
    Copy the full SHA
    813f0ab View commit details
    Browse the repository at this point in the history

Commits on Jun 4, 2024

  1. Merge branch 'master' into project/ares/holderperk

    @realforest2001
    realforest2001 committed Jun 4, 2024
    Configuration menu
    Copy the full SHA
    8b8f3f9 View commit details
    Browse the repository at this point in the history

Commits on Jun 7, 2024

  1. Merge branch 'master' into project/ares/holderperk

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

  2. Merge branch 'master' into project/ares/sparker

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

Commits on Jun 9, 2024

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

    …olderperk
    @realforest2001
    realforest2001 committed Jun 9, 2024
    Configuration menu
    Copy the full SHA
    8e307ea View commit details
    Browse the repository at this point in the history

  2. compat refigure

    @realforest2001
    realforest2001 committed Jun 9, 2024
    Configuration menu
    Copy the full SHA
    916c63b View commit details
    Browse the repository at this point in the history

Commits on Jun 14, 2024

  1. Merge branch 'master' into project/ares/holderperk

    @realforest2001
    realforest2001 committed Jun 14, 2024
    Configuration menu
    Copy the full SHA
    da60304 View commit details
    Browse the repository at this point in the history

  2. X114-Phase 1

    @realforest2001
    realforest2001 committed Jun 14, 2024
    Configuration menu
    Copy the full SHA
    d0f661f View commit details
    Browse the repository at this point in the history

  3. X114-Phase 2

    @realforest2001
    realforest2001 committed Jun 14, 2024
    Configuration menu
    Copy the full SHA
    f7fa677 View commit details
    Browse the repository at this point in the history

Commits on Jun 15, 2024

  1. X114-Phase 3

    @realforest2001
    realforest2001 committed Jun 15, 2024
    Configuration menu
    Copy the full SHA
    410bba0 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into project/ares/sparker

    @realforest2001
    realforest2001 committed Jun 15, 2024
    Configuration menu
    Copy the full SHA
    050dd69 View commit details
    Browse the repository at this point in the history

Commits on Jun 16, 2024

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

    …parker
    @realforest2001
    realforest2001 committed Jun 16, 2024
    Configuration menu
    Copy the full SHA
    741ee90 View commit details
    Browse the repository at this point in the history

  2. fix

    @realforest2001
    realforest2001 committed Jun 16, 2024
    Configuration menu
    Copy the full SHA
    0d19a0a View commit details
    Browse the repository at this point in the history

Commits on Jun 17, 2024

  1. X114-Phase 4

    @realforest2001
    realforest2001 committed Jun 17, 2024
    Configuration menu
    Copy the full SHA
    dcc5e46 View commit details
    Browse the repository at this point in the history

  2. Undo tank compat

    @realforest2001
    realforest2001 committed Jun 17, 2024
    Configuration menu
    Copy the full SHA
    b420ca9 View commit details
    Browse the repository at this point in the history

  3. X114-Phase 5

    @realforest2001
    realforest2001 committed Jun 17, 2024
    Configuration menu
    Copy the full SHA
    31cb215 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'master' into project/ares/holderperk

    @realforest2001
    realforest2001 committed Jun 17, 2024
    Configuration menu
    Copy the full SHA
    fbe9109 View commit details
    Browse the repository at this point in the history

Commits on Jun 18, 2024

  1. stoopid forest again

    @realforest2001
    realforest2001 committed Jun 18, 2024
    Configuration menu
    Copy the full SHA
    a3a244f View commit details
    Browse the repository at this point in the history

Commits on Jun 23, 2024

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

    …olderperk
    @realforest2001
    realforest2001 committed Jun 23, 2024
    Configuration menu
    Copy the full SHA
    1433f82 View commit details
    Browse the repository at this point in the history

  2. x

    @realforest2001
    realforest2001 committed Jun 23, 2024
    Configuration menu
    Copy the full SHA
    42631cd View commit details
    Browse the repository at this point in the history

  3. x

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

Commits on Jun 29, 2024

  1. x

    @realforest2001
    realforest2001 committed Jun 29, 2024
    Configuration menu
    Copy the full SHA
    e85c779 View commit details
    Browse the repository at this point in the history

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

    …olderperk
    @realforest2001
    realforest2001 committed Jun 29, 2024
    Configuration menu
    Copy the full SHA
    13f9e5a View commit details
    Browse the repository at this point in the history

  3. x

    @realforest2001
    realforest2001 committed Jun 29, 2024
    Configuration menu
    Copy the full SHA
    b6dcb88 View commit details
    Browse the repository at this point in the history

  4. belt icons

    @realforest2001
    realforest2001 committed Jun 29, 2024
    Configuration menu
    Copy the full SHA
    c086c5a View commit details
    Browse the repository at this point in the history

  5. comms

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

Commits on Jul 6, 2024

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

    …olderperk
    @realforest2001
    realforest2001 committed Jul 6, 2024
    Configuration menu
    Copy the full SHA
    719ed27 View commit details
    Browse the repository at this point in the history

Commits on Jul 13, 2024

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

    …olderperk
    @realforest2001
    realforest2001 committed Jul 13, 2024
    Configuration menu
    Copy the full SHA
    e200ed1 View commit details
    Browse the repository at this point in the history

  2. grr

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

  3. mapmore

    @realforest2001
    realforest2001 committed Jul 13, 2024
    Configuration menu
    Copy the full SHA
    6d87f3e View commit details
    Browse the repository at this point in the history

  4. f

    @realforest2001
    realforest2001 committed Jul 13, 2024
    Configuration menu
    Copy the full SHA
    6c21bbc View commit details
    Browse the repository at this point in the history

  5. curses upon this ruddy mapping change

    @realforest2001
    realforest2001 committed Jul 13, 2024
    Configuration menu
    Copy the full SHA
    2c21fd8 View commit details
    Browse the repository at this point in the history

  6. grrr

    @realforest2001
    realforest2001 committed Jul 13, 2024
    Configuration menu
    Copy the full SHA
    916a7b4 View commit details
    Browse the repository at this point in the history

  7. istfg

    @realforest2001
    realforest2001 committed Jul 13, 2024
    Configuration menu
    Copy the full SHA
    76d70a1 View commit details
    Browse the repository at this point in the history

Commits on Jul 16, 2024

  1. Merge from master

    @realforest2001
    realforest2001 committed Jul 16, 2024
    Configuration menu
    Copy the full SHA
    a074536 View commit details
    Browse the repository at this point in the history

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

    …parker
    @realforest2001
    realforest2001 committed Jul 16, 2024
    Configuration menu
    Copy the full SHA
    b425723 View commit details
    Browse the repository at this point in the history

Commits on Jul 28, 2024

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

    …olderperk
    @realforest2001
    realforest2001 committed Jul 28, 2024
    Configuration menu
    Copy the full SHA
    cf48484 View commit details
    Browse the repository at this point in the history

Commits on Jul 30, 2024

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

    …acerPublic
    @realforest2001
    realforest2001 committed Jul 30, 2024
    Configuration menu
    Copy the full SHA
    30085f4 View commit details
    Browse the repository at this point in the history

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

    …olderperk
    @realforest2001
    realforest2001 committed Jul 30, 2024
    Configuration menu
    Copy the full SHA
    f3de9e9 View commit details
    Browse the repository at this point in the history

  3. conflict

    @realforest2001
    realforest2001 committed Jul 30, 2024
    Configuration menu
    Copy the full SHA
    f9a7bbf View commit details
    Browse the repository at this point in the history

  4. wy conflict

    @realforest2001
    realforest2001 committed Jul 30, 2024
    Configuration menu
    Copy the full SHA
    b016069 View commit details
    Browse the repository at this point in the history

Commits on Aug 3, 2024

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

    …acerPublic
    @realforest2001
    realforest2001 committed Aug 3, 2024
    Configuration menu
    Copy the full SHA
    8c8c94e View commit details
    Browse the repository at this point in the history

  2. f

    @realforest2001
    realforest2001 committed Aug 3, 2024
    Configuration menu
    Copy the full SHA
    d47f9a0 View commit details
    Browse the repository at this point in the history

  3. f

    @realforest2001
    realforest2001 committed Aug 3, 2024
    Configuration menu
    Copy the full SHA
    405a449 View commit details
    Browse the repository at this point in the history

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

    …olderperk
    @realforest2001
    realforest2001 committed Aug 3, 2024
    Configuration menu
    Copy the full SHA
    3341660 View commit details
    Browse the repository at this point in the history

  5. icon fix

    @realforest2001
    realforest2001 committed Aug 3, 2024
    Configuration menu
    Copy the full SHA
    165352a View commit details
    Browse the repository at this point in the history

Commits on Aug 13, 2024

  1. Update code/game/machinery/vending/vendor_types/crew/synthetic.dm

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

  2. Update code/game/machinery/vending/vendor_types/crew/synthetic.dm

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

  3. smartpack

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

Commits on Aug 19, 2024

  1. x

    @realforest2001
    realforest2001 committed Aug 19, 2024
    Configuration menu
    Copy the full SHA
    93830af View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into project/SIMIBracerPublic

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

  3. anchor fix and on-mob sprite tweaks

    @realforest2001
    realforest2001 committed Aug 19, 2024
    Configuration menu
    Copy the full SHA
    483b6bc View commit details
    Browse the repository at this point in the history

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

    …olderperk
    @realforest2001
    realforest2001 committed Aug 19, 2024
    Configuration menu
    Copy the full SHA
    7dd3b3d View commit details
    Browse the repository at this point in the history

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

    …parker
    @realforest2001
    realforest2001 committed Aug 19, 2024
    Configuration menu
    Copy the full SHA
    e2016e5 View commit details
    Browse the repository at this point in the history

  6. fix

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

Commits on Aug 21, 2024

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

    …olderperk
    @realforest2001
    realforest2001 committed Aug 21, 2024
    Configuration menu
    Copy the full SHA
    632cae9 View commit details
    Browse the repository at this point in the history

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

    …parker
    @realforest2001
    realforest2001 committed Aug 21, 2024
    Configuration menu
    Copy the full SHA
    cba0d27 View commit details
    Browse the repository at this point in the history

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

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

Commits on Aug 22, 2024

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

    …olderperk
    @realforest2001
    realforest2001 committed Aug 22, 2024
    Configuration menu
    Copy the full SHA
    9e9dc41 View commit details
    Browse the repository at this point in the history

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

    …m_holder
    @realforest2001
    realforest2001 committed Aug 22, 2024
    Configuration menu
    Copy the full SHA
    dbf1efa 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 Aug 22, 2024
    Configuration menu
    Copy the full SHA
    3352be2 View commit details
    Browse the repository at this point in the history

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

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

Commits on Aug 23, 2024

  1. drop fix

    @realforest2001
    realforest2001 committed Aug 23, 2024
    Configuration menu
    Copy the full SHA
    a8e8d7e View commit details
    Browse the repository at this point in the history

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

    @realforest2001
    realforest2001 committed Aug 23, 2024
    Configuration menu
    Copy the full SHA
    c7480b7 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 Aug 23, 2024
    Configuration menu
    Copy the full SHA
    265f944 View commit details
    Browse the repository at this point in the history

Commits on Aug 24, 2024

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

    …m_holder
    @realforest2001
    realforest2001 committed Aug 24, 2024
    Configuration menu
    Copy the full SHA
    8c785be View commit details
    Browse the repository at this point in the history

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

    …olderperk
    @realforest2001
    realforest2001 committed Aug 24, 2024
    Configuration menu
    Copy the full SHA
    bfd7ae3 View commit details
    Browse the repository at this point in the history

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

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

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

    …acerPublic
    @realforest2001
    realforest2001 committed Aug 24, 2024
    Configuration menu
    Copy the full SHA
    a390c58 View commit details
    Browse the repository at this point in the history

  5. fix 2.0

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

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

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

  7. Hrm

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

  8. temp office removal

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

  9. office restored

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

  10. intercoms

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

  11. gas tweak

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

Commits on Aug 26, 2024

  1. how did this happen

    @realforest2001
    realforest2001 committed Aug 26, 2024
    Configuration menu
    Copy the full SHA
    069bcb4 View commit details
    Browse the repository at this point in the history

Commits on Aug 29, 2024

  1. backend overhaul

    @realforest2001
    realforest2001 committed Aug 29, 2024
    Configuration menu
    Copy the full SHA
    7fdaa4d View commit details
    Browse the repository at this point in the history

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

    @realforest2001
    realforest2001 committed Aug 29, 2024
    Configuration menu
    Copy the full SHA
    a0724d1 View commit details
    Browse the repository at this point in the history

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

    @realforest2001
    realforest2001 committed Aug 29, 2024
    Configuration menu
    Copy the full SHA
    34c9662 View commit details
    Browse the repository at this point in the history

  4. admin menu fix

    @realforest2001
    realforest2001 committed Aug 29, 2024
    Configuration menu
    Copy the full SHA
    d1305cb View commit details
    Browse the repository at this point in the history

  5. sensors

    @realforest2001
    realforest2001 committed Aug 29, 2024
    Configuration menu
    Copy the full SHA
    a11b024 View commit details
    Browse the repository at this point in the history

  6. wake-up announce

    @realforest2001
    realforest2001 committed Aug 29, 2024
    Configuration menu
    Copy the full SHA
    f45218f View commit details
    Browse the repository at this point in the history

  7. WY grade fix

    @realforest2001
    realforest2001 committed Aug 29, 2024
    Configuration menu
    Copy the full SHA
    e3e9779 View commit details
    Browse the repository at this point in the history

  8. relent

    @realforest2001
    realforest2001 committed Aug 29, 2024
    Configuration menu
    Copy the full SHA
    6039a93 View commit details
    Browse the repository at this point in the history

  9. wy clothes vend

    @realforest2001
    realforest2001 committed Aug 29, 2024
    Configuration menu
    Copy the full SHA
    ffff808 View commit details
    Browse the repository at this point in the history

  10. t

    @realforest2001
    realforest2001 committed Aug 29, 2024
    Configuration menu
    Copy the full SHA
    139b21c View commit details
    Browse the repository at this point in the history

  11. announce change

    @realforest2001
    realforest2001 committed Aug 29, 2024
    Configuration menu
    Copy the full SHA
    c3d8e10 View commit details
    Browse the repository at this point in the history

  12. headset

    @realforest2001
    realforest2001 committed Aug 29, 2024
    Configuration menu
    Copy the full SHA
    e869d65 View commit details
    Browse the repository at this point in the history

  13. fix

    @realforest2001
    realforest2001 committed Aug 29, 2024
    Configuration menu
    Copy the full SHA
    eeaad67 View commit details
    Browse the repository at this point in the history

Commits on Aug 31, 2024

  1. 1:1 fix

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

  2. real 1:1 fix

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

  3. f

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

  4. auto-lockdown test

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

  5. sensor broadcast test

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

  6. ffs forest

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

  7. f

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

Commits on Sep 5, 2024

  1. t

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

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

    …m_holder
    @realforest2001
    realforest2001 committed Sep 5, 2024
    Configuration menu
    Copy the full SHA
    02852a5 View commit details
    Browse the repository at this point in the history

  3. intel late fix

    @realforest2001
    realforest2001 committed Sep 5, 2024
    Configuration menu
    Copy the full SHA
    0cdaac5 View commit details
    Browse the repository at this point in the history