Split up and rename var/flags (#17794)

* Split up and rename `var/flags`

* Various fixes

* CL

* Don't rename Phoron Guard phoron preset

---------

Co-authored-by: Cody Brittain <cbrittain10@live.com>

code/modules/reagents/Chemistry-Holder.dm

@@ -83,7 +83,7 @@
 /datum/reagents/proc/process_reactions()
 	if(!my_atom?.loc)
 		return FALSE
-	if(my_atom.flags & NOREACT)
+	if(my_atom.atom_flags & ATOM_FLAG_NO_REACT)
 		return FALSE
 
 	var/reaction_occured

code/modules/reagents/Chemistry-Machinery.dm

@@ -29,7 +29,7 @@
 	var/bottlesprite = "bottle-1" //yes, strings
 	var/pillsprite = "pill1"
 	var/max_pill_count = 20
-	flags = OPENCONTAINER
+	atom_flags = ATOM_FLAG_OPEN_CONTAINER
 	var/datum/asset/spritesheet/chem_master/chem_asset
 	var/list/forbidden_containers = list(/obj/item/reagent_containers/glass/bucket) //For containers we don't want people to shove into the chem machine. Like big-ass buckets.
 	var/datum/tgui/ui = null

code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm

@@ -867,7 +867,7 @@
 			if(I.body_parts_covered & EYES)
 				eyes_covered |= EYES_PROTECTED
 				eye_protection = I.name
-			if((I.body_parts_covered & FACE) && !(I.item_flags & FLEXIBLEMATERIAL))
+			if((I.body_parts_covered & FACE) && !(I.item_flags & ITEM_FLAG_FLEXIBLE_MATERIAL))
 				mouth_covered = 1
 				face_protection = I.name
 

code/modules/reagents/dispenser/cartridge.dm

@@ -86,10 +86,10 @@
 	..()
 	if (is_open_container())
 		to_chat(usr, "<span class = 'notice'>You put the cap on \the [src].</span>")
-		flags ^= OPENCONTAINER
+		atom_flags ^= ATOM_FLAG_OPEN_CONTAINER
 	else
 		to_chat(usr, "<span class = 'notice'>You take the cap off \the [src].</span>")
-		flags |= OPENCONTAINER
+		atom_flags |= ATOM_FLAG_OPEN_CONTAINER
 	update_icon()
 
 /obj/item/reagent_containers/chem_disp_cartridge/attackby(obj/item/W as obj, mob/user as mob)

code/modules/reagents/reagent_containers.dm

@@ -80,7 +80,7 @@
 		return
 	if(fragile && (speed >= fragile))
 		shatter()
-	if(flags && NOREACT)
+	if(atom_flags && ATOM_FLAG_NO_REACT)
 		return
 	if(!reagents)
 		return
@@ -99,7 +99,7 @@
 		var/obj/item/reagent_containers/food/snacks/dipped = W
 		dipped.attempt_apply_coating(src, user)
 		return
-	if(!(W.flags & NOBLUDGEON) && (user.a_intent == I_HURT) && fragile && (W.force > fragile))
+	if(!(W.item_flags & ITEM_FLAG_NO_BLUDGEON) && (user.a_intent == I_HURT) && fragile && (W.force > fragile))
 		if(do_after(user, 1 SECOND, src))
 			if(!QDELETED(src))
 				visible_message(SPAN_WARNING("[user] smashes [src] with \a [W]!"))
@@ -129,9 +129,9 @@
 	if(standard_splash_obj(user, target))
 		return
 
-	if(istype(target, /obj/))
-		var/obj/O = target
-		if(!(O.flags & NOBLUDGEON) && reagents)
+	if(istype(target, /obj/item))
+		var/obj/item/O = target
+		if(!(O.item_flags & ITEM_FLAG_NO_BLUDGEON) && reagents)
 			reagents.apply_force(O.force)
 	return ..()
 

code/modules/reagents/reagent_containers/blood_pack.dm

@@ -24,7 +24,7 @@
 
 	amount_per_transfer_from_this = 0.2
 	possible_transfer_amounts = list(0.2, 1, 2, 3, 4)
-	flags = OPENCONTAINER
+	atom_flags = ATOM_FLAG_OPEN_CONTAINER
 
 	var/datum/weakref/attached_mob
 

code/modules/reagents/reagent_containers/food.dm

@@ -5,7 +5,7 @@
 	drop_sound = 'sound/items/drop/food.ogg'
 	pickup_sound = 'sound/items/pickup/food.ogg'
 	contained_sprite = TRUE
-	flags = OPENCONTAINER
+	atom_flags = ATOM_FLAG_OPEN_CONTAINER
 	possible_transfer_amounts = null
 	volume = 50 //Sets the default container amount for all food items.
 	var/bitesize = 1

code/modules/reagents/reagent_containers/food/cans.dm

@@ -15,7 +15,7 @@
 	var/list/can_size_overrides = list("x" = 0, "y" = -3) // position of the can's opening - make sure to take away 16 from X and 23 from Y
 	volume = 40 //just over one and a half cups
 	amount_per_transfer_from_this = 5
-	flags = 0 //starts closed
+	atom_flags = 0 //starts closed
 	icon = 'icons/obj/item/reagent_containers/food/drinks/soda.dmi'
 	drop_sound = 'sound/items/drop/soda.ogg'
 	pickup_sound = 'sound/items/pickup/soda.ogg'

code/modules/reagents/reagent_containers/food/condiment.dm

@@ -10,7 +10,7 @@
 	desc = "Just your average condiment container."
 	icon = 'icons/obj/item/reagent_containers/food/condiment.dmi'
 	icon_state = "emptycondiment"
-	flags = OPENCONTAINER
+	atom_flags = ATOM_FLAG_OPEN_CONTAINER
 	possible_transfer_amounts = list(1,5,10)
 	center_of_mass = list("x"=16, "y"=6)
 	volume = 50

code/modules/reagents/reagent_containers/food/drinks.dm

@@ -17,7 +17,7 @@ If you add a drink with an empty icon sprite, ensure it is in the same folder, e
 	pickup_sound = 'sound/items/pickup/bottle.ogg'
 	icon_state = null
 	item_state = "glass_empty"
-	flags = OPENCONTAINER
+	atom_flags = ATOM_FLAG_OPEN_CONTAINER
 	amount_per_transfer_from_this = 5
 	volume = 50
 	var/shaken = 0
@@ -52,17 +52,17 @@ If you add a drink with an empty icon sprite, ensure it is in the same folder, e
 /obj/item/reagent_containers/food/drinks/proc/open(mob/user as mob)
 	playsound(loc,'sound/items/soda_open.ogg', rand(10,50), 1)
 	user.visible_message("<b>[user]</b> opens \the [src].", SPAN_NOTICE("You open \the [src] with an audible pop!"), "You can hear a pop.")
-	flags |= OPENCONTAINER
+	atom_flags |= ATOM_FLAG_OPEN_CONTAINER
 
 /obj/item/reagent_containers/food/drinks/proc/boom(mob/user as mob)
 	user.visible_message("<span class='danger'>\The [src] explodes all over [user] as they open it!</span>","<span class='danger'>\The [src] explodes all over you as you open it!</span>","You can hear a soda can explode.")
 	playsound(loc,'sound/items/Soda_Burst.ogg', rand(20,50), 1)
 	reagents.clear_reagents()
-	flags |= OPENCONTAINER
+	atom_flags |= ATOM_FLAG_OPEN_CONTAINER
 	shaken = 0
 
 /obj/item/reagent_containers/food/drinks/attack(mob/M as mob, mob/user as mob, def_zone)
-	if(force && !(flags & NOBLUDGEON) && user.a_intent == I_HURT)
+	if(force && !(atom_flags & ITEM_FLAG_NO_BLUDGEON) && user.a_intent == I_HURT)
 		return ..()
 	return 0
 
@@ -223,7 +223,7 @@ If you add a drink with an empty icon sprite, ensure it is in the same folder, e
 	and 'Martian Water' has become a prized collector's item."
 	icon = 'icons/obj/item/reagent_containers/food/drinks/soda.dmi' // it's no soda, but shows up in vending machines nonetheless
 	icon_state = "smallbottle"
-	flags = 0 //starts closed
+	atom_flags = 0 //starts closed
 	center_of_mass = list("x"=16, "y"=8)
 	drop_sound = 'sound/items/drop/disk.ogg'
 	pickup_sound = 'sound/items/pickup/disk.ogg'
@@ -350,7 +350,7 @@ If you add a drink with an empty icon sprite, ensure it is in the same folder, e
 		if(cap)
 			to_chat(user, SPAN_NOTICE("You remove \the [src]'s [cap]."))
 			user.put_in_hands(cap)
-			flags |= OPENCONTAINER
+			atom_flags |= ATOM_FLAG_OPEN_CONTAINER
 			cap = null
 			playsound(src.loc, /singleton/sound_category/shaker_lid_off, 50, 1)
 			update_icon()
@@ -380,7 +380,7 @@ If you add a drink with an empty icon sprite, ensure it is in the same folder, e
 			return TRUE
 		to_chat(user, SPAN_NOTICE("You put \the [W] onto \the [src]."))
 		user.drop_from_inventory(W, src)
-		flags ^= OPENCONTAINER
+		atom_flags ^= ATOM_FLAG_OPEN_CONTAINER
 		cap = W
 		playsound(src.loc, /singleton/sound_category/shaker_lid_off, 50, 1)
 		update_icon()

code/modules/reagents/reagent_containers/food/drinks/bottle.dm

@@ -108,7 +108,7 @@
 		to_chat(user, "<span class='notice'>You stuff [R] into [src].</span>")
 		rag = R
 		rag.forceMove(src)
-		flags &= ~OPENCONTAINER
+		atom_flags &= ~ATOM_FLAG_OPEN_CONTAINER
 		update_icon()
 
 /obj/item/reagent_containers/food/drinks/bottle/proc/remove_rag(mob/user)
@@ -116,14 +116,14 @@
 		return
 	user.put_in_hands(rag)
 	rag = null
-	flags |= (initial(flags) & OPENCONTAINER)
+	atom_flags |= (initial(atom_flags) & ATOM_FLAG_OPEN_CONTAINER)
 	update_icon()
 
 /obj/item/reagent_containers/food/drinks/bottle/proc/delete_rag()
 	if(!rag)
 		return
 	QDEL_NULL(rag)
-	flags |= (initial(flags) & OPENCONTAINER)
+	atom_flags |= (initial(atom_flags) & ATOM_FLAG_OPEN_CONTAINER)
 	update_icon()
 
 /obj/item/reagent_containers/food/drinks/bottle/open(mob/user)
@@ -342,7 +342,7 @@
 	icon_state = "champagnebottle"
 	center_of_mass = list("x"=16, "y"=4)
 	reagents_to_add = list(/singleton/reagent/alcohol/champagne = 100)
-	flags = 0 // starts closed
+	atom_flags = 0 // starts closed
 	///Used for sabrage; increases the chance of success per 1 force of the attacking sharp item
 	var/sabrage_success_percentile = 5
 	///Whether this bottle was a victim of a successful sabrage attempt
@@ -423,7 +423,7 @@
 								SPAN_GOOD("You elegantly slice the cork off of [src], causing it to fly off the bottle with great force."), \
 								"You can hear a pop.")
 	playsound(src, 'sound/items/champagne_pop.ogg', 70, TRUE)
-	flags |= OPENCONTAINER
+	atom_flags |= ATOM_FLAG_OPEN_CONTAINER
 	update_icon()
 	make_froth(offset_x = 0, offset_y = sabraged ? 13 : 15, intensity = froth_severity) //the y offset for sabraged is lower because the bottle's lip is smashed
 	///Type of cork to fire away
@@ -618,7 +618,7 @@
 	empty_icon_state = "soda_empty"
 	center_of_mass = list("x"=16, "y"=6)
 	volume = 30
-	flags = 0 //starts closed
+	atom_flags = 0 //starts closed
 	reagents_to_add = list(/singleton/reagent/drink/space_cola = 30)
 
 /obj/item/reagent_containers/food/drinks/bottle/space_up
@@ -657,7 +657,7 @@
 	icon_state = "beer"
 	volume = 30
 	smash_duration = 1
-	flags = 0 //starts closed
+	atom_flags = 0 //starts closed
 	rag_underlay = "rag_small"
 	center_of_mass = list("x"=16, "y"=8)
 

code/modules/reagents/reagent_containers/food/drinks/flask.dm

@@ -32,13 +32,13 @@
 /obj/item/reagent_containers/food/drinks/flask/vacuumflask/Initialize()
 	. = ..()
 	cup = new(src)
