diff --git a/code/modules/mob/living/silicon/robot/dogborg/dog_modules_vr.dm b/code/modules/mob/living/silicon/robot/dogborg/dog_modules_vr.dm index f387b6a6533..a11bcd1ea47 100644 --- a/code/modules/mob/living/silicon/robot/dogborg/dog_modules_vr.dm +++ b/code/modules/mob/living/silicon/robot/dogborg/dog_modules_vr.dm @@ -51,7 +51,6 @@ w_class = ITEMSIZE_NORMAL update_icon() - //Boop //New and improved, now a simple reagent sniffer. /obj/item/device/dogborg/boop_module name = "boop module" @@ -77,6 +76,7 @@ var/pressure = environment.return_pressure() var/total_moles = environment.total_moles + user.setClickCooldown(DEFAULT_ATTACK_COOLDOWN) user.visible_message("[user] sniffs the air.", "You sniff the air...") user << "Smells like:" @@ -97,6 +97,7 @@ if(!istype(O)) return + user.setClickCooldown(DEFAULT_ATTACK_COOLDOWN) user.visible_message("[user] sniffs at \the [O.name].", "You sniff \the [O.name]...") if(!isnull(O.reagents)) @@ -216,8 +217,10 @@ /obj/item/device/dogborg/tongue/afterattack(atom/target, mob/user, proximity) if(!proximity) return + + user.setClickCooldown(DEFAULT_ATTACK_COOLDOWN) if(user.client && (target in user.client.screen)) - user << "You need to take that [target.name] off before cleaning it!" + user << "You need to take \the [target.name] off before cleaning it!" else if(istype(target,/obj/effect/decal/cleanable)) user.visible_message("[user] begins to lick off \the [target.name].", "You begin to lick off \the [target.name]...") if(do_after (user, 50)) diff --git a/code/modules/vore/eating/living_vr.dm b/code/modules/vore/eating/living_vr.dm index e0d5d911caf..11566abb805 100644 --- a/code/modules/vore/eating/living_vr.dm +++ b/code/modules/vore/eating/living_vr.dm @@ -256,9 +256,10 @@ if(!istype(tasted)) return - if(src.sleeping || src.resting || src.weakened || src.stat >= DEAD) + if(!src.canClick() || incapacitated(INCAPACITATION_ALL)) return + src.setClickCooldown(DEFAULT_ATTACK_COOLDOWN) var/taste_message = "" if(tasted.vore_taste && (tasted.vore_taste != "")) taste_message += "[tasted.vore_taste]"