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

XM43E1 in regular gameplay #5724

Closed
wants to merge 46 commits into from
Closed

XM43E1 in regular gameplay #5724

wants to merge 46 commits into from

Commits on Feb 14, 2024

  1. gun changes

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

Commits on Feb 15, 2024

  1. wow i actually did so much work

    @Releasethesea
    Releasethesea committed Feb 15, 2024
    Configuration menu
    Copy the full SHA
    007af19 View commit details
    Browse the repository at this point in the history

  2. litterally one dot of white

    @Releasethesea
    Releasethesea committed Feb 15, 2024
    Configuration menu
    Copy the full SHA
    7f27c87 View commit details
    Browse the repository at this point in the history

Commits on Feb 16, 2024

  1. more testing because turns out things are hard

    @Releasethesea
    Releasethesea committed Feb 16, 2024
    Configuration menu
    Copy the full SHA
    e27a415 View commit details
    Browse the repository at this point in the history

  2. flavour text changes and making rifle work

    @Releasethesea
    Releasethesea committed Feb 16, 2024
    Configuration menu
    Copy the full SHA
    86606a0 View commit details
    Browse the repository at this point in the history

  3. flavour text jokes

    @Releasethesea
    Releasethesea committed Feb 16, 2024
    Configuration menu
    Copy the full SHA
    98ea7cc View commit details
    Browse the repository at this point in the history

  4. woops

    @Releasethesea
    Releasethesea committed Feb 16, 2024
    Configuration menu
    Copy the full SHA
    473710a View commit details
    Browse the repository at this point in the history

Commits on Feb 17, 2024

  1. sprite fix

    @Releasethesea
    Releasethesea committed Feb 17, 2024
    Configuration menu
    Copy the full SHA
    162ec9a View commit details
    Browse the repository at this point in the history

Commits on Feb 18, 2024

  1. fixes conflict probably

    @Releasethesea
    Releasethesea committed Feb 18, 2024
    Configuration menu
    Copy the full SHA
    409b512 View commit details
    Browse the repository at this point in the history

  2. Fix workflows

    @Releasethesea
    Releasethesea committed Feb 18, 2024
    Configuration menu
    Copy the full SHA
    70b51c3 View commit details
    Browse the repository at this point in the history

  3. Merge remote-tracking branch 'upstream/master' into XM43E1-balance-at… 

    …tempt
    @Releasethesea
    Releasethesea committed Feb 18, 2024
    Configuration menu
    Copy the full SHA
    56d91b2 View commit details
    Browse the repository at this point in the history

Commits on Feb 20, 2024

  1. Merge remote-tracking branch 'upstream/master' into XM43E1-balance-at… 

    …tempt
    @Releasethesea
    Releasethesea committed Feb 20, 2024
    Configuration menu
    Copy the full SHA
    1100ec6 View commit details
    Browse the repository at this point in the history

  2. fixes conflicts

    @Releasethesea
    Releasethesea committed Feb 20, 2024
    Configuration menu
    Copy the full SHA
    1b6c8a0 View commit details
    Browse the repository at this point in the history

Commits on Feb 26, 2024

  1. more fixes hopefully

    @Releasethesea
    Releasethesea committed Feb 26, 2024
    Configuration menu
    Copy the full SHA
    a02e005 View commit details
    Browse the repository at this point in the history

  2. should fix sprites? maybe

    @Releasethesea
    Releasethesea committed Feb 26, 2024
    Configuration menu
    Copy the full SHA
    c787ccb View commit details
    Browse the repository at this point in the history

  3. Merge remote-tracking branch 'upstream/master' into XM43E1-balance-at… 

    …temptmERGE
    @Releasethesea
    Releasethesea committed Feb 26, 2024
    Configuration menu
    Copy the full SHA
    235ab1d View commit details
    Browse the repository at this point in the history

  4. maow

    @Releasethesea
    Releasethesea committed Feb 26, 2024
    Configuration menu
    Copy the full SHA
    70c587e View commit details
    Browse the repository at this point in the history

  5. forgot to delete the head thingy

    @Releasethesea
    Releasethesea committed Feb 26, 2024
    Configuration menu
    Copy the full SHA
    9996518 View commit details
    Browse the repository at this point in the history

Commits on Feb 27, 2024

  1. unique audio for XM43E1

    @Releasethesea
    Releasethesea committed Feb 27, 2024
    Configuration menu
    Copy the full SHA
    db0ae0b View commit details
    Browse the repository at this point in the history

Commits on Mar 1, 2024

  1. more fixes, woooo

    @Releasethesea
    Releasethesea committed Mar 1, 2024
    Configuration menu
    Copy the full SHA
    3546c14 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'upstream/master' into XM43E1-balance-at… 

    …tempt
    @Releasethesea
    Releasethesea committed Mar 1, 2024
    Configuration menu
    Copy the full SHA
    084a50c View commit details
    Browse the repository at this point in the history

Commits on Mar 7, 2024

  1. Merge branch 'master' into XM43E1-balance-attempt

    @Drulikar
    Drulikar authored Mar 7, 2024
    Configuration menu
    Copy the full SHA
    1f03d4f View commit details
    Browse the repository at this point in the history

Commits on Mar 13, 2024

  1. helmet fix, again?

    @Releasethesea
    Releasethesea committed Mar 13, 2024
    Configuration menu
    Copy the full SHA
    717b8d2 View commit details
    Browse the repository at this point in the history

  2. Update code/modules/clothing/head/helmet.dm 

    Co-authored-by: Drathek <[email protected]>
    @Releasethesea @Drulikar
    Releasethesea and Drulikar authored Mar 13, 2024
    Configuration menu
    Copy the full SHA
    9f897ae View commit details
    Browse the repository at this point in the history