-	flags ^= OPENCONTAINER
+	atom_flags ^= ATOM_FLAG_OPEN_CONTAINER
 
 /obj/item/reagent_containers/food/drinks/flask/vacuumflask/attack_self(mob/user)
 	if(cup)
 		to_chat(user, SPAN_NOTICE("You remove \the [src]'s cap."))
 		user.put_in_hands(cup)
-		flags |= OPENCONTAINER
+		atom_flags |= ATOM_FLAG_OPEN_CONTAINER
 		cup = null
 		update_icon()
 
@@ -52,7 +52,7 @@
 			return TRUE
 		to_chat(user, SPAN_NOTICE("You put the cap onto \the [src]."))
 		user.drop_from_inventory(W, src)
-		flags ^= OPENCONTAINER
+		atom_flags ^= ATOM_FLAG_OPEN_CONTAINER
 		cup = W
 		cup.reagents.trans_to_holder(reagents, cup.reagents.total_volume)
 		update_icon()

code/modules/reagents/reagent_containers/food/drinks/trophy.dm

@@ -10,7 +10,8 @@
 	matter = list(MATERIAL_IRON = 10)
 	possible_transfer_amounts = null
 	volume = 5
-	flags = CONDUCT | OPENCONTAINER
+	atom_flags = ATOM_FLAG_OPEN_CONTAINER
+	obj_flags = OBJ_FLAG_CONDUCTABLE
 
 /obj/item/reagent_containers/food/drinks/trophy/gold_cup
 	name = "gold cup"

