Merge pull request #103 from ReddeyfishVor/igni

Add custom items for Igni/Kelly Summers

code/game/objects/structures/crates_lockers/closets/secure/security.dm

@@ -205,6 +205,7 @@
 		new /obj/item/device/flashlight/maglight(src)
 		new /obj/item/device/megaphone(src)
 		new /obj/item/clothing/mask/gas/half(src)
+		new /obj/item/clothing/gloves/warden(src)
 		return
 
 

code/modules/clothing/gloves/miscellaneous.dm

@@ -47,6 +47,15 @@
 	heat_protection = HANDS
 	max_heat_protection_temperature = GLOVES_MAX_HEAT_PROTECTION_TEMPERATURE
 
+/obj/item/clothing/gloves/warden
+    desc = "These black gloves scream of prisoner abuse"
+    name = "Warden's Gloves"
+    icon_state = "swat"
+    item_state = "swat"
+    force = 2
+    punch_force = 1
+    damtype= HALLOSS
+
 /obj/item/clothing/gloves/sterile
 	name = "sterile gloves"
 	desc = "Sterile gloves."

code/modules/vore/fluffstuff/custom_clothes_vr.dm

@@ -1760,3 +1760,25 @@ Departamental Swimsuits, for general use
 	icon_state = "tronsiren_shoes"
 	icon = 'icons/vore/custom_clothes_vr.dmi'
 	icon_override = 'icons/vore/custom_onmob_vr.dmi'
+
+//Igni Vulpas
+/obj/item/clothing/accessory/collar/fluff/Kellyscollar
+    name = "Warden's collar"
+    desc = "A collar with spikes that look dangerously sharp, projecting an menacing aura"
+    icon_state = "collar_spik"
+    item_state = "collar_spik_overlay"
+    overlay_state = "collar_spik_overlay"
+
+/obj/item/clothing/accessory/collar/fluff/Kellyscollar/attack_self(mob/user as mob)
+    user << "<span class='notice'>[name]'s interface is projected onto your hand.</span>"
+
+    var/str = copytext(reject_bad_text(input(user,"Tag text?","Set tag","")),1,MAX_NAME_LEN)
+
+    if(!str || !length(str))
+        user << "<span class='notice'>[name]'s tag set to be blank.</span>"
+        name = initial(name)
+        desc = initial(desc)
+    else
+        user << "<span class='notice'>You set the [name]'s tag to '[str]'.</span>"
+        name = initial(name) + " ([str])"
+        desc = initial(desc) + " The tag says \"[str]\"."

code/modules/vore/fluffstuff/custom_items_vr.dm

@@ -2004,3 +2004,21 @@
 	..()
 	attack_verb = list("bapped", "thwapped", "bonked", "whacked")
 	icon_state = initial(icon_state)
+
+//Igni Vulpas
+/obj/item/weapon/melee/fluffstuff/wardenschain
+    name = "Warden's chain"
+    desc = "A High Tech solution to simple punishment. It has a red leather handle with the word 'punish'. The silver base has a pair of engraved initials, K.S."
+    icon = 'icons/vore/custom_items_vr.dmi'
+    icon_state = "holochain"
+
+    icon_override = 'icons/vore/custom_items_vr.dmi'
+    item_state = "holochain_mob"
+
+    flags = CONDUCT | NOBLOODY
+    slot_flags = SLOT_BELT
+    force = 15
+    throwforce = 3
+    w_class = ITEMSIZE_NORMAL
+    damtype = HALLOSS
+    attack_verb = list("flogged", "whipped", "lashed", "disciplined", "chastised", "flayed", "punished")

config/custom_items.txt

@@ -282,6 +282,19 @@ item_path: /obj/item/weapon/implanter/reagent_generator/belle
 
 # ######## I CKEYS
 
+{
+ckey: igni
+character_name:  Kelly Summers
+item_path:/obj/item/weapon/melee/fluffstuff/wardenschain
+req_titles: Warden, Head of Security
+}
+
+{
+ckey: igni
+character_name:  Kelly Summers
+item_path:/obj/item/clothing/accessory/collar/fluff/Kellyscollar
+}
+
 {
 ckey: interrolouis
 character_name:  Ruda Lizden