diff --git a/code/modules/customitems/item_defines.dm b/code/modules/customitems/item_defines.dm index f316f486379..04766b56d73 100644 --- a/code/modules/customitems/item_defines.dm +++ b/code/modules/customitems/item_defines.dm @@ -1712,5 +1712,17 @@ body_parts_covered = UPPER_TORSO|LOWER_TORSO species_restricted = list("Vox") +/obj/item/clothing/mask/gas/fluff/kikerimask //Gangelwaefre: Kikeri + name = "Kikeri's Mask" + desc = "A light grey mask with masquerade-esque blue details." + icon = 'icons/obj/custom_items.dmi' + lefthand_file = 'icons/mob/inhands/fluff_lefthand.dmi' + righthand_file = 'icons/mob/inhands/fluff_righthand.dmi' + sprite_sheets = list("Vox" = 'icons/mob/clothing/species/vox/mask.dmi') + icon_state = "kikerimask" + item_state = "kikerimask" + item_color = "kikerimask" + species_restricted = list("Vox") + #undef USED_MOD_HELM #undef USED_MOD_SUIT diff --git a/code/modules/mob/living/simple_animal/friendly/mouse.dm b/code/modules/mob/living/simple_animal/friendly/mouse.dm index d8bdbfeb0ab..e924ea9eed7 100644 --- a/code/modules/mob/living/simple_animal/friendly/mouse.dm +++ b/code/modules/mob/living/simple_animal/friendly/mouse.dm @@ -226,18 +226,6 @@ to_chat(grabber, "You try to pick up [src], but they slip out of your grasp!") to_chat(src, "[src] tries to pick you up, but you wriggle free of their grasp!") -/mob/living/simple_animal/mouse/fluff/clockwork - name = "Chip" - real_name = "Chip" - mouse_color = "clockwork" - icon_state = "mouse_clockwork" - response_help = "pets" - response_disarm = "gently pushes aside" - response_harm = "stamps on" - gold_core_spawnable = NO_SPAWN - can_collar = 0 - butcher_results = list(/obj/item/stack/sheet/metal = 1) - /mob/living/simple_animal/mouse/decompile_act(obj/item/matter_decompiler/C, mob/user) if(!(istype(user, /mob/living/silicon/robot/drone))) user.visible_message("[user] sucks [src] into its decompiler. There's a horrible crunching noise.", \ diff --git a/icons/mob/animal.dmi b/icons/mob/animal.dmi index 549304a43f3..241cfe6639f 100644 Binary files a/icons/mob/animal.dmi and b/icons/mob/animal.dmi differ diff --git a/icons/mob/clothing/species/vox/mask.dmi b/icons/mob/clothing/species/vox/mask.dmi index 3e3a074c629..a875b7205a5 100644 Binary files a/icons/mob/clothing/species/vox/mask.dmi and b/icons/mob/clothing/species/vox/mask.dmi differ diff --git a/icons/mob/inhands/fluff_lefthand.dmi b/icons/mob/inhands/fluff_lefthand.dmi index daed1b89256..2dcc8ce9591 100644 Binary files a/icons/mob/inhands/fluff_lefthand.dmi and b/icons/mob/inhands/fluff_lefthand.dmi differ diff --git a/icons/mob/inhands/fluff_righthand.dmi b/icons/mob/inhands/fluff_righthand.dmi index 83666d38747..a510a24b943 100644 Binary files a/icons/mob/inhands/fluff_righthand.dmi and b/icons/mob/inhands/fluff_righthand.dmi differ diff --git a/icons/obj/custom_items.dmi b/icons/obj/custom_items.dmi index b3d640050a8..6f00d41c5d5 100644 Binary files a/icons/obj/custom_items.dmi and b/icons/obj/custom_items.dmi differ