Merge pull request #6989 from atlantiscze/door-fix-mk2

Fixes #6985
2026-08-30 23:49:21 +01:00 · 2014-11-12 23:44:29 +03:00
parent 65cdfc4e52 0a783651a8
commit a54b7c5ea2
1 changed files with 4 additions and 0 deletions
@@ -127,6 +127,10 @@
 	return

 /obj/machinery/door/bullet_act(var/obj/item/projectile/Proj)
+	//Tasers and the like should not damage doors.
+	if(Proj.damage_type == HALLOSS)
+		return
+
 	if(Proj.damage)
 		take_damage(round(Proj.damage * 4))
 	..()