Fixes switching firemodes not generating any messages

2025-12-26 10:02:28 +00:00 · 2015-12-06 01:45:15 -05:00
parent 9b118df8a5
commit 24688cd28a
2 changed files with 3 additions and 2 deletions
--- a/code/modules/projectiles/guns/energy.dm
+++ b/code/modules/projectiles/guns/energy.dm
@@ -20,7 +20,8 @@
 	var/charge_tick = 0

 /obj/item/weapon/gun/energy/switch_firemodes()
-	if(..())
+	. = ..()
+	if(.)
 		update_icon()

 /obj/item/weapon/gun/energy/emp_act(severity)
--- a/code/modules/projectiles/guns/projectile.dm
+++ b/code/modules/projectiles/guns/projectile.dm
@@ -176,7 +176,7 @@

 /obj/item/weapon/gun/projectile/attack_self(mob/user as mob)
 	if(firemodes.len > 1)
-		switch_firemodes(user)
+		..()
 	else
 		unload_ammo(user)