Skip to content

Commit

Permalink
Merge branch 'tg-effects-part2-poc' into tg-effects-part3
Browse files Browse the repository at this point in the history
  • Loading branch information
fira committed Nov 5, 2023
2 parents d525d91 + 83013e3 commit 93e4fcd
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions code/modules/mob/living/carbon/human/life/life_helpers.dm
Original file line number Diff line number Diff line change
Expand Up @@ -206,20 +206,20 @@

/mob/living/carbon/human/GetStunDuration(amount)
. = ..()
var/skill_resistance = skills ? (skills.get_skill_level(SKILL_ENDURANCE)-1)*0.1 : 0
var/final_reduction = (1 - skill_resistance * 0.02) / species.stun_reduction
var/skill_resistance = skills ? (skills.get_skill_level(SKILL_ENDURANCE)-1)*0.08 : 0
var/final_reduction = (1 - skill_resistance) / species.stun_reduction
return . * final_reduction

/mob/living/carbon/human/GetKnockDownDuration(amount)
. = ..()
var/skill_resistance = skills ? (skills.get_skill_level(SKILL_ENDURANCE)-1)*0.1 : 0
var/final_reduction = (1 - skill_resistance * 0.02) / species.knock_down_reduction
var/skill_resistance = skills ? (skills.get_skill_level(SKILL_ENDURANCE)-1)*0.08 : 0
var/final_reduction = (1 - skill_resistance) / species.knock_down_reduction
return . * final_reduction

/mob/living/carbon/human/GetKnockOutDuration(amount)
. = ..()
var/skill_resistance = skills ? (skills.get_skill_level(SKILL_ENDURANCE)-1)*0.1 : 0
var/final_reduction = (1 - skill_resistance * 0.02) / species.knock_out_reduction
var/skill_resistance = skills ? (skills.get_skill_level(SKILL_ENDURANCE)-1)*0.08 : 0
var/final_reduction = (1 - skill_resistance) / species.knock_out_reduction
return . * final_reduction

/mob/living/carbon/human/GetDazeDuration(amount)
Expand Down

0 comments on commit 93e4fcd

Please sign in to comment.