cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-31 09:00:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

Gunshots now show up on autopsies (#7761)

Browse Source 
* bullet_act fix

* changelog

* Update html/changelogs/crosarius-autopsy-fixes.yml

Co-Authored-By: fernerr <35879136+fernerr@users.noreply.github.com>

Co-authored-by: fernerr <35879136+fernerr@users.noreply.github.com>
This commit is contained in:
Crosarius
2019-12-21 11:56:25 +01:00
committed by Werner
co-authored by fernerr
parent 447ebe8a6b
commit ce7f8ac3a6
2 changed files with 43 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/living_defense.dm
+2 -2
View File
@@ -62,7 +62,7 @@
return 0
/mob/living/bullet_act(var/obj/item/projectile/P, var/def_zone)
/mob/living/bullet_act(var/obj/item/projectile/P, var/def_zone, var/used_weapon = null)
//Being hit while using a cloaking device
var/obj/item/cloaking_device/C = locate(/obj/item/cloaking_device) in src
@@ -96,7 +96,7 @@
proj_edge = 0
if(!P.nodamage)
apply_damage(P.damage, P.damage_type, def_zone, absorb, 0, P, sharp=proj_sharp, edge=proj_edge, damage_flags = P.damage_flags)
apply_damage(P.damage, P.damage_type, def_zone, absorb, 0, P, sharp=proj_sharp, edge=proj_edge, damage_flags = P.damage_flags, used_weapon = "\the [P.shot_from] [P.name]")
P.on_hit(src, absorb, def_zone)
return absorb