cyberpresidentvanellope/vgstation13
1
0
Fork 0
mirror of https://github.com/vgstation-coders/vgstation13.git synced 2025-12-10 02:16:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #35239 from boy2mantwicethefam/pain-mirror-event-fix

Browse Source 
Removes Summon Server Crash
This commit is contained in:
d3athrow
2023-10-29 04:47:50 -04:00
committed by GitHub
parent 623164de81 71d5e6b1b4
commit 840d9ea43b
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/modules/mob/living/carbon/human/human_damage.dm
View File

@@ -379,7 +379,7 @@ This function restores all organs.
damage = (damage/100)*(100-blocked)
if(!ignore_events && INVOKE_EVENT(src, /event/damaged, "kind" = damagetype, "amount" = damage))
return 0
return 0 //This event code is also in the mob/living parent which this proc mostly overrides.
switch(damagetype)
if(BRUTE)

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

@@ -12,6 +12,8 @@
if(!damage)
return 0
var/damage_done = (damage/100)*(100-blocked)
if(!ignore_events && INVOKE_EVENT(src, /event/damaged, "kind" = damagetype, "amount" = damage))
return 0
switch(damagetype)
if(BRUTE)
adjustBruteLoss(damage_done)