From 70458fcf036c378c53d7056201823c96645e2c63 Mon Sep 17 00:00:00 2001
From: misghast <51974455+misterghast@users.noreply.github.com>
Date: Tue, 28 Nov 2023 01:17:59 -0600
Subject: [PATCH] [MODULAR] Fixed hypospray wait times (#25295)

* Fixed hyposprays

* Update hyposprays_II.dm

removed blank spaces which weren't necessary for visibility

* Update modular_skyrat/modules/hyposprays/code/hyposprays_II.dm

Changes suggested by vinylspiders

Co-authored-by: Bloop <13398309+vinylspiders@users.noreply.github.com>

---------

Co-authored-by: Bloop <13398309+vinylspiders@users.noreply.github.com>
---
 modular_skyrat/modules/hyposprays/code/hyposprays_II.dm | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/modular_skyrat/modules/hyposprays/code/hyposprays_II.dm b/modular_skyrat/modules/hyposprays/code/hyposprays_II.dm
index 5cb82e0918a..51cc9c71472 100644
--- a/modular_skyrat/modules/hyposprays/code/hyposprays_II.dm
+++ b/modular_skyrat/modules/hyposprays/code/hyposprays_II.dm
@@ -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