diff --git a/code/game/machinery/cell_charger.dm b/code/game/machinery/cell_charger.dm
index 83b0c0ee2d..15df92c37e 100644
--- a/code/game/machinery/cell_charger.dm
+++ b/code/game/machinery/cell_charger.dm
@@ -103,8 +103,18 @@
 	removecell()
 
 /obj/machinery/cell_charger/attack_ai(mob/user)
+	if(!charging)
+		return
+
+	charging.forceMove(loc)
+	to_chat(user, "<span class='notice'>You remotely disconnect the battery port and eject [charging] from [src].</span>")
+
+	removecell()
 	return
 
+/obj/machinery/cell_charger/attack_robot(mob/user)
+	attack_ai(user)
+
 /obj/machinery/cell_charger/emp_act(severity)
 	. = ..()
 
diff --git a/code/game/objects/items/robot/robot_items.dm b/code/game/objects/items/robot/robot_items.dm
index 564f08b14d..4b2e022da7 100644
--- a/code/game/objects/items/robot/robot_items.dm
+++ b/code/game/objects/items/robot/robot_items.dm
@@ -765,7 +765,8 @@
 		/obj/item/vending_refill,
 		/obj/item/stack/sheet,
 		/obj/item/stack/tile,
-		/obj/item/stack/rods
+		/obj/item/stack/rods,
+		/obj/item/stock_parts
 		)
 	//Basically a blacklist for any subtypes above we dont want
 	var/list/cannot_hold = list(