diff --git a/code/modules/customitems/item_defines.dm b/code/modules/customitems/item_defines.dm index 332d0fbd438..65d3c4f3efe 100644 --- a/code/modules/customitems/item_defines.dm +++ b/code/modules/customitems/item_defines.dm @@ -2645,6 +2645,7 @@ All custom items with worn sprites must follow the contained sprite system: http icon_state = "qrqil_cane" item_state = "qrqil_cane" contained_sprite = TRUE + w_class = 2 var/active = FALSE /obj/item/weapon/cane/fluff/qrqil_cane/attack_self(mob/user) @@ -2653,9 +2654,11 @@ All custom items with worn sprites must follow the contained sprite system: http playsound(user, 'sound/weapons/saberon.ogg', 50, 1) to_chat(user, "\The [src] is now energised.") item_state = icon_state + w_class = 4 else playsound(user, 'sound/weapons/saberoff.ogg', 50, 1) to_chat(user, "\The [src] is now de-energised..") + w_class = initial(w_class) update_icon() user.update_inv_l_hand(FALSE) @@ -2667,4 +2670,28 @@ All custom items with worn sprites must follow the contained sprite system: http item_state = icon_state else icon_state = initial(icon_state) - item_state = icon_state \ No newline at end of file + item_state = icon_state + + +/obj/item/clothing/accessory/poncho/fluff/djar_cape //Zandiziite Cape - D'Jar Sa'Kuate - firstact + name = "zandiziite cape" + desc = "A dominian cape, with a clasp bearing the symbol of a champion Zandiziite wrestler. It looks well worn, of the finest material." + icon = 'icons/obj/custom_items/djar_cape.dmi' + icon_state = "djar_cape" + item_state = "djar_cape" + contained_sprite = TRUE + icon_override = FALSE + + +/obj/item/device/flashlight/fluff/maximus_squirrel //Vibrating Blue Squirrel - Maximus Crane - lordfowl + name = "vibrating blue squirrel" + desc = "It vibrates, and it is blue. The goal of adventurers everywhere." + icon = 'icons/obj/custom_items/maximus_squirrel.dmi' + icon_state = "maximus_squirrel" + item_state = "maximus_squirrel" + light_color = LIGHT_COLOR_BLUE + light_wedge = LIGHT_OMNI + action_button_name = null + activation_sound = null + brightness_on = 1 + contained_sprite = TRUE diff --git a/icons/mob/custom_synthetic.dmi b/icons/mob/custom_synthetic.dmi index 99a9a8139d0..1eb2aef5d79 100644 Binary files a/icons/mob/custom_synthetic.dmi and b/icons/mob/custom_synthetic.dmi differ diff --git a/icons/obj/custom_items/djar_cape.dmi b/icons/obj/custom_items/djar_cape.dmi new file mode 100644 index 00000000000..02ad26ff87a Binary files /dev/null and b/icons/obj/custom_items/djar_cape.dmi differ diff --git a/icons/obj/custom_items/maximus_squirrel.dmi b/icons/obj/custom_items/maximus_squirrel.dmi new file mode 100644 index 00000000000..89e833e6d49 Binary files /dev/null and b/icons/obj/custom_items/maximus_squirrel.dmi differ diff --git a/icons/obj/custom_items/mira_clothing.dmi b/icons/obj/custom_items/mira_clothing.dmi index 97b7690369d..e1a457479f0 100644 Binary files a/icons/obj/custom_items/mira_clothing.dmi and b/icons/obj/custom_items/mira_clothing.dmi differ