Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[MIRROR] [MODULAR] Fixed hypospray wait times #866

Merged
merged 1 commit into from
Nov 28, 2023
Merged

[MIRROR] [MODULAR] Fixed hypospray wait times #866

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion modular_skyrat/modules/hyposprays/code/hyposprays_II.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,14 @@
if(injectee != user)
injectee.visible_message(span_danger("[user] is trying to [fp_verb] [injectee] with [src]!"), \
span_userdanger("[user] is trying to [fp_verb] you with [src]!"))
if(!do_after(user, inject_wait, injectee, extra_checks = CALLBACK(injectee, /mob/living/proc/can_inject, user, user.zone_selected, penetrates)))

var/selected_wait_time
if(target == user)
selected_wait_time = (mode == HYPO_INJECT) ? inject_self : spray_self
else
selected_wait_time = (mode == HYPO_INJECT) ? inject_wait : spray_wait

if(!do_after(user, selected_wait_time, injectee, extra_checks = CALLBACK(injectee, /mob/living/proc/can_inject, user, user.zone_selected, penetrates)))
return
if(!vial.reagents.total_volume)
return
Expand Down
Loading