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 variants of 10mm ammunition. #5569

Closed
wants to merge 1 commit into from
Closed

Adds variants of 10mm ammunition. #5569

wants to merge 1 commit into from

Conversation

theColdflame
Copy link
Contributor

@theColdflame theColdflame commented Aug 29, 2016

Adds three new types of 10mm ammunition and the relevant magazines. Currently unavailable outside of being spawned by admins.

Incendiary-Ignites the target. The fire can be easily rolled off, so this mostly functions as a diversion tactic in fights rather than significantly increasing the stetchkin's damage output.
AP- Ignores a portion of the target's armor, but does slightly reduced base damage. Gives an edge against security whilst marginally reducing effectiveness against squishy targets. (This one's probably on the weak side right now).
Silencer- Extremely briefly silences the target, allowing for repeated shots to keep them from speaking. Allows for stetchkin users to eliminate a target without fear of them calling out for help provided they can maintain their fire.

🆑 Coldflame
rscadd: Adds three new variants of 10mm ammunition, AP, Silencer, and Incendiary. Currently admin-only.
/:cl:

@monster860
Copy link
Contributor

monster860 commented Aug 29, 2016

Congratulations on your first pull request

Anyways, you need to add changelog text to the body of your PR. Basically, add this to the description on your PR:

:cl: Coldflame
rscadd: Adds new variants of 10mm ammunition.
/:cl:

For more information, see here.

ammo_type = /obj/item/ammo_casing/c10mm/fire
caliber = "10mm"
max_ammo = 8
multiple_sprites = 2
Copy link
Member

Choose a reason for hiding this comment

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

Don't copy-paste stuff.

@theColdflame
Copy link
Contributor Author

@Fox-McCloud Sorry about being sloppy code-wise, I'm new at this.

As far as the balance goes, spamming the shots to maintain the silence is the intended usage of silencer rounds. I'm not sure how it'd play out in live, but the idea is that you use them to stop your target yelling ';HELP MAINT' as you shoot them repeatedly with a silenced pistol. If this ever does make its way to the uplink, it'd cost several TC.

/obj/item/ammo_box/magazine/m10mm/fire
name = "pistol magazine (10mm incendiary)"
desc = "A gun magazine. Loaded with rounds which ignite the target."
ammo_type = /obj/item/ammo_casing/c10mm/fire
Copy link
Member

Choose a reason for hiding this comment

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

All these types are not defined. Not sure why you removed them; some of their code needed to be removed, but not their underlying types.

@FreeStylaLT
Copy link
Contributor

code/modules/projectiles/ammunition/magazines.dm:186:error: /obj/item/ammo_casing/c10mm/fire: undefined type path

code/modules/projectiles/ammunition/magazines.dm:191:error: /obj/item/ammo_casing/c10mm/silencer: undefined type path

code/modules/projectiles/ammunition/magazines.dm:197:error: /obj/item/ammo_casing/c10mm/ap: undefined type path

@TheDZD TheDZD added the Feature This PR is a new addition to the game label Aug 29, 2016
@monster860
Copy link
Contributor

@theColdflame

For the title of the branch you are currently using for your PR, look under the title of the PR:

                                                                                       VVVVVVV
    theColdflame  wants to merge 12 commits into ParadiseSS13:master from theColdflame:newammo
                                                                                       ^^^^^^^

Here's the proper way to add commits to your PR:

git checkout <name of branch used in PR>
git add -A
git commit -m "Commit message goes here"

@monster860
Copy link
Contributor

monster860 commented Aug 31, 2016

Anyways, this looks good codewise, however, I highly recommend you squash your commits

git checkout <name of branch>
git reset --soft HEAD~12
git add -A
git commit -m "Commit message goes here"
git push -f origin <name of branch>

The 12 in this case is the total number of commits in your PR.

@Fox-McCloud
Copy link
Member

Going to have to squash this, for sure--wayyyy too many commits for such a simple PR.

I still contend that a silence on a high damage weapon is generally a bad thing---even more so when it's ranged, to boot.

@Necaladun
Copy link
Contributor

I think AP rounds and fire rounds would be a more solid start and simple.

Silencer rounds are....potentially very powerful.

MAYBE HP rounds if you can actually increase armour effectiveness, not sure how that works.

I'd like 10mm to get more love though.

@theColdflame
Copy link
Contributor Author

Alright, closing this for now and making a new version with some alterations.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Feature This PR is a new addition to the game
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants