diff --git a/code/_onclick/item_attack.dm b/code/_onclick/item_attack.dm index 02aada16f6..51f2b375cc 100644 --- a/code/_onclick/item_attack.dm +++ b/code/_onclick/item_attack.dm @@ -124,9 +124,9 @@ //var/smutant = force*0.25 //Not using this for FEV mutated as this could let you do a lot of trolling. //var/ghoulmelee = force*0.25 //negative trait, this will cut 25% of the damage done by melee - //var/regular = force*(user.special_s/100)//SPECIAL integration + var/regular = force*(user.special_s/100)//SPECIAL integration - //force += regular//SPECIAL integration + force += regular//SPECIAL integration var/force_modifier = 0 if(force >= 5) diff --git a/code/modules/mob/living/life.dm b/code/modules/mob/living/life.dm index b055761c20..df30d0f773 100644 --- a/code/modules/mob/living/life.dm +++ b/code/modules/mob/living/life.dm @@ -7,11 +7,11 @@ /mob/living/proc/Life(seconds, times_fired) - //if(!SPECIAL_SET) - // src.maxHealth += (src.special_e*3)//SPECIAL Integration - // src.health += (src.special_e*3)//SPECIAL Integration - // update_special_speed((5-src.special_a)/20)//SPECIAL Integration - // SPECIAL_SET = TRUE + if(!SPECIAL_SET) + src.maxHealth += (src.special_e*3)//SPECIAL Integration + src.health += (src.special_e*3)//SPECIAL Integration + update_special_speed((5-src.special_a)/20)//SPECIAL Integration + SPECIAL_SET = FALSE //SHOULD_NOT_SLEEP(TRUE) if(mob_transforming)