From a42dcebc21ea615d36ada5734851620aa93dc5ce Mon Sep 17 00:00:00 2001
From: SamCroswell <Sam.Croswell@gmail.com>
Date: Thu, 14 Jul 2016 01:14:22 -0400
Subject: [PATCH] Fixes a bug with the flash C4

---
 code/game/objects/items/weapons/explosives.dm | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/code/game/objects/items/weapons/explosives.dm b/code/game/objects/items/weapons/explosives.dm
index c4f1fbf8890..7ff1db28f06 100644
--- a/code/game/objects/items/weapons/explosives.dm
+++ b/code/game/objects/items/weapons/explosives.dm
@@ -194,8 +194,11 @@
 
 /obj/item/weapon/grenade/plastic/c4/flash/prime()
 	var/turf/T
+
 	if(target && target.density)
-		T = get_step(get_turf(src), aim_dir)
+		T = get_step(get_turf(target), aim_dir)
+	else if(target)
+		T = get_turf(target)
 	else
 		T = get_turf(src)