From 88afb698d18d35884f9ea47dd951e9090f65a39d Mon Sep 17 00:00:00 2001
From: Purpose <SamHPurp@users.noreply.github.com>
Date: Sun, 21 Oct 2018 11:28:59 +0100
Subject: [PATCH] Fixes  flashlight not calling parent proc correctly

---
 code/game/objects/items/devices/flashlight.dm | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/code/game/objects/items/devices/flashlight.dm b/code/game/objects/items/devices/flashlight.dm
index 967354605eb..6c1fa89a4c6 100644
--- a/code/game/objects/items/devices/flashlight.dm
+++ b/code/game/objects/items/devices/flashlight.dm
@@ -358,9 +358,10 @@ obj/item/flashlight/lamp/bananalamp
 		to_chat(user, "<span class='notice'>[src] is already lit.</span>")
 		return
 
- 	. = ..()
-	user.visible_message("<span class='notice'>[user] cracks and shakes [src].</span>", "<span class='notice'>You crack and shake [src], turning it on!</span>")
-	activate()
+	. = ..()
+	if(.)
+		user.visible_message("<span class='notice'>[user] cracks and shakes [src].</span>", "<span class='notice'>You crack and shake [src], turning it on!</span>")
+		activate()
 
 /obj/item/flashlight/glowstick/proc/activate()
 	if(!on)