forked from DarkPack13/SecondCity
-
Notifications
You must be signed in to change notification settings - Fork 49
Ballistic Balance Blowout - Guns Galore #161
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
Open
Avalon-Proto
wants to merge
29
commits into
Monkestation:master
Choose a base branch
from
Avalon-Proto:Ballistic-Balance-Blowout
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
29 commits
Select commit
Hold shift + click to select a range
076c167
Draft Time
Avalon-Proto 42df9a8
Update tgstation.dme
Avalon-Proto 23751ea
RAH
Avalon-Proto abfb97b
Delete cg_projectiles.dm
Avalon-Proto 7d1e377
Update tgstation.dme
Avalon-Proto 60540be
Update tgstation.dme
Avalon-Proto 2c6ae17
Merge remote-tracking branch 'upstream/master' into Ballistic-Balance…
Avalon-Proto ebed690
RAH
Avalon-Proto eca5b6e
RAHG
Avalon-Proto fb7d596
Update gun_store.dm
Avalon-Proto 91a1a1d
Update gun_store.dm
Avalon-Proto 5672ccd
Update guns.dm
Avalon-Proto 90038b1
Fixes + Comments addressed
Avalon-Proto f601ab0
Update projectiles.dm
Avalon-Proto 3288e36
Update modular_vcg/modules/weapons/code/projectiles.dm
Avalon-Proto 855be95
Update modular_vcg/modules/weapons/code/guns.dm
Avalon-Proto 0268eac
Comment Cleanup
Avalon-Proto edd6e0d
Merge branch 'Ballistic-Balance-Blowout' of https://github.com/Avalon…
Avalon-Proto b6bc7e2
Update guns.dm
Avalon-Proto 95df4e7
Merge branch 'master' into Ballistic-Balance-Blowout
Avalon-Proto fb16c54
Update projectiles.dm
Avalon-Proto 8a6eef3
Rah
Avalon-Proto 3d11ea3
Merge branch 'master' into Ballistic-Balance-Blowout
Avalon-Proto 9256807
Merge remote-tracking branch 'upstream/master' into Ballistic-Balance…
Avalon-Proto 1971e65
Merge branch 'master' into Ballistic-Balance-Blowout
Avalon-Proto a18add9
Update projectiles.dm
Avalon-Proto be07414
Merge branch 'Ballistic-Balance-Blowout' of https://github.com/Avalon…
Avalon-Proto 4bb3ee8
Merge branch 'master' into Ballistic-Balance-Blowout
Avalon-Proto cf61240
Merge branch 'master' into Ballistic-Balance-Blowout
Avalon-Proto File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,29 +1,154 @@ | ||
| //Sniper | ||
| /obj/projectile/bullet/darkpack/vamp50 | ||
| damage = 50 | ||
| // Handgun/Compact cartridges | ||
|
|
||
| //50 deagle | ||
| /obj/projectile/bullet/darkpack/vamp50ae | ||
| // 9mm | ||
|
|
||
| /obj/projectile/bullet/darkpack/vamp9mm | ||
| damage = 30 | ||
| exposed_wound_bonus = 10 | ||
|
|
||
| //Autosniper PSG | ||
| /obj/projectile/bullet/darkpack/vamp762x51mm | ||
| /obj/projectile/bullet/darkpack/vamp9mm/silver | ||
| exposed_wound_bonus = 10 | ||
|
|
||
| /obj/projectile/bullet/darkpack/vamp9mm/plus | ||
| damage = 34 | ||
| armour_penetration = 15 | ||
|
|
||
| // 4.6mm | ||
|
|
||
| /obj/projectile/bullet/darkpack/vamp46mm | ||
| damage = 25 | ||
| armour_penetration = 35 | ||
| exposed_wound_bonus = -5 | ||
| wound_bonus = 0 | ||
|
|
||
| // .45 Auto | ||
|
|
||
| /obj/projectile/bullet/darkpack/vamp45acp | ||
| damage = 35 | ||
| armour_penetration = 0 | ||
|
|
||
| /obj/projectile/bullet/darkpack/vamp45acp/silver | ||
| armour_penetration = 0 | ||
|
|
||
| /obj/projectile/bullet/darkpack/vamp45acp/HP | ||
| damage = 50 | ||
| armour_penetration = -10 | ||
| exposed_wound_bonus = 5 | ||
| wound_bonus = 10 | ||
|
|
||
| // .44 Magnum | ||
|
|
||
| /obj/projectile/bullet/darkpack/vamp44 | ||
| damage = 45 | ||
| armour_penetration = 25 | ||
| exposed_wound_bonus = 0 | ||
| wound_bonus = 10 | ||
|
|
||
| /obj/projectile/bullet/darkpack/vamp762x51mm/incendiary | ||
| damage = 40 | ||
| /obj/projectile/bullet/darkpack/vamp44/silver | ||
| exposed_wound_bonus = -5 | ||
|
|
||
| // .50 Action Express | ||
|
|
||
| /obj/projectile/bullet/darkpack/vamp50ae | ||
| damage = 60 | ||
| armour_penetration = 10 | ||
| exposed_wound_bonus = 10 | ||
| wound_bonus = 10 | ||
| sharpness = SHARP_EDGED | ||
|
|
||
| // Rifle cartridges | ||
|
|
||
| // 5.56mm | ||
|
|
||
| //AR15, AUG, Hunt Rifle | ||
| /obj/projectile/bullet/darkpack/vamp556mm | ||
| damage = 35 | ||
| damage = 33 | ||
| armour_penetration = 33 | ||
| exposed_wound_bonus = -10 | ||
| wound_bonus = 5 | ||
|
|
||
| /obj/projectile/bullet/darkpack/vamp556mm/incendiary | ||
| damage = 24 | ||
| armour_penetration = 15 | ||
| exposed_wound_bonus = 5 | ||
| wound_bonus = 10 | ||
|
|
||
| /obj/projectile/bullet/darkpack/vamp556mm/silver | ||
| wound_bonus = 10 | ||
|
Avalon-Proto marked this conversation as resolved.
|
||
|
|
||
| // 5.45mm | ||
|
|
||
| //AK | ||
| /obj/projectile/bullet/darkpack/vamp545mm | ||
| damage = 30 | ||
| armour_penetration = 40 | ||
| exposed_wound_bonus = -10 | ||
| wound_bonus = 10 | ||
|
|
||
|
|
||
| // 7.62x51mm | ||
|
|
||
| /obj/projectile/bullet/darkpack/vamp762x51mm | ||
| armour_penetration = 45 | ||
| exposed_wound_bonus = -5 | ||
| wound_bonus = 10 | ||
|
|
||
| /obj/projectile/bullet/darkpack/vamp762x51mm/silver | ||
| exposed_wound_bonus = 0 | ||
| wound_bonus = 5 | ||
|
|
||
| /obj/projectile/bullet/darkpack/vamp762x51mm/incendiary | ||
| armour_penetration = 15 | ||
| exposed_wound_bonus = 5 | ||
| wound_bonus = 10 | ||
|
Avalon-Proto marked this conversation as resolved.
|
||
|
|
||
| // .50 BMG | ||
| /obj/projectile/bullet/darkpack/vamp50 | ||
| damage = 120 | ||
| armour_penetration = 95 | ||
| exposed_wound_bonus = -10 | ||
| wound_bonus = 20 | ||
| sharpness = SHARP_EDGED | ||
|
|
||
| // Shotgun ammunition | ||
|
|
||
| /obj/projectile/bullet/darkpack/dragonsbreath | ||
| damage = 10 | ||
| armour_penetration = 0 | ||
| exposed_wound_bonus = 5 | ||
| wound_bonus = 5 | ||
| var/firestacks = 2 | ||
|
|
||
| /obj/projectile/bullet/darkpack/shotpellet | ||
| damage = 12 | ||
| armour_penetration = -10 | ||
|
|
||
| //shotguns - note that this is slug, not buckshot, single-shot | ||
| /obj/projectile/bullet/shotgun_slug/vamp | ||
| damage = 55 | ||
| damage = 80 | ||
| exposed_wound_bonus = 10 | ||
| sharpness = SHARP_EDGED | ||
|
|
||
| /obj/projectile/bullet/shotgun_slug/vamp/silver | ||
| exposed_wound_bonus = 5 | ||
|
|
||
| // Special projectiles | ||
|
|
||
| /obj/projectile/bullet/darkpack/rubber | ||
| damage = 5 | ||
| exposed_wound_bonus = 0 | ||
| wound_bonus = -5 | ||
| sharpness = NONE | ||
|
|
||
| /obj/projectile/bullet/crossbow_bolt | ||
| damage = 45 | ||
| armour_penetration = 75 | ||
| exposed_wound_bonus = 30 | ||
| wound_bonus = 30 | ||
|
|
||
| /obj/projectile/bullet/darkpack/vamp75 | ||
| damage = 150 | ||
| armour_penetration = 60 | ||
| exposed_wound_bonus = 15 | ||
| wound_bonus = 15 | ||
| sharpness = SHARP_EDGED | ||
|
Avalon-Proto marked this conversation as resolved.
|
||
|
|
||
| /obj/projectile/bullet/darkpack/vamp75/silver | ||
| armour_penetration = 50 | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.