diff --git a/code/game/objects/items/weapons/implants/implantreagent_vr.dm b/code/game/objects/items/weapons/implants/implantreagent_vr.dm index ddaa6680c8..5642d1bfd6 100644 --- a/code/game/objects/items/weapons/implants/implantreagent_vr.dm +++ b/code/game/objects/items/weapons/implants/implantreagent_vr.dm @@ -70,7 +70,7 @@ do_reagent_implant(usr) /mob/living/carbon/human/proc/do_reagent_implant(var/mob/living/carbon/human/user = usr) - if(!isliving(user) || !user.canClick()) + if(!isliving(user) || !user.checkClickCooldown()) return if(user.incapacitated() || user.stat > CONSCIOUS) diff --git a/code/modules/mob/living/carbon/human/species/station/alraune.dm b/code/modules/mob/living/carbon/human/species/station/alraune.dm index b78d7caf78..f55935ac9e 100644 --- a/code/modules/mob/living/carbon/human/species/station/alraune.dm +++ b/code/modules/mob/living/carbon/human/species/station/alraune.dm @@ -417,7 +417,7 @@ set src in view(1) //do_reagent_implant(usr) - if(!isliving(usr) || !usr.canClick()) + if(!isliving(usr) || !usr.checkClickCooldown()) return if(usr.incapacitated() || usr.stat > CONSCIOUS) diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/passive/mouse_vr.dm b/code/modules/mob/living/simple_mob/subtypes/animal/passive/mouse_vr.dm index 3c74e3784f..26c15f9c17 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/passive/mouse_vr.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/passive/mouse_vr.dm @@ -22,7 +22,7 @@ //No longer in use, as mice create a holder/micro object instead /obj/item/weapon/holder/mouse/attack_self(var/mob/U) for(var/mob/living/simple_mob/M in src.contents) - if((I_HELP) && U.canClick()) //a little snowflakey, but makes it use the same cooldown as interacting with non-inventory objects + if((I_HELP) && U.checkClickCooldown()) //a little snowflakey, but makes it use the same cooldown as interacting with non-inventory objects U.setClickCooldown(U.get_attack_speed()) //if there's a cleaner way in baycode, I'll change this U.visible_message("[U] [M.response_help] \the [M].") diff --git a/code/modules/vore/eating/living_vr.dm b/code/modules/vore/eating/living_vr.dm index 15fde8b613..e73eff48f3 100644 --- a/code/modules/vore/eating/living_vr.dm +++ b/code/modules/vore/eating/living_vr.dm @@ -327,7 +327,7 @@ if(!istype(tasted)) return - if(!canClick() || incapacitated(INCAPACITATION_ALL)) + if(!checkClickCooldown() || incapacitated(INCAPACITATION_ALL)) return setClickCooldown(DEFAULT_ATTACK_COOLDOWN) diff --git a/code/modules/vore/fluffstuff/custom_items_vr.dm b/code/modules/vore/fluffstuff/custom_items_vr.dm index 9c4d262820..8c7c940ad5 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.canClick()) + if(!isliving(usr) || !usr.checkClickCooldown()) return if(usr.incapacitated() || usr.stat > CONSCIOUS) @@ -960,7 +960,7 @@ set src in view(1) //do_reagent_implant(usr) - if(!isliving(usr) || !usr.canClick()) + if(!isliving(usr) || !usr.checkClickCooldown()) return if(usr.incapacitated() || usr.stat > CONSCIOUS) @@ -1029,7 +1029,7 @@ set src in view(1) //do_reagent_implant(usr) - if(!isliving(usr) || !usr.canClick()) + if(!isliving(usr) || !usr.checkClickCooldown()) return if(usr.incapacitated() || usr.stat > CONSCIOUS) @@ -1114,7 +1114,7 @@ set src in view(1) //do_reagent_implant(usr) - if(!isliving(usr) || !usr.canClick()) + if(!isliving(usr) || !usr.checkClickCooldown()) return if(usr.incapacitated() || usr.stat > CONSCIOUS) @@ -1474,7 +1474,7 @@ set src in view(1) //do_reagent_implant(usr) - if(!isliving(usr) || !usr.canClick()) + if(!isliving(usr) || !usr.checkClickCooldown()) return if(usr.incapacitated() || usr.stat > CONSCIOUS) diff --git a/code/modules/vore/resizing/holder_micro_vr.dm b/code/modules/vore/resizing/holder_micro_vr.dm index 3a4b291940..aa22fdd55b 100644 --- a/code/modules/vore/resizing/holder_micro_vr.dm +++ b/code/modules/vore/resizing/holder_micro_vr.dm @@ -26,12 +26,12 @@ /obj/item/weapon/holder/micro/attack_self(mob/living/carbon/user) //reworked so it works w/ nonhumans for(var/L in contents) - if(ishuman(L) && user.canClick()) // These canClicks() are repeated here to make sure users can't avoid the click delay + if(ishuman(L) && user.checkClickCooldown()) // These canClicks() are repeated here to make sure users can't avoid the click delay var/mob/living/carbon/human/H = L H.help_shake_act(user) user.setClickCooldown(user.get_attack_speed()) //uses the same cooldown as regular attack_hand return - if(isanimal(L) && user.canClick()) + if(isanimal(L) && user.checkClickCooldown()) var/mob/living/simple_mob/S = L user.visible_message("[user] [S.response_help] \the [S].") user.setClickCooldown(user.get_attack_speed())