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 a CL-exclusive pistol, the ES-4. #3583

Merged
merged 5 commits into from
Jul 19, 2023
Merged

Adds a CL-exclusive pistol, the ES-4. #3583

merged 5 commits into from
Jul 19, 2023

Conversation

NewyearnewmeUwu
Copy link
Contributor

@NewyearnewmeUwu NewyearnewmeUwu commented Jun 9, 2023

About the pull request

This PR adds a CL- and therefore WY - exclusive pistol. The ES-4 is a Weyland Corp manufactures less-lethal pistol that's essentially a reskin of the 88 mod 4 that only fires less-lethal projectiles. Sprites by the fantastic @thwompa

Explain why it's good for the game

The pistol uses distinct blue muzzle flashes for its firing so that it's easier to distinguish it from normal guns, and it comes straight from the Aliens RPG. It also looks cool and makes it harder for the CL to get a lethal firearm straight off the bat.

Testing Photographs and Procedure

Screenshots & Videos

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

Changelog

🆑
add: Added the ES-4 electrostatic pistol to the CL's safe.
/:cl:

@github-actions github-actions bot added Sprites Remove the soul from the game. Mapping did you remember to save in tgm format? Sound Blast 5 minutes of bass boosted music to our players Feature Feature coder badge labels Jun 9, 2023
@thwompa
Copy link
Contributor

thwompa commented Jun 9, 2023

lets gooo!!!!

@NewyearnewmeUwu NewyearnewmeUwu marked this pull request as ready for review June 10, 2023 00:03
@MusselMain
Copy link

MusselMain commented Jun 12, 2023

seems like a weapon that will fit ML better, allowing CL to be armed shipside, but making sense lore wise. As it wouldn't make sense for civilians aboard a military vessel to be armed unless deploying or on code blue/red, but since CL is a fairly important individual in the ship's crew, having something to stop a rogue marine who despises WY from harming them, without risk of causing big legal issues between WY and USCM.

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 looks fine

@harryob harryob added the Mapping Approved adds 500 new dict keys label Jun 12, 2023
@harryob harryob requested a review from a team June 12, 2023 08:16
@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 Jun 20, 2023
@github-actions github-actions bot closed this Jun 27, 2023
@morrowwolf morrowwolf reopened this Jul 17, 2023
@morrowwolf morrowwolf removed the Stale beg a maintainer to review your PR label Jul 17, 2023
Copy link
Contributor

@FransFeiffer FransFeiffer left a comment

Choose a reason for hiding this comment

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

Sprites are fine, LGTM

@FransFeiffer FransFeiffer added the Sprites Approved confirmed no stray pixels label Jul 17, 2023
@morrowwolf morrowwolf added this pull request to the merge queue Jul 17, 2023
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks Jul 17, 2023
@morrowwolf morrowwolf added this pull request to the merge queue Jul 17, 2023
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks Jul 17, 2023
@Drulikar Drulikar enabled auto-merge July 18, 2023 22:39
@Drulikar Drulikar added this pull request to the merge queue Jul 18, 2023
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks Jul 18, 2023
@Drulikar Drulikar marked this pull request as draft July 18, 2023 23:27
@Drulikar Drulikar marked this pull request as ready for review July 18, 2023 23:51
@Drulikar Drulikar enabled auto-merge July 18, 2023 23:51
@Drulikar Drulikar added this pull request to the merge queue Jul 18, 2023
Merged via the queue into cmss13-devs:master with commit a86a9e2 Jul 19, 2023
github-actions bot added a commit that referenced this pull request Jul 19, 2023
cm13-github added a commit that referenced this pull request Jul 19, 2023
@cm13live
Copy link

This pull request has been mentioned on CM-SS13. Please provide feedback here:

https://forum.cm-ss13.com/t/weapon-restrictions-in-sop/2387/16

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Feature Feature coder badge Mapping Approved adds 500 new dict keys Mapping did you remember to save in tgm format? Sound Blast 5 minutes of bass boosted music to our players Sprites Approved confirmed no stray pixels Sprites Remove the soul from the game.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants