Merge pull request #6836 from Boggart/holosignfix

Fixes the holosign projector making signs when put into storage. (can_be_placed_into refactor)

code/modules/mining/equipment_locker.dm

@@ -471,13 +471,6 @@
 	force = 10
 	throwforce = 10
 	var/cooldown = 0
-	var/list/can_be_placed_into = list(
-		/obj/structure/table,
-		/obj/structure/closet,
-		/obj/item/weapon/storage,
-		/obj/structure/safe,
-		/obj/machinery/disposal
-		)
 
 /obj/item/weapon/resonator/proc/CreateResonance(var/target, var/creator)
 	if(cooldown <= 0)
@@ -493,12 +486,8 @@
 	..()
 
 /obj/item/weapon/resonator/afterattack(atom/target, mob/user, proximity_flag)
-	if(target in user.contents)
-		return
 	if(proximity_flag)
-		for(var/type in can_be_placed_into)
-			if(istype(target, type))
-				return
+		if(!check_allowed_items(target, 1)) return
 		CreateResonance(target, user)
 
 /obj/effect/resonance

code/modules/reagents/reagent_containers/glass.dm

@@ -12,11 +12,13 @@
 	volume = 50
 	flags = OPENCONTAINER
 
-	var/list/can_be_placed_into = list(
+	can_be_placed_into = list(
 		/obj/machinery/chem_master/,
 		/obj/machinery/chem_dispenser/,
 		/obj/machinery/reagentgrinder,
+		/obj/machinery/biogenerator,
 		/obj/structure/table,
+		/obj/structure/rack,
 		/obj/structure/closet,
 		/obj/structure/sink,
 		/obj/item/weapon/storage,
@@ -35,10 +37,7 @@
 
 
 /obj/item/weapon/reagent_containers/glass/afterattack(obj/target, mob/user, proximity)
-	if(!proximity) return // not adjacent
-	for(var/type in can_be_placed_into)
-		if(istype(target, type))
-			return
+	if((!proximity) || !check_allowed_items(target)) return
 
 	if(ismob(target) && target.reagents && reagents.total_volume)
 		var/mob/M = target