Commits on Mar 14, 2024

  1. increases ammo for Xm43

    @Releasethesea
    Releasethesea committed Mar 14, 2024
    Configuration menu
    Copy the full SHA
    b62cc98 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'XM43E1-balance-attempt' of https://github.com/Releaseth… 

    …esea/CMSS13 into XM43E1-balance-attempt
    @Releasethesea
    Releasethesea committed Mar 14, 2024
    Configuration menu
    Copy the full SHA
    14c0dcd View commit details
    Browse the repository at this point in the history

  3. Apply suggestions from code review

    @Drulikar
    Drulikar authored Mar 14, 2024
    Configuration menu
    Copy the full SHA
    d6f45c8 View commit details
    Browse the repository at this point in the history

Commits on Mar 18, 2024

  1. NVGs for the XM43

    @Releasethesea
    Releasethesea committed Mar 18, 2024
    Configuration menu
    Copy the full SHA
    01b9fb2 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'XM43E1-balance-attempt' of https://github.com/Releaseth… 

    …esea/CMSS13 into XM43E1-balance-attempt
    @Releasethesea
    Releasethesea committed Mar 18, 2024
    Configuration menu
    Copy the full SHA
    6e08dc8 View commit details
    Browse the repository at this point in the history

Commits on Mar 21, 2024

  1. helmet motion detector to replace to night vision

    @Releasethesea
    Releasethesea committed Mar 21, 2024
    Configuration menu
    Copy the full SHA
    ad6633b View commit details
    Browse the repository at this point in the history

Commits on Mar 23, 2024

  1. fixes slightly out of pace light blinks

    @Releasethesea
    Releasethesea committed Mar 23, 2024
    Configuration menu
    Copy the full SHA
    4083ba9 View commit details
    Browse the repository at this point in the history

Commits on Mar 26, 2024

  1. Merge remote-tracking branch 'upstream/master' into XM43E1-balance-at… 

    …tempt
    @Releasethesea
    Releasethesea committed Mar 26, 2024
    Configuration menu
    Copy the full SHA
    d0820f3 View commit details
    Browse the repository at this point in the history

Commits on Mar 30, 2024

  1. new ammo type hopefully it works

    @Releasethesea
    Releasethesea committed Mar 30, 2024
    Configuration menu
    Copy the full SHA
    7521a29 View commit details
    Browse the repository at this point in the history

  2. beeboop getting closer

    @Releasethesea
    Releasethesea committed Mar 30, 2024
    Configuration menu
    Copy the full SHA
    d558579 View commit details
    Browse the repository at this point in the history

Commits on Mar 31, 2024

  1. wallpop function

    @Releasethesea
    Releasethesea committed Mar 31, 2024
    Configuration menu
    Copy the full SHA
    06df050 View commit details
    Browse the repository at this point in the history

  2. wallpopper balance

    @Releasethesea
    Releasethesea committed Mar 31, 2024
    Configuration menu
    Copy the full SHA
    ed81ca1 View commit details
    Browse the repository at this point in the history

  3. bruh

    @Releasethesea
    Releasethesea committed Mar 31, 2024
    Configuration menu
    Copy the full SHA
    6629c0c View commit details
    Browse the repository at this point in the history

  4. Merge remote-tracking branch 'upstream/master' into XM43E1-balance-at… 

    …tempt
    @Releasethesea
    Releasethesea committed Mar 31, 2024
    Configuration menu
    Copy the full SHA
    05794ab View commit details
    Browse the repository at this point in the history

  5. gorp

    @Releasethesea
    Releasethesea committed Mar 31, 2024
    Configuration menu
    Copy the full SHA
    6b8e450 View commit details
    Browse the repository at this point in the history

Commits on Apr 3, 2024

  1. Revert "gorp" 

    This reverts commit 6b8e450.
    @Releasethesea
    Releasethesea committed Apr 3, 2024
    Configuration menu
    Copy the full SHA
    a5b3d41 View commit details
    Browse the repository at this point in the history

  2. Revert "bruh" 

    This reverts commit 6629c0c.
    @Releasethesea
    Releasethesea committed Apr 3, 2024
    Configuration menu
    Copy the full SHA
    4dfbe85 View commit details
    Browse the repository at this point in the history

  3. Revert "wallpopper balance" 

    This reverts commit ed81ca1.
    @Releasethesea
    Releasethesea committed Apr 3, 2024
    Configuration menu
    Copy the full SHA
    522eaca View commit details
    Browse the repository at this point in the history

  4. Revert "wallpop function" 

    This reverts commit 06df050.
    @Releasethesea
    Releasethesea committed Apr 3, 2024
    Configuration menu
    Copy the full SHA
    694ec83 View commit details
    Browse the repository at this point in the history

  5. Revert "beeboop getting closer" 

    This reverts commit d558579.
    @Releasethesea
    Releasethesea committed Apr 3, 2024
    Configuration menu
    Copy the full SHA
    885072e View commit details
    Browse the repository at this point in the history

  6. Revert "new ammo type hopefully it works" 

    This reverts commit 7521a29.
    @Releasethesea
    Releasethesea committed Apr 3, 2024
    Configuration menu
    Copy the full SHA
    5fa1243 View commit details
    Browse the repository at this point in the history

  7. equal round start ammo

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