diff --git a/code/modules/vore/fluffstuff/custom_boxes_yw.dm b/code/modules/vore/fluffstuff/custom_boxes_yw.dm index 44c6fa987f..4dca1f0eea 100644 --- a/code/modules/vore/fluffstuff/custom_boxes_yw.dm +++ b/code/modules/vore/fluffstuff/custom_boxes_yw.dm @@ -380,4 +380,15 @@ /obj/item/clothing/mask/gas/fluff/skinner, /obj/item/device/modkit_conversion/fluff/skinner/a, /obj/item/device/modkit_conversion/fluff/skinner/b, - /obj/item/device/modkit_conversion/fluff/skinner/c) \ No newline at end of file + /obj/item/device/modkit_conversion/fluff/skinner/c) + +// ******** +// MASMC +// ******** + +// Kettek Ollarch +/obj/item/weapon/storage/box/fluff/kettek + name = "Kettek's box" + desc = "a kit containing Kettek's equipment." + has_items = list ( + /obj/item/accessory/fluff/kettek_collar) diff --git a/code/modules/vore/fluffstuff/custom_clothes_yw.dm b/code/modules/vore/fluffstuff/custom_clothes_yw.dm index d37ccf99c1..a0a279d70e 100644 --- a/code/modules/vore/fluffstuff/custom_clothes_yw.dm +++ b/code/modules/vore/fluffstuff/custom_clothes_yw.dm @@ -1321,4 +1321,48 @@ icon = 'icons/vore/custom_clothes_yw.dmi' icon_override = 'icons/vore/custom_onmob_yw.dmi' icon_state = "skinnermask" - item_state = "skinnermask" \ No newline at end of file + item_state = "skinnermask" + +// ***** +// MASMC +// ***** + +// Kettek Ollarch +/obj/item/accessory/fluff/kettek_collar + name = "Kettek's Collar" + desc = "A colour-changing collar. The collar itself changes colour, and has a gold tag on it that says \"Kettek Ollarch\" in small black lettering. Stiched on the inside is the same name, seemingly in case the tag falls off." + icon = 'icons/vore/custom_clothes_yw.dmi' + icon_override = 'icons/vore/custom_onmob_yw.dmi' + icon_state = "kettek_collar_default" + item_state = "kettek_collar" + +// We need additional procs to make this item work +/obj/item/accessory/fluff/kettek_collar/New() + ..() + verbs |- /obj/item/accessory/fluff/kettek_collar/proc/change_color + color = "#"+get_random_colour() + update_icon() + +/obj/item/accessory/fluff/kettek_collar/proc/change_color() + set name = "Change collar colour" + set category = "Object" + set desc = "Chane the colour of the collar." + set src in usr + + if(usr.stat || usr.incapacitated()) + return + + var/new_color = input(usr, "Pick a new colour", "Collar Colour", color) as color|null + + if(new_color && (new_color != color)) + color = new_color + +/obj/item/accessory/fluff/kettek_collar/emp_act() + var/original_state = icon_state + icon_state = "kettek_collar_emp" + update_icon() + + spawn(200) + if(src) + icon_state = original_state + update_icon() diff --git a/icons/vore/custom_clothes_yw.dmi b/icons/vore/custom_clothes_yw.dmi index 9ff270281d..ae2764bd39 100644 Binary files a/icons/vore/custom_clothes_yw.dmi and b/icons/vore/custom_clothes_yw.dmi differ diff --git a/icons/vore/custom_onmob_yw.dmi b/icons/vore/custom_onmob_yw.dmi index f5a6e0018b..d9ddf10f4d 100644 Binary files a/icons/vore/custom_onmob_yw.dmi and b/icons/vore/custom_onmob_yw.dmi differ