nayser

code/modules/mob/living/living_active_block.dm

@@ -83,6 +83,12 @@
 		return FALSE
 	// QOL: Instead of trying to just block with held item, grab first available item.
 	var/obj/item/I = find_active_block_item()
+	var/list/other_items = list()
+	if(SEND_SIGNAL(src, COMSIG_LIVING_START_ACTIVE_BLOCKING, I, other_items) & COMPONENT_PREVENT_BLOCK_START)
+		to_chat(src, "<span class='warning'>Something is preventing you from blocking!</span>")
+		return
+	if(!I && length(other_items))
+		I = other_items[1]
 	if(!I)
 		to_chat(src, "<span class='warning'>You can't block with your bare hands!</span>")
 		return

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_START_ACTIVE_PARRYING, 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

@@ -273,12 +273,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_START_ACTIVE_BLOCKING, .proc/on_signal)
+
+/obj/item/organ/cyberimp/arm/shield/Remove(special = FALSE)
+	UnregisterSignal(owner, COMSIG_LIVING_START_ACTIVE_BLOCKING)
+	return ..()
+
+/obj/item/organ/cyberimp/arm/shield/proc/on_signal(datum/source, obj/item/blocking_item, list/other_items = list())
+	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)