[MIRROR] Removes duplicate atom break calls on atoms taking damage [M…

…DB IGNORE] (#604) * Removes duplicate atom break calls on atoms taking damage (#79667) --------- Co-authored-by: SkyratBot <[email protected]> Co-authored-by: distributivgesetz <[email protected]>
Fluffy-Frontier · Nov 13, 2023 · 2c00b72 · 2c00b72
1 parent d3478da
commit 2c00b72
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/code/game/atom_defense.dm b/code/game/atom_defense.dm
@@ -19,14 +19,18 @@
 
 	. = damage_amount
 
+	var/previous_atom_integrity = atom_integrity
+
 	update_integrity(atom_integrity - damage_amount)
 
+	var/integrity_failure_amount = integrity_failure * max_integrity
+
 	//BREAKING FIRST
-	if(integrity_failure && atom_integrity <= integrity_failure * max_integrity)
+	if(integrity_failure && previous_atom_integrity > integrity_failure_amount && atom_integrity <= integrity_failure_amount)
 		atom_break(damage_flag)
 
 	//DESTROYING SECOND
-	if(atom_integrity <= 0)
+	if(atom_integrity <= 0 && previous_atom_integrity > 0)
 		atom_destruction(damage_flag)
 
 /// Proc for recovering atom_integrity. Returns the amount repaired by