blue yeen's request

pink sec winter coat, BDSM whip + riding crop now inflict arousal damage on all intents + have special interaction if you target the groin (ass), slutbelt now can carry flashbangs/grenades + classic batons
This commit is contained in:
Unknown
2020-09-05 17:13:33 -05:00
parent 9c746b9e52
commit 4e272b9cf4
13 changed files with 50 additions and 20 deletions
+2
View File
@@ -243,6 +243,8 @@ obj/item/storage/belt/slut/ComponentInitialize()
STR.max_w_class = WEIGHT_CLASS_NORMAL
STR.can_hold = typecacheof(list(
/obj/item/melee/baton,
/obj/item/melee/classic_baton,
/obj/item/grenade,
/obj/item/reagent_containers/spray/pepper,
/obj/item/restraints/handcuffs,
/obj/item/assembly/flash/handheld,
+7 -3
View File
@@ -672,22 +672,26 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301
lefthand_file = 'icons/mob/inhands/weapons/melee_lefthand.dmi'
righthand_file = 'icons/mob/inhands/weapons/melee_righthand.dmi'
slot_flags = ITEM_SLOT_BELT
damtype = "arousal"
damtype = AROUSAL
throwforce = 0
force = 5
w_class = WEIGHT_CLASS_NORMAL
attack_verb = list("flogged", "whipped", "lashed", "disciplined")
hitsound = 'sound/weapons/whip.ogg'
/obj/item/bdsm_whip/ridingcrop
name = "riding crop"
desc = "For teaching a lesson in a more compact fashion."
icon_state = "ridingcrop"
force = 10
/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)
/obj/item/bdsm_whip/attack(mob/M, mob/user)
playsound(loc, 'sound/weapons/whip.ogg', 30)
if(user.a_intent != INTENT_HELP)
if(user.zone_selected == BODY_ZONE_PRECISE_GROIN)
playsound(loc, 'sound/weapons/whip.ogg', 30)
M.visible_message("<span class='userdanger'>[user] has [pick(attack_verb)] [M] on the ass!</span>")
else
return ..(M, user)