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

SMG Gun+Mag Holster #3825

Merged
merged 10 commits into from
Aug 9, 2023
Merged

Conversation

Steelpoint
Copy link
Contributor

@Steelpoint Steelpoint commented Jul 6, 2023

About the pull request

Adds a new holster for the SMG. It can hold a M39 SMG plus two M39 magazines, it replaces the old SMG belt.

Explain why it's good for the game

The M39 SMG is intended as an inferior firearm to the mainline M41A. The perceived benefit of a M39 would be its lightness compared to the bulkier M41A, however this is not reflected in-game outside of the M39 not confering a movement speed down when wielded, which is shared with many other bulky guns like the M4RA.

The idea around this new holster is that it would give Marines a better reason to consider taking the M39, as Marines in a more support oriented role can access a unique holster that lets them carry additional magazines in addition to the firearm itself.

Testing Photographs and Procedure

Screenshots & Videos

Screenshot 2023-07-07 19 17 20
Current iteration

Screenshot 2023-07-07 01 58 02
Screenshot 2023-07-07 02 01 46
Old iteration

Screenshot 2023-07-06 17 17 56
Old sprite and internal storage view

OBJ sprites and the inventory capacity as seen in game

Changelog

🆑
add: The SMG belt has been changed. It now holds a SMG plus two extra magazines, plus it can fit in either the belt or armour slot.
/:cl:

@github-actions
Copy link
Contributor

github-actions bot commented Jul 6, 2023

You currently have a negative Fix/Feature pull request delta of -4. Maintainers may close this PR at will. Fixing issues or improving the codebase will improve this score.

@github-actions github-actions bot added Sprites Remove the soul from the game. Feature Feature coder badge labels Jul 6, 2023
Copy link
Contributor

@sleepynecrons sleepynecrons left a comment

Choose a reason for hiding this comment

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

use the m39 holster that we already have as a base. sticking the m39 in a pistol holster just looks extremely silly and is visually inconsistent with the other holsters.
image

@Steelpoint
Copy link
Contributor Author

use the m39 holster that we already have as a base. sticking the m39 in a pistol holster just looks extremely silly and is visually inconsistent with the other holsters. image

I considered that at first, that's even how I initially did it, but the way the code works for the sprites is that the gun is placed behind the sprite not in front of it. So I settled on what is currently being used.

Outside of a code solution to make the gun sprite appear in front of the rig sprite, which I won't be able to do by myself, I did a hacky fix where I edited the rig sprite to remove the parts of the rig that would be in front of the gun sprite. Not a great solution though.

@Steelpoint
Copy link
Contributor Author

Steelpoint commented Jul 6, 2023

For the interim I've implemented an alt solution as described above, here is how the sprite looks in game

Screenshot 2023-07-07 01 58 02
Screenshot 2023-07-07 02 01 46

@sleepynecrons
Copy link
Contributor

For the interim I've implemented an alt solution as described above, here is how the sprite looks in game

Screenshot 2023-07-07 01 58 02 Screenshot 2023-07-07 02 01 46

swap the holster and mag pouches position and it'll be good to go
image
basically like this

@Steelpoint
Copy link
Contributor Author

Swapped the sprite around
Screenshot 2023-07-07 19 17 20

@github-actions
Copy link
Contributor

This PR has been inactive for long enough to be automatically marked as stale. This means it is at risk of being auto closed in ~ 7 days, please address any outstanding review items and ensure your PR is finished, if these are all true and you are auto-staled anyway, you need to actively ask maintainers if your PR will be merged. Once you have done any of the previous actions then you should request a maintainer remove the stale label on your PR, to reset the stale timer. If you feel no maintainer will respond in that time, you may wish to close this PR youself, while you seek maintainer comment, as you will then be able to reopen the PR yourself

@github-actions github-actions bot added the Stale beg a maintainer to review your PR label Jul 15, 2023
code/game/objects/items/storage/belt.dm Outdated Show resolved Hide resolved
code/__DEFINES/vendors.dm Outdated Show resolved Hide resolved
code/__DEFINES/vendors.dm Outdated Show resolved Hide resolved
@morrowwolf morrowwolf marked this pull request as draft July 19, 2023 06:09
@Steelpoint Steelpoint marked this pull request as ready for review July 19, 2023 06:53
@Steelpoint
Copy link
Contributor Author

Requested changes made.

@morrowwolf morrowwolf removed the Stale beg a maintainer to review your PR label Jul 19, 2023
@cm13-github cm13-github added the Merge Conflict PR can't be merged because it touched too much code label Jul 20, 2023
@cm13-github cm13-github removed the Merge Conflict PR can't be merged because it touched too much code label Jul 24, 2023
Copy link
Member

@harryob harryob left a comment

Choose a reason for hiding this comment

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

code

@github-actions
Copy link
Contributor

github-actions bot commented Aug 2, 2023

This PR has been inactive for long enough to be automatically marked as stale. This means it is at risk of being auto closed in ~ 7 days, please address any outstanding review items and ensure your PR is finished, if these are all true and you are auto-staled anyway, you need to actively ask maintainers if your PR will be merged. Once you have done any of the previous actions then you should request a maintainer remove the stale label on your PR, to reset the stale timer. If you feel no maintainer will respond in that time, you may wish to close this PR youself, while you seek maintainer comment, as you will then be able to reopen the PR yourself

@github-actions github-actions bot added the Stale beg a maintainer to review your PR label Aug 2, 2023
@github-actions github-actions bot closed this Aug 9, 2023
@nauticall nauticall reopened this Aug 9, 2023
Copy link
Contributor

@nauticall nauticall left a comment

Choose a reason for hiding this comment

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

sprites 👍

@nauticall nauticall added the Sprites Approved confirmed no stray pixels label Aug 9, 2023
@Steelpoint
Copy link
Contributor Author

gonna make a change

@Steelpoint
Copy link
Contributor Author

Stated to make this replace the current SMG belt, will need to make some changes, shouldn't take too long (famous last words)

@Steelpoint
Copy link
Contributor Author

This SMG belt now replaces all regular instances of the old SMG belt. Old SMG belt is still in the game, though I believe only PMC's use it now.

@Zonespace27 Zonespace27 added this pull request to the merge queue Aug 9, 2023
Merged via the queue into cmss13-devs:master with commit d54ba97 Aug 9, 2023
25 checks passed
cm13-github added a commit that referenced this pull request Aug 9, 2023
@Steelpoint Steelpoint deleted the SMGGunHolster branch July 17, 2024 17:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Feature Feature coder badge Sprites Approved confirmed no stray pixels Sprites Remove the soul from the game. Stale beg a maintainer to review your PR
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants