Merge pull request #15209 from SteelSlayer/spawn-removal

Removes a bunch of spawn()'s

code/game/objects/items/devices/whistle.dm

@@ -1,3 +1,6 @@
+
+#define USE_COOLDOWN 2 SECONDS
+
 /obj/item/hailer
 	name = "hailer"
 	desc = "Used by obese officers to save their breath for running."
@@ -6,11 +9,11 @@
 	item_state = "flashtool"	//looks exactly like a flash (and nothing like a flashbang)
 	w_class = WEIGHT_CLASS_TINY
 	flags = CONDUCT
-
+	var/next_use_time
 	var/spamcheck = 0
 
 /obj/item/hailer/attack_self(mob/living/carbon/user as mob)
-	if(spamcheck)
+	if(world.time < next_use_time)
 		return
 
 	if(emagged)
@@ -20,11 +23,11 @@
 		playsound(get_turf(src), 'sound/voice/halt.ogg', 100, 1, vary = 0)
 		user.visible_message("<span class='warning'>[user]'s [name] rasps, \"Halt! Security!\"</span>")
 
-	spamcheck = 1
-	spawn(20)
-		spamcheck = 0
+	next_use_time = world.time + USE_COOLDOWN
 
 /obj/item/hailer/emag_act(user as mob)
 	if(!emagged)
 		to_chat(user, "<span class='warning'>You overload \the [src]'s voice synthesizer.</span>")
 		emagged = 1
+
+#undef USE_COOLDOWN

code/game/objects/structures/inflatable.dm

@@ -59,10 +59,12 @@
 		qdel(src)
 	else
 		visible_message("[src] slowly deflates.")
-		spawn(50)
-			var/obj/item/inflatable/R = new intact(loc)
-			transfer_fingerprints_to(R)
-			qdel(src)
+		addtimer(CALLBACK(src, .proc/deflate), 5 SECONDS)
+
+/obj/structure/inflatable/proc/deflate()
+	var/obj/item/inflatable/R = new intact(loc)
+	transfer_fingerprints_to(R)
+	qdel(src)
 
 /obj/structure/inflatable/verb/hand_deflate()
 	set name = "Deflate"