Fixing beam rifles lacking pin and pacifism checks. (#12349)

2020-05-24 22:29:45 +02:00
parent 07df0102f8
commit a41a06bc4b
2 changed files with 6 additions and 7 deletions
@@ -295,7 +295,7 @@
 	if(istype(object, /obj/screen) && !istype(object, /obj/screen/click_catcher))
 		return
 	process_aim()
-	if(fire_check())
+	if(fire_check() && can_trigger_gun(M))
 		sync_ammo()
 		do_fire(M.client.mouseObject, M, FALSE, M.client.mouseParams, M.zone_selected)
 	stop_aiming()