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

updating MP and warden vendors. adding handgun case. #4007

Merged

Conversation

Huffie56
Copy link
Contributor

@Huffie56 Huffie56 commented Jul 26, 2023

About the pull request

So the idea is to update the vendors for MP and warden because they are outdated.
i replace the full belt by a handgun case choice as i found them more pleasing to use.
i added a bunch of option for pouches and belt(including the previous available handgun belt but empty) that seem fitting to me

Explain why it's good for the game

It expand the option MP and Warden when they equip at start of the game.

Testing Photographs and Procedure

Screenshots & Videos

Put screenshots and videos here with an empty line between the screenshots and the <details> tags.

Changelog

🆑
add: Update the MP and Warden vendor to fallow more the standard of the rifleman vendor.
add: change the selection of the handgun from a full belt to a handgun case(3magazin,one railgunlight and the gun.).
/:cl:

@github-actions github-actions bot added the Code Improvement Make the code longer label Jul 26, 2023
@Huffie56 Huffie56 marked this pull request as ready for review July 26, 2023 20:29
@LC4492
Copy link
Contributor

LC4492 commented Jul 26, 2023

...Being basically an engineer, you need to think on how the changes you make can be useful, not only for you, but for the rest of the people who is going to use it. I say that because...you completely replaced the handgun belts because you "thought They were more pleasing to use"? What for the people who used to use them?

@Huffie56
Copy link
Contributor Author

Huffie56 commented Jul 26, 2023

...Being basically an engineer, you need to think on how the changes you make can be useful, not only for you, but for the rest of the people who is going to use it. I say that because...you completely replaced the handgun belts because you "thought They were more pleasing to use"? What for the people who used to use them?

you can still get the belt in the vendor.... it's just empty..
image

@LC4492
Copy link
Contributor

LC4492 commented Jul 26, 2023

I beg your pardon, but I believe you incorrectly used the word "replace", then.

@Huffie56
Copy link
Contributor Author

I beg your pardon, but I believe you incorrectly used the word "replace", then.

i specify after that i added more choice for belt and pouches after.
i remade the phrase to be more specific...
don't need to apologies....

@Huffie56 Huffie56 marked this pull request as draft July 27, 2023 11:26
@Huffie56
Copy link
Contributor Author

ask me if you want CMP to have access to a more rare handgun...

@Huffie56 Huffie56 marked this pull request as ready for review July 27, 2023 12:19
@cm13-github cm13-github added the Merge Conflict PR can't be merged because it touched too much code label Aug 7, 2023
@cm13-github
Copy link
Contributor

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

@cm13-github cm13-github removed the Merge Conflict PR can't be merged because it touched too much code label Aug 7, 2023
@cm13-github
Copy link
Contributor

Conflicts have been resolved. A maintainer will review the pull request shortly.

Huffie56 and others added 2 commits August 7, 2023 16:59
Copy link
Contributor

@Zonespace27 Zonespace27 left a comment

Choose a reason for hiding this comment

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

Overall, i have some issues w/ this allowing MPs to be less recognizable

code/__DEFINES/vendors.dm Outdated Show resolved Hide resolved
code/game/machinery/vending/vendor_types/crew/mp.dm Outdated Show resolved Hide resolved
code/game/machinery/vending/vendor_types/crew/mp.dm Outdated Show resolved Hide resolved
code/game/machinery/vending/vendor_types/crew/mp.dm Outdated Show resolved Hide resolved
code/game/machinery/vending/vendor_types/crew/mp.dm Outdated Show resolved Hide resolved
code/modules/cm_marines/equipment/guncases.dm Outdated Show resolved Hide resolved
@Huffie56
Copy link
Contributor Author

Huffie56 commented Aug 8, 2023

Overall, i have some issues w/ this allowing MPs to be less recognizable

should be fine now...

Copy link
Contributor

@Zonespace27 Zonespace27 left a comment

Choose a reason for hiding this comment

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

nits

code/modules/cm_marines/equipment/guncases.dm Outdated Show resolved Hide resolved
code/modules/cm_marines/equipment/guncases.dm Outdated Show resolved Hide resolved
code/modules/cm_marines/equipment/guncases.dm Outdated Show resolved Hide resolved
Wrong case to Case

Co-authored-by: Zonespace <[email protected]>
@Huffie56
Copy link
Contributor Author

Huffie56 commented Aug 9, 2023

nits

i forgot to recheck this file sorry.

@Zonespace27 Zonespace27 added Feature Feature coder badge and removed Code Improvement Make the code longer labels Aug 9, 2023
@Zonespace27 Zonespace27 added this pull request to the merge queue Aug 9, 2023
Merged via the queue into cmss13-devs:master with commit d6a1cd6 Aug 9, 2023
25 checks passed
cm13-github added a commit that referenced this pull request Aug 9, 2023
@Huffie56
Copy link
Contributor Author

Huffie56 commented Aug 9, 2023

thanks zonespace

@Huffie56 Huffie56 deleted the updating_militarypolice_vendors branch August 11, 2023 07:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Feature Feature coder badge
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants