diff --git a/code/modules/admin/verbs/debug.dm b/code/modules/admin/verbs/debug.dm
index 66438d1fac..362ce2a1d8 100644
--- a/code/modules/admin/verbs/debug.dm
+++ b/code/modules/admin/verbs/debug.dm
@@ -348,11 +348,10 @@ GLOBAL_PROTECT(AdminProcCallCount)
 			/obj/effect/decal/cleanable = "CLEANABLE",
 			/obj/item/device/radio/headset = "HEADSET",
 			/obj/item/clothing/head/helmet/space = "SPESSHELMET",
-			/obj/item/weapon/book/manual = "MANUAL",
-			/obj/item/weapon/reagent_containers/food/drinks = "DRINK", //longest paths comes first
-			/obj/item/weapon/reagent_containers/food = "FOOD",
-			/obj/item/weapon/reagent_containers = "REAGENT_CONTAINERS",
-			/obj/item/weapon = "WEAPON",
+			/obj/item/book/manual = "MANUAL",
+			/obj/item/reagent_containers/food/drinks = "DRINK", //longest paths comes first
+			/obj/item/reagent_containers/food = "FOOD",
+			/obj/item/reagent_containers = "REAGENT_CONTAINERS",
 			/obj/machinery/atmospherics = "ATMOS_MECH",
 			/obj/machinery/portable_atmospherics = "PORT_ATMOS",
 			/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/missile_rack = "MECHA_MISSILE_RACK",
@@ -442,14 +441,14 @@ GLOBAL_PROTECT(AdminProcCallCount)
 	if(ishuman(M))
 		var/mob/living/carbon/human/H = M
 		var/obj/item/worn = H.wear_id
-		var/obj/item/weapon/card/id/id = null
+		var/obj/item/card/id/id = null
 		if(worn)
 			id = worn.GetID()
 		if(id)
 			id.icon_state = "gold"
 			id.access = get_all_accesses()+get_all_centcom_access()+get_all_syndicate_access()
 		else
-			id = new /obj/item/weapon/card/id/gold(H.loc)
+			id = new /obj/item/card/id/gold(H.loc)
 			id.access = get_all_accesses()+get_all_centcom_access()+get_all_syndicate_access()
 			id.registered_name = H.real_name
 			id.assignment = "Captain"
@@ -460,8 +459,8 @@ GLOBAL_PROTECT(AdminProcCallCount)
 					var/obj/item/device/pda/PDA = worn
 					PDA.id = id
 					id.forceMove(PDA)
-				else if(istype(worn, /obj/item/weapon/storage/wallet))
-					var/obj/item/weapon/storage/wallet/W = worn
+				else if(istype(worn, /obj/item/storage/wallet))
+					var/obj/item/storage/wallet/W = worn
 					W.front_id = id
 					id.forceMove(W)
 					W.update_icon()
@@ -505,12 +504,13 @@ GLOBAL_PROTECT(AdminProcCallCount)
 	var/list/areas_with_LS = list()
 	var/list/areas_with_intercom = list()
 	var/list/areas_with_camera = list()
+	var/list/station_areas_blacklist = typecacheof(list(/area/holodeck/rec_center, /area/shuttle, /area/engine/supermatter, /area/science/test_area, /area/space, /area/solar, /area/mine, /area/ruin))
 
 	for(var/area/A in world)
 		if(on_station)
 			var/turf/picked = safepick(get_area_turfs(A.type))
 			if(picked && (picked.z == ZLEVEL_STATION))
-				if(!(A.type in areas_all))
+				if(!(A.type in areas_all) && !is_type_in_typecache(A, station_areas_blacklist))
 					areas_all.Add(A.type)
 		else if(!(A.type in areas_all))
 			areas_all.Add(A.type)
@@ -705,7 +705,7 @@ GLOBAL_PROTECT(AdminProcCallCount)
 	for(var/obj/machinery/power/rad_collector/Rad in GLOB.machines)
 		if(Rad.anchored)
 			if(!Rad.loaded_tank)
-				var/obj/item/weapon/tank/internals/plasma/Plasma = new/obj/item/weapon/tank/internals/plasma(Rad)
+				var/obj/item/tank/internals/plasma/Plasma = new/obj/item/tank/internals/plasma(Rad)
 				Plasma.air_contents.assert_gas("plasma")
 				Plasma.air_contents.gases["plasma"][MOLES] = 70
 				Rad.drainratio = 0
diff --git a/code/modules/admin/verbs/debug.dm.rej b/code/modules/admin/verbs/debug.dm.rej
deleted file mode 100644
index d212d37447..0000000000
--- a/code/modules/admin/verbs/debug.dm.rej
+++ /dev/null
@@ -1,9 +0,0 @@
-diff a/code/modules/admin/verbs/debug.dm b/code/modules/admin/verbs/debug.dm	(rejected hunks)
-@@ -352,7 +352,6 @@ GLOBAL_PROTECT(AdminProcCallCount)
- 			/obj/item/reagent_containers/food/drinks = "DRINK", //longest paths comes first
- 			/obj/item/reagent_containers/food = "FOOD",
- 			/obj/item/reagent_containers = "REAGENT_CONTAINERS",
--			/obj/item = "WEAPON",
- 			/obj/machinery/atmospherics = "ATMOS_MECH",
- 			/obj/machinery/portable_atmospherics = "PORT_ATMOS",
- 			/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/missile_rack = "MECHA_MISSILE_RACK",