diff --git a/code/game/objects/items/weaponry.dm b/code/game/objects/items/weaponry.dm index 1e464612..77f48847 100644 --- a/code/game/objects/items/weaponry.dm +++ b/code/game/objects/items/weaponry.dm @@ -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("[user] is getting just a little too kinky!") 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) \ No newline at end of file + return ..(M, user) diff --git a/code/modules/vending/security.dm b/code/modules/vending/security.dm index 63adf0dc..1ef8ffe7 100644 --- a/code/modules/vending/security.dm +++ b/code/modules/vending/security.dm @@ -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, diff --git a/icons/obj/items_and_weapons.dmi b/icons/obj/items_and_weapons.dmi index ddb9ed63..5caa3e04 100644 Binary files a/icons/obj/items_and_weapons.dmi and b/icons/obj/items_and_weapons.dmi differ