code/modules/reagents/reagent_containers/food/snacks/processed.dm

@@ -11,7 +11,7 @@
 /obj/item/reagent_containers/food/snacks/monkeycube
 	name = "monkey cube"
 	desc = "Just add water!"
-	flags = 0
+	atom_flags = 0
 	icon = 'icons/obj/item/reagent_containers/food/processed.dmi'
 	icon_state = "monkeycube"
 	bitesize = 12

code/modules/reagents/reagent_containers/glass.dm

@@ -13,7 +13,7 @@
 	volume = 60
 	accuracy = 0.1
 	w_class = ITEMSIZE_SMALL
-	flags = OPENCONTAINER
+	atom_flags = ATOM_FLAG_OPEN_CONTAINER
 	fragile = 2
 	unacidable = 1 //glass doesn't dissolve in acid
 	drop_sound = 'sound/items/drop/bottle.ogg'
@@ -64,10 +64,10 @@
 	..()
 	if(is_open_container())
 		to_chat(usr, "<span class = 'notice'>You put the lid on \the [src].</span>")
-		flags ^= OPENCONTAINER
+		atom_flags ^= ATOM_FLAG_OPEN_CONTAINER
 	else
 		to_chat(usr, "<span class = 'notice'>You take the lid off \the [src].</span>")
-		flags |= OPENCONTAINER
+		atom_flags |= ATOM_FLAG_OPEN_CONTAINER
 	update_icon()
 
 /obj/item/reagent_containers/glass/AltClick(var/mob/user)
@@ -168,7 +168,7 @@
 	matter = list(MATERIAL_GLASS = 500)
 	volume = 60
 	amount_per_transfer_from_this = 10
-	flags = OPENCONTAINER | NOREACT
+	atom_flags = ATOM_FLAG_OPEN_CONTAINER | ATOM_FLAG_NO_REACT
 	fragile = 0
 
 /obj/item/reagent_containers/glass/beaker/bluespace
@@ -250,7 +250,7 @@
 	amount_per_transfer_from_this = 120
 	possible_transfer_amounts = list(5,10,15,25,30,50,60,100,120,250,300)
 	volume = 300
-	flags = OPENCONTAINER
+	atom_flags = ATOM_FLAG_OPEN_CONTAINER
 	unacidable = 0
 	drop_sound = 'sound/items/drop/helm.ogg'
 	pickup_sound = 'sound/items/pickup/helm.ogg'

code/modules/reagents/reagent_containers/glass/bottle.dm

@@ -9,7 +9,7 @@
 	filling_states = "20;40;60;80;100"
 	amount_per_transfer_from_this = 5
 	possible_transfer_amounts = list(5,10,15,25,30,60)
-	flags = 0
+	atom_flags = 0
 	volume = 60
 
 /obj/item/reagent_containers/glass/bottle/on_reagent_change()
@@ -234,7 +234,7 @@
 	desc = "A small bottle dispenser."
 	icon_state = "syrup"
 	filling_states = "20;40;60;80;100"
-	flags = POURCONTAINER
+	atom_flags = ATOM_FLAG_POUR_CONTAINER
 	volume = 50
 
 /obj/item/reagent_containers/glass/bottle/syrup/chocolate

