From cec73fb2af4eb69f5a60f1e26871ec2f587dd3a1 Mon Sep 17 00:00:00 2001
From: Perakp <perhal90@hotmail.com>
Date: Sun, 27 Oct 2013 10:37:29 +0200
Subject: [PATCH] Testing branching again

---
 code/modules/projectiles/gun.dm                 | 6 +++++-
 code/modules/projectiles/guns/energy/special.dm | 5 +++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/code/modules/projectiles/gun.dm b/code/modules/projectiles/gun.dm
index 88e12b1affd..02f1e6d0d2e 100644
--- a/code/modules/projectiles/gun.dm
+++ b/code/modules/projectiles/gun.dm
@@ -34,6 +34,10 @@
 		proj.silenced = silenced
 		return
 
+	proc/shoot_with_empty_chamber(mob/living/user as mob|obj)
+       	user << "<span class='warning'>*click*</span>"
+       	return
+
 
 	emp_act(severity)
 		for(var/obj/O in contents)
@@ -78,7 +82,7 @@
 		if(!special_check(user))
 			return
 		if(!load_into_chamber())
-			user << "<span class='warning'>*click*</span>"
+			shoot_with_empty_chamber(user)
 			return
 
 		if(!in_chamber)
diff --git a/code/modules/projectiles/guns/energy/special.dm b/code/modules/projectiles/guns/energy/special.dm
index 89d5a02f585..7d1d9705e60 100644
--- a/code/modules/projectiles/guns/energy/special.dm
+++ b/code/modules/projectiles/guns/energy/special.dm
@@ -64,6 +64,11 @@ obj/item/weapon/gun/energy/staff
 	update_icon()
 		return
 
+	shoot_with_empty_chamber(mob/living/user as mob|obj)
+       user << "<span class='warning'>The [name] whizzles quietly.<span>"
+       return
+
+
 /obj/item/weapon/gun/energy/staff/animate
 	name = "staff of animation"
 	desc = "An artefact that spits bolts of life-force which causes objects which are hit by it to animate and come to life! This magic doesn't affect machines."