diff --git a/code/game/machinery/rechargestation.dm b/code/game/machinery/rechargestation.dm
index 96ab5eab20..87077b68db 100644
--- a/code/game/machinery/rechargestation.dm
+++ b/code/game/machinery/rechargestation.dm
@@ -289,3 +289,27 @@
 	if(!usr.incapacitated())
 		return
 	go_in(usr)
+
+/obj/machinery/recharge_station/ghost_pod_recharger
+	name = "drone pod"
+	desc = "This is a pod which used to contain a drone... Or maybe it still does?"
+	icon = 'icons/obj/structures.dmi'
+
+/obj/machinery/recharge_station/ghost_pod_recharger/update_icon()
+	..()
+	if(stat & BROKEN)
+		icon_state = "borg_pod_closed"
+		desc = "It appears broken..."
+		return
+
+	if(occupant)
+		if((stat & NOPOWER) && !has_cell_power())
+			icon_state = "borg_pod_closed"
+			desc = "It appears to be unpowered..."
+		else
+			icon_state = "borg_pod_closed"
+	else
+		icon_state = "borg_pod_opened"
+
+	if(icon_update_tick == 0)
+		build_overlays()
\ No newline at end of file
diff --git a/code/game/objects/structures/ghost_pods/ghost_pods.dm b/code/game/objects/structures/ghost_pods/ghost_pods.dm
index 7beba29caa..9eeefeee61 100644
--- a/code/game/objects/structures/ghost_pods/ghost_pods.dm
+++ b/code/game/objects/structures/ghost_pods/ghost_pods.dm
@@ -22,6 +22,8 @@
 	if(winner.len)
 		var/mob/observer/dead/D = winner[1]
 		create_occupant(D)
+		new /obj/machinery/recharge_station/ghost_pod_recharger(src.loc)
+		del(src)
 		return TRUE
 	else
 		return FALSE
@@ -29,7 +31,6 @@
 // Override this to create whatever mob you need. Be sure to call ..() if you don't want it to make infinite mobs.
 /obj/structure/ghost_pod/proc/create_occupant(var/mob/M)
 	used = TRUE
-	icon_state = icon_state_opened
 	return TRUE