diff --git a/code/game/atoms.dm b/code/game/atoms.dm
index dcc13c5b85..e68b617f51 100644
--- a/code/game/atoms.dm
+++ b/code/game/atoms.dm
@@ -1,7 +1,7 @@
 /atom
 	layer = TURF_LAYER //This was here when I got here. Why though?
 	var/level = 2
-	var/atom_flags = 0
+	var/atom_flags = EMPTY_BITFIELD
 	var/list/fingerprints
 	var/list/fingerprintshidden
 	var/fingerprintslast = null
diff --git a/code/game/gamemodes/changeling/powers/armor.dm b/code/game/gamemodes/changeling/powers/armor.dm
index b6d8b5fa0c..80b41e3017 100644
--- a/code/game/gamemodes/changeling/powers/armor.dm
+++ b/code/game/gamemodes/changeling/powers/armor.dm
@@ -37,7 +37,7 @@
 	name = "flesh mass"
 	icon_state = "lingspacesuit"
 	desc = "A huge, bulky mass of pressure and temperature-resistant organic tissue, evolved to facilitate space travel."
-	item_flags = 0
+	item_flags = EMPTY_BITFIELD
 	allowed = list(/obj/item/flashlight, /obj/item/tank/emergency/oxygen, /obj/item/tank/oxygen)
 	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0) //No armor at all.
 	canremove = 0
diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm
index 1466b8d441..86d722b73c 100644
--- a/code/game/objects/items.dm
+++ b/code/game/objects/items.dm
@@ -44,7 +44,7 @@
 	var/flags_inv = 0
 	var/body_parts_covered = 0 //see setup.dm for appropriate bit flags
 
-	var/item_flags = 0 //Miscellaneous flags pertaining to equippable objects.
+	var/item_flags = EMPTY_BITFIELD //Miscellaneous flags pertaining to equippable objects.
 
 	//var/heat_transfer_coefficient = 1 //0 prevents all transfers, 1 is invisible
 	var/gas_transfer_coefficient = 1 // for leaking gas from turf to mask and vice-versa (for masks right now, but at some point, i'd like to include space helmets)
diff --git a/code/game/objects/items/contraband.dm b/code/game/objects/items/contraband.dm
index 011417e9e7..559276b584 100644
--- a/code/game/objects/items/contraband.dm
+++ b/code/game/objects/items/contraband.dm
@@ -13,7 +13,7 @@
 
 
 /obj/item/reagent_containers/glass/beaker/vial/random
-	atom_flags = 0
+	atom_flags = EMPTY_BITFIELD
 	var/list/random_reagent_list = list(list("water" = 15) = 1, list("cleaner" = 15) = 1)
 
 
diff --git a/code/game/objects/items/stacks/tiles/tile_types.dm b/code/game/objects/items/stacks/tiles/tile_types.dm
index 8f0b15f49a..930d9d1424 100644
--- a/code/game/objects/items/stacks/tiles/tile_types.dm
+++ b/code/game/objects/items/stacks/tiles/tile_types.dm
@@ -36,7 +36,7 @@
 	throwforce = 1.0
 	throw_speed = 5
 	throw_range = 20
-	atom_flags = 0
+	atom_flags = EMPTY_BITFIELD
 	origin_tech = list(TECH_BIO = 1)
 	no_variants = FALSE
 	drop_sound = 'sound/items/drop/herb.ogg'
@@ -64,7 +64,7 @@
 	throwforce = 1.0
 	throw_speed = 5
 	throw_range = 20
-	atom_flags = 0
+	atom_flags = EMPTY_BITFIELD
 	no_variants = FALSE
 	drop_sound = 'sound/items/drop/wooden.ogg'
 	pickup_sound = 'sound/items/pickup/wooden.ogg'
@@ -112,7 +112,7 @@
 	throwforce = 1.0
 	throw_speed = 5
 	throw_range = 20
-	atom_flags = 0
+	atom_flags = EMPTY_BITFIELD
 	no_variants = FALSE
 	drop_sound = 'sound/items/drop/cloth.ogg'
 	pickup_sound = 'sound/items/pickup/cloth.ogg'
@@ -244,7 +244,7 @@
 	throwforce = 1.0
 	throw_speed = 5
 	throw_range = 20
-	atom_flags = 0
+	atom_flags = EMPTY_BITFIELD
 	no_variants = FALSE
 
 /obj/item/stack/tile/wmarble
@@ -256,7 +256,7 @@
 	throwforce = 15.0
 	throw_speed = 5
 	throw_range = 20
-	atom_flags = 0
+	atom_flags = EMPTY_BITFIELD
 	no_variants = FALSE
 
 /obj/item/stack/tile/bmarble
