diff --git a/code/game/objects/items/weapons/tools.dm b/code/game/objects/items/weapons/tools.dm
index e8e1bc2dd6d..4430d9fa024 100644
--- a/code/game/objects/items/weapons/tools.dm
+++ b/code/game/objects/items/weapons/tools.dm
@@ -314,7 +314,7 @@
 			// Welder is switched off!
 			user << "<span class='warning'>You need to light the welding tool, first!</span>"
 			return
-		if(S.brute_dam > ROBOLIMB_SELF_REPAIR_CAP)
+		if(S.brute_dam > ROBOLIMB_SELF_REPAIR_CAP && (S.status & ORGAN_ROBOT))
 			user << "<span class='warning'>The damage is far too severe to patch over externally.</span>"
 			return
 		if (src.remove_fuel(0))
diff --git a/code/modules/power/cable.dm b/code/modules/power/cable.dm
index 6f5d5708d1b..34c73b19839 100644
--- a/code/modules/power/cable.dm
+++ b/code/modules/power/cable.dm
@@ -516,18 +516,18 @@ obj/structure/cable/proc/cableColor(var/colorC)
 		if(!(S.status & ORGAN_ASSISTED) || user.a_intent != I_HELP)
 			return ..()
 
-		if(M.isSynthetic() && M == user)
+		if(M.isSynthetic() && M == user && !(M.get_species() == "Hunter-Killer"))
 			user << "<span class='warning'>You can't repair damage to your own body - it's against OH&S.</span>"
 			return
 
 		if(S.burn_dam)
-			if(S.burn_dam < ROBOLIMB_SELF_REPAIR_CAP)
-				S.heal_damage(0,15,0,1)
-				user.setClickCooldown(DEFAULT_ATTACK_COOLDOWN)
-				user.visible_message("<span class='danger'>\The [user] patches some damaged wiring on \the [M]'s [S.name] with \the [src].</span>")
-			else if(S.open != 2)
-				user << "<span class='danger'>The damage is far too severe to patch over externally.</span>"
-			return 1
+			if(S.burn_dam > ROBOLIMB_SELF_REPAIR_CAP && (S.status & ORGAN_ROBOT))
+				to_chat(user, "<span class='warning'>The damage is far too severe to patch over externally.</span>")
+				return
+
+			S.heal_damage(0,15,0,1)
+			user.setClickCooldown(DEFAULT_ATTACK_COOLDOWN)
+			user.visible_message("<span class='danger'>\The [user] patches some damaged wiring on \the [M]'s [S.name] with \the [src].</span>")
 		else if(S.open != 2)
 			user << "<span class='notice'>Nothing to fix!</span>"
 
diff --git a/html/changelogs/alberyk-repair.yml b/html/changelogs/alberyk-repair.yml
new file mode 100644
index 00000000000..0bfe1940630
--- /dev/null
+++ b/html/changelogs/alberyk-repair.yml
@@ -0,0 +1,6 @@
+author: Alberyk
+
+delete-after: True
+
+changes: 
+  - bugfix: "Aut'akh can now properly heal their chest, groin and head."