From aa8d28a86bf13d65a3200363a634e58080714435 Mon Sep 17 00:00:00 2001
From: crazyraio2 <44246096+crazyraio2@users.noreply.github.com>
Date: Fri, 31 Jul 2020 12:37:45 -0300
Subject: [PATCH] gets rid of my lazy fix for the glory kill

---
 .../simple_animal/hostile/megafauna/megafauna.dm       |  6 ++++--
 .../simple_animal/hostile/mining_mobs/miningmobs.dm    | 10 +++-------
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/sandcode/code/modules/mob/living/simple_animal/hostile/megafauna/megafauna.dm b/sandcode/code/modules/mob/living/simple_animal/hostile/megafauna/megafauna.dm
index 64ffdb492f..b8a480dbe8 100644
--- a/sandcode/code/modules/mob/living/simple_animal/hostile/megafauna/megafauna.dm
+++ b/sandcode/code/modules/mob/living/simple_animal/hostile/megafauna/megafauna.dm
@@ -116,7 +116,7 @@
 	else
 		for(var/mob/living/M in view(src, vision_range))
 			if(M.client)
-				M.stop_sound_channel(CHANNEL_BOSSMUSIC)
+				M.stop_sound_channel(CHANNEL_AMBIENCE)
 		animate(src, color = initial(color), time = 3)
 		desc = initial(desc)
 		var/datum/status_effect/crusher_damage/C = has_status_effect(STATUS_EFFECT_CRUSHERDAMAGETRACKING)
@@ -134,13 +134,15 @@
 		..()
 
 /mob/living/simple_animal/hostile/megafauna/AltClick(mob/living/carbon/slayer)
+	if(!slayer.canUseTopic(src, TRUE))
+		return
 	if(glorykill)
 		if(ranged)
 			if(ranged_cooldown >= world.time)
 				ranged_cooldown += 10
 			else
 				ranged_cooldown = 10 + world.time
-		if(do_after(slayer, 10, needhand = TRUE, target = src, progress = FALSE) && (stat != DEAD))
+		if(do_mob(slayer, src, 10) && (stat != DEAD))
 			var/message
 			if(!slayer.get_active_held_item() || (!istype(slayer.get_active_held_item(), /obj/item/kinetic_crusher) && !istype(slayer.get_active_held_item(), /obj/item/gun/energy/kinetic_accelerator)))
 				message = pick(glorymessageshand)
diff --git a/sandcode/code/modules/mob/living/simple_animal/hostile/mining_mobs/miningmobs.dm b/sandcode/code/modules/mob/living/simple_animal/hostile/mining_mobs/miningmobs.dm
index 7f2b4ee1ef..e6b8f83e80 100644
--- a/sandcode/code/modules/mob/living/simple_animal/hostile/mining_mobs/miningmobs.dm
+++ b/sandcode/code/modules/mob/living/simple_animal/hostile/mining_mobs/miningmobs.dm
@@ -34,14 +34,10 @@
 	..(gibbed)
 
 /mob/living/simple_animal/hostile/asteroid/AltClick(mob/living/carbon/slayer)
+	if(!slayer.canUseTopic(src, TRUE))
+		return
 	if(glorykill)
-		if(ranged)
-			if(ranged_cooldown >= world.time)
-				ranged_cooldown += 10
-			else
-				ranged_cooldown = 10 + world.time
-	if(glorykill)
-		if(do_after(slayer, 10, needhand = TRUE, target = src, progress = FALSE) && (stat != DEAD))
+		if(do_mob(slayer, src, 10) && (stat != DEAD))
 			var/message
 			if(!slayer.get_active_held_item() || (!istype(slayer.get_active_held_item(), /obj/item/kinetic_crusher) && !istype(slayer.get_active_held_item(), /obj/item/gun/energy/kinetic_accelerator)))
 				message = pick(glorymessageshand)