Merge pull request #15101 from Citadel-Station-13/silicons-patch-6

fixes the comedy antag parry gauntlets
2021-09-09 19:10:51 -05:00
parent ead04910c2 7d62753fe4
commit 3f09f56e3d
1 changed files with 3 additions and 0 deletions
@@ -103,13 +103,16 @@
 		var/_method = override[thing]
 		if(_method == ITEM_PARRY)
 			using_item = thing
+			tool = using_item
 			method = ITEM_PARRY
 			data = using_item.block_parry_data
 		else if(_method == UNARMED_PARRY)
 			method = UNARMED_PARRY
+			tool = src
 			data = thing
 	if(!using_item && !method && length(other_items))
 		using_item = other_items[1]
+		tool = using_item
 		method = ITEM_PARRY
 		data = using_item.block_parry_data
 	if(!method)