Skip to content

Firearm Crit Buff #5360

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.

Sign up for GitHub

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
Rockslp wants to merge 5 commits into
base: main
Choose a base branch
from
+12 −1
Open

Firearm Crit Buff #5360

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1f90f78
The crittening...
Rockslp Feb 22, 2026
670e38d
Merge branch 'main' into Puffer
Rockslp Feb 22, 2026
6ce5c2e
Merge branch 'main' into Puffer
Rockslp Feb 23, 2026
9015fc3
Merge branch 'main' into Puffer
Rockslp Feb 24, 2026
a9700b6
Merge branch 'main' into Puffer
Rockslp Feb 25, 2026
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
13 changes: 12 additions & 1 deletion code/game/objects/items/weapons/ranged/ammo.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -511,7 +511,6 @@
armor_penetration = BULLET_PENETRATION
speed = 0.3
accuracy = 50 //Lower accuracy than an arrow.
reduce_crit_chance = 5 //Reduces crit chance
dismemberment = 0 //Can't dismember

/obj/projectile/bullet/reusable/bullet/on_hit(atom/target)
Expand All @@ -520,6 +519,18 @@
var/mob/living/carbon/target_mob = target
target_mob.safe_throw_at(throw_target, 1, 4)
target_mob.Knockdown(SHOVE_KNOCKDOWN_SOLID)

if(get_dist(get_turf(firer), get_turf(target)) <= 3)
var/mob/living/carbon/C = target
var/obj/item/bodypart/BP = C.get_bodypart(def_zone)
if(BP)
var/fracture_type = /datum/wound/fracture
switch(BP.body_zone)
if(BODY_ZONE_HEAD)
fracture_type = /datum/wound/fracture/head
if(BODY_ZONE_CHEST)
fracture_type = /datum/wound/fracture/chest
BP.add_wound(fracture_type)
..()

/obj/projectile/bullet/fragment
Expand Down
Loading