Merge pull request #424 from TotallyNotADog/slaveImplant

The Slutcurity Update. Powered by Horny™

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

@@ -111,7 +111,7 @@
 obj/item/dildo/human
 	dildo_shape 		= "human"
 	name 				= "human dildo"
-	attack_verb = list("penetrated", "slapped", "inseminated")
+	attack_verb         = list("penetrated", "slapped", "inseminated")
 
 obj/item/dildo/plain
 	dildo_shape 		= "plain"
@@ -128,6 +128,12 @@ obj/item/dildo/flared/huge
 	desc 				= "THIS THING IS HUGE!"
 	dildo_size 			= 4
 
+obj/item/dildo/flared/gigantic
+	name 				= "bitch breaker"
+	desc 				= "You can barely carry this thing! Meant for... \"advanced\" interrogation techniques."
+	dildo_size 			= 5
+	attack_verb 		= list("penetrated", "slapped", "gaped", "prolapsed", "inseminated", "destroyed", "broke", "demolished", "whacked")
+
 obj/item/dildo/custom
 	name 				= "customizable dildo"
 	desc 				= "Thanks to significant advances in synthetic nanomaterials, this dildo is capable of taking on many different forms to fit the user's preferences! Pricy!"
@@ -162,3 +168,13 @@ obj/item/dildo/custom
 		user.adjust_eye_damage(15)
 	return MANUAL_SUICIDE
 
+/obj/item/dildo/flared/gigantic/suicide_act(mob/living/user)
+	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)
+		user.adjust_blurriness(24)
+		user.adjust_eye_damage(20)
+		user.adjustOxyLoss(15)
+	return MANUAL_SUICIDE
+

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/shoes.dm

@@ -23,6 +23,11 @@
 	category = SLOT_SHOES
 	path = /obj/item/clothing/shoes/jackboots/toeless
 
+/datum/gear/jackboots/tall
+	name = "tall jackboots"
+	category = SLOT_SHOES
+	path = /obj/item/clothing/shoes/jackboots/tall
+
 /datum/gear/winterboots
 	name = "Winter boots"
 	category = SLOT_SHOES
@@ -86,4 +91,4 @@
 datum/gear/highheels
 	name = "High Heels"
 	category = SLOT_SHOES
-	path= /obj/item/clothing/shoes/highheels
+	path= /obj/item/clothing/shoes/highheels

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

@@ -422,4 +422,4 @@
 	name = "Corset"
 	category = SLOT_W_UNIFORM
 	path = /obj/item/clothing/under/corset
-	cost = 1
+	cost = 1