Merge branch 'master' into upstream-merge-37597

code/_globalvars/bitfields.dm

@@ -30,7 +30,8 @@ GLOBAL_LIST_INIT(bitfields, list(
 		"DANGEROUS_POSSESSION" = DANGEROUS_POSSESSION,
 		"ON_BLUEPRINTS" = ON_BLUEPRINTS,
 		"UNIQUE_RENAME" = UNIQUE_RENAME,
-		"USES_TGUI" = USES_TGUI
+		"USES_TGUI" = USES_TGUI,
+		"FROZEN" = FROZEN,
 		),
 	"datum_flags" = list(
 		"DF_USE_TAG" = DF_USE_TAG,
@@ -40,7 +41,9 @@ GLOBAL_LIST_INIT(bitfields, list(
 		"BEING_REMOVED" = BEING_REMOVED,
 		"IN_INVENTORY" = IN_INVENTORY,
 		"FORCE_STRING_OVERRIDE" = FORCE_STRING_OVERRIDE,
-		"NEEDS_PERMIT" = NEEDS_PERMIT
+		"NEEDS_PERMIT" = NEEDS_PERMIT,
+		"SLOWS_WHILE_IN_HAND" = SLOWS_WHILE_IN_HAND,
+		"NO_MAT_REDEMPTION" = NO_MAT_REDEMPTION,
 		),
 	"admin_flags" = list(
 		"BUILDMODE" = R_BUILDMODE,
@@ -106,17 +109,15 @@ GLOBAL_LIST_INIT(bitfields, list(
 		"REAGENT_NOREACT" = REAGENT_NOREACT
 		),
 	"flags_1" = list(
-		"STOPSPRESSUREDMAGE_1 / NOJAUNT_1 (turfs)" = STOPSPRESSUREDMAGE_1,
+		"NOJAUNT_1" = NOJAUNT_1,
 		"NODROP_1 / UNUSED_TRANSIT_TURF_1 (turfs)" = NODROP_1,
 		"NOBLUDGEON_1 / CAN_BE_DIRTY_1 (turfs)" = NOBLUDGEON_1,
-		"MASKINTERNALS_1" = MASKINTERNALS_1,
 		"HEAR_1 / NO_DEATHRATTLE_1 (turfs)" = HEAR_1,
 		"CHECK_RICOCHET_1 / NO_RUINS_1 (turfs)" = CHECK_RICOCHET_1,
 		"CONDUCT_1 / NO_LAVA_GEN_1" = CONDUCT_1,
 		"ABSTRACT_1" = ABSTRACT_1,
 		"NODECONSTRUCT_1" = NODECONSTRUCT_1,
 		"OVERLAY_QUEUED_1" = OVERLAY_QUEUED_1,
-		"NO_EMP_WIRES_1" = NO_EMP_WIRES_1,
 		"HOLOGRAM_1" = HOLOGRAM_1,
 		"TESLA_IGNORE_1" = TESLA_IGNORE_1
 		),