Merge pull request #12652 from silicons/cool

cybernetic implant shields will now automatically extend and be used to block if the user has no item to block with

code/__DEFINES/dcs/signals.dm

@@ -224,6 +224,11 @@
 #define COMSIG_LIVING_RUN_BLOCK "living_do_run_block"				//from base of mob/living/do_run_block(): (real_attack, atom/object, damage, attack_text, attack_type, armour_penetration, mob/attacker, def_zone)
 #define COMSIG_LIVING_GET_BLOCKING_ITEMS "get_blocking_items"	//from base of mob/living/get_blocking_items(): (list/items)
 
+#define COMSIG_LIVING_ACTIVE_BLOCK_START "active_block_start"			//from base of mob/living/keybind_start_active_blocking(): (obj/item/blocking_item, list/backup_items)
+	#define COMPONENT_PREVENT_BLOCK_START 1
+#define COMSIG_LIVING_ACTIVE_PARRY_START "active_parry_start"			//from base of mob/living/initiate_parry_sequence(): (parrying_method, datum/parrying_item_mob_or_art, list/backup_items)
+	#define COMPONENT_PREVENT_PARRY_START 1
+
 //ALL OF THESE DO NOT TAKE INTO ACCOUNT WHETHER AMOUNT IS 0 OR LOWER AND ARE SENT REGARDLESS!
 #define COMSIG_LIVING_STATUS_STUN "living_stun"					//from base of mob/living/Stun() (amount, update, ignore)
 #define COMSIG_LIVING_STATUS_KNOCKDOWN "living_knockdown"		//from base of mob/living/Knockdown() (amount, update, ignore)

code/game/objects/items/shields.dm

@@ -386,7 +386,7 @@ obj/item/shield/riot/bullet_proof
 	max_integrity = 100
 	obj_integrity = 100
 	can_shatter = FALSE
-	item_flags = SLOWS_WHILE_IN_HAND
+	item_flags = SLOWS_WHILE_IN_HAND | ITEM_CAN_BLOCK
 	var/recharge_timerid
 	var/recharge_delay = 15 SECONDS
 

code/modules/mob/living/living_active_block.dm

@@ -14,14 +14,14 @@
 		changeNext_move(data.block_end_click_cd_add)
 	return TRUE
 
-/mob/living/proc/start_active_blocking(obj/item/I)
+/mob/living/proc/ACTIVE_BLOCK_START(obj/item/I)
 	if(combat_flags & (COMBAT_FLAG_ACTIVE_BLOCK_STARTING | COMBAT_FLAG_ACTIVE_BLOCKING))
 		return FALSE
 	if(!(I in held_items))
 		return FALSE
 	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.
-		CRASH("start_active_blocking 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
 	active_block_item = I
 	if(data.block_lock_attacking)
@@ -83,9 +83,15 @@
 		return FALSE
 	// QOL: Instead of trying to just block with held item, grab first available item.
 	var/obj/item/I = find_active_block_item()
-	if(!I)
-		to_chat(src, "<span class='warning'>You can't block with your bare hands!</span>")
+	var/list/other_items = list()
+	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>")
 		return
+	if(!I)
+		if(!length(other_items))
+			to_chat(src, "<span class='warning'>You can't block with your bare hands!</span>")
+			return
+		I = other_items[1]
 	if(!I.can_active_block())
 		to_chat(src, "<span class='warning'>[I] is either not capable of being used to actively block, or is not currently in a state that can! (Try wielding it if it's twohanded, for example.)</span>")
 		return
@@ -104,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)
 		return
 	combat_flags &= ~(COMBAT_FLAG_ACTIVE_BLOCK_STARTING)
