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

Completely removes the SVG from the game and it's variants #2734

Merged
merged 10 commits into from
Feb 23, 2024

Conversation

rye-rice
Copy link
Member

@rye-rice rye-rice commented Feb 16, 2024

About The Pull Request

This PR completely removes the SVG/AKs from the game including cargo, ruins, loadouts, ships, and the code.

...

...

...

image

... And replaces it with the SKM rifle, a original gun made by me and apoggers! Unlike the Literally A Soviet AK47, the SKM is a original rifle with history rooted in the game's lore and has quirks related to it's origin. This also fixes some of my fuckups:

  • .45-70 hollow point boxes now contain 45-70 instead of .357
  • 762x39mm for some fucking reason has a bullet spread override that broke spread wielded and unwielded.
  • 762x39mm has been renamed 762x40mm CLIP
  • the NT-SVG and AK-74 have been merged into the 24v

Also jesus chirst, another 'small' pr turns into a big files changed one and such.

Apogee drew the "Chopper," SKM-44, and SKM 44v

Why It's Good For The Game

As said before, the SKM actually exists and fits in the game's world and fits the thematic roles the AK served. Also, bless Any and Cole who made the old sprites which have somehow held up for years, but they have shown their age

image

Changelog

🆑 ryerice, Apogee-dev
add: All the SVGs have been placed in a Illestren museum, somehow, instead being replaced by the SKM, CLIP's former standard issue rifle!
add: 7.62x39mm has been renamed to 7.62x40mm CLIP
add: LMGs now support bipods; this is a mystery tool that will be useful later!
fix: 7.62x40mm no longer breaks spread on the rifles it's used in
del: NT-SVG and AK-74 have been merged into a single gun
balance: 7.62x40mm now contains eighty rounds per ammo box
fix: 45-70 hollow point ammo boxes now no longer contains 357 for some reason
/:cl:

@rye-rice rye-rice requested review from a team as code owners February 16, 2024 10:50
@github-actions github-actions bot added Map Change Tile placing is hard. Thank you for your service. Sprites A bikeshed full of soulless bikes. Sound USSR Anthem 2.66 MB file. Code change Watch something violently break. labels Feb 16, 2024
Copy link
Contributor

@meemofcourse meemofcourse left a comment

Choose a reason for hiding this comment

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

rifle is fine

code/game/objects/items/storage/belt.dm Outdated Show resolved Hide resolved
@Martinpachu
Copy link
Contributor

awesome sauce

@Latentish
Copy link
Member

Finally some good fucking removal.

@github-actions github-actions bot added the Merge Conflict Use Git Hooks, you're welcome. label Feb 22, 2024
Copy link
Contributor

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 Feb 23, 2024
@rye-rice
Copy link
Member Author

conflicts fixed

@thgvr thgvr added this pull request to the merge queue Feb 23, 2024
Merged via the queue into shiptest-ss13:master with commit 16d3a01 Feb 23, 2024
14 checks passed
MysticalFaceLesS pushed a commit to CeladonSS13/Shiptest that referenced this pull request Feb 26, 2024
…ss13#2734)

<!-- 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. -->

This PR completely removes the SVG/AKs from the game including cargo,
ruins, loadouts, ships, and the code.

...

...

...

![image](https://github.com/shiptest-ss13/Shiptest/assets/58402542/d1c44092-6d64-43d9-b0a0-aed855f057c7)

... And replaces it with the SKM rifle, a original gun made by me and
apoggers! Unlike the Literally A Soviet AK47, the SKM is a original
rifle with history rooted in the game's lore and has quirks related to
it's origin. This also fixes some of my fuckups:
- .45-70 hollow point boxes now contain 45-70 instead of .357
- 762x39mm for some fucking reason has a bullet spread override that
broke spread wielded and unwielded.
- 762x39mm has been renamed 762x40mm CLIP
- the NT-SVG and AK-74 have been merged into the 24v

Also jesus chirst, another 'small' pr turns into a big files changed one
and such.

Apogee drew the "Chopper," SKM-44, and SKM 44v

As said before, the SKM actually exists and fits in the game's world and
fits the thematic roles the AK served. Also, bless Any and Cole who made
the old sprites which have somehow held up for years, but they have
shown their age

![image](https://github.com/shiptest-ss13/Shiptest/assets/58402542/bdcc8097-2e91-4112-8f08-e4e0dfe1b564)

:cl: ryerice, [Apogee-dev](https://github.com/Apogee-dev)
add: All the SVGs have been placed in a Illestren museum, somehow,
instead being replaced by the SKM, CLIP's former standard issue rifle!
add: 7.62x39mm has been renamed to 7.62x40mm CLIP
add: LMGs now support bipods; this is a mystery tool that will be useful
later!
fix: 7.62x40mm no longer breaks spread on the rifles it's used in
del: NT-SVG and AK-74 have been merged into a single gun
balance: 7.62x40mm now contains eighty rounds per ammo box
fix: 45-70 hollow point ammo boxes now no longer contains 357 for some
reason
/:cl:

---------

Signed-off-by: retlaw34 <[email protected]>
Co-authored-by: meem <[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. Map Change Tile placing is hard. Thank you for your service. Sound USSR Anthem 2.66 MB file. Sprites A bikeshed full of soulless bikes.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants