cyberpresidentvanellope/GS13
1
0
Fork 0
mirror of https://github.com/KabKebab/GS13.git synced 2026-07-11 16:08:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

riding crop

Browse Source
This commit is contained in:
Unknown
2020-09-05 00:08:25 -05:00
parent 95891e97b0
commit a37b290e13
3 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/weaponry.dm
+6 -1
View File
@@ -678,6 +678,11 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301
w_class = WEIGHT_CLASS_NORMAL
attack_verb = list("flogged", "whipped", "lashed", "disciplined")
/obj/item/bdsm_whip/ridingcrop
name = "riding crop"
desc = "For teaching a lesson in a more compact fashion."
icon_state = "ridingcrop"
/obj/item/bdsm_whip/suicide_act(mob/user)
user.visible_message("<span class='suicide'>[user] is getting just a little too kinky!</span>")
return (OXYLOSS)
@@ -685,4 +690,4 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301
/obj/item/bdsm_whip/attack(mob/M, mob/user)
playsound(loc, 'sound/weapons/whip.ogg', 30)
if(user.a_intent != INTENT_HELP)
return ..(M, user)
return ..(M, user)