From 0fae71b79b7fb13d2a8dd88c5d89fd0bca6daa3e Mon Sep 17 00:00:00 2001
From: DGamerL <108773801+DGamerL@users.noreply.github.com>
Date: Tue, 3 Oct 2023 18:48:13 +0200
Subject: [PATCH] Seems to fix it (#22680)

---
 code/game/gamemodes/malfunction/Malf_Modules.dm          | 4 ++--
 code/modules/mob/living/silicon/robot/robot_inventory.dm | 2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/code/game/gamemodes/malfunction/Malf_Modules.dm b/code/game/gamemodes/malfunction/Malf_Modules.dm
index 8bff1509840..8d40d27b4c9 100644
--- a/code/game/gamemodes/malfunction/Malf_Modules.dm
+++ b/code/game/gamemodes/malfunction/Malf_Modules.dm
@@ -807,13 +807,13 @@
 		return
 	is_active = TRUE
 	ranged_ability_user.playsound_local(ranged_ability_user, "sparks", 50, FALSE, use_reverb = FALSE)
-	attached_action.adjust_uses(-1)
+	var/datum/action/innate/ai/ranged/repair_cyborg/actual_action = attached_action
+	actual_action.adjust_uses(-1)
 	robot_target.audible_message("<span class='italics'>You hear a loud electrical buzzing sound coming from [robot_target]!</span>")
 	if(!do_mob(caller, robot_target, 10 SECONDS))
 		is_active = FALSE
 		return
 	is_active = FALSE
-	var/datum/action/innate/ai/ranged/repair_cyborg/actual_action = attached_action
 	actual_action.fix_borg(robot_target)
 	remove_ranged_ability(ranged_ability_user, "<span class='warning'>[robot_target] successfully rebooted.</span>")
 	return TRUE
diff --git a/code/modules/mob/living/silicon/robot/robot_inventory.dm b/code/modules/mob/living/silicon/robot/robot_inventory.dm
index 2fa67b06613..e065e41d1c5 100644
--- a/code/modules/mob/living/silicon/robot/robot_inventory.dm
+++ b/code/modules/mob/living/silicon/robot/robot_inventory.dm
@@ -249,6 +249,8 @@
 	return ..()
 
 /mob/living/silicon/robot/proc/update_module_icon()
+	if(!hands)
+		return
 	if(!module)
 		hands.icon_state = "nomod"
 	else