shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix

Browse Source
This commit is contained in:
kevinz000
2020-05-30 20:12:50 -07:00
parent e5c32c1746
commit 588443e928
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/__DEFINES/combat/attack_types.dm
+6 -6
View File
@@ -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"
code/game/objects/items/twohanded.dm
+1 -1
View File
@@ -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