Merge remote-tracking branch 'citadel/master' into mobility_flags

2020-01-27 23:35:35 -07:00
parent 6e31db958c 5e10d297e1
commit 611fd7ea89
323 changed files with 16725 additions and 11570 deletions
@@ -30,7 +30,7 @@
 	var/locked = FALSE
 	var/allow_switch_interact = TRUE

-	var/projectile_type = /obj/item/projectile/beam/emitter
+	var/projectile_type = /obj/item/projectile/beam/emitter/hitscan
 	var/projectile_sound = 'sound/weapons/emitter.ogg'
 	var/datum/effect_system/spark_spread/sparks