cyberpresidentvanellope/S.P.L.U.R.T-Station-13
1
0
Fork 0
mirror of https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13.git synced 2025-12-10 09:54:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #13108 from Hatterhat/357-dumdum

Browse Source 
.357 DumDum Rounds (they're adminspawn only don't worry)
This commit is contained in:
silicons
2020-08-17 08:58:00 -07:00
committed by GitHub
parent c1a2d907f1 eeefc1cbaa
commit d35cba095f
3 changed files with 23 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
code/modules/projectiles/ammunition/ballistic/revolver.dm
View File

@@ -14,9 +14,13 @@
/obj/item/ammo_casing/a357/match
name = ".357 match bullet casing"
desc = "A .357 bullet casing, manufactured to exceedingly high standards."
caliber = "357"
projectile_type = /obj/item/projectile/bullet/a357/match
/obj/item/ammo_casing/a357/dumdum
name = ".357 DumDum bullet casing"
desc = "A .357 bullet casing. Usage of this ammunition will constitute a war crime in your area."
projectile_type = /obj/item/projectile/bullet/a357/dumdum
// 7.62x38mmR (Nagant Revolver)
/obj/item/ammo_casing/n762
@@ -68,4 +72,4 @@
/obj/item/ammo_casing/c38/dumdum
name = ".38 DumDum bullet casing"
desc = "A .38 DumDum bullet casing."
projectile_type = /obj/item/projectile/bullet/c38/dumdum
projectile_type = /obj/item/projectile/bullet/c38/dumdum

5
code/modules/projectiles/boxes_magazines/ammo_boxes.dm
View File

@@ -16,6 +16,11 @@
name = "speed loader (.357 AP)"
ammo_type = /obj/item/ammo_casing/a357/ap
/obj/item/ammo_box/a357/dumdum
name = "speed loader (.357 DumDum)"
desc = "Designed to quickly reload revolvers. Usage of these rounds will constitute a war crime in your area."
ammo_type = /obj/item/ammo_casing/a357/dumdum
/obj/item/ammo_box/c38
name = "speed loader (.38 rubber)"
desc = "Designed to quickly reload revolvers."

13
code/modules/projectiles/projectile/bullets/revolver.dm
View File

@@ -126,4 +126,15 @@
ricochet_auto_aim_angle = 50
ricochet_auto_aim_range = 6
ricochet_incidence_leeway = 80
ricochet_decay_chance = 1
ricochet_decay_chance = 1
/obj/item/projectile/bullet/a357/dumdum
name = ".357 DumDum bullet" // the warcrime bullet
damage = 40
armour_penetration = -20
wound_bonus = 45
bare_wound_bonus = 45
sharpness = SHARP_EDGED
embedding = list(embed_chance=90, fall_chance=2, jostle_chance=5, ignore_throwspeed_threshold=TRUE, pain_stam_pct=0.4, pain_mult=5, jostle_pain_mult=6, rip_time=10)
wound_falloff_tile = -1
embed_falloff_tile = -5