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 the SLP-67 "Volk" #1793

Merged
merged 3 commits into from
Sep 20, 2024
Merged

Conversation

TadJohnson00
Copy link
Contributor

Adds the SLP-67, intended to fulfil the role of a fullsize .35 pistol, with higher capacity and improved ergonomics.

Why / Balance

While the SLP-57 fills the role of a standard issue compact pistol, small and functional, the SLP-67 will be a more balanced option, featuring a 16-round capacity and greater accuracy - at the cost of fitting in neither pockets nor boots. Additionally, the Volk will be restricted to the Armoury, or to Logistics' catalogue.

Technical details

n/a

Media

image

Requirements

  • I have read and I am following the Pull Request Guidelines. I understand that not doing so may get my pr closed at maintainer’s discretion
  • I have added screenshots/videos to this PR showcasing its changes ingame, or this PR does not require an ingame showcase

Breaking changes

n/a
Changelog

n/a

Legally distinct VP :blunt:
@github-actions github-actions bot added Changes: YML Changes any yml files Changes: Sprite Changes any png or json in an rsi labels Sep 11, 2024
Copy link
Contributor

github-actions bot commented Sep 11, 2024

RSI Diff Bot; head commit 53aa065 merging into ecc4e12
This PR makes changes to 1 or more RSIs. Here is a summary of all changes:

Resources/Textures/DeltaV/Objects/Weapons/Guns/Pistols/slp67.rsi

State Old New Status
base Added
bolt-open Added
equipped-BELT Added
equipped-SUITSTORAGE Added
icon Added
inhand-left Added
inhand-right Added
mag-0 Added

Edit: diff updated after 53aa065

ghost
ghost previously approved these changes Sep 18, 2024
Copy link

@ghost ghost left a comment

Choose a reason for hiding this comment

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

Seems to be fine in terms of YAML, but the uh. I envision this is going to catch a merge conflict depending on if I merge the SLP-57 first.

@github-actions github-actions bot added the S: Merge Conflict Fix your PR! label Sep 19, 2024
Copy link
Contributor

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

Signed-off-by: Tad "Taddy" Johnson <[email protected]>
@TadJohnson00 TadJohnson00 requested a review from a team as a code owner September 19, 2024 08:06
@github-actions github-actions bot removed the S: Merge Conflict Fix your PR! label Sep 19, 2024
@TadJohnson00
Copy link
Contributor Author

Turns out you were right, teehee. Ready for review again.

Copy link

@ghost ghost left a comment

Choose a reason for hiding this comment

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

Top ten reasons why I don't do two PRs adjacent to one another at once, number one: this sort of merge conflict.

@TadJohnson00
Copy link
Contributor Author

squashing as approved

@TadJohnson00 TadJohnson00 merged commit c8cc180 into DeltaV-Station:master Sep 20, 2024
14 checks passed
@TadJohnson00 TadJohnson00 deleted the morepistols branch September 28, 2024 10:35
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Changes: Sprite Changes any png or json in an rsi Changes: YML Changes any yml files S: Needs Review
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant