Merge resolution.

2026-08-26 05:27:39 +01:00 · 2015-01-07 03:43:12 +10:30
parent fe91f23482 7570cf7ea7
commit cb88860f6b
8 changed files with 731 additions and 50 deletions
@@ -14,6 +14,11 @@
 	return 1

 /obj/structure/girder/bullet_act(var/obj/item/projectile/Proj)
+
+	//Tasers and the like should not damage girders.
+	if(Proj.damage_type == HALLOSS || Proj.damage_type == TOX || Proj.damage_type == CLONE)
+		return
+
 	if(istype(Proj, /obj/item/projectile/beam))
 		health -= Proj.damage
 		..()