fix

2020-05-30 01:22:09 -07:00
parent e16acb01bf
commit b74d465b6c
3 changed files with 23 additions and 2 deletions
@@ -101,7 +101,7 @@
 		return 1
 	return ..()

-/obj/structure/destructible/clockwork/attacked_by(obj/item/I, mob/living/user)
+/obj/structure/destructible/clockwork/attacked_by(obj/item/I, mob/living/user, attackchain_flags = NONE, damage_multiplier = 1)
 	if(is_servant_of_ratvar(user) && immune_to_servant_attacks)
 		return FALSE
 	return ..()
@@ -66,6 +66,8 @@
 /mob/living/proc/end_parry_sequence()
 	if(!parrying)
 		return
+	REMOVE_TRAIT(src, TRAIT_MOBILITY_NOUSE, ACTIVE_PARRY_TRAIT)
+	REMOVE_TRAIT(src, TRAIT_SPRINT_LOCKED, ACTIVE_PARRY_TRAIT)
 	if(parry_visual_effect)
 		QDEL_NULL(parry_visual_effect)
 	var/datum/block_parry_data/data = get_parry_data()