@@ -268,7 +268,7 @@
 	throwforce = 15.0
 	throw_speed = 5
 	throw_range = 20
-	atom_flags = 0
+	atom_flags = EMPTY_BITFIELD
 	no_variants = FALSE
 
 /obj/item/stack/tile/roofing
diff --git a/code/game/objects/structures/ledges.dm b/code/game/objects/structures/ledges.dm
index 2c1a71fb77..f53ee83a8a 100644
--- a/code/game/objects/structures/ledges.dm
+++ b/code/game/objects/structures/ledges.dm
@@ -13,7 +13,7 @@
 
 /obj/structure/ledge_corner
 	icon_state = "ledge-corner"
-	atom_flags = 0
+	atom_flags = EMPTY_BITFIELD
 	name = "rock ledge"
 	desc = "An easily scaleable rocky ledge."
 	icon = 'icons/obj/ledges.dmi'
diff --git a/code/game/turfs/turf.dm b/code/game/turfs/turf.dm
index d0409dbf4d..5e42b9ae25 100644
--- a/code/game/turfs/turf.dm
+++ b/code/game/turfs/turf.dm
@@ -3,7 +3,8 @@
 	layer = TURF_LAYER
 	plane = TURF_PLANE
 	level = 1
-	var/holy = 0
+
+	var/turf_flags = EMPTY_BITFIELD
 
 	// Initial air contents (in moles)
 	var/oxygen = 0
diff --git a/code/modules/clothing/glasses/glasses.dm b/code/modules/clothing/glasses/glasses.dm
index f2d1827170..4b95f8d161 100644
--- a/code/modules/clothing/glasses/glasses.dm
+++ b/code/modules/clothing/glasses/glasses.dm
@@ -542,7 +542,7 @@ BLIND     // can't see anything
 	item_state_slots = list(slot_r_hand_str = "sunglasses", slot_l_hand_str = "sunglasses")
 	toggleable = 1
 	action_button_name = "Toggle Monocle"
-	atom_flags = 0
+	atom_flags = EMPTY_BITFIELD
 
 	body_parts_covered = 0
 
diff --git a/code/modules/clothing/glasses/hud.dm b/code/modules/clothing/glasses/hud.dm
index d9319e4d93..96ed230b5f 100644
--- a/code/modules/clothing/glasses/hud.dm
+++ b/code/modules/clothing/glasses/hud.dm
@@ -1,7 +1,7 @@
 /obj/item/clothing/glasses/hud
 	name = "HUD"
 	desc = "A heads-up display that provides important info in (almost) real time."
-	atom_flags = 0 //doesn't protect eyes because it's a monocle, duh
+	atom_flags = EMPTY_BITFIELD //doesn't protect eyes because it's a monocle, duh
 	origin_tech = list(TECH_MAGNET = 3, TECH_BIO = 2)
 
 /obj/item/clothing/glasses/hud/health
diff --git a/code/modules/clothing/spacesuits/miscellaneous.dm b/code/modules/clothing/spacesuits/miscellaneous.dm
index 96edb184d1..ce954fb97d 100644
--- a/code/modules/clothing/spacesuits/miscellaneous.dm
+++ b/code/modules/clothing/spacesuits/miscellaneous.dm
@@ -3,7 +3,7 @@
 	name = "space helmet"
 	icon_state = "capspace"
 	desc = "A special helmet designed for work in a hazardous, low-pressure environment. Only for the most fashionable of military figureheads."
-	item_flags = 0
+	item_flags = EMPTY_BITFIELD
 	flags_inv = HIDEFACE|BLOCKHAIR
 	permeability_coefficient = 0.01
 	armor = list(melee = 65, bullet = 50, laser = 50,energy = 25, bomb = 50, bio = 100, rad = 50)
@@ -16,7 +16,7 @@
 	w_class = ITEMSIZE_HUGE
 	gas_transfer_coefficient = 0.01
 	permeability_coefficient = 0.02
-	item_flags = 0
+	item_flags = EMPTY_BITFIELD
 	body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS
 	allowed = list(/obj/item/tank/emergency/oxygen, /obj/item/flashlight,/obj/item/gun/energy, /obj/item/gun/projectile, /obj/item/ammo_magazine, /obj/item/ammo_casing, /obj/item/melee/baton,/obj/item/handcuffs)
 	slowdown = 1.5
@@ -46,7 +46,7 @@
 	icon_state = "beret_badge"
 	item_state_slots = list(slot_r_hand_str = "beret", slot_l_hand_str = "beret")
 	armor = list(melee = 65, bullet = 55, laser = 35,energy = 20, bomb = 30, bio = 30, rad = 30)
