From 2d71218bb2a6efc7271679dc736a771ba3bdd01c Mon Sep 17 00:00:00 2001
From: GDN <96800819+GDNgit@users.noreply.github.com>
Date: Sun, 5 Feb 2023 11:10:36 -0600
Subject: [PATCH] it's borging time (#20282)

---
 code/modules/mob/living/silicon/robot/robot_mob.dm     | 6 ++++--
 code/modules/mob/living/silicon/robot/robot_modules.dm | 1 +
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/code/modules/mob/living/silicon/robot/robot_mob.dm b/code/modules/mob/living/silicon/robot/robot_mob.dm
index 2dd8cd19897..42938d5a284 100644
--- a/code/modules/mob/living/silicon/robot/robot_mob.dm
+++ b/code/modules/mob/living/silicon/robot/robot_mob.dm
@@ -925,12 +925,14 @@ GLOBAL_LIST_INIT(robot_verbs_default, list(
 	if(!remove || !Adjacent(user) || !opened)
 		return
 
+	if(module && (remove in module.custom_removals))
+		module.handle_custom_removal(remove, user, I)
+		return
+
 	var/datum/robot_component/C = components[remove]
 	if(C.is_missing()) // Somebody else removed it during the input
 		return
 
-	if(module && module.handle_custom_removal(remove, user, I))
-		return
 	if(!I.use_tool(src, user, 0, volume = I.tool_volume))
 		return
 	var/obj/item/robot_parts/robot_component/thing = C.wrapped
diff --git a/code/modules/mob/living/silicon/robot/robot_modules.dm b/code/modules/mob/living/silicon/robot/robot_modules.dm
index 781de699bf9..82b5876d148 100644
--- a/code/modules/mob/living/silicon/robot/robot_modules.dm
+++ b/code/modules/mob/living/silicon/robot/robot_modules.dm
@@ -575,6 +575,7 @@
 	if(component_id == "KA modkits")
 		for(var/obj/item/gun/energy/kinetic_accelerator/cyborg/D in src)
 			D.crowbar_act(user, W)
+		to_chat(user, "You remove the KPA modkits.")
 		return TRUE
 	return ..()