Merge pull request #12883 from Citadel-Station-13/silicons-patch-49

beam rifles are now practical in emitters
2020-07-28 22:05:39 -05:00
parent be20861294 aabe3c3b32
commit bbffd41d55
5 changed files with 22 additions and 4 deletions
@@ -315,6 +315,9 @@

 /obj/machinery/power/emitter/proc/integrate(obj/item/gun/energy/E,mob/user)
 	if(istype(E, /obj/item/gun/energy))
+		if(!E.can_emitter)
+			to_chat(user, "<span class='warning'>[E] cannot fit into emitters.</span>")
+			return
 		if(!user.transferItemToLoc(E, src))
 			return
 		gun = E