-	item_flags = 0
+	item_flags = EMPTY_BITFIELD
 	flags_inv = BLOCKHAIR
 	siemens_coefficient = 0.9
 
@@ -55,7 +55,7 @@
 	name = "Santa's hat"
 	desc = "Ho ho ho. Merrry X-mas!"
 	icon_state = "santahat"
-	item_flags = 0
+	item_flags = EMPTY_BITFIELD
 	flags_inv = BLOCKHAIR
 	body_parts_covered = HEAD
 
@@ -64,7 +64,7 @@
 	desc = "Festive!"
 	icon_state = "santa"
 	slowdown = 0
-	item_flags = 0
+	item_flags = EMPTY_BITFIELD
 	allowed = list(/obj/item) //for stuffing exta special presents
 
 //Space pirate outfit
@@ -73,7 +73,7 @@
 	desc = "Yarr."
 	icon_state = "pirate"
 	armor = list(melee = 60, bullet = 50, laser = 30,energy = 15, bomb = 30, bio = 30, rad = 30)
-	item_flags = 0
+	item_flags = EMPTY_BITFIELD
 	flags_inv = BLOCKHAIR
 	body_parts_covered = 0
 	siemens_coefficient = 0.9
@@ -115,4 +115,4 @@
 	desc = "A high-dexterity spacesuit for the civilian extra-vehicular extreme sports market, for when zero-g sports in controlled environments are just too tame."
 	description_fluff = "Ward-Takahashi zero-gravity performance sportswear does not require an EVA certification to purchase, though user manuals do list it as 'recommended' on condition of a 2550 lawsuit."
 	icon_state = "sports_void"
-	slowdown = 0
\ No newline at end of file
+	slowdown = 0
diff --git a/code/modules/clothing/suits/utility.dm b/code/modules/clothing/suits/utility.dm
index eda3702ea2..f8224c2aa7 100644
--- a/code/modules/clothing/suits/utility.dm
+++ b/code/modules/clothing/suits/utility.dm
@@ -21,7 +21,7 @@
 	allowed = list(/obj/item/flashlight,/obj/item/tank/emergency/oxygen,/obj/item/extinguisher)
 	slowdown = 0.8 //Slightly better than a voidsuit
 	flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT|HIDETAIL|HIDETIE|HIDEHOLSTER
-	item_flags = 0
+	item_flags = EMPTY_BITFIELD
 	heat_protection = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS
 	max_heat_protection_temperature = FIRESUIT_MAX_HEAT_PROTECTION_TEMPERATURE
 	cold_protection = UPPER_TORSO | LOWER_TORSO | LEGS | FEET | ARMS | HANDS
diff --git a/code/modules/food/food/cans.dm b/code/modules/food/food/cans.dm
index f068bab222..4549daf2bb 100644
--- a/code/modules/food/food/cans.dm
+++ b/code/modules/food/food/cans.dm
@@ -1,7 +1,7 @@
 /obj/item/reagent_containers/food/drinks/cans
 	volume = 40 //just over one and a half cups
 	amount_per_transfer_from_this = 5
-	atom_flags = 0 //starts closed
+	atom_flags = EMPTY_BITFIELD //starts closed
 	drop_sound = 'sound/items/drop/soda.ogg'
 	pickup_sound = 'sound/items/pickup/soda.ogg'
 
diff --git a/code/modules/food/food/drinks/bottle.dm b/code/modules/food/food/drinks/bottle.dm
index 639db5038f..f4a0eed692 100644
--- a/code/modules/food/food/drinks/bottle.dm
+++ b/code/modules/food/food/drinks/bottle.dm
@@ -625,7 +625,7 @@
 /obj/item/reagent_containers/food/drinks/bottle/small
 	volume = 50
 	smash_duration = 1
-	atom_flags = 0 //starts closed
+	atom_flags = EMPTY_BITFIELD //starts closed
 	rag_underlay = "rag_small"
 
 /obj/item/reagent_containers/food/drinks/bottle/small/beer
diff --git a/code/modules/food/food/snacks.dm b/code/modules/food/food/snacks.dm
index 25f76199f0..e2aa606190 100644
--- a/code/modules/food/food/snacks.dm
+++ b/code/modules/food/food/snacks.dm
@@ -1884,7 +1884,7 @@
 /obj/item/reagent_containers/food/snacks/cube/monkeycube/wrapped
 	desc = "Still wrapped in some paper."
 	icon_state = "monkeycubewrap"
