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

fix

Browse Source
This commit is contained in:
silicons
2020-06-29 23:45:18 -07:00
parent 6a91ce8416
commit 7a2818d657
3 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/living_active_block.dm
+6 -6
View File
@@ -14,14 +14,14 @@
changeNext_move(data.block_end_click_cd_add) changeNext_move(data.block_end_click_cd_add)
return TRUE return TRUE
/mob/living/proc/ACTIVE_BLOCKING_START(obj/item/I) /mob/living/proc/ACTIVE_BLOCK_START(obj/item/I)
if(combat_flags & (COMBAT_FLAG_ACTIVE_BLOCK_STARTING | COMBAT_FLAG_ACTIVE_BLOCKING)) if(combat_flags & (COMBAT_FLAG_ACTIVE_BLOCK_STARTING | COMBAT_FLAG_ACTIVE_BLOCKING))
return FALSE return FALSE
if(!(I in held_items)) if(!(I in held_items))
return FALSE return FALSE
var/datum/block_parry_data/data = I.get_block_parry_data() var/datum/block_parry_data/data = I.get_block_parry_data()
if(!istype(data)) //Typecheck because if an admin/coder screws up varediting or something we do not want someone being broken forever, the CRASH logs feedback so we know what happened. if(!istype(data)) //Typecheck because if an admin/coder screws up varediting or something we do not want someone being broken forever, the CRASH logs feedback so we know what happened.
CRASH("ACTIVE_BLOCKING_START called with an item with no valid data: [I] --> [I.block_parry_data]!") CRASH("ACTIVE_BLOCK_START called with an item with no valid data: [I] --> [I.block_parry_data]!")
combat_flags |= COMBAT_FLAG_ACTIVE_BLOCKING combat_flags |= COMBAT_FLAG_ACTIVE_BLOCKING
active_block_item = I active_block_item = I
if(data.block_lock_attacking) if(data.block_lock_attacking)
@@ -70,12 +70,12 @@
if(combat_flags & (COMBAT_FLAG_ACTIVE_BLOCK_STARTING | COMBAT_FLAG_ACTIVE_BLOCKING)) if(combat_flags & (COMBAT_FLAG_ACTIVE_BLOCK_STARTING | COMBAT_FLAG_ACTIVE_BLOCKING))
return keybind_stop_active_blocking() return keybind_stop_active_blocking()
else else
return keybind_ACTIVE_BLOCKING_START() return keybind_ACTIVE_BLOCK_START()
/** /**
* Proc called by keybindings to start active blocking. * Proc called by keybindings to start active blocking.
*/ */
/mob/living/proc/keybind_ACTIVE_BLOCKING_START() /mob/living/proc/keybind_ACTIVE_BLOCK_START()
if(combat_flags & (COMBAT_FLAG_ACTIVE_BLOCK_STARTING | COMBAT_FLAG_ACTIVE_BLOCKING)) if(combat_flags & (COMBAT_FLAG_ACTIVE_BLOCK_STARTING | COMBAT_FLAG_ACTIVE_BLOCKING))
return FALSE return FALSE
if(!(combat_flags & COMBAT_FLAG_BLOCK_CAPABLE)) if(!(combat_flags & COMBAT_FLAG_BLOCK_CAPABLE))
@@ -84,7 +84,7 @@
// QOL: Instead of trying to just block with held item, grab first available item. // QOL: Instead of trying to just block with held item, grab first available item.
var/obj/item/I = find_active_block_item() var/obj/item/I = find_active_block_item()
var/list/other_items = list() var/list/other_items = list()
if(SEND_SIGNAL(src, COMSIG_LIVING_ACTIVE_BLOCKING_START, I, other_items) & COMPONENT_PREVENT_BLOCK_START) if(SEND_SIGNAL(src, COMSIG_LIVING_ACTIVE_BLOCK_START, I, other_items) & COMPONENT_PREVENT_BLOCK_START)
to_chat(src, "<span class='warning'>Something is preventing you from blocking!</span>") to_chat(src, "<span class='warning'>Something is preventing you from blocking!</span>")
return return
if(!I && length(other_items)) if(!I && length(other_items))
@@ -110,7 +110,7 @@
animate(src, pixel_x = get_standard_pixel_x_offset(), pixel_y = get_standard_pixel_y_offset(), time = 2.5, FALSE, SINE_EASING | EASE_IN, ANIMATION_END_NOW) animate(src, pixel_x = get_standard_pixel_x_offset(), pixel_y = get_standard_pixel_y_offset(), time = 2.5, FALSE, SINE_EASING | EASE_IN, ANIMATION_END_NOW)
return return
combat_flags &= ~(COMBAT_FLAG_ACTIVE_BLOCK_STARTING) combat_flags &= ~(COMBAT_FLAG_ACTIVE_BLOCK_STARTING)
ACTIVE_BLOCKING_START(I) ACTIVE_BLOCK_START(I)
/** /**
* Gets the first item we can that can block, but if that fails, default to active held item.COMSIG_ENABLE_COMBAT_MODE * Gets the first item we can that can block, but if that fails, default to active held item.COMSIG_ENABLE_COMBAT_MODE
code/modules/mob/living/living_active_parry.dm
+1 -1
View File
@@ -47,7 +47,7 @@
using_item = backup using_item = backup
method = ITEM_PARRY method = ITEM_PARRY
var/list/other_items = list() var/list/other_items = list()
if(SEND_SIGNAL(src, COMSIG_LIVING_ACTIVE_PARRYING_START, method, tool, other_items) & COMPONENT_PREVENT_PARRY_START) if(SEND_SIGNAL(src, COMSIG_LIVING_ACTIVE_PARRY_START, method, tool, other_items) & COMPONENT_PREVENT_PARRY_START)
to_chat(src, "<span class='warning'>Something is preventing you from parrying!</span>") to_chat(src, "<span class='warning'>Something is preventing you from parrying!</span>")
return return
if(!using_item && !method && length(other_items)) if(!using_item && !method && length(other_items))
code/modules/surgery/organs/augments_arms.dm
+2 -2
View File
@@ -283,10 +283,10 @@
/obj/item/organ/cyberimp/arm/shield/Insert(mob/living/carbon/M, special = FALSE, drop_if_replaced = TRUE) /obj/item/organ/cyberimp/arm/shield/Insert(mob/living/carbon/M, special = FALSE, drop_if_replaced = TRUE)
. = ..() . = ..()
if(.) if(.)
RegisterSignal(M, COMSIG_LIVING_ACTIVE_BLOCKING_START, .proc/on_signal) RegisterSignal(M, COMSIG_LIVING_ACTIVE_BLOCK_START, .proc/on_signal)
/obj/item/organ/cyberimp/arm/shield/Remove(special = FALSE) /obj/item/organ/cyberimp/arm/shield/Remove(special = FALSE)
UnregisterSignal(owner, COMSIG_LIVING_ACTIVE_BLOCKING_START) UnregisterSignal(owner, COMSIG_LIVING_ACTIVE_BLOCK_START)
return ..() return ..()
/obj/item/organ/cyberimp/arm/shield/proc/on_signal(datum/source, obj/item/blocking_item, list/other_items = list()) /obj/item/organ/cyberimp/arm/shield/proc/on_signal(datum/source, obj/item/blocking_item, list/other_items = list())