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

Merge branch 'master' into upstream-merge-37597

Browse Source
This commit is contained in:
LetterJay
2018-05-23 05:21:19 -05:00
committed by GitHub
parent 6a575f19d1 ae279fed73
commit e7d9cd0698
29 changed files with 103 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/carbon/human/species.dm
+1 -1
View File
@@ -1251,7 +1251,7 @@ GLOBAL_LIST_EMPTY(roundstart_races)
if(H.back)
. += H.back.slowdown
for(var/obj/item/I in H.held_items)
if(I.flags_2 & SLOWS_WHILE_IN_HAND_2)
if(I.item_flags & SLOWS_WHILE_IN_HAND)
. += I.slowdown
var/stambufferinfluence = (H.bufferedstam*(100/H.stambuffer))*0.2 //CIT CHANGE - makes stamina buffer influence movedelay
var/health_deficiency = ((100 + stambufferinfluence) - H.health + (H.getStaminaLoss()*0.75))//CIT CHANGE - reduces the impact of staminaloss on movement speed and makes stamina buffer influence movedelay