Various reagent-to-mob interactions have click cds again (#93295)

## About The Pull Request

Moving from `attack` to `item_interaction` and `interact_with_atom`
accidentally made these click CD free

Which is probably a bad thing

So I re-added click CDs to reagent container -> mob interactions that
were converted.
Reagent container -> item interactions have no CDs. 

## Changelog

🆑 Melbert
fix: Reagent container interactions with mobs have click cooldown again
/🆑
This commit is contained in:
MrMelbert
2025-10-05 16:22:41 -06:00
committed by GitHub
parent 6743a64b2c
commit 1afe7a9b89
9 changed files with 16 additions and 6 deletions
@@ -31,6 +31,7 @@
if(!canconsume(target_mob, user))
return ITEM_INTERACT_BLOCKING
user.changeNext_move(CLICK_CD_MELEE)
if(target_mob == user)
target_mob.visible_message(span_notice("[user] attempts to [apply_method] [src]."))
if(self_delay)
@@ -44,6 +44,7 @@
if(!canconsume(target, user))
return ITEM_INTERACT_BLOCKING
user.changeNext_move(CLICK_CD_MELEE)
if(target == user)
user.visible_message(
span_notice("[user] swallows some of the contents of \the [src]."),
@@ -69,6 +69,7 @@
if(!canconsume(target_mob, user))
return ITEM_INTERACT_BLOCKING
user.changeNext_move(CLICK_CD_MELEE)
if(target_mob != user)
target_mob.visible_message(
span_danger("[user] attempts to feed [target_mob] something from [src]."),
@@ -28,9 +28,9 @@
var/fraction = min(amount_per_transfer_from_this / reagents.total_volume, 1)
if(ismob(target))
user.changeNext_move(CLICK_CD_MELEE)
if(ishuman(target))
var/mob/living/carbon/human/victim = target
var/obj/item/safe_thing = victim.is_eyes_covered()
if(safe_thing)
@@ -45,13 +45,15 @@
to_chat(user, span_notice("You transfer [trans] unit\s of the solution."))
update_appearance()
return ITEM_INTERACT_BLOCKING
else if(isalien(target)) //hiss-hiss has no eyes!
to_chat(target, span_danger("[target] does not seem to have any eyes!"))
return ITEM_INTERACT_BLOCKING
target.visible_message(span_danger("[user] squirts something into [target]'s eyes!"), \
span_userdanger("[user] squirts something into your eyes!"))
target.visible_message(
span_danger("[user] squirts something into [target]'s eyes!"),
span_userdanger("[user] squirts something into your eyes!"),
)
SEND_SIGNAL(target, COMSIG_MOB_REAGENTS_DROPPED_INTO_EYES, user, src, reagents, fraction)
reagents.expose(target, TOUCH, fraction)
var/mob/M = target
@@ -42,6 +42,7 @@
injected += injected_reagent.name
var/contained = english_list(injected)
log_combat(user, affected_mob, "attempted to inject", src, "([contained])")
user.changeNext_move(CLICK_CD_MELEE)
if(!used_up && (ignore_flags || affected_mob.try_inject(user, injection_flags = INJECT_TRY_SHOW_ERROR_MESSAGE))) // Ignore flag should be checked first or there will be an error message.
to_chat(affected_mob, span_warning("You feel a tiny prick!"))
@@ -44,6 +44,7 @@
to_chat(user, span_warning("[src] is empty!"))
return ITEM_INTERACT_BLOCKING
user.changeNext_move(CLICK_CD_MELEE)
if(interacting_with == user)
interacting_with.visible_message(span_notice("[user] attempts to [apply_method] [src] on [user.p_them()]self."))
if(self_delay)