code/modules/reagents/reagent_containers/glass/bottle/robot.dm

@@ -2,7 +2,7 @@
 /obj/item/reagent_containers/glass/bottle/robot
 	amount_per_transfer_from_this = 10
 	possible_transfer_amounts = list(5,10,15,25,30,50,100)
-	flags = OPENCONTAINER
+	atom_flags = ATOM_FLAG_OPEN_CONTAINER
 	volume = 60
 	fragile = 0 // do NOT shatter
 	var/reagent = /singleton/reagent/

code/modules/reagents/reagent_containers/glass/coffeecup.dm

@@ -210,7 +210,8 @@
 	name = "metal coffee cup"
 	desc = "A metal coffee cup. You're not sure which metal."
 	icon_state = "coffeecup_metal"
-	flags = OPENCONTAINER | CONDUCT
+	atom_flags = ATOM_FLAG_OPEN_CONTAINER
+	obj_flags = OBJ_FLAG_CONDUCTABLE
 	fragile = 0
 
 /obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/glass
@@ -253,7 +254,8 @@
 	name = "tall metal coffee cup"
 	desc = "An unreasonably tall coffee cup, for when you really need to wake up in the morning. This one is made of metal."
 	icon_state = "coffeecup_tall_metal"
-	flags = OPENCONTAINER | CONDUCT
+	atom_flags = ATOM_FLAG_OPEN_CONTAINER
+	obj_flags = OBJ_FLAG_CONDUCTABLE
 	fragile = 0
 
 /obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/tall/rainbow

code/modules/reagents/reagent_containers/hypospray.dm

@@ -15,7 +15,7 @@
 	unacidable = 1
 	volume = 15
 	possible_transfer_amounts = list(5, 10, 15)
-	flags = OPENCONTAINER
+	atom_flags = ATOM_FLAG_OPEN_CONTAINER
 	slot_flags = SLOT_BELT
 	drop_sound = 'sound/items/drop/gun.ogg'
 	pickup_sound = 'sound/items/pickup/gun.ogg'
@@ -129,7 +129,7 @@
 		name = "[name] ([name_label])"
 		verbs += /atom/proc/remove_label
 	if(reagents_to_add)
-		flags = 0
+		atom_flags = 0
 		spent = FALSE
 	update_icon()
 
@@ -157,7 +157,7 @@
 		if(LAZYLEN(reagents.reagent_volumes))
 			to_chat(user, SPAN_NOTICE("With a quick twist of \the [src]'s lid, you secure the reagents inside."))
 			spent = FALSE
-			flags &= ~OPENCONTAINER
+			atom_flags &= ~ATOM_FLAG_OPEN_CONTAINER
 			update_icon()
 		else
 			to_chat(user, SPAN_NOTICE("You can't secure \the [src] without putting reagents in!"))
@@ -167,7 +167,7 @@
 /obj/item/reagent_containers/hypospray/autoinjector/attackby(obj/item/W, mob/user)
 	if(W.isscrewdriver() && !is_open_container())
 		to_chat(user, SPAN_NOTICE("Using \the [W], you unsecure the autoinjector's lid.")) // it locks shut after being secured
-		flags |= OPENCONTAINER
+		atom_flags |= ATOM_FLAG_OPEN_CONTAINER
 		update_icon()
 		return TRUE
 	. = ..()
@@ -215,12 +215,12 @@
 	name_label = "coagzolug"
 	desc = "A rapid and safe way to administer small amounts of drugs by untrained or trained personnel. This one contains coagzolug, a quick-acting blood coagulant that will slow bleeding for as long as it's within the bloodstream."
 	volume = 5
-	flags = 0
+	atom_flags = 0
 	reagents_to_add = list(/singleton/reagent/coagzolug = 5)
 
 /obj/item/reagent_containers/hypospray/autoinjector/hyronalin
 	name_label = "hyronalin"
-	flags = 0
+	atom_flags = 0
 	reagents_to_add = list(/singleton/reagent/hyronalin = 5)
 
 /obj/item/reagent_containers/hypospray/autoinjector/sideeffectbgone

code/modules/reagents/reagent_containers/inhaler.dm

@@ -13,7 +13,7 @@
 	volume = 5
 	w_class = ITEMSIZE_SMALL
 	possible_transfer_amounts = null
-	flags = OPENCONTAINER
+	atom_flags = ATOM_FLAG_OPEN_CONTAINER
 	slot_flags = SLOT_BELT
 	center_of_mass = null
 	var/name_label
@@ -27,7 +27,7 @@
 		name = "[name] ([name_label])"
 		verbs += /atom/proc/remove_label
 	if(reagents_to_add)
-		flags = 0
+		atom_flags = 0
 		spent = FALSE
 	update_icon()
 
@@ -114,7 +114,7 @@
 	if(is_open_container())
 		if(LAZYLEN(reagents.reagent_volumes))
 			to_chat(user,"<span class='notice'>With a quick twist of \the [src]'s lid, you secure the reagents inside.</span>")
-			flags &= ~OPENCONTAINER
+			atom_flags &= ~ATOM_FLAG_OPEN_CONTAINER
 			spent = FALSE
 			update_icon()
 		else
@@ -126,7 +126,7 @@
 /obj/item/reagent_containers/inhaler/attackby(obj/item/W, mob/user)
 	if(W.isscrewdriver() && !is_open_container())
 		to_chat(user,"<span class='notice'>Using \the [W], you unsecure the inhaler's lid.</span>") // it locks shut after being secured
-		flags |= OPENCONTAINER
+		atom_flags |= ATOM_FLAG_OPEN_CONTAINER
 		update_icon()
 		return TRUE
 	. = ..()
@@ -156,7 +156,7 @@
 /obj/item/reagent_containers/inhaler/dexalin
 	name_label = "dexalin"
 	desc = "A rapid and safe way to administer small amounts of drugs into the lungs by untrained or trained personnel. This one contains dexalin."
-	flags = 0
+	atom_flags = 0
 
 /obj/item/reagent_containers/inhaler/dexalin/Initialize()
 	. =..()
@@ -167,7 +167,7 @@
 /obj/item/reagent_containers/inhaler/peridaxon
 	name_label = "peridaxon"
 	desc = "A rapid and safe way to administer small amounts of drugs into the lungs by untrained or trained personnel. This one contains peridaxon."
-	flags = 0
+	atom_flags = 0
 
 /obj/item/reagent_containers/inhaler/peridaxon/Initialize()
 	. =..()
@@ -178,7 +178,7 @@
 /obj/item/reagent_containers/inhaler/hyperzine
 	name_label = "hyperzine"
 	desc = "A rapid and safe way to administer small amounts of drugs into the lungs by untrained or trained personnel. This one contains hyperzine."
-	flags = 0
+	atom_flags = 0
 
 /obj/item/reagent_containers/inhaler/hyperzine/Initialize()
 	. =..()
@@ -189,7 +189,7 @@
 /obj/item/reagent_containers/inhaler/xuxigas
 	name_label = "xu'xi gas"
 	desc = "A rapid and safe way to administer small amounts of drugs into the lungs by untrained or trained personnel. This one contains xu'xi gas."
-	flags = 0
+	atom_flags = 0
 
 /obj/item/reagent_containers/inhaler/xuxigas/Initialize()
 	. =..()
@@ -200,7 +200,7 @@
 /obj/item/reagent_containers/inhaler/phoron
 	name_label = "phoron"
 	desc = "A rapid and safe way to administer small amounts of drugs into the lungs by untrained or trained personnel. This one contains phoron."
-	flags = 0
+	atom_flags = 0
 
 /obj/item/reagent_containers/inhaler/phoron/Initialize()
 	. =..()
@@ -212,7 +212,7 @@
 	name = "vaurca autoinhaler (phoron)"
 	desc = "A strange device that contains some sort of heavy-duty bag and mouthpiece combo."
 	icon_state = "anthaler1"
-	flags = 0
+	atom_flags = 0
 	volume = 10
 	var/empty_state = "anthaler0"
 
@@ -226,7 +226,7 @@
 	name_label = "soporific"
 	desc = "A rapid and safe way to administer small amounts of drugs into the lungs by untrained or trained personnel. This one contains soporific."
 	volume = 10
-	flags = 0
+	atom_flags = 0
 
 /obj/item/reagent_containers/inhaler/soporific/Initialize()
 	. =..()
@@ -237,7 +237,7 @@
 /obj/item/reagent_containers/inhaler/space_drugs
 	name_label = "space drugs"
 	desc = "A rapid and safe way to administer small amounts of drugs into the lungs by untrained or trained personnel. This one contains space drugs."
-	flags = 0
+	atom_flags = 0
 
 /obj/item/reagent_containers/inhaler/space_drugs/Initialize()
 	. =..()
@@ -248,7 +248,7 @@
 /obj/item/reagent_containers/inhaler/ammonia
 	name_label = "ammonia"
 	desc = "A rapid and safe way to administer small amounts of drugs into the lungs by untrained or trained personnel. This one contains ammonia."
-	flags = 0
+	atom_flags = 0
 
 /obj/item/reagent_containers/inhaler/ammonia/Initialize()
 	. =..()
@@ -259,7 +259,7 @@
 /obj/item/reagent_containers/inhaler/pulmodeiectionem
 	name_label = "pulmodeiectionem"
 	desc = "A rapid and safe way to administer small amounts of drugs into the lungs by untrained or trained personnel. This one contains pulmodeiectionem."
-	flags = 0
+	atom_flags = 0
 
 /obj/item/reagent_containers/inhaler/pulmodeiectionem/Initialize()
 	. =..()
@@ -271,7 +271,7 @@
 	name_label = "pneumalin"
 	desc = "A rapid and safe way to administer small amounts of drugs into the lungs by untrained or trained personnel. This one contains pneumalin."
 	volume = 10
-	flags = 0
+	atom_flags = 0
 
 /obj/item/reagent_containers/inhaler/pneumalin/Initialize()
 	. =..()
@@ -282,7 +282,7 @@
 /obj/item/reagent_containers/inhaler/raskara_dust
 	name_label = "unmarked autoinhaler"
 	desc = "A rapid and safe way to administer small amounts of drugs into the lungs by untrained or trained personnel. This one is unmarked."
-	flags = 0
+	atom_flags = 0
 
 /obj/item/reagent_containers/inhaler/raskara_dust/Initialize()
 	. =..()

code/modules/reagents/reagent_containers/inhaler_advanced.dm

@@ -13,7 +13,7 @@
 	unacidable = 1
 	amount_per_transfer_from_this = 5
 	possible_transfer_amounts = list(5,10,15)
-	flags = OPENCONTAINER
+	atom_flags = ATOM_FLAG_OPEN_CONTAINER
 	slot_flags = SLOT_BELT
 	origin_tech = list(TECH_BIO = 2, TECH_MATERIAL = 2)
 	matter = list(DEFAULT_WALL_MATERIAL = 250)
@@ -53,7 +53,7 @@
 	if(is_open_container())
 		if(LAZYLEN(reagents.reagent_volumes))
 			to_chat(user,"<span class='notice'>With a quick twist of \the [src]'s lid, you secure the reagents inside.</span>")
-			flags &= ~OPENCONTAINER
+			atom_flags &= ~ATOM_FLAG_OPEN_CONTAINER
 		else
 			to_chat(user,"<span class='notice'>You can't secure \the [src] without putting reagents in!</span>")
 	else
@@ -63,7 +63,7 @@
 /obj/item/reagent_containers/personal_inhaler_cartridge/attackby(obj/item/W, mob/user)
 	if(W.isscrewdriver() && !is_open_container())
 		to_chat(user,"<span class='notice'>Using \the [W], you unsecure the inhaler cartridge's lid.</span>") // it locks shut after being secured
-		flags |= OPENCONTAINER
+		atom_flags |= ATOM_FLAG_OPEN_CONTAINER
 		return
 	. = ..()
 
@@ -219,7 +219,7 @@
 /obj/item/reagent_containers/personal_inhaler_cartridge/large/hyperzine/Initialize()
 	. = ..()
 	reagents.add_reagent(/singleton/reagent/hyperzine, 30)
-	flags ^= OPENCONTAINER
+	atom_flags ^= ATOM_FLAG_OPEN_CONTAINER
 	update_icon()
 	return
 
@@ -229,6 +229,6 @@
 /obj/item/reagent_containers/personal_inhaler_cartridge/large/inaprovaline/Initialize()
 	. = ..()
 	reagents.add_reagent(/singleton/reagent/inaprovaline, 30)
-	flags ^= OPENCONTAINER
+	atom_flags ^= ATOM_FLAG_OPEN_CONTAINER
 	update_icon()
 	return

code/modules/reagents/reagent_containers/ladle.dm

@@ -8,7 +8,8 @@
 	w_class = ITEMSIZE_SMALL
 	volume = 30
 	force = 6
-	flags = OPENCONTAINER | NOBLUDGEON
+	atom_flags = ATOM_FLAG_OPEN_CONTAINER
+	item_flags = ITEM_FLAG_NO_BLUDGEON
 	drop_sound = 'sound/items/drop/glass.ogg'
 	pickup_sound = 'sound/items/pickup/glass.ogg'
 	center_of_mass = list("x"=14, "y"=6)

code/modules/reagents/reagent_containers/spray.dm

@@ -9,7 +9,8 @@
 	icon_state = "cleaner"
 	item_state = "cleaner"
 	center_of_mass = list("x" = 16,"y" = 10)
-	flags = OPENCONTAINER|NOBLUDGEON
+	atom_flags = ATOM_FLAG_OPEN_CONTAINER
+	item_flags = ITEM_FLAG_NO_BLUDGEON
 	slot_flags = SLOT_BELT
 	throwforce = 3
 	w_class = ITEMSIZE_SMALL

code/modules/reagents/reagent_containers/tooth_paste.dm

@@ -3,7 +3,7 @@
 	desc = "A simple tube full of toothpaste."
 	icon = 'icons/obj/chemical.dmi'
 	icon_state = "toothpaste"
-	flags = OPENCONTAINER
+	atom_flags = ATOM_FLAG_OPEN_CONTAINER
 	possible_transfer_amounts = null
 	amount_per_transfer_from_this = 5
 	volume = 20
@@ -27,7 +27,7 @@
 	desc = "An essential tool in dental hygiene."
 	icon = 'icons/obj/chemical.dmi'
 	icon_state = "toothbrush_b"
-	flags = OPENCONTAINER
+	atom_flags = ATOM_FLAG_OPEN_CONTAINER
 	possible_transfer_amounts = null
 	amount_per_transfer_from_this = 5
 	volume = 5
@@ -68,7 +68,7 @@
 			if(!reagents.total_volume)
 				to_chat(user, "<span class='warning'>The [initial(name)] is dry!</span>")
 			else if(reagents.total_volume)
-				if(user.zone_sel.selecting == BP_MOUTH && !(M.wear_mask && M.wear_mask.item_flags & AIRTIGHT))
+				if(user.zone_sel.selecting == BP_MOUTH && !(M.wear_mask && M.wear_mask.item_flags & ITEM_FLAG_AIRTIGHT))
 					user.do_attack_animation(src)
 					user.visible_message("<span class='warning'>[user] is trying to brush \the [target]'s teeth \the [src]!</span>")
 					playsound(loc, 'sound/effects/toothbrush.ogg', 15, 1)

code/modules/reagents/reagent_containers/welding_backpack.dm

@@ -29,12 +29,12 @@
 
 /obj/item/reagent_containers/weldpack/attackby(obj/item/W, mob/user)
 	if(W.iswrench())
-		if(flags & OPENCONTAINER)
-			flags &= ~OPENCONTAINER
+		if(atom_flags & ATOM_FLAG_OPEN_CONTAINER)
+			atom_flags &= ~ATOM_FLAG_OPEN_CONTAINER
 		else
-			flags = OPENCONTAINER
+			atom_flags = ATOM_FLAG_OPEN_CONTAINER
 		playsound(src, W.usesound, 70)
-		to_chat(user, SPAN_NOTICE("You wrench \the [src]'s fuel cap [(flags & OPENCONTAINER) ? "open" : "closed"]."))
+		to_chat(user, SPAN_NOTICE("You wrench \the [src]'s fuel cap [(atom_flags & ATOM_FLAG_OPEN_CONTAINER) ? "open" : "closed"]."))
 		return
 	else if(W.iswelder())
 		var/obj/item/weldingtool/T = W

code/modules/reagents/reagent_dispenser.dm

@@ -77,11 +77,11 @@
 				START_PROCESSING(SSprocessing,src)
 
 		else if(accept_any_reagent)
-			if(flags & OPENCONTAINER)
+			if(atom_flags & ATOM_FLAG_OPEN_CONTAINER)
 				user.visible_message(SPAN_NOTICE("[user] wrenches the inlet cap on \the [src] shut."), SPAN_NOTICE("You wrench the inlet cap back on \the [src]."))
 			else
 				user.visible_message(SPAN_NOTICE("[user] unwrenches the inlet cap from \the [src]."), SPAN_NOTICE("You unwrench the inlet cap from \the [src]."))
-			flags ^= OPENCONTAINER
+			atom_flags ^= ATOM_FLAG_OPEN_CONTAINER
 			return
 
 /obj/structure/reagent_dispensers/process()