diff --git a/code/__DEFINES/combat/attack_types.dm b/code/__DEFINES/combat/attack_types.dm index 297c511c69..2d001089f0 100644 --- a/code/__DEFINES/combat/attack_types.dm +++ b/code/__DEFINES/combat/attack_types.dm @@ -15,9 +15,9 @@ // Requires for datum definitions to not error with must be a constant statement when used in lists as text associative keys. // KEEP IN SYNC WITH ABOVE! -#define TEXT_ATTACK_TYPE_MELEE 1 -#define TEXT_ATTACK_TYPE_PROJECTILE 2 -#define TEXT_ATTACK_TYPE_UNARMED 4 -#define TEXT_ATTACK_TYPE_THROWN 8 -#define TEXT_ATTACK_TYPE_TACKLE 16 -#define TEXT_ATTACK_TYPE_PARRY_COUNTERATTACK 32 +#define TEXT_ATTACK_TYPE_MELEE "1" +#define TEXT_ATTACK_TYPE_PROJECTILE "2" +#define TEXT_ATTACK_TYPE_UNARMED "4" +#define TEXT_ATTACK_TYPE_THROWN "8" +#define TEXT_ATTACK_TYPE_TACKLE "16" +#define TEXT_ATTACK_TYPE_PARRY_COUNTERATTACK "32" diff --git a/code/game/objects/items/twohanded.dm b/code/game/objects/items/twohanded.dm index 72519e8d41..8cd7dce631 100644 --- a/code/game/objects/items/twohanded.dm +++ b/code/game/objects/items/twohanded.dm @@ -275,7 +275,7 @@ throw_range = 5 w_class = WEIGHT_CLASS_SMALL var/w_class_on = WEIGHT_CLASS_BULKY - item_flags = ITEM_CAN_PARRY | SLOWS_WHILE_IN_HAND | + item_flags = ITEM_CAN_PARRY | SLOWS_WHILE_IN_HAND | ITEM_CAN_BLOCK block_parry_data = /datum/block_parry_data/dual_esword force_unwielded = 3 force_wielded = 34