diff --git a/code/modules/client/preference_setup/loadout/loadout_fluffitems_yw.dm b/code/modules/client/preference_setup/loadout/loadout_fluffitems_yw.dm index 0bfe5bd45a..72ac886472 100644 --- a/code/modules/client/preference_setup/loadout/loadout_fluffitems_yw.dm +++ b/code/modules/client/preference_setup/loadout/loadout_fluffitems_yw.dm @@ -628,6 +628,13 @@ // K CKEYS +/datum/gear/fluff/kbraidgoggles + path = /obj/item/clothing/glasses/fluff/avigoggles_yw + display_name = "K'braid Aviation Goggles" + description = "You're such a goggle head!" + ckeywhitelist = list("kbraid") + character_name = list("Eili") //Character name. this variable is required, or the item doesn't show in loadout. Change to "character_name = null" if not character restricted. + // L CKEYS //lawst diff --git a/code/modules/vore/fluffstuff/custom_clothes_yw.dm b/code/modules/vore/fluffstuff/custom_clothes_yw.dm index 1e116b0d30..19207cdf78 100644 --- a/code/modules/vore/fluffstuff/custom_clothes_yw.dm +++ b/code/modules/vore/fluffstuff/custom_clothes_yw.dm @@ -1649,4 +1649,49 @@ icon_state = "khlife3" icon_override = 'icons/vore/custom_items_vr.dmi' item_state = "khlife_overlay" - overlay_state = "khlife_overlay" \ No newline at end of file + overlay_state = "khlife_overlay" + +// ****** +// KBraid +// ****** +/obj/item/clothing/glasses/fluff/avigoggles_yw + name = "aviation goggles" + desc = "You're such a goggle head!" + icon = 'icons/vore/custom_clothes_yw.dmi' + icon_state = "avigoggles_i" + item_state = "avigoggles" + icon_override = 'icons/vore/custom_clothes_yw.dmi' + action_button_name = "Flip Aviation Goggles" + item_flags = AIRTIGHT + var/up = 0 + +/obj/item/clothing/glasses/fluff/avigoggles_yw/attack_self() + toggle() + +/obj/item/clothing/glasses/fluff/avigoggles_yw/verb/toggle() + set category = "Object" + set name = "Adjust aviation goggles" + set src in usr + + if(usr.canmove && !usr.stat && !usr.restrained()) + if(src.up) + src.up = !src.up + flags_inv |= HIDEEYES + body_parts_covered |= EYES + item_state = initial(item_state) + to_chat(usr, "You flip \the [src] down to protect your eyes.") + else + src.up = !src.up + flags_inv &= ~HIDEEYES + body_parts_covered &= ~EYES + item_state = "[initial(item_state)]_up" + to_chat(usr, "You push \the [src] up out of your face.") + update_clothing_icon() + usr.update_action_buttons() + +/obj/item/clothing/glasses/fluff/avigoggles_yw/get_worn_icon_file(var/body_type,var/slot_name,var/default_icon,var/inhands) + if(body_type == SPECIES_TESHARI) + if(!inhands) + return 'icons/vore/custom_clothes_yw_special.dmi' + else + return ..() \ No newline at end of file diff --git a/icons/vore/custom_clothes_yw.dmi b/icons/vore/custom_clothes_yw.dmi index acfc8d368b..439fd7ac69 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_clothes_yw_special.dmi b/icons/vore/custom_clothes_yw_special.dmi index 4b956b8722..f852c4b231 100644 Binary files a/icons/vore/custom_clothes_yw_special.dmi and b/icons/vore/custom_clothes_yw_special.dmi differ diff --git a/obj/item/clothing/glasses/fluff/avigoggles_yw.dm b/obj/item/clothing/glasses/fluff/avigoggles_yw.dm deleted file mode 100644 index 1ab35ded72..0000000000 --- a/obj/item/clothing/glasses/fluff/avigoggles_yw.dm +++ /dev/null @@ -1,36 +0,0 @@ -// ****** -// KBraid -// ****** -/obj/item/clothing/glasses/fluff/avigoggles_yw - name = "aviation goggles" - desc = "You're such a goggle head!" - icon_state = "avigoggles-g" - icon_override = 'icons/vore/custom_clothes_yw.dmi' - item_state_slots = list(slot_r_hand_str = "avigoggles-g", slot_l_hand_str = "avigoggles-g") - action_button_name = "Flip Aviation Goggles" - item_flags = AIRTIGHT - var/up = 0 - -/obj/item/clothing/glasses/fluff/avigoggles_yw/attack_self() - toggle() - -/obj/item/clothing/glasses/fluff/avigoggles_yw/verb/toggle() - set category = "Object" - set name = "Adjust aviation goggles" - set src in usr - - if(usr.canmove && !usr.stat && !usr.restrained()) - if(src.up) - src.up = !src.up - flags_inv |= HIDEEYES - body_parts_covered |= EYES - icon_state = initial(icon_state) - to_chat(usr, "You flip \the [src] down to protect your eyes.") - else - src.up = !src.up - flags_inv &= ~HIDEEYES - body_parts_covered &= ~EYES - icon_state = "[initial(icon_state)]up" - to_chat(usr, "You push \the [src] up out of your face.") - update_clothing_icon() - usr.update_action_buttons()