diff --git a/code/__DEFINES/admin.dm b/code/__DEFINES/admin.dm
index ea18a90908a..78ed29c3321 100644
--- a/code/__DEFINES/admin.dm
+++ b/code/__DEFINES/admin.dm
@@ -64,7 +64,6 @@
#define ADMIN_COORDJMP(src) "[src ? "[COORD(src)] [ADMIN_JMP(src)]" : "nonexistent location"]"
#define ADMIN_VERBOSEJMP(src) "[src ? "[AREACOORD(src)] [ADMIN_JMP(src)]" : "nonexistent location"]"
#define ADMIN_INDIVIDUALLOG(user) "(LOGS)"
-#define ADMIN_RETRIEVE_BOH_ITEMS(boh) "(RETRIEVE CONSUMED ITEMS)"
#define ADMIN_PUNISHMENT_LIGHTNING "Lightning bolt"
#define ADMIN_PUNISHMENT_BRAINDAMAGE "Brain damage"
diff --git a/code/modules/admin/topic.dm b/code/modules/admin/topic.dm
index e731b3847e3..c32840a49dd 100644
--- a/code/modules/admin/topic.dm
+++ b/code/modules/admin/topic.dm
@@ -2195,19 +2195,6 @@
else if(href_list["beakerpanel"])
beaker_panel_act(href_list)
- else if(href_list["retrieveboh"])
- var/obj/singularity/boh_tear/tear = locate(href_list["retrieveboh"])
- if(!tear)
- to_chat(usr, "Either items were already retrieved or 10 minutes have passed and they were deleted.")
- return
- var/confirm = alert("This will teleport all items consumed to the BoH tear back to the BoH tear original location, and delete the BoH if it still exists. Are you sure?", "Confirm Damage Control", "Yes", "No")
- if(confirm != "Yes")
- return
- var/turf/T = get_turf(tear.old_loc)
- message_admins("The items consumed by the BoH tear at [ADMIN_VERBOSEJMP(T)] were retrieved by [key_name_admin(usr)].")
- tear.investigate_log("Items consumed at [AREACOORD(T)] retrieved by [key_name(usr)].", INVESTIGATE_SINGULO)
- tear.retrieve_consumed_items()
-
/datum/admins/proc/HandleCMode()
if(!check_rights(R_ADMIN))
return
diff --git a/code/modules/power/singularity/boh_tear.dm b/code/modules/power/singularity/boh_tear.dm
index 684776d8485..697425246a0 100644
--- a/code/modules/power/singularity/boh_tear.dm
+++ b/code/modules/power/singularity/boh_tear.dm
@@ -20,47 +20,17 @@
/obj/singularity/boh_tear/Initialize()
. = ..()
old_loc = loc
- addtimer(CALLBACK(src, /atom/movable.proc/moveToNullspace), 5 SECONDS) // vanishes after 5 seconds
- QDEL_IN(src, 10 MINUTES)
-
-/// Retrieve all the items consumed
-/obj/singularity/boh_tear/proc/retrieve_consumed_items()
- for(var/atom/movable/content in contents)
- content.forceMove(old_loc)
- if(ismob(content))
- var/mob/M = content
- if(!M.mind)
- continue
- for(var/mob/dead/observer/ghost in ghosts)
- if(ghost.mind == M.mind)
- ghosts -= ghost
- ghost.can_reenter_corpse = TRUE
- ghost.reenter_corpse()
- break
- qdel(src)
+ QDEL_IN(src, 5 SECONDS) // vanishes after 5 seconds
/obj/singularity/boh_tear/process()
eat()
/obj/singularity/boh_tear/consume(atom/A)
- if(isturf(A))
- A.singularity_act()
- return
- var/atom/movable/AM = A
- if(!istype(AM))
- return
- if(isliving(AM))
- var/mob/living/M = AM
- var/turf/T = get_turf(src)
- investigate_log("([key_name(A)]) has been consumed by the BoH tear at [AREACOORD(T)].", INVESTIGATE_SINGULO)
- M.ghostize(FALSE)
- else if(!isobj(AM))
- return
- AM.forceMove(src)
+ A.singularity_act(current_size, src)
/obj/singularity/boh_tear/admin_investigate_setup()
var/turf/T = get_turf(src)
- message_admins("A BoH tear has been created at [ADMIN_VERBOSEJMP(T)]. [ADMIN_RETRIEVE_BOH_ITEMS(src)]")
+ message_admins("A BoH tear has been created at [ADMIN_VERBOSEJMP(T)].")
investigate_log("was created at [AREACOORD(T)].", INVESTIGATE_SINGULO)
/obj/singularity/boh_tear/attack_tk(mob/living/user)