Kills off three more flags from flags_2

code/__DEFINES/flags.dm

@@ -35,10 +35,10 @@ GLOBAL_LIST_INIT(bitflags, list(1, 2, 4, 8, 16, 32, 64, 128, 256, 512, 1024, 204
 
 /* Secondary atom flags, for the flags_2 var, denoted with a _2 */
 
-#define SLOWS_WHILE_IN_HAND_2		(1<<0)
+
 #define NO_EMP_WIRES_2				(1<<1)
 #define HOLOGRAM_2					(1<<2)
-#define FROZEN_2					(1<<3)
+
 #define BANG_PROTECT_2				(1<<6)
 
 // An item worn in the ear slot with HEALS_EARS will heal your ears each
@@ -54,12 +54,15 @@ GLOBAL_LIST_INIT(bitflags, list(1, 2, 4, 8, 16, 32, 64, 128, 256, 512, 1024, 204
 // TESLA_IGNORE grants immunity from being targeted by tesla-style electricity
 #define TESLA_IGNORE_2				(1<<9)
 
+<<<<<<< HEAD
 // Stops you from putting things like an RCD or other items into an ORM or protolathe for materials.
 #define NO_MAT_REDEMPTION_2			(1<<10)
 
 // LAVA_PROTECT used on the flags_2 variable for both SUIT and HEAD items, and stops lava damage. Must be present in both to stop lava damage.
 #define LAVA_PROTECT_2				(1<<11)
 
+=======
+>>>>>>> ccf8fc5... Kills off three more flags from flags_2 (#37529)
 //turf-only flags
 #define NOJAUNT_1				(1<<0)
 #define UNUSED_TRANSIT_TURF_1	(1<<1)

code/__DEFINES/obj_flags.dm

@@ -9,6 +9,7 @@
 #define ON_BLUEPRINTS			(1<<5)  //Are we visible on the station blueprints at roundstart?
 #define UNIQUE_RENAME			(1<<6) // can you customize the description/name of the thing?
 #define USES_TGUI				(1<<7)	//put on things that use tgui on ui_interact instead of custom/old UI.
+#define FROZEN					(1<<8)
 
 // If you add new ones, be sure to add them to /obj/Initialize as well for complete mapping support
 
@@ -18,3 +19,17 @@
 #define IN_INVENTORY			(1<<1) //is this item equipped into an inventory slot or hand of a mob? used for tooltips
 #define FORCE_STRING_OVERRIDE	(1<<2) // used for tooltips
 #define NEEDS_PERMIT			(1<<3) //Used by security bots to determine if this item is safe for public use.
+<<<<<<< HEAD
+=======
+#define SLOWS_WHILE_IN_HAND		(1<<4)
+#define NO_MAT_REDEMPTION			(1<<5) // Stops you from putting things like an RCD or other items into an ORM or protolathe for materials.
+
+// Flags for the clothing_flags var on /obj/item/clothing
+
+#define LAVAPROTECT (1<<0)
+#define STOPSPRESSUREDAMAGE		(1<<1)	//SUIT and HEAD items which stop pressure damage. To stop you taking all pressure damage you must have both a suit and head item with this flag.
+#define BLOCK_GAS_SMOKE_EFFECT	(1<<2)	// blocks the effect that chemical clouds would have on a mob --glasses, mask and helmets ONLY!
+#define MASKINTERNALS				    (1<<3)		// mask allows internals
+#define NOSLIP                  (1<<4)   //prevents from slipping on wet floors, in space etc
+#define THICKMATERIAL				(1<<5)	//prevents syringes, parapens and hypos if the external suit or helmet (if targeting head) has this flag. Example: space suits, biosuit, bombsuits, thick suits that cover your body.
+>>>>>>> ccf8fc5... Kills off three more flags from flags_2 (#37529)