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

M47A2 Offensive Handgun #6734

Closed
wants to merge 15 commits into from
Closed

Conversation

zc-byte-boxer
Copy link
Contributor

@zc-byte-boxer zc-byte-boxer commented Jul 17, 2024

About the pull request

Adds the M47A2 offensive sidearm, a limited service 1911 variant used by limited USMC units, including FORECON. It finally adds a new, less ostentatious CO sidearm, and adds a unique sidearm for those on the backline.

Explain why it's good for the game

Well, I concepted this pistol mainly as a new weapon for the commanding officer role that'd be more... less than the Mateba or Deagle. I'm very proud of the sprites I've got going with this, and since the lore fits, and it's a bit less powerful than the Mateba or Deagle, I'd like to include this as a non wl-exclusive item so more people may use it.

The intended design is to have a long-lasting sidearm that is sufficent for covering you in an emergency. It has damage inbetween the M44 and mod88, a slow RPM (help conserve that big magazine), low recoil, medium scatter, 14 rounds, and limited availability

Testing Photographs and Procedure

Screenshots & Videos
Untitled.video.9.1.mp4

Changelog

🆑 Byte-Boxer
add: Added the M47A2 Offensive Handgun. It's a mix of the 1911 and Hush Puppy pistol for usage by specialized marine units within the USCM. It spawns as the default pistol for IOs, is available to the CO, has a 20% FORECON spawn, and spawns in limited numbers (the same as the MOU) in req.
add: Added the M47A2 HP, AP, Impact, and regular magazines. Due to combat messages these use their own bullet, too. Although, the base shares its bullets with the 1911.
code: Added a new reload volume setting for coders with their guns. I added it so I could make the 1911 reload real load, s people hear its awesomeness.
code: Changed some backend code for IOs to be simpler.
soundadd: New sounds for the M47A2.
add: Fixes an error in logic wherein CO pistols were unacidable, but still could be blown up. Seeing as CO pistols are now the only way to BE, it seemed pertinent to fix this.
add: Added a falloff stat to heavy pistol rounds. Previously it had none.
/:cl:

@github-actions github-actions bot added Sprites Remove the soul from the game. Sound Blast 5 minutes of bass boosted music to our players Feature Feature coder badge Code Improvement Make the code longer labels Jul 17, 2024
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.

otherwise seems fine

code/modules/projectiles/gun.dm Outdated Show resolved Hide resolved
@Blundir
Copy link
Contributor

Blundir commented Jul 17, 2024

and since the lore fits

Where? Made up pistol overall.
Honestly speaking we have a huge dozen of lore friendly handguns out there, and adding fourth colt pistol to the game is a bit silly, considering how many unique designs are just lying around.

Byte-Boxer and others added 3 commits July 17, 2024 13:46
@zc-byte-boxer
Copy link
Contributor Author

Assuming the workflows pass, could we get a TM for this so I can get the balance worked out for this? Sorry about being pushy.

@harryob @Drulikar

@zc-byte-boxer
Copy link
Contributor Author

That should resolve the signal error.

@@ -151,6 +151,56 @@
/obj/item/weapon/gun/pistol/m1911/socom/equipped
starting_attachment_types = list(/obj/item/attachable/suppressor, /obj/item/attachable/lasersight, /obj/item/attachable/reflex)

// A version of the M1911 for COs and FORECON.
Copy link
Contributor

Choose a reason for hiding this comment

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

Forecom quite literally already spawns with a m1911

code/modules/projectiles/guns/revolvers.dm Show resolved Hide resolved
@@ -236,6 +286,8 @@
icon = 'icons/obj/items/weapons/guns/guns_by_faction/colony.dmi'
icon_state = "c_deagle"
item_state = "c_deagle"
unacidable = TRUE
Copy link
Contributor

Choose a reason for hiding this comment

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

undocumented change

Copy link
Contributor Author

Choose a reason for hiding this comment

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

added. thanks for da reminder


/obj/item/weapon/gun/pistol/m47/co
name = "\improper custom M47A2 offensive handgun"
desc_lore = "The feeding ramp is polished to a mirror sheen, with a reinforced slide, and tightened locking mechanisms in the frame for added precision. The thumb safety is extended to make it easier on the finger, with a long-type trigger with non-slip grooves. A ring hammer. The base of the trigger guards's been filed down for a higher grip, too. And not only that, but nearly every other part of this gun has been expertly crafted and customized by USMC armourers."
Copy link
Contributor

Choose a reason for hiding this comment

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

USCM not USMC

Copy link
Contributor Author

@zc-byte-boxer zc-byte-boxer Jul 23, 2024

Choose a reason for hiding this comment

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

edited!

/datum/ammo/bullet/pistol/heavy
name = "heavy pistol bullet"
headshot_state = HEADSHOT_OVERLAY_MEDIUM
accuracy = -HIT_ACCURACY_TIER_3
accuracy_var_low = PROJECTILE_VARIANCE_TIER_6
damage = 55
damage_falloff = DAMAGE_FALLOFF_TIER_5
Copy link
Contributor

Choose a reason for hiding this comment

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

undocumented ?

@Diegoflores31
Copy link
Contributor

Diegoflores31 commented Jul 22, 2024

I personally dont think this weapon fits . and it is probably bloat
rather VP78 could use some refreshment

@IroquoisLou
Copy link

I feel this is too similar to the M48A4.

Copy link
Contributor

github-actions bot commented Aug 1, 2024

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 1, 2024
@cm13-github cm13-github added the Merge Conflict PR can't be merged because it touched too much code label Aug 3, 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 3, 2024
@cm13-github
Copy link
Contributor

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

@Blundir Blundir removed the Stale beg a maintainer to review your PR label Aug 7, 2024
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.

needs some shading, details work, attachment position tweaked, make a new sprite for magazine or at least tweak current one, elaborated in dm

@Blundir Blundir marked this pull request as draft August 7, 2024 03:14
@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.

@Blundir
Copy link
Contributor

Blundir commented Oct 26, 2024

let me know when you'd return to it

@Blundir Blundir closed this Oct 26, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Code Improvement Make the code longer Feature Feature coder badge Merge Conflict PR can't be merged because it touched too much code 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.

6 participants