cyberpresidentvanellope/Yogstation
1
0
Fork 0
mirror of https://github.com/yogstation13/Yogstation.git synced 2025-02-26 09:04:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

.357 Alternative Ammo Update (#15519)

Browse Source 
* i will make bullets unique

* spontaneous re-spriting

* updates some comments

* two new ammo types

* Update code/modules/projectiles/projectile/bullets/revolver.dm

Co-authored-by: tattax <71668564+tattax@users.noreply.github.com>

* Update revolver.dm

* Update uplink_items.dm

* Update ammo_boxes.dm

Co-authored-by: tattax <71668564+tattax@users.noreply.github.com>
This commit is contained in:
Skrem_7
2022-09-04 08:07:34 -05:00
committed by GitHub
parent 9fd4a612fb
commit a93c7a3993
6 changed files with 172 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/modules/mob/living/living_defense.dm
View File

@@ -52,7 +52,7 @@
apply_damage(P.damage, P.damage_type, def_zone, armor, wound_bonus = P.wound_bonus, bare_wound_bonus = P.bare_wound_bonus, sharpness = P.get_sharpness())
if(P.dismemberment)
check_projectile_dismemberment(P, def_zone)
if(istype(P, /obj/item/projectile/bullet/shotgun_uraniumslug))
if(istype(P, /obj/item/projectile/bullet/shotgun_uraniumslug) || istype(P, /obj/item/projectile/bullet/a357/heartpiercer)) //snowflake code
return P.on_hit(src, armor)
return P.on_hit(src, armor)? BULLET_ACT_HIT : BULLET_ACT_BLOCK