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

amends

Browse Source
This commit is contained in:
silicons
2020-09-20 13:38:36 -07:00
parent fad91b1f79
commit 86ca2cb905
4 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/_onclick/hud/screen_objects/stamina.dm
+1 -1
View File
@@ -73,7 +73,7 @@
icon_state = "stambuffer29"
return FALSE
else if(user.stamina_buffer >= user.stamina_buffer_max)
icon_state = "staminabuffer29"
icon_state = "stambuffer29"
return FALSE
else
icon_state = "stambuffer[FLOOR((user.stamina_buffer / user.stamina_buffer_max) * 29, 1)]"
code/_onclick/item_attack.dm
+1 -1
View File
@@ -255,7 +255,7 @@
if(!isnull(stagger_force))
return stagger_force
/// totally not an untested, arbitrary equation.
return clamp((1.5 + (w_class/7.5)) * ((force_override || force) / 2), 0, 10 SECONDS)
return clamp((1.5 + (w_class/5)) * ((force_override || force) / 1.5), 0, 10 SECONDS)
/obj/item/proc/do_stagger_action(mob/living/target, mob/living/user, force_override)
if(!CHECK_BITFIELD(target.status_flags, CANSTAGGER))