diff --git a/code/modules/client/preference_setup/loadout/loadout_fluffitems_vr.dm b/code/modules/client/preference_setup/loadout/loadout_fluffitems_vr.dm index d5151526b3..8a42309e62 100644 --- a/code/modules/client/preference_setup/loadout/loadout_fluffitems_vr.dm +++ b/code/modules/client/preference_setup/loadout/loadout_fluffitems_vr.dm @@ -738,6 +738,13 @@ ckeywhitelist = list("phoenixgamma7") character_name = list("Jamie Findlay") +/datum/gear/fluff/scylla_shades + path = /obj/item/clothing/glasses/fluff/scylla + display_name = "Scylla's Shades" + description = "These cherry-red cat-eye shades give you an inclination to eat chalk." + ckeywhitelist = list("pimientopyro") + character_name = list("Scylla Casmus") + // Q CKEYS // R CKEYS diff --git a/code/modules/vore/fluffstuff/custom_items_vr.dm b/code/modules/vore/fluffstuff/custom_items_vr.dm index e978bcf366..ec2f649eee 100644 --- a/code/modules/vore/fluffstuff/custom_items_vr.dm +++ b/code/modules/vore/fluffstuff/custom_items_vr.dm @@ -891,7 +891,7 @@ set src in view(1) //do_reagent_implant(usr) - if(!isliving(usr) || !usr.checkClickCooldown()) + if(!isliving(usr) || !usr.canClick()) return if(usr.incapacitated() || usr.stat > CONSCIOUS) @@ -960,7 +960,7 @@ set src in view(1) //do_reagent_implant(usr) - if(!isliving(usr) || !usr.checkClickCooldown()) + if(!isliving(usr) || !usr.canClick()) return if(usr.incapacitated() || usr.stat > CONSCIOUS) @@ -1029,7 +1029,7 @@ set src in view(1) //do_reagent_implant(usr) - if(!isliving(usr) || !usr.checkClickCooldown()) + if(!isliving(usr) || !usr.canClick()) return if(usr.incapacitated() || usr.stat > CONSCIOUS) @@ -1114,7 +1114,7 @@ set src in view(1) //do_reagent_implant(usr) - if(!isliving(usr) || !usr.checkClickCooldown()) + if(!isliving(usr) || !usr.canClick()) return if(usr.incapacitated() || usr.stat > CONSCIOUS) @@ -1474,7 +1474,7 @@ set src in view(1) //do_reagent_implant(usr) - if(!isliving(usr) || !usr.checkClickCooldown()) + if(!isliving(usr) || !usr.canClick()) return if(usr.incapacitated() || usr.stat > CONSCIOUS) @@ -1808,4 +1808,16 @@ desc = "A black bomber jacket with the security emblem sewn onto it." icon = 'icons/vore/custom_items_vr.dmi' icon_override = 'icons/vore/custom_items_vr.dmi' - icon_state = "bombersec" \ No newline at end of file + icon_state = "bombersec" + + +//pimientopyro - Scylla Casmus +/obj/item/clothing/glasses/fluff/scylla + name = "Cherry-Red Shades" + desc = "These cheap, cherry-red cat-eye glasses seem to give you the inclination to eat chalk when you wear them." + + icon = 'icons/vore/custom_items_vr.dmi' + icon_state = "blindshades" + + icon_override = 'icons/vore/custom_clothes_vr.dmi' + item_state = "blindshades_mob" \ No newline at end of file diff --git a/icons/vore/custom_clothes_vr.dmi b/icons/vore/custom_clothes_vr.dmi index 0a20d366cc..1abc46e4d4 100644 Binary files a/icons/vore/custom_clothes_vr.dmi and b/icons/vore/custom_clothes_vr.dmi differ diff --git a/icons/vore/custom_items_vr.dmi b/icons/vore/custom_items_vr.dmi index 19a64fb393..a16ebe46d9 100644 Binary files a/icons/vore/custom_items_vr.dmi and b/icons/vore/custom_items_vr.dmi differ