From fb79a2033d68c201e2f2b4b4430defcab894f3e0 Mon Sep 17 00:00:00 2001
From: Blue Wildrose <glowingroseofblue@gmail.com>
Date: Sun, 4 Apr 2021 21:34:27 -0700
Subject: [PATCH] usr.name into user, also adding in do_after.

---
 .../objects/structures/ghost_role_spawners.dm | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/code/game/objects/structures/ghost_role_spawners.dm b/code/game/objects/structures/ghost_role_spawners.dm
index 9a85a700e2..2e1f76cefe 100644
--- a/code/game/objects/structures/ghost_role_spawners.dm
+++ b/code/game/objects/structures/ghost_role_spawners.dm
@@ -623,14 +623,19 @@
 		if(user.mind.has_antag_datum(/datum/antagonist/pirate))
 			to_chat(user,"<span class='warning'>Why would you want to do that to your shipmate? That'd kill them.</span>")
 			return
-		user.visible_message("<span class='warning'>[usr.name] pries open the [src], disrupting the sleep of the pirate within and killing them.</span>",
-			"<span class='notice'>You pry open the [src], disrupting the sleep of the pirate within and killing them.</span>",
-			"<span class='italics'>You hear prying, followed by the death rattling of bones.</span>")
+		user.visible_message("<span class='warning'>[user] start to pry open the [src]...</span>",
+				"<span class='notice'>You start to pry open the [src]...</span>",
+				"<span class='italics'>You hear prying...</span>")
 		W.play_tool_sound(src)
-		playsound(src.loc, 'modular_citadel/sound/voice/scream_skeleton.ogg', 50, 1, 4, 1.2)
-		if(rank == "Captain") new /obj/effect/mob_spawn/human/pirate/corpse/captain(get_turf(src))
-		else new /obj/effect/mob_spawn/human/pirate/corpse(get_turf(src))
-		qdel(src)
+		if(do_after(user, 100*W.toolspeed, target = src))
+			user.visible_message("<span class='warning'>[user] pries open the [src], disrupting the sleep of the pirate within and killing them.</span>",
+				"<span class='notice'>You pry open the [src], disrupting the sleep of the pirate within and killing them.</span>",
+				"<span class='italics'>You hear prying, followed by the death rattling of bones.</span>")
+			W.play_tool_sound(src)
+			playsound(src.loc, 'modular_citadel/sound/voice/scream_skeleton.ogg', 50, 1, 4, 1.2)
+			if(rank == "Captain") new /obj/effect/mob_spawn/human/pirate/corpse/captain(get_turf(src))
+			else new /obj/effect/mob_spawn/human/pirate/corpse(get_turf(src))
+			qdel(src)
 	else
 		..()