From 1609f761db7fc57cc1e9315885ae5b49fac89164 Mon Sep 17 00:00:00 2001
From: Cyantime <Cyantime@users.noreply.github.com>
Date: Sat, 5 Sep 2020 10:26:18 -0400
Subject: [PATCH] Fix mech weapons breaking on self-deleting mobs (#7615)

---
 code/game/mecha/equipment/weapons/weapons.dm | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/code/game/mecha/equipment/weapons/weapons.dm b/code/game/mecha/equipment/weapons/weapons.dm
index fa7e2005c6b..0482af9937a 100644
--- a/code/game/mecha/equipment/weapons/weapons.dm
+++ b/code/game/mecha/equipment/weapons/weapons.dm
@@ -32,6 +32,13 @@
 	chassis.visible_message("<span class='warning'>[chassis] fires [src]!</span>")
 	occupant_message("<span class='warning'>You fire [src]!</span>")
 	log_message("Fired from [src], targeting [target].")
+	var/target_for_log = "unknown"
+	if(ismob(target))
+		target_for_log = target
+	else if(target)
+		target_for_log = "[target.name]"
+	add_attack_logs(chassis.occupant,target_for_log,"Fired exosuit weapon [src.name] (MANUAL)")
+
 	for(var/i = 1 to min(projectiles, projectiles_per_shot))
 		var/turf/aimloc = targloc
 		if(deviation)
@@ -57,14 +64,6 @@
 		projectiles = projectiles_per_shot
 //	set_ready_state(0)
 
-	var/target_for_log
-	if(ismob(target))
-		target_for_log = target
-	else
-		target_for_log = "[target.name]"
-
-	add_attack_logs(chassis.occupant,target_for_log,"Fired exosuit weapon [src.name] (MANUAL)")
-
 	do_after_cooldown()
 
 	return