Merge branch 'master' of github.com:Baystation12/Baystation12 into bleeding-edge-freeze

2026-08-26 21:48:21 +01:00 · 2013-06-01 20:34:24 +01:00
parent 33856b7086 08339dbda6
commit 73f0b22c42
4 changed files with 34 additions and 50 deletions
@@ -136,6 +136,8 @@ emp_act
 	if(!I || !user)	return 0

 	var/target_zone = get_zone_with_miss_chance(user.zone_sel.selecting, src)
+	if(user == src) // Attacking yourself can't miss
+		target_zone = user.zone_sel.selecting
 	if(!target_zone)
 		visible_message("\red <B>[user] misses [src] with \the [I]!")
 		return