riding crop

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
+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)
+1
View File
@@ -23,6 +23,7 @@
/obj/item/electropack/shockcollar/security = 5,
/obj/item/storage/belt/slut = 5,
/obj/item/clothing/mask/gas/sechailer/slut = 5,
/obj/item/bdsm_whip/ridingcrop = 3,
/obj/item/dildo/flared/gigantic = 1)
premium = list(/obj/item/coin/antagtoken = 1,
/obj/item/clothing/head/helmet/blueshirt = 1,
Binary file not shown.

Before

Width:  |  Height:  |  Size: 121 KiB

After

Width:  |  Height:  |  Size: 122 KiB