-	start_active_blocking(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
@@ -115,7 +121,8 @@
 		for(var/obj/item/I in held_items - held)
 			if(I.can_active_block())
 				return I
-	return held
+	else
+		return held
 
 /**
   * Proc called by keybindings to stop active blocking.

code/modules/mob/living/living_active_parry.dm

@@ -24,25 +24,39 @@
 	// yanderedev else if time
 	var/obj/item/using_item = get_active_held_item()
 	var/datum/block_parry_data/data
+	var/datum/tool
 	var/method
 	if(using_item?.can_active_parry())
 		data = using_item.block_parry_data
 		method = ITEM_PARRY
+		tool = using_item
 	else if(mind?.martial_art?.can_martial_parry)
 		data = mind.martial_art.block_parry_data
 		method = MARTIAL_PARRY
+		tool = mind.martial_art
 	else if(combat_flags & COMBAT_FLAG_UNARMED_PARRY)
 		data = block_parry_data
 		method = UNARMED_PARRY
+		tool = src
 	else
 		// QOL: If none of the above work, try to find another item.
 		var/obj/item/backup = find_backup_parry_item()
-		if(!backup)
-			to_chat(src, "<span class='warning'>You have nothing to parry with!</span>")
-			return FALSE
-		data = backup.block_parry_data
-		using_item = backup
+		if(backup)
+			tool = backup
+			data = backup.block_parry_data
+			using_item = backup
+			method = ITEM_PARRY
+	var/list/other_items = list()
+	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>")
+		return
+	if(!using_item && !method && length(other_items))
+		using_item = other_items[1]
 		method = ITEM_PARRY
+		data = using_item.block_parry_data
+	if(!method)
+		to_chat(src, "<span class='warning'>You have nothing to parry with!</span>")
+		return FALSE
 	//QOL: Try to enable combat mode if it isn't already
 	SEND_SIGNAL(src, COMSIG_ENABLE_COMBAT_MODE)
 	if(!SEND_SIGNAL(src, COMSIG_COMBAT_MODE_CHECK, COMBAT_MODE_ACTIVE))

code/modules/surgery/organs/augments_arms.dm

@@ -132,6 +132,7 @@
 		"<span class='notice'>You extend [holder] from your [zone == BODY_ZONE_R_ARM ? "right" : "left"] arm.</span>",
 		"<span class='italics'>You hear a short mechanical noise.</span>")
 	playsound(get_turf(owner), 'sound/mecha/mechmove03.ogg', 50, 1)
+	return TRUE
 
 /obj/item/organ/cyberimp/arm/ui_action_click()
 	if(crit_fail || (organ_flags & ORGAN_FAILING) || (!holder && !contents.len))
@@ -273,12 +274,29 @@
 	desc = "A deployable riot shield to help deal with civil unrest."
 	contents = newlist(/obj/item/shield/riot/implant)
 
-/obj/item/organ/cyberimp/arm/shield/Extend(obj/item/I)
+/obj/item/organ/cyberimp/arm/shield/Extend(obj/item/I, silent = FALSE)
 	if(I.obj_integrity == 0)				//that's how the shield recharge works
-		to_chat(owner, "<span class='warning'>[I] is still too unstable to extend. Give it some time!</span>")
+		if(!silent)
+			to_chat(owner, "<span class='warning'>[I] is still too unstable to extend. Give it some time!</span>")
 		return FALSE
 	return ..()
 
+/obj/item/organ/cyberimp/arm/shield/Insert(mob/living/carbon/M, special = FALSE, drop_if_replaced = TRUE)
+	. = ..()
+	if(.)
+		RegisterSignal(M, COMSIG_LIVING_ACTIVE_BLOCK_START, .proc/on_signal)
+
+/obj/item/organ/cyberimp/arm/shield/Remove(special = FALSE)
+	UnregisterSignal(owner, COMSIG_LIVING_ACTIVE_BLOCK_START)
+	return ..()
+
+/obj/item/organ/cyberimp/arm/shield/proc/on_signal(datum/source, obj/item/blocking_item, list/other_items)
+	if(!blocking_item)		//if they don't have something
+		var/obj/item/shield/S = locate() in contents
+		if(!Extend(S, TRUE))
+			return
+		other_items += S
+
 /obj/item/organ/cyberimp/arm/shield/emag_act()
 	. = ..()
 	if(obj_flags & EMAGGED)