Merge pull request #6945 from ElPresidentePoole/master

Allows players to commit seppuku with any katana, adds SFX for seppuku
This commit is contained in:
deathride58
2018-08-17 16:55:28 -04:00
committed by GitHub
3 changed files with 11 additions and 0 deletions

View File

@@ -32,6 +32,11 @@
dash_toggled = !dash_toggled
to_chat(user, "<span class='notice'>You [dash_toggled ? "enable" : "disable"] the dash function on [src].</span>")
/obj/item/energy_katana/suicide_act(mob/living/carbon/user)
user.visible_message("<span class='suicide'>[user] is slitting [user.p_their()] stomach open with [src]! It looks like [user.p_theyre()] trying to commit cyber-seppuku!</span>")
playsound(src, 'sound/weapons/blade1.ogg', 50, 1)
return(BRUTELOSS)
/obj/item/energy_katana/afterattack(atom/target, mob/user, proximity_flag, click_parameters)
if(dash_toggled)
jaunt.Teleport(user, target)