Does the thing

code/modules/mob/living/simple_animal/constructs.dm

@@ -44,6 +44,7 @@
 	var/can_repair_constructs = FALSE
 	var/can_repair_self = FALSE
 	var/runetype
+	var/original_body
 
 /mob/living/simple_animal/hostile/construct/Initialize()
 	. = ..()
@@ -66,6 +67,11 @@
 		CR.button.screen_loc = "6:[pos],4:-2"
 		CR.button.moved = "6:[pos],4:-2"
 
+/mob/living/simple_animal/hostile/construct/death()
+	if(original_body)
+		transfer_ckey(original_body)
+	..()
+
 /mob/living/simple_animal/hostile/construct/Login()
 	..()
 	to_chat(src, playstyle_string)
@@ -107,7 +113,7 @@
 	return
 
 /mob/living/simple_animal/hostile/construct/electrocute_act(shock_damage, source, siemens_coeff = 1, flags = NONE)
-	return 0
+	return FALSE
 
 /mob/living/simple_animal/hostile/construct/adjustHealth(amount, updating_health = TRUE, forced = FALSE)
 	. = ..()