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

Replaces the MK-221 Riot shotgun with the ES-7 V2 #6875

Closed
wants to merge 38 commits into from

Conversation

IroquoisLou
Copy link

About the pull request

Second attempt at #6836, accidentally closed it.

Explain why it's good for the game

The MK221 riot gun is just a blue coloured version of the Mk221 that can only fire 20ga beanbags very slowly, a Mk221 with 12ga beanbags could fulfil it's use and would be much more useful, the Mk221 riot gun also has a UGL meaning that the MP's have no use in using the special grenade launcher meant for them, the ES-7 on the other hand is faster firing and has more ammo but can't have an underbarrel grenade launcher, encouraging MP's to use the Special grenade launcher and giving MP's a more unique riot gun.

Testing Photographs and Procedure

image
image
image
image
image

Changelog

🆑
add: Added the ES-7, a fast firing Non-lethal shotgun and it's sprites
del: Removed the MK221 Riot gun.
imageadd: added ES-7 ammo and gun sprites
imagedel: Replaced MK221 Riot gun sprites and 20ga beanbag ammo sprites with ES-7 ammo and ES-7.
maptweak: Changed the nightmare inserts with MK221 shotguns to having the updated ES-7
/:cl:

@IroquoisLou IroquoisLou changed the title Electro shotgun V2 Replaces the MK-221 Riot shotgun with the ES-7 V2 Aug 4, 2024
@github-actions github-actions bot added Sprites Remove the soul from the game. Feature Feature coder badge Removal snap Mapping did you remember to save in tgm format? labels Aug 4, 2024
@IroquoisLou IroquoisLou marked this pull request as ready for review August 4, 2024 13:16
@github-actions github-actions bot added the Sound Blast 5 minutes of bass boosted music to our players label Aug 4, 2024
Copy link
Member

@realforest2001 realforest2001 left a comment

Choose a reason for hiding this comment

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

Code is fine

Copy link
Contributor

@Blundir Blundir left a comment

Choose a reason for hiding this comment

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

Find some better sprite for the projectile, otherwise looks fine

@Blundir Blundir marked this pull request as draft August 14, 2024 13:08
@IroquoisLou IroquoisLou marked this pull request as ready for review August 14, 2024 18:44
@cm13-github cm13-github added the Merge Conflict PR can't be merged because it touched too much code label Aug 21, 2024
@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 21, 2024
@cm13-github
Copy link
Contributor

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

@cm13-github
Copy link
Contributor

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

@cm13-github cm13-github added the Merge Conflict PR can't be merged because it touched too much code label Aug 23, 2024
@IroquoisLou IroquoisLou marked this pull request as draft August 29, 2024 18:30
@IroquoisLou IroquoisLou closed this by deleting the head repository Sep 26, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Feature Feature coder badge Mapping did you remember to save in tgm format? Merge Conflict PR can't be merged because it touched too much code Removal snap Sound Blast 5 minutes of bass boosted music to our players Sprites Remove the soul from the game.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants