Merge pull request #11627 from kevinz000/combat_rework

"Unofficial" Combat Rework Part 3: Blocking/Parrying
2020-06-12 16:39:11 -05:00
parent 9215b484f4 b3afed69f4
commit bfe8ccdfb5
83 changed files with 2073 additions and 462 deletions
@@ -506,7 +506,7 @@
 			cell = null
 	qdel(src)

-/obj/machinery/light/attacked_by(obj/item/I, mob/living/user)
+/obj/machinery/light/attacked_by(obj/item/I, mob/living/user, attackchain_flags = NONE, damage_multiplier = 1)
 	..()
 	if(status == LIGHT_BROKEN || status == LIGHT_EMPTY)
 		if(on && (I.flags_1 & CONDUCT_1))