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 cc64e7dfe0..9c9c5a61e3 100644 --- a/code/modules/client/preference_setup/loadout/loadout_fluffitems_yw.dm +++ b/code/modules/client/preference_setup/loadout/loadout_fluffitems_yw.dm @@ -449,6 +449,23 @@ ckeywhitelist = list("generalpantsu") character_name = list("Samantha Quzix") +//Gozulio +//Glitterpaws +/datum/gear/fluff/goz_whitecane_j + path = /obj/item/weapon/melee/goz_whitecane + display_name = "Telescopic White Cane" + description = "A telescoping white cane. They are commonly used by the blind or visually impaired as a mobility tool or as a courtesy to others." + ckeywhitelist = list("gozulio") + character_name = list("Jessie Glitterpaws") + +/datum/gear/fluff/goz_whitecane_e + path = /obj/item/weapon/melee/goz_whitecane + display_name = "Telescopic White Cane" + description = "A telescoping white cane. They are commonly used by the blind or visually impaired as a mobility tool or as a courtesy to others." + ckeywhitelist = list("gozulio") + character_name = list("Eira Glitterpaws") + + // H CKEYS //harpsong diff --git a/code/modules/vore/fluffstuff/custom_items_yw.dm b/code/modules/vore/fluffstuff/custom_items_yw.dm index 3534cc1e22..6c9e2d628b 100644 --- a/code/modules/vore/fluffstuff/custom_items_yw.dm +++ b/code/modules/vore/fluffstuff/custom_items_yw.dm @@ -133,6 +133,66 @@ from_suit = /obj/item/clothing/suit/storage/vest/officer to_suit = /obj/item/clothing/suit/storage/vest/officer/fluff/nika +// ******* +// Gozulio +// ******* + +//Glitterpaws +/obj/item/weapon/melee/goz_whitecane + name = "white cane" + desc = "A telescoping white cane. They are commonly used by the blind or visually impaired as a mobility tool or as a courtesy to others." + icon = 'icons/vore/custom_items_yw.dmi' + icon_state = "goz_whitecane_0" + item_icons = list( + slot_l_hand_str = 'icons/vore/custom_items_left_hand_yw.dmi', + slot_r_hand_str = 'icons/vore/custom_items_right_hand_yw.dmi', + ) + slot_flags = SLOT_BELT + w_class = ITEMSIZE_SMALL + force = 3 + var/on = 0 + +/obj/item/weapon/melee/goz_whitecane/attack_self(mob/user as mob) + on = !on + if(on) + user.visible_message("\The [user] extends the white cane.",\ + "You extend the white cane.",\ + "You hear an ominous click.") + icon_state = "goz_whitecane_1" + item_state_slots = list(slot_r_hand_str = "goz_whitecane", slot_l_hand_str = "goz_whitecane") + w_class = ITEMSIZE_NORMAL + force = 5 + attack_verb = list("smacked", "struck", "craked", "beaten", "tripped") + else + user.visible_message("\The [user] collapses the white cane.",\ + "You collapse the white cane.",\ + "You hear a click.") + icon_state = "goz_whitecane_0" + item_state_slots = list(slot_r_hand_str = null, slot_l_hand_str = null) + w_class = ITEMSIZE_SMALL + force = 3 + attack_verb = list("hit", "poked") + + if(istype(user,/mob/living/carbon/human)) + var/mob/living/carbon/human/H = user + H.update_inv_l_hand() + H.update_inv_r_hand() + + playsound(src.loc, 'sound/weapons/empty.ogg', 50, 1) + add_fingerprint(user) + + if(blood_overlay && blood_DNA && (blood_DNA.len >= 1)) //updates blood overlay, if any + overlays.Cut()//this might delete other item overlays as well but eeeeeeeh + + var/icon/I = new /icon(src.icon, src.icon_state) + I.Blend(new /icon('icons/effects/blood.dmi', rgb(255,255,255)),ICON_ADD) + I.Blend(new /icon('icons/effects/blood.dmi', "itemblood"),ICON_MULTIPLY) + blood_overlay = I + + overlays += blood_overlay + + return + // ******* // Dawidoe // ******* diff --git a/icons/vore/custom_items_left_hand_yw.dmi b/icons/vore/custom_items_left_hand_yw.dmi index fa31013589..b028e1e264 100644 Binary files a/icons/vore/custom_items_left_hand_yw.dmi and b/icons/vore/custom_items_left_hand_yw.dmi differ diff --git a/icons/vore/custom_items_right_hand_yw.dmi b/icons/vore/custom_items_right_hand_yw.dmi index d5e70167e8..f2a517fe9f 100644 Binary files a/icons/vore/custom_items_right_hand_yw.dmi and b/icons/vore/custom_items_right_hand_yw.dmi differ diff --git a/icons/vore/custom_items_yw.dmi b/icons/vore/custom_items_yw.dmi index f98c15f7f3..3e228fee3b 100644 Binary files a/icons/vore/custom_items_yw.dmi and b/icons/vore/custom_items_yw.dmi differ