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

Laser Pistol #1527

Merged
merged 7 commits into from
Jun 30, 2024
Merged

Laser Pistol #1527

merged 7 commits into from
Jun 30, 2024

Commits on Jun 16, 2024

  1. Laser Pistol

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

  2. small sprite update

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

  3. tiniest sprite update

    @ErhardSteinhauer
    ErhardSteinhauer committed Jun 16, 2024
    Configuration menu
    Copy the full SHA
    008bfc8 View commit details
    Browse the repository at this point in the history

  4. animation fix, item size fix

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

  5. Update Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Battery… 

    …/battery_guns.yml

Co-authored-by: Whatstone <[email protected]>
    @ErhardSteinhauer @whatston3
    ErhardSteinhauer and whatston3 authored Jun 16, 2024
    Configuration menu
    Copy the full SHA
    19b0483 View commit details
    Browse the repository at this point in the history

  6. CBURN, shuttle gun, merc

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

  7. Merge branch '2024-06-Laser-Pistol-Resprite' of https://github.com/Er… 

    …hardSteinhauer/frontier-station-14 into 2024-06-Laser-Pistol-Resprite
    @ErhardSteinhauer
    ErhardSteinhauer committed Jun 16, 2024
    Configuration menu
    Copy the full SHA
    c5b1b72 View commit details
    Browse the repository at this point in the history