shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

definition fixes

Browse Source
This commit is contained in:
kevinz000
2020-05-30 22:09:13 -07:00
parent c613726c2a
commit 1fef5825a9
3 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/melee/misc.dm
-1
View File
@@ -234,7 +234,6 @@
. = ..()
if(iscarbon(target))
var/mob/living/carbon/H = target
var/loss = H.getStaminaLoss()
H.Dizzy(10)
H.adjustStaminaLoss(30)
if(CHECK_STAMCRIT(H) != NOT_STAMCRIT)
code/game/objects/items/twohanded.dm
+3 -6
View File
@@ -339,7 +339,7 @@
// more efficient vs projectiles
block_stamina_efficiency_override = list(
"[TEXT_ATTACK_TYPE_PROJECTILE]" = 4
TEXT_ATTACK_TYPE_PROJECTILE = 4
)
/obj/item/twohanded/dualsaber/suicide_act(mob/living/carbon/user)
@@ -1093,8 +1093,8 @@
/datum/block_parry_data/electrostaff
block_damage_absorption = 0
block_damage_multiplier = 1
block_attack_types = ~ATTACK_TYPE_PROJECTILE // only able to parry non projectiles
block_damage_multiplier_override(
can_block_attack_types = ~ATTACK_TYPE_PROJECTILE // only able to parry non projectiles
block_damage_multiplier_override = list(
TEXT_ATTACK_TYPE_MELEE = 0.5, // only useful on melee and unarmed
TEXT_ATTACK_TYPE_UNARMED = 0.3
)
@@ -1114,9 +1114,6 @@
parry_time_perfect = 0
parry_time_perfect_leeway = 1.5
parry_efficiency_perfect = 100
parry_efficiency_perfect_override = list(
TEXT_ATTACK_TYPE_PROJECTILE = 80 // no perfect projectile blocking
)
parry_imperfect_falloff_percent = 15
parry_imperfect_falloff_percent_override = list(
TEXT_ATTACK_TYPE_PROJECTILE = 35 // really crappy vs projectiles