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

[IDB IGNORE][MDB IGNORE] Reorganizes Guns Sprites and Repaths #3176

Merged
merged 20 commits into from
Jul 5, 2024

Conversation

rye-rice
Copy link
Member

@rye-rice rye-rice commented Jul 2, 2024

About The Pull Request

This reorganizes most of the gun spritesheets into separate files, making it not fucking agony to look through

This also repaths pistols and revolvers, this is a mystery tool we will need later.

This also take the liberty of removing belt_mirror.dmi because fuck that file, all suit storage slots will pull from either mob overlay icon or back.dmi as a fallback.

Why It's Good For The Game

Would be very helpful for the 5 million gun rewokrs that are done, but not implmented yet. While it is true i'm waiting on gun attachments, this is more pressing than that.

Changelog

🆑
add: Resprites the E-50 and gives it proper inhands now!
fix: The Syndicate sniper rifle fires at a normal rate of fire and has the correct recoil now.
/:cl:

@rye-rice rye-rice requested review from FalloutFalcon and a team as code owners July 2, 2024 06:58
@github-actions github-actions bot added Map Change Tile placing is hard. Thank you for your service. DME Edit Sprites A bikeshed full of soulless bikes. Code change Watch something violently break. labels Jul 2, 2024
@rye-rice rye-rice changed the title Reorganizes Guns Sprites and Repaths [IDB IGNORE][MDB IGNORE] Reorganizes Guns Sprites and Repaths Jul 2, 2024
@Imaginos16 Imaginos16 added Test Merge Candidate You do it for free. Test Merge Required They'll have to do it for free. labels Jul 3, 2024
@github-actions github-actions bot added the Merge Conflict Use Git Hooks, you're welcome. label Jul 3, 2024
Copy link
Contributor

github-actions bot commented Jul 3, 2024

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@github-actions github-actions bot removed the Merge Conflict Use Git Hooks, you're welcome. label Jul 3, 2024
@Imaginos16 Imaginos16 added Test Merged They've done it for free. and removed Test Merge Candidate You do it for free. Test Merge Required They'll have to do it for free. labels Jul 5, 2024
@Imaginos16
Copy link
Member

LGTM

@Imaginos16 Imaginos16 added this pull request to the merge queue Jul 5, 2024
Merged via the queue into shiptest-ss13:master with commit 047acb4 Jul 5, 2024
14 checks passed
MysticalFaceLesS pushed a commit to CeladonSS13/Shiptest that referenced this pull request Jul 5, 2024
…st-ss13#3176)

<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull
request process. -->

## About The Pull Request

This reorganizes most of the gun spritesheets into separate files,
making it not fucking agony to look through

This also repaths pistols and revolvers, this is a mystery tool we will
need later.

This also take the liberty of removing belt_mirror.dmi because fuck that
file, all suit storage slots will pull from either mob overlay icon or
back.dmi as a fallback.

## Why It's Good For The Game

Would be very helpful for the 5 million gun rewokrs that are done, but
not implmented yet. While it is true i'm waiting on gun attachments,
this is more pressing than that.

## Changelog

:cl:
add: Resprites the E-50 and gives it proper inhands now!
fix: The Syndicate sniper rifle fires at a normal rate of fire and has
the correct recoil now.
/:cl:

---------

Co-authored-by: retlaw34 <[email protected]>
FalloutFalcon pushed a commit to FalloutFalcon/ShiptestF that referenced this pull request Aug 30, 2024
…st-ss13#3176)

<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull
request process. -->

## About The Pull Request

This reorganizes most of the gun spritesheets into separate files,
making it not fucking agony to look through

This also repaths pistols and revolvers, this is a mystery tool we will
need later.

This also take the liberty of removing belt_mirror.dmi because fuck that
file, all suit storage slots will pull from either mob overlay icon or
back.dmi as a fallback.

## Why It's Good For The Game

Would be very helpful for the 5 million gun rewokrs that are done, but
not implmented yet. While it is true i'm waiting on gun attachments,
this is more pressing than that.

## Changelog

:cl:
add: Resprites the E-50 and gives it proper inhands now!
fix: The Syndicate sniper rifle fires at a normal rate of fire and has
the correct recoil now.
/:cl:

---------

Co-authored-by: retlaw34 <[email protected]>
FalloutFalcon pushed a commit to FalloutFalcon/ShiptestF that referenced this pull request Aug 30, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Code change Watch something violently break. DME Edit Map Change Tile placing is hard. Thank you for your service. Sprites A bikeshed full of soulless bikes. Test Merged They've done it for free.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants