experimental

code/__DEFINES/_flags/return_values.dm

@@ -1,8 +1,6 @@
-// melee_attack_chain() attackchain_flags
-/// The attack is from a parry counterattack.
-#define ATTACKCHAIN_PARRY_COUNTERATTACK			(1<<0)
-
+/////////// ATTACKCHAIN_FLAGS ////////////
 // melee_attack_chain(), attackby(), pre_attack(), afterattack(), and tool_act(), attack() and **anything that is called by ClickOn()** return values.
+// These are all passed down through the attack chain and are binary OR'd into each other!
 /// Stop the attack chain if still in melee_attack_chain()
 #define STOP_ATTACK_PROC_CHAIN					(1<<0)
 /// This attack should discard last_action instead of flushing (storing) it). You should probably know what you're doing if you use this considering this is how clickdelay is enforced.
@@ -12,14 +10,12 @@
 #define NO_AUTO_CLICKDELAY_HANDLING				(1<<2)
 /// Only used with UnarmedAttack(). Interrupts unarmed attack from progressing.
 #define INTERRUPT_UNARMED_ATTACK				(1<<3)
-/// Attack hand should not set next action even if the atom wants it to be an action
-#define ATTACK_HAND_IGNORE_ACTION				(1<<4)
-/// Attack hand should not at all check last_action/attack_hand_speed even if the atom wants to
-#define ATTACK_HAND_IGNORE_CLICKDELAY			(1<<5)
-
-// UnarmedAttack() flags
-/// Attack is from a parry counterattack
-#define UNARMED_ATTACK_PARRY					(1<<0)
+/// Attack should not set next action even if the atom wants it to be an action
+#define ATTACK_IGNORE_ACTION					(1<<4)
+/// Attack should not at all check last_action/attack_hand_speed even if the atom wants to
+#define ATTACK_IGNORE_CLICKDELAY				(1<<5)
+/// This attack is from a parry counterattack
+#define ATTACK_IS_PARRY_COUNTERATTACK			(1<<6)
 
 // obj/item/dropped()
 /// dropped() relocated this item, return FALSE for doUnEquip.