shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #3452 from Citadel-Station-13/upstream-merge-31761

Browse Source 
[MIRROR] obj_break() will always be called before obj_destruction()
This commit is contained in:
LetterJay
2017-10-17 08:58:20 -04:00
committed by GitHub
parent 8cb9316afa d16a93813e
commit e3922656fc
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/obj_defense.dm
+5 -1
View File
@@ -7,8 +7,12 @@
damage_amount = run_obj_armor(damage_amount, damage_type, damage_flag, attack_dir)
if(damage_amount >= 0.1)
. = damage_amount
obj_integrity = max(obj_integrity - damage_amount, 0)
var/old_integ = obj_integrity
obj_integrity = max(old_integ - damage_amount, 0)
if(obj_integrity <= 0)
var/int_fail = integrity_failure
if(int_fail && old_integ > int_fail)
obj_break(damage_flag)
obj_destruction(damage_flag)
else if(integrity_failure)
if(obj_integrity <= integrity_failure)