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.

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

10x28 changes #376

Merged
merged 44 commits into from
Sep 10, 2024
Merged

10x28 changes #376

merged 44 commits into from
Sep 10, 2024

Commits on Aug 14, 2024

  1. Update

    AmoryBlaine committed Aug 14, 2024
    Configuration menu
    Copy the full SHA
    e705c4c View commit details
    Browse the repository at this point in the history
  2. Revert "Update"

    This reverts commit e705c4c.
    AmoryBlaine committed Aug 14, 2024
    Configuration menu
    Copy the full SHA
    4a75bbd View commit details
    Browse the repository at this point in the history
  3. Reapply "Update"

    This reverts commit 4a75bbd.
    AmoryBlaine committed Aug 14, 2024
    Configuration menu
    Copy the full SHA
    c5bdd50 View commit details
    Browse the repository at this point in the history

Commits on Aug 17, 2024

  1. update

    - base M4RA sprite updated
    - Map variants disabled
    AmoryBlaine committed Aug 17, 2024
    Configuration menu
    Copy the full SHA
    acdf62e View commit details
    Browse the repository at this point in the history
  2. Update

    - Smartgun lockers only have two drums
    - MK1s removed from Platoon leader lockers
    - A19 ammo made into a child of base 'heavy' 10x28 ammo for simplicity
    - M41 rubber magazine box added
    - Rubber rounds now do 5 damage, don't spam people with rubber rounds it hurts
    - SG armor can now fit M37 holster and any long guns
    - UPP now use 10x31 caseless for the Type 71. It's 10x28 but with more penetration essentially
    - UPP GPMG now chambered with 10x31, sharing ammo with Type 71s
    AmoryBlaine committed Aug 17, 2024
    Configuration menu
    Copy the full SHA
    f9b907b View commit details
    Browse the repository at this point in the history
  3. sentry and rifle multipliers

    - Rifle damage multipliers removed
    - UPP Sentry shares ammo with all UPP weapons
    AmoryBlaine committed Aug 17, 2024
    Configuration menu
    Copy the full SHA
    da55a71 View commit details
    Browse the repository at this point in the history
  4. Update sentry.dm

    - UPP sentry drum holds 350 rounds to balance against shared ammo cap and higher platoon damage output compared to marines
    AmoryBlaine committed Aug 17, 2024
    Configuration menu
    Copy the full SHA
    bcb4e8b View commit details
    Browse the repository at this point in the history
  5. cupola and m56 mounted

    - Mounted SGs now utilize real 10x28
    - Vehicle attachment M56 Cupolas also use 10x28
    - All 10x28 sentry variants use same ammo
    - irradiated smartgun drums now work with all smartguns
    AmoryBlaine committed Aug 17, 2024
    Configuration menu
    Copy the full SHA
    e133457 View commit details
    Browse the repository at this point in the history

Commits on Aug 18, 2024

  1. revert gear preset

    AmoryBlaine committed Aug 18, 2024
    Configuration menu
    Copy the full SHA
    70a089b View commit details
    Browse the repository at this point in the history
  2. Fixes Map error

    AmoryBlaine committed Aug 18, 2024
    Configuration menu
    Copy the full SHA
    ad7c5b0 View commit details
    Browse the repository at this point in the history

Commits on Aug 19, 2024

  1. Type 71 Desc updates

    AmoryBlaine committed Aug 19, 2024
    Configuration menu
    Copy the full SHA
    7e9d5d0 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    3df1a1d View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    4bdc683 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    6e7d2a5 View commit details
    Browse the repository at this point in the history
  5. Temp VP70 fixes

    AmoryBlaine committed Aug 19, 2024
    Configuration menu
    Copy the full SHA
    7f8fa5b View commit details
    Browse the repository at this point in the history

Commits on Aug 22, 2024

  1. One step back

    - 10x31 now shares stats with 10x28
    - PKP no longer crap- use burst fire for accuracy
    - general purpose belt back sprite looks less shit
    AmoryBlaine committed Aug 22, 2024
    Configuration menu
    Copy the full SHA
    5a1e193 View commit details
    Browse the repository at this point in the history
  2. I forgor

    AmoryBlaine committed Aug 22, 2024
    Configuration menu
    Copy the full SHA
    4ce832d View commit details
    Browse the repository at this point in the history
  3. revert backpack

    AmoryBlaine committed Aug 22, 2024
    Configuration menu
    Copy the full SHA
    95dbac7 View commit details
    Browse the repository at this point in the history

