Merge pull request #21 from nicky89107/master

Fixes the telebaton logging to be the correct way around. Slightly modifies muzzle sprite to not look like it is eating faces.
ParadiseSS13 · Dec 1, 2014 · 0adf734 · 0adf734
2 parents 0c2ac9b + 3ba2f64
commit 0adf734
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 1 deletion.
diff --git a/code/game/objects/items/weapons/swords_axes_etc.dm b/code/game/objects/items/weapons/swords_axes_etc.dm
@@ -222,7 +222,7 @@
 			if(cooldown <= 0)
 				playsound(get_turf(src), 'sound/effects/woodhit.ogg', 75, 1, -1)
 				target.Weaken(3)
-				add_logs(user, target, "stunned", object="telescopic baton")
+				add_logs(target, user, "stunned", object="telescopic baton")
 				src.add_fingerprint(user)
 				target.visible_message("<span class ='danger'>[target] has been knocked down with \the [src] by [user]!</span>")
 				if(!iscarbon(user))

diff --git a/icons/mob/mask.dmi b/icons/mob/mask.dmi