Kills off three more flags from flags_2

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,
@@ -119,15 +122,26 @@ GLOBAL_LIST_INIT(bitfields, list(
 		"NOSLIP_1" = NOSLIP_1
 		),
 	"flags_2" = list(
-		"SLOWS_WHILE_IN_HAND_2" = SLOWS_WHILE_IN_HAND_2,
 		"NO_EMP_WIRES_2" = NO_EMP_WIRES_2,
 		"HOLOGRAM_2" = HOLOGRAM_2,
-		"FRONZE_2" = FROZEN_2,
 		"BANG_PROTECT_2" = BANG_PROTECT_2,
 		"HEALS_EARS_2" = HEALS_EARS_2,
 		"OMNITONGUE_2" = OMNITONGUE_2,
+<<<<<<< HEAD
 		"TESLA_IGNORE_2" = TESLA_IGNORE_2,
 		"NO_MAT_REDEMPTION_2" = NO_MAT_REDEMPTION_2,
 		"LAVA_PROTECT_2" = LAVA_PROTECT_2
 		)
+=======
+		"TESLA_IGNORE_2" = TESLA_IGNORE_2
+		),
+	"clothing_flags" = list(
+		"LAVAPROTECT" = LAVAPROTECT,
+		"STOPSPRESSUREDAMAGE" = STOPSPRESSUREDAMAGE,
+		"BLOCK_GAS_SMOKE_EFFECT" = BLOCK_GAS_SMOKE_EFFECT,
+		"MASKINTERNALS" = MASKINTERNALS,
+		"NOSLIP" = NOSLIP,
+		"THICKMATERIAL" = THICKMATERIAL,
+	)
+>>>>>>> ccf8fc5... Kills off three more flags from flags_2 (#37529)
 	))