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

code/game/objects/items/storage/belt.dm

@@ -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,

code/game/objects/items/weaponry.dm

@@ -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)

code/modules/clothing/suits/miscellaneous.dm

@@ -573,6 +573,12 @@
 	armor = list("melee" = 25, "bullet" = 15, "laser" = 30, "energy" = 10, "bomb" = 25, "bio" = 0, "rad" = 0, "fire" = 0, "acid" = 45)
 	hoodtype = /obj/item/clothing/head/hooded/winterhood/security
 
+/obj/item/clothing/suit/hooded/wintercoat/security/pink
+	name = "pink security winter coat"
+	icon_state = "coatsecuritypink"
+	item_state = "coatsecuritypink"
+	hoodtype = /obj/item/clothing/head/hooded/winterhood/security/pink
+
 /obj/item/clothing/suit/hooded/wintercoat/security/Initialize()
 	. = ..()
 	allowed = GLOB.security_wintercoat_allowed
@@ -580,6 +586,9 @@
 /obj/item/clothing/head/hooded/winterhood/security
 	icon_state = "winterhood_security"
 
+/obj/item/clothing/head/hooded/winterhood/security/pink
+	icon_state = "winterhood_securitypink"
+
 /obj/item/clothing/suit/hooded/wintercoat/hos
 	name = "head of security's winter coat"
 	icon_state = "coathos"
@@ -887,4 +896,4 @@
 	allowed = GLOB.security_wintercoat_allowed
 
 /obj/item/clothing/head/hooded/winterhood/durathread
-	icon_state = "winterhood_durathread"
+	icon_state = "winterhood_durathread"

code/modules/vending/wardrobes.dm

@@ -23,6 +23,7 @@
 					/obj/item/clothing/suit/security/officer = 5,
 					/obj/item/clothing/head/beret/sec/navyofficer = 5,
 					/obj/item/clothing/under/rank/security/pink = 5,
+					/obj/item/clothing/suit/hooded/wintercoat/security/pink = 5,
 					/obj/item/clothing/under/rank/security/skirt/slut = 5,
 					/obj/item/clothing/under/rank/security/skirt/slut/pink = 5,
 					/obj/item/clothing/under/rank/security/stripper = 5,

modular_citadel/code/modules/arousal/toys/dildos.dm

@@ -169,7 +169,7 @@ obj/item/dildo/custom
 	return MANUAL_SUICIDE
 
 /obj/item/dildo/flared/gigantic/suicide_act(mob/living/user)
-	if(do_after(user,35,target=src))
+	if(do_after(user,45,target=src))
 		user.visible_message("<span class='suicide'>[user] tears-up and gags as they try to deepthroat the [src]! WHY WOULD THEY DO THAT? It looks like [user.p_theyre()] trying to commit suicide!!</span>")
 		playsound(loc, 'sound/weapons/gagging.ogg', 50, 2, -1)
 		user.Stun(400)

modular_citadel/code/modules/client/loadout/_security.dm

@@ -68,4 +68,32 @@
 	name = "Security Hud"
 	category = SLOT_GLASSES
 	path = /obj/item/clothing/glasses/hud/security
-	restricted_roles = list("Security Officer", "Warden", "Head of Security")
+	restricted_roles = list("Security Officer", "Warden", "Head of Security")
+
+/datum/gear/pinksec
+	name = "Pink Security Jumpsuit"
+	category = SLOT_W_UNIFORM
+	path = /obj/item/clothing/under/rank/security/pink
+	cost = 1
+	restricted_roles = list("Security Officer","Warden","Head of Security")
+
+/datum/gear/pinksecskirt
+	name = "Pink Security Jumpskirt"
+	category = SLOT_W_UNIFORM
+	path = /obj/item/clothing/under/rank/security/skirt/slut/pink
+	cost = 1
+	restricted_roles = list("Security Officer","Warden","Head of Security")
+
+/datum/gear/secwintercoat
+	name = "Security Winter Coat"
+	category = SLOT_WEAR_SUIT
+	path = /obj/item/clothing/suit/hooded/wintercoat/security
+	cost = 1
+	restricted_roles = list("Security Officer","Warden","Head of Security")
+
+/datum/gear/pinksecwintercoat
+	name = "Pink Security Winter Coat"
+	category = SLOT_WEAR_SUIT
+	path = /obj/item/clothing/suit/hooded/wintercoat/security/pink
+	cost = 1
+	restricted_roles = list("Security Officer","Warden","Head of Security")

modular_citadel/code/modules/client/loadout/uniform.dm

@@ -423,17 +423,3 @@
 	category = SLOT_W_UNIFORM
 	path = /obj/item/clothing/under/corset
 	cost = 1
-
-/datum/gear/pinksec
-	name = "Pink Security Jumpsuit"
-	category = SLOT_W_UNIFORM
-	path = /obj/item/clothing/under/rank/security/pink
-	cost = 1
-	restricted_roles = list("Security Officer","Warden","Head of Security")
-
-/datum/gear/pinksecskirt
-	name = "Pink Security Jumpskirt"
-	category = SLOT_W_UNIFORM
-	path = /obj/item/clothing/under/rank/security/skirt/slut/pink
-	cost = 1
-	restricted_roles = list("Security Officer","Warden","Head of Security")