Merge branch 'master' into Projectile_Rework

2022-04-09 04:19:56 +00:00
parent 1b83713f43 3d91de2f10
commit fd286c325e
410 changed files with 7476 additions and 7443 deletions
@@ -13,7 +13,7 @@
 /obj/item/projectile/bullet/p50/on_hit(atom/target, blocked = 0)
 	if(isobj(target) && (blocked != 100) && breakthings)
 		var/obj/O = target
-		O.take_damage(80, BRUTE, "bullet", FALSE)
+		O.take_damage(80, BRUTE, BULLET, FALSE)
 	return ..()

 /obj/item/projectile/bullet/p50/soporific