cyberpresidentvanellope/S.P.L.U.R.T-Station-13
1
0
Fork 0
mirror of https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13.git synced 2025-12-10 18:02:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #14233 from DeltaFire15/armwrap-kneecap

Browse Source 
About unarmed parrying..
This commit is contained in:
silicons
2021-02-13 19:06:39 -07:00
committed by GitHub
parent c186a5c1c8 06101ee9c8
commit aeb9b1e06c
2 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/modules/clothing/gloves/miscellaneous.dm
View File

@@ -220,8 +220,8 @@
parry_max_attacks = INFINITY parry_max_attacks = INFINITY
parry_failed_cooldown_duration = 2.25 SECONDS parry_failed_cooldown_duration = 2.25 SECONDS
parry_failed_stagger_duration = 2.25 SECONDS parry_failed_stagger_duration = 2.25 SECONDS
parry_cooldown = 0 parry_cooldown = 3 SECONDS
parry_failed_clickcd_duration = 0 parry_failed_clickcd_duration = 0.5 SECONDS
/obj/item/clothing/gloves/botanic_leather /obj/item/clothing/gloves/botanic_leather
name = "botanist's leather gloves" name = "botanist's leather gloves"

17
code/modules/mob/living/carbon/human/human_defines.dm
View File

@@ -95,9 +95,10 @@
parry_efficiency_considered_successful = 0.01 parry_efficiency_considered_successful = 0.01
parry_efficiency_to_counterattack = 0.01 parry_efficiency_to_counterattack = 0.01
parry_max_attacks = 3 parry_max_attacks = 3
parry_cooldown = 30 parry_cooldown = 3 SECONDS
parry_failed_stagger_duration = 0 parry_failed_cooldown_duration = 1.5 SECONDS
parry_failed_clickcd_duration = 0.4 parry_failed_stagger_duration = 1 SECONDS
parry_failed_clickcd_duration = 0.4 SECONDS
parry_data = list( // yeah it's snowflake parry_data = list( // yeah it's snowflake
"UNARMED_PARRY_STAGGER" = 3 SECONDS, "UNARMED_PARRY_STAGGER" = 3 SECONDS,
@@ -135,16 +136,16 @@
parry_imperfect_falloff_percent = 20 parry_imperfect_falloff_percent = 20
parry_efficiency_perfect = 100 parry_efficiency_perfect = 100
parry_efficiency_perfect_override = list( parry_efficiency_perfect_override = list(
ATTACK_TYPE_PROJECTILE_TEXT = 60, TEXT_ATTACK_TYPE_PROJECTILE = 60,
) )
parry_efficiency_considered_successful = 0.01 parry_efficiency_considered_successful = 0.01
parry_efficiency_to_counterattack = 0.01 parry_efficiency_to_counterattack = 0.01
parry_max_attacks = INFINITY parry_max_attacks = INFINITY
parry_failed_cooldown_duration = 1.5 SECONDS parry_failed_cooldown_duration = 3 SECONDS
parry_failed_stagger_duration = 0 parry_failed_stagger_duration = 2 SECONDS
parry_cooldown = 0 parry_cooldown = 3 SECONDS
parry_failed_clickcd_duration = 0.8 parry_failed_clickcd_duration = 0.8 SECONDS
parry_data = list( // yeah it's snowflake parry_data = list( // yeah it's snowflake
"UNARMED_PARRY_STAGGER" = 3 SECONDS, "UNARMED_PARRY_STAGGER" = 3 SECONDS,