Commits on Aug 23, 2024

  1. Configuration menu
    Copy the full SHA
    59fe33a View commit details
    Browse the repository at this point in the history
  2. PKP HEAP loadout

    AmoryBlaine committed Aug 23, 2024
    Configuration menu
    Copy the full SHA
    101b33b View commit details
    Browse the repository at this point in the history

Commits on Aug 24, 2024

  1. Revert "Temp VP70 fixes"

    This reverts commit 7f8fa5b.
    AmoryBlaine committed Aug 24, 2024
    Configuration menu
    Copy the full SHA
    3ce9416 View commit details
    Browse the repository at this point in the history
  2. Removes changes

    AmoryBlaine committed Aug 24, 2024
    Configuration menu
    Copy the full SHA
    8b3b664 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    de0784d View commit details
    Browse the repository at this point in the history
  4. revert

    AmoryBlaine committed Aug 24, 2024
    Configuration menu
    Copy the full SHA
    451538d View commit details
    Browse the repository at this point in the history
  5. Fixes the thing

    AmoryBlaine committed Aug 24, 2024
    Configuration menu
    Copy the full SHA
    026c671 View commit details
    Browse the repository at this point in the history
  6. Fixed

    AmoryBlaine committed Aug 24, 2024
    Configuration menu
    Copy the full SHA
    ae66220 View commit details
    Browse the repository at this point in the history
  7. test

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

Commits on Aug 26, 2024

  1. Update code/datums/ammo/bullet/rifle.dm

    Co-authored-by: private-tristan <[email protected]>
    AmoryBlaine and private-tristan authored Aug 26, 2024
    Configuration menu
    Copy the full SHA
    ab460f6 View commit details
    Browse the repository at this point in the history
  2. UPP SG base code

    - Adds UPP SG DP-88 in as unspawnable item. Sprites within UPP PR.
    AmoryBlaine committed Aug 26, 2024
    Configuration menu
    Copy the full SHA
    da75ac7 View commit details
    Browse the repository at this point in the history

Commits on Aug 30, 2024

  1. Configuration menu
    Copy the full SHA
    623a9b8 View commit details
    Browse the repository at this point in the history

Commits on Sep 1, 2024

  1. Configuration menu
    Copy the full SHA
    76cfd57 View commit details
    Browse the repository at this point in the history
  2. Icon updates

    AmoryBlaine committed Sep 1, 2024
    Configuration menu
    Copy the full SHA
    56889e1 View commit details
    Browse the repository at this point in the history
  3. stocks fix

    AmoryBlaine committed Sep 1, 2024
    Configuration menu
    Copy the full SHA
    d74f27f View commit details
    Browse the repository at this point in the history
  4. Lineart fixed

    AmoryBlaine committed Sep 1, 2024
    Configuration menu
    Copy the full SHA
    2a8fc51 View commit details
    Browse the repository at this point in the history
  5. duplicate

    AmoryBlaine committed Sep 1, 2024
    Configuration menu
    Copy the full SHA
    1d3c539 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    3858c66 View commit details
    Browse the repository at this point in the history

Commits on Sep 8, 2024

  1. Configuration menu
    Copy the full SHA
    0eca330 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    4b4ed7f View commit details
    Browse the repository at this point in the history
  3. Forgot the barrel lol

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

Commits on Sep 9, 2024

  1. Configuration menu
    Copy the full SHA
    16d76e5 View commit details
    Browse the repository at this point in the history

Commits on Sep 10, 2024

  1. merge conflict fix

    AmoryBlaine committed Sep 10, 2024
    Configuration menu
    Copy the full SHA
    92e6e6a View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    abac325 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    b2660c4 View commit details
    Browse the repository at this point in the history
  4. revert uscm.dmi to master

    Doubleumc committed Sep 10, 2024
    Configuration menu
    Copy the full SHA
    c709a7b View commit details
    Browse the repository at this point in the history