Merge branch 'master' into synctesting

2018-04-09 21:43:26 +00:00
parent d3ba1085bb dab96582bd
commit e0d7630c19
43 changed files with 411 additions and 90 deletions
@@ -1,4 +1,27 @@
 GLOBAL_LIST_INIT(bitfields, list(
+	"appearance_flags" = list(
+		"LONG_GLIDE" = LONG_GLIDE,
+		"RESET_COLOR" = RESET_COLOR,
+		"RESET_ALPHA" = RESET_ALPHA,
+		"RESET_TRANSFORM" = RESET_TRANSFORM,
+		"NO_CLIENT_COLOR" = NO_CLIENT_COLOR,
+		"KEEP_TOGETHER" = KEEP_TOGETHER,
+		"KEEP_APART" = KEEP_APART,
+		"PLANE_MASTER" = PLANE_MASTER,
+		"TILE_BOUND" = TILE_BOUND,
+		"PIXEL_SCALE" = PIXEL_SCALE
+		),
+	"sight" = list(
+		"SEE_INFRA" = SEE_INFRA,
+		"SEE_SELF" = SEE_SELF,
+		"SEE_MOBS" = SEE_MOBS,
+		"SEE_OBJS" = SEE_OBJS,
+		"SEE_TURFS" = SEE_TURFS,
+		"SEE_PIXELS" = SEE_PIXELS,
+		"SEE_THRU" = SEE_THRU,
+		"SEE_BLACKNESS" = SEE_BLACKNESS,
+		"BLIND" = BLIND
+		),
 	"obj_flags" = list(
 		"EMAGGED" = EMAGGED,
 		"IN_USE" = IN_USE,
@@ -108,4 +131,4 @@ GLOBAL_LIST_INIT(bitfields, list(
 		"NO_MAT_REDEMPTION_2" = NO_MAT_REDEMPTION_2,
 		"LAVA_PROTECT_2" = LAVA_PROTECT_2
 		)
-	))
+	))