diff --git a/code/modules/customitems/item_defines.dm b/code/modules/customitems/item_defines.dm index faae9240827..3813e2e22a8 100644 --- a/code/modules/customitems/item_defines.dm +++ b/code/modules/customitems/item_defines.dm @@ -616,9 +616,57 @@ All custom items with worn sprites must follow the contained sprite system: http item_state = "poslan_jacket" contained_sprite = 1 + /obj/item/sign/fluff/alexis_degree //Xenonuerology Doctorate - Alexis Shaw - Tenenza - DONE name = "xenonuerology degree" desc = "Certification for a doctorate in Xenonuerology, made out to Alexis Shaw by the St. Grahelm University of Biesel, authenticated by watermarking." icon_state = "alexis_degree" sign_state = "alexis_degree" w_class = 2 + + +/obj/item/clothing/mask/fluff/rur_collar //Tagging Collar - R.U.R - coalf - DONE + name = "tagging collar" + desc = "A steel tagging collar, a giant golden D is imprinted on the front." + icon = 'icons/obj/custom_items/rur_collar.dmi' + icon_state = "rur_collar" + item_state = "rur_collar" + contained_sprite = 1 + flags = MASKCOVERSMOUTH + body_parts_covered = 0 + canremove = 0 + species_restricted = list("Machine") + var/emagged = 0 + +/obj/item/clothing/mask/fluff/rur_collar/attackby(obj/item/I, mob/user) + if(istype(I, /obj/item/weapon/card/emag) && !emagged) + user << "You short out \the [src]'s locking mechanism." + src.icon_state = "rur_collar_broken" + src.canremove = 1 + src.emagged = 1 + playsound(src.loc, 'sound/effects/sparks1.ogg', 100, 0) + return + + return + + +/obj/item/clothing/mask/bluescarf/fluff/simon_scarf //Fancy Scarf - Simon Greene - icydew - DONE + name = "fancy scarf" + desc = "A very smooth, dark blue scarf with a golden trim. It feels really new and clean." + icon = 'icons/obj/custom_items/simon_scarf.dmi' + icon_state = "simon_scarf" + item_state = "simon_scarf" + contained_sprite = 1 + + +/obj/item/clothing/head/soft/sec/corp/fluff/karson_cap //Karson's Cap - Eric Karson - dronzthewolf - DONE + name = "well-worn corporate security cap" + desc = "A well-worn corporate security cap. The name Karson is written on the underside of the brim, it is well-worn at the point where it has shaped to the owner's head." + + +/obj/item/sign/fluff/triaka_atimono //Framed Zatimono - Azkuyua Triaka - jackboot - DONE + name = "framed zatimono" + desc = "A framed Zatimono, a Unathi standard worn into battle similar to an old-Earth Sashimono. This one is slightly faded." + icon_state = "triaka_atimono" + sign_state = "triaka_atimono" + w_class = 2 diff --git a/icons/obj/custom_items/rur_collar.dmi b/icons/obj/custom_items/rur_collar.dmi new file mode 100644 index 00000000000..1d95eb76d30 Binary files /dev/null and b/icons/obj/custom_items/rur_collar.dmi differ diff --git a/icons/obj/custom_items/simon_scarf.dmi b/icons/obj/custom_items/simon_scarf.dmi new file mode 100644 index 00000000000..44ce2f881a9 Binary files /dev/null and b/icons/obj/custom_items/simon_scarf.dmi differ diff --git a/icons/obj/decals.dmi b/icons/obj/decals.dmi index 5f01d16e07b..7792bbbe012 100644 Binary files a/icons/obj/decals.dmi and b/icons/obj/decals.dmi differ