Merge remote-tracking branch 'citadel/master' into pp_fix

2020-06-13 12:03:01 -07:00
parent 3752aecfdb 4a59066e43
commit 8162303bad
150 changed files with 2873 additions and 516 deletions
@@ -49,6 +49,8 @@ GLOBAL_LIST_INIT(bitfields, list(
 		"DROPDEL" = DROPDEL,
 		"NOBLUDGEON" = NOBLUDGEON,
 		"ABSTRACT" = ABSTRACT,
+		"ITEM_CAN_BLOCK" = ITEM_CAN_BLOCK,
+		"ITEM_CAN_PARRY" = ITEM_CAN_PARRY
 		),
 	"admin_flags" = list(
 		"BUILDMODE" = R_BUILDMODE,