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

Adds two new lever action rifles. #3243

Merged
merged 20 commits into from
Sep 6, 2024

Conversation

Martinpachu
Copy link
Contributor

@Martinpachu Martinpachu commented Jul 24, 2024

About The Pull Request

Adds the Absolution Lever Action Rifle, chambered in 357, and Conflagration Lever Action Shotgun. Pictured below.
imagen
imagen
imagen

Spriting by RyeRice, Names by Valorium, Descriptions by Apogee, and coding by me!!

Why It's Good For The Game

Upgrades to the .38 lever action rifle that provide a nice variety, with the lever-action shotgun being an inbetween of a double-barrel and pump action shotgun and the 357 being more expensive and with a smaller ammo capacity but with a lot more power.

Changelog

🆑
add: To-do once i get the proper names and all
/:cl:

@github-actions github-actions bot added the Code change Watch something violently break. label Jul 24, 2024
@Martinpachu Martinpachu marked this pull request as draft July 24, 2024 18:03
Copy link
Member

@rye-rice rye-rice left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Made the sprites for this, though they aren't implmented yet

Copy link
Contributor

github-actions bot commented Sep 3, 2024

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

@github-actions github-actions bot added Merge Conflict Use Git Hooks, you're welcome. DME Edit Sprites A bikeshed full of soulless bikes. labels Sep 3, 2024
@github-actions github-actions bot removed Merge Conflict Use Git Hooks, you're welcome. DME Edit labels Sep 3, 2024
@Martinpachu Martinpachu marked this pull request as ready for review September 4, 2024 04:06
@Martinpachu Martinpachu requested a review from a team as a code owner September 4, 2024 04:06
@Martinpachu
Copy link
Contributor Author

This Pull Request is complete. Please review ! It is so late in the night

@rye-rice
Copy link
Member

rye-rice commented Sep 6, 2024

During testing it seems to have gotten mixed reactions, however it had no issues i could see so into the queue it goes

@rye-rice rye-rice added this pull request to the merge queue Sep 6, 2024
Merged via the queue into shiptest-ss13:master with commit 103479c Sep 6, 2024
14 checks passed
MysticalFaceLesS pushed a commit to CeladonSS13/Shiptest that referenced this pull request Sep 7, 2024
<!-- 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
Adds the Absolution Lever Action Rifle, chambered in 357, and
Conflagration Lever Action Shotgun. Pictured below.

![imagen](https://github.com/user-attachments/assets/5294ed7e-5d64-44dd-90b9-10d14a19e58b)

![imagen](https://github.com/user-attachments/assets/dcffaaca-ce82-48eb-b2fa-423204542f22)

![imagen](https://github.com/user-attachments/assets/62b9fdd1-f0f7-4a7b-977a-1da4362690ba)

Spriting by RyeRice, Names by Valorium, Descriptions by Apogee, and
coding by me!!

## Why It's Good For The Game
Upgrades to the .38 lever action rifle that provide a nice variety, with
the lever-action shotgun being an inbetween of a double-barrel and pump
action shotgun and the 357 being more expensive and with a smaller ammo
capacity but with a lot more power.
## Changelog

:cl:
add: To-do once i get the proper names and all
/:cl:

---------

Signed-off-by: Martinpachu <[email protected]>
Co-authored-by: Theos <[email protected]>
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. Sprites A bikeshed full of soulless bikes.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants