Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fixes the telebaton logging to be the correct way around. Slightly modifies muzzle sprite to not look like it is eating faces. #21

Merged
merged 2 commits into from Dec 1, 2014
Merged

Fixes the telebaton logging to be the correct way around. Slightly modifies muzzle sprite to not look like it is eating faces. #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
770c2ca
Fixes the telebaton logging to be the correct way around.
nicky89107 Dec 1, 2014
3ba2f64
Slight modification to make the muzzle less face-eating.
nicky89107 Dec 1, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion code/game/objects/items/weapons/swords_axes_etc.dm
View file
Open in desktop
Expand Up @@ -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))
Expand Down
Binary file modified icons/mob/mask.dmi
View file
Open in desktop
Binary file not shown.