cyberpresidentvanellope/S.P.L.U.R.T-Station-13
1
0
Fork 0
mirror of https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13.git synced 2025-12-12 02:43:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6945 from ElPresidentePoole/master

Browse Source 
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
parent 31f386233c e4c63ac25a
commit 4f36f3d263
3 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
code/game/objects/items/toys.dm
View File

@@ -348,6 +348,11 @@
attack_verb = list("attacked", "slashed", "stabbed", "sliced") attack_verb = list("attacked", "slashed", "stabbed", "sliced")
hitsound = 'sound/weapons/bladeslice.ogg' hitsound = 'sound/weapons/bladeslice.ogg'
/obj/item/toy/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 seppuku!</span>")
playsound(src, 'sound/weapons/bladeslice.ogg', 50, 1)
return(BRUTELOSS)
/* /*
* Snap pops * Snap pops
*/ */

1
code/game/objects/items/weaponry.dm
View File

@@ -228,6 +228,7 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301
/obj/item/katana/suicide_act(mob/user) /obj/item/katana/suicide_act(mob/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 seppuku!</span>") 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 seppuku!</span>")
playsound(src, 'sound/weapons/bladeslice.ogg', 50, 1)
return(BRUTELOSS) return(BRUTELOSS)
/obj/item/wirerod /obj/item/wirerod

5
code/modules/ninja/energy_katana.dm
View File

@@ -32,6 +32,11 @@
dash_toggled = !dash_toggled dash_toggled = !dash_toggled
to_chat(user, "<span class='notice'>You [dash_toggled ? "enable" : "disable"] the dash function on [src].</span>") 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) /obj/item/energy_katana/afterattack(atom/target, mob/user, proximity_flag, click_parameters)
if(dash_toggled) if(dash_toggled)
jaunt.Teleport(user, target) jaunt.Teleport(user, target)