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

lmao

Browse Source
This commit is contained in:
kevinz000
2020-04-11 05:52:37 -07:00
parent 65f61c968c
commit f8a7a68ac3
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/living_active_block.dm
+2 -2
View File
@@ -18,6 +18,7 @@
if(!active_blocking)
return FALSE
var/obj/item/I = active_block_item
active_block_effect_end()
active_blocking = FALSE
active_block_item = null
REMOVE_TRAIT(src, TRAIT_MOBILITY_NOUSE, ACTIVE_BLOCK_TRAIT)
@@ -25,7 +26,6 @@
var/datum/block_parry_data/data = get_block_parry_data(I.block_parry_data)
if(timeToNextMove() < data.block_end_click_cd_add)
changeNext_move(data.block_end_click_cd_add)
active_block_effect_end()
return TRUE
/mob/living/proc/start_active_blocking(obj/item/I)
@@ -39,7 +39,7 @@
active_blocking = TRUE
active_block_item = I
if(data.block_lock_attacking)
ADD_TRAIT(src, TRAIT_MOBILITY_NOMOVE, ACTIVE_BLOCK_TRAIT)
ADD_TRAIT(src, TRAIT_MOBILITY_NOUSE, ACTIVE_BLOCK_TRAIT) //probably should be something else at some point
add_movespeed_modifier(MOVESPEED_ID_ACTIVE_BLOCK, TRUE, 100, override = TRUE, multiplicative_slowdown = data.block_slowdown, blacklisted_movetypes = FLOATING)
active_block_effect_start()
return TRUE