-	atom_flags = 0
+	atom_flags = EMPTY_BITFIELD
 	wrapped = 1
 
 /obj/item/reagent_containers/food/snacks/cube/monkeycube/farwacube
@@ -6856,7 +6856,7 @@
 /obj/item/reagent_containers/food/snacks/canned
 	name = "void can"
 	icon = 'icons/obj/food_canned.dmi'
-	atom_flags = 0
+	atom_flags = EMPTY_BITFIELD
 	var/sealed = TRUE
 
 /obj/item/reagent_containers/food/snacks/canned/Initialize()
diff --git a/code/modules/food/glass/bottle.dm b/code/modules/food/glass/bottle.dm
index 50206e47dc..0947e9d63d 100644
--- a/code/modules/food/glass/bottle.dm
+++ b/code/modules/food/glass/bottle.dm
@@ -9,7 +9,7 @@
 	item_state = "atoxinbottle"
 	amount_per_transfer_from_this = 10
 	possible_transfer_amounts = list(5,10,15,25,30,60)
-	atom_flags = 0
+	atom_flags = EMPTY_BITFIELD
 	volume = 60
 	drop_sound = 'sound/items/drop/bottle.ogg'
 	pickup_sound = 'sound/items/pickup/bottle.ogg'
diff --git a/code/modules/food/kitchen/microwave.dm b/code/modules/food/kitchen/microwave.dm
index 35c7f4fea1..d06201a0bb 100644
--- a/code/modules/food/kitchen/microwave.dm
+++ b/code/modules/food/kitchen/microwave.dm
@@ -422,7 +422,7 @@
 /obj/machinery/microwave/proc/muck_finish()
 	src.visible_message("<span class='warning'>The microwave gets covered in muck!</span>")
 	src.dirty = 100 // Make it dirty so it can't be used util cleaned
-	src.atom_flags = 0 //So you can't add condiments
+	src.atom_flags = EMPTY_BITFIELD //So you can't add condiments
 	src.icon_state = "mwbloody" // Make it look dirty too
 	src.operating = 0 // Turn it off again aferwards
 	src.updateUsrDialog()
@@ -436,7 +436,7 @@
 	src.icon_state = "mwb" // Make it look all busted up and shit
 	src.visible_message("<span class='warning'>The microwave breaks!</span>") //Let them know they're stupid
 	src.broken = 2 // Make it broken so it can't be used util fixed
-	src.atom_flags = 0 //So you can't add condiments
+	src.atom_flags = EMPTY_BITFIELD //So you can't add condiments
 	src.operating = 0 // Turn it off again aferwards
 	src.updateUsrDialog()
 	soundloop.stop()
diff --git a/code/modules/mob/mob_grab.dm b/code/modules/mob/mob_grab.dm
index 70d4c7b469..66c8cd4db6 100644
--- a/code/modules/mob/mob_grab.dm
+++ b/code/modules/mob/mob_grab.dm
@@ -19,7 +19,7 @@
 	name = "grab"
 	icon = 'icons/mob/screen1.dmi'
 	icon_state = "reinforce"
-	atom_flags = 0
+	atom_flags = EMPTY_BITFIELD
 	var/obj/screen/grab/hud = null
 	var/mob/living/affecting = null
 	var/mob/living/carbon/human/assailant = null
diff --git a/code/modules/reagents/reagent_containers/unidentified_hypospray.dm b/code/modules/reagents/reagent_containers/unidentified_hypospray.dm
index 0d215df647..62188b9982 100644
--- a/code/modules/reagents/reagent_containers/unidentified_hypospray.dm
+++ b/code/modules/reagents/reagent_containers/unidentified_hypospray.dm
@@ -7,102 +7,102 @@
 // The good.
 /obj/item/reagent_containers/hypospray/autoinjector/bonemed/unidentified
 	init_hide_identity = TRUE
-	atom_flags = 0
+	atom_flags = EMPTY_BITFIELD
 
 /obj/item/reagent_containers/hypospray/autoinjector/clonemed/unidentified
 	init_hide_identity = TRUE
-	atom_flags = 0
+	atom_flags = EMPTY_BITFIELD
 
 /obj/item/reagent_containers/hypospray/autoinjector/biginjector/brute/unidentified
 	init_hide_identity = TRUE
-	atom_flags = 0
+	atom_flags = EMPTY_BITFIELD
 
 /obj/item/reagent_containers/hypospray/autoinjector/biginjector/burn/unidentified
 	init_hide_identity = TRUE
-	atom_flags = 0
+	atom_flags = EMPTY_BITFIELD
 
 /obj/item/reagent_containers/hypospray/autoinjector/biginjector/toxin/unidentified
 	init_hide_identity = TRUE
-	atom_flags = 0
+	atom_flags = EMPTY_BITFIELD
 
 /obj/item/reagent_containers/hypospray/autoinjector/biginjector/oxy/unidentified
 	init_hide_identity = TRUE
-	atom_flags = 0
+	atom_flags = EMPTY_BITFIELD
 
 /obj/item/reagent_containers/hypospray/autoinjector/biginjector/purity/unidentified
 	init_hide_identity = TRUE
-	atom_flags = 0
+	atom_flags = EMPTY_BITFIELD
 
 /obj/item/reagent_containers/hypospray/autoinjector/biginjector/pain/unidentified
 	init_hide_identity = TRUE
-	atom_flags = 0
+	atom_flags = EMPTY_BITFIELD
 
 /obj/item/reagent_containers/hypospray/autoinjector/biginjector/organ/unidentified
 	init_hide_identity = TRUE
-	atom_flags = 0
+	atom_flags = EMPTY_BITFIELD
 
 /obj/item/reagent_containers/hypospray/autoinjector/biginjector/clotting/unidentified
 	init_hide_identity = TRUE
-	atom_flags = 0
+	atom_flags = EMPTY_BITFIELD
 
 /obj/item/reagent_containers/hypospray/autoinjector/biginjector/combat/unidentified
 	init_hide_identity = TRUE
-	atom_flags = 0
+	atom_flags = EMPTY_BITFIELD
 
 /obj/item/reagent_containers/hypospray/autoinjector/biginjector/healing_nanites/unidentified
 	init_hide_identity = TRUE
-	atom_flags = 0
+	atom_flags = EMPTY_BITFIELD
 
 // The somewhat bad.
 /obj/item/reagent_containers/hypospray/autoinjector/biginjector/stimm/unidentified
 	init_hide_identity = TRUE
-	atom_flags = 0
+	atom_flags = EMPTY_BITFIELD
 
 /obj/item/reagent_containers/hypospray/autoinjector/biginjector/bliss/unidentified
 	init_hide_identity = TRUE
-	atom_flags = 0
+	atom_flags = EMPTY_BITFIELD
 
 /obj/item/reagent_containers/hypospray/autoinjector/biginjector/expired/unidentified
 	init_hide_identity = TRUE
-	atom_flags = 0
+	atom_flags = EMPTY_BITFIELD
 
 /obj/item/reagent_containers/hypospray/autoinjector/biginjector/serotrotium/unidentified
 	init_hide_identity = TRUE
-	atom_flags = 0
+	atom_flags = EMPTY_BITFIELD
 
 /obj/item/reagent_containers/hypospray/autoinjector/biginjector/cryptobiolin/unidentified
 	init_hide_identity = TRUE
-	atom_flags = 0
+	atom_flags = EMPTY_BITFIELD
 
 /obj/item/reagent_containers/hypospray/autoinjector/biginjector/mindbreaker/unidentified
 	init_hide_identity = TRUE
-	atom_flags = 0
+	atom_flags = EMPTY_BITFIELD
 
 /obj/item/reagent_containers/hypospray/autoinjector/biginjector/psilocybin/unidentified
 	init_hide_identity = TRUE
-	atom_flags = 0
+	atom_flags = EMPTY_BITFIELD
 
 /obj/item/reagent_containers/hypospray/autoinjector/biginjector/soporific/unidentified
 	init_hide_identity = TRUE
-	atom_flags = 0
+	atom_flags = EMPTY_BITFIELD
 
 // The very bad.
 /obj/item/reagent_containers/hypospray/autoinjector/biginjector/cyanide/unidentified
 	init_hide_identity = TRUE
-	atom_flags = 0
+	atom_flags = EMPTY_BITFIELD
 
 /obj/item/reagent_containers/hypospray/autoinjector/biginjector/impedrezene/unidentified
 	init_hide_identity = TRUE
-	atom_flags = 0
+	atom_flags = EMPTY_BITFIELD
 
 /obj/item/reagent_containers/hypospray/autoinjector/biginjector/mutagen/unidentified
 	init_hide_identity = TRUE
-	atom_flags = 0
+	atom_flags = EMPTY_BITFIELD
 
 /obj/item/reagent_containers/hypospray/autoinjector/biginjector/defective_nanites/unidentified
 	init_hide_identity = TRUE
-	atom_flags = 0
+	atom_flags = EMPTY_BITFIELD
 
 /obj/item/reagent_containers/hypospray/autoinjector/biginjector/contaminated/unidentified
 	init_hide_identity = TRUE
-	atom_flags = 0
+	atom_flags = EMPTY_BITFIELD