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鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Adds the AK-814 rifle #20820

Merged
merged 4 commits into from Apr 22, 2023
Merged

Adds the AK-814 rifle #20820

merged 4 commits into from Apr 22, 2023

Conversation

Henri215
Copy link
Member

@Henri215 Henri215 commented Apr 5, 2023

What Does This PR Do

From the #16250 with his permission.

Added the USSP themed AK-814 rifle, available at liberation station vendor.

  • Uses new 5.45mm ammo
  • Semi and two round burst mode.
  • Has a bayonet lug
  • Overall, slightly weaker than the ARG (5 less damage, 1 less burst)

Why It's Good For The Game

Its bring to life a gun that is mentioned in the lore and that could be used by admins as an weaker alternative to the ARG.

Images of changes

AK.mp4

Testing

  • See video above

Changelog

馃啈
add: U.S.S.P themed AK-814 rifle has been added
/:cl:

@ParadiseSS13-Bot ParadiseSS13-Bot added -Status: Awaiting type assignment This PR is waiting for its type to be assigned internally Sprites This PR modifies the game sprites labels Apr 5, 2023
@hal9000PR hal9000PR added the Feature This PR is a new addition to the game label Apr 7, 2023
@ParadiseSS13-Bot ParadiseSS13-Bot added -Status: Awaiting approval This PR is waiting for approval internally -Status: Awaiting review This PR is awaiting review from the review team and removed -Status: Awaiting type assignment This PR is waiting for its type to be assigned internally -Status: Awaiting approval This PR is waiting for approval internally labels Apr 7, 2023
@ParadiseSS13-Bot ParadiseSS13-Bot added -Status: Awaiting merge This PR is ready for merge and removed -Status: Awaiting review This PR is awaiting review from the review team labels Apr 9, 2023
@github-actions github-actions bot added the Merge Conflict This PR is merge conflicted label Apr 15, 2023
@github-actions github-actions bot removed the Merge Conflict This PR is merge conflicted label Apr 16, 2023
@farie82 farie82 merged commit 3357693 into ParadiseSS13:master Apr 22, 2023
14 checks passed
unknownuser782 pushed a commit to unknownuser782/Paradise that referenced this pull request Jun 4, 2023
@Henri215 @unknownuser782
Adds the AK-814 rifle (ParadiseSS13#20820)
96a4a2c 
* Adds the AK-814 rifle

* lets kill another conflict

* Die conflict!
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@S34NW S34NW S34NW approved these changes

@farie82 farie82 farie82 approved these changes

@Sirryan2002 Sirryan2002 Sirryan2002 approved these changes

Assignees
No one assigned
Labels
-Status: Awaiting merge This PR is ready for merge Feature This PR is a new addition to the game Sprites This PR modifies the game sprites
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
6 participants
@Henri215 @S34NW @farie82 @Sirryan2002 @ParadiseSS13-Bot @hal9000PR