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

Requested balance changes #5898

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 17 additions & 17 deletions code/modules/projectiles/projectile/bullettypes.dm
Original file line number Diff line number Diff line change
Expand Up @@ -343,9 +343,9 @@

/obj/item/projectile/bullet/light_rifle_257
icon_state = "bullet_carbine"
damage_types = list(BRUTE = 21)
damage_types = list(BRUTE = 25)
armor_divisor = 1
wounding_mult = WOUNDING_SMALL
wounding_mult = WOUNDING_NORMAL
penetrating = 1
can_ricochet = TRUE
step_delay = 0.3
Expand All @@ -363,7 +363,7 @@
recoil = 4

/obj/item/projectile/bullet/light_rifle_257/hv
damage_types = list(BRUTE = 17)
damage_types = list(BRUTE = 19)
armor_divisor = 2.5
penetrating = 2
hitscan = TRUE
Expand Down Expand Up @@ -409,7 +409,7 @@

/obj/item/projectile/bullet/light_rifle_257/lethal
name = "hollow-point bullet"
damage_types = list(BRUTE = 17)
damage_types = list(BRUTE = 19)
armor_divisor = 0.5
wounding_mult = WOUNDING_SERIOUS
Trilbyspaceclone marked this conversation as resolved.
Show resolved Hide resolved
penetrating = 0
Expand All @@ -433,7 +433,7 @@
recoil = 7

/obj/item/projectile/bullet/light_rifle_257/scrap
damage_types = list(BRUTE = 14)
damage_types = list(BRUTE = 15)
armor_divisor = 0.5
affective_damage_range = 4
affective_ap_range = 4
Expand All @@ -445,7 +445,7 @@
/// 7.62x39mm Rifle ///

/obj/item/projectile/bullet/rifle_75
damage_types = list(BRUTE = 25)
damage_types = list(BRUTE = 27)
armor_divisor = 1.25
wounding_mult = WOUNDING_SERIOUS
penetrating = 1
Expand All @@ -456,7 +456,7 @@
recoil = 10

/obj/item/projectile/bullet/rifle_75/hv
damage_types = list(BRUTE = 19)
damage_types = list(BRUTE = 21)
armor_divisor = 3
penetrating = 2
hitscan = TRUE
Expand Down Expand Up @@ -510,7 +510,7 @@

/obj/item/projectile/bullet/rifle_75/lethal
name = "hollow-point bullet"
damage_types = list(BRUTE = 19)
damage_types = list(BRUTE = 21)
armor_divisor = 0.65
wounding_mult = WOUNDING_WIDE
Trilbyspaceclone marked this conversation as resolved.
Show resolved Hide resolved
penetrating = 0
Expand All @@ -532,7 +532,7 @@
recoil = 9

/obj/item/projectile/bullet/rifle_75/scrap
damage_types = list(BRUTE = 14)
damage_types = list(BRUTE = 17)
armor_divisor = 0.5
affective_damage_range = 3
affective_ap_range = 3
Expand All @@ -542,9 +542,9 @@

/obj/item/projectile/bullet/heavy_rifle_408
icon_state = "bullet_heavy"
damage_types = list(BRUTE = 28)
damage_types = list(BRUTE = 30)
armor_divisor = 1.4
wounding_mult = WOUNDING_SERIOUS
wounding_mult = WOUNDING_WIDE
penetrating = 2
can_ricochet = TRUE
step_delay = 0.3
Expand Down Expand Up @@ -579,7 +579,7 @@

/obj/item/projectile/bullet/heavy_rifle_408/hv
name = "sabot penetrator"
damage_types = list(BRUTE = 20)
damage_types = list(BRUTE = 24)
armor_divisor = 3.5
penetrating = 3
hitscan = TRUE
Expand All @@ -591,9 +591,9 @@

/obj/item/projectile/bullet/heavy_rifle_408/lethal
name = "hollow-point bullet"
damage_types = list(BRUTE = 20)
damage_types = list(BRUTE = 24)
armor_divisor = 0.7
wounding_mult = WOUNDING_WIDE
wounding_mult = WOUNDING_DEVESTATING
penetrating = 0
can_ricochet = FALSE
embed = TRUE
Expand All @@ -614,7 +614,7 @@
recoil = 15

/obj/item/projectile/bullet/heavy_rifle_408/scrap
damage_types = list(BRUTE = 15)
damage_types = list(BRUTE = 20)
armor_divisor = 0.75
affective_damage_range = 4
affective_ap_range = 4
Expand All @@ -623,7 +623,7 @@
///Snowflake ///

/obj/item/projectile/bullet/c10x24
damage_types = list(BRUTE = 20)
damage_types = list(BRUTE = 25)
armor_divisor = 2
wounding_mult = WOUNDING_SMALL
penetrating = 2
Expand Down Expand Up @@ -1436,4 +1436,4 @@
/obj/item/projectile/bullet/reusable/arrow/explosive/smoke/Destroy()
..()
if (smoke)
QDEL_NULL(smoke)
QDEL_NULL(smoke)
Loading