From 0b39956cf175fc10970bca64f73351111b4f2c11 Mon Sep 17 00:00:00 2001
From: PopeDaveThe3th <80988376+PopeDaveThe3th@users.noreply.github.com>
Date: Fri, 25 Aug 2023 11:45:49 -0400
Subject: [PATCH] Fixes the Timestop spell (#21998)

* Fixes the Timestop spell

* Update code/datums/spells/conjure.dm

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>

---------

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
---
 code/datums/spells/conjure.dm       | 2 +-
 code/datums/spells/wizard_spells.dm | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/code/datums/spells/conjure.dm b/code/datums/spells/conjure.dm
index 6c32400744a..ab1d191f658 100644
--- a/code/datums/spells/conjure.dm
+++ b/code/datums/spells/conjure.dm
@@ -28,7 +28,7 @@
 			targets -= T
 	playsound(get_turf(src), cast_sound, 50, 1)
 
-	if(do_after(user, delay, target = user))
+	if(delay <= 0 || do_after(user, delay, target = user))
 		for(var/i=0,i<summon_amt,i++)
 			if(!targets.len)
 				break
diff --git a/code/datums/spells/wizard_spells.dm b/code/datums/spells/wizard_spells.dm
index 61e5b013eaf..77a8ccfd9b9 100644
--- a/code/datums/spells/wizard_spells.dm
+++ b/code/datums/spells/wizard_spells.dm
@@ -225,11 +225,13 @@
 	invocation_type = "shout"
 	cooldown_min = 100
 	summon_amt = 1
+	delay = 0
 	action_icon_state = "time"
 
 	summon_type = list(/obj/effect/timestop/wizard)
 	aoe_range = 0
 
+
 /obj/effect/proc_holder/spell/aoe/conjure/carp
 	name = "Summon Carp"
 	desc = "This spell conjures a simple carp."