diff --git a/code/__defines/faction.dm b/code/__defines/faction.dm
index fd5da74f86..5de9f18f92 100644
--- a/code/__defines/faction.dm
+++ b/code/__defines/faction.dm
@@ -20,6 +20,7 @@
 #define FACTION_VIRGO3B "virgo3b"
 
 #define FACTION_ALTEVIAN "altevian"
+#define FACTION_BLACKHOLE "blackhole" //CHOMPAdd
 #define FACTION_CULT "cult"
 #define FACTION_ECLIPSE "eclipse" //CHOMPAdd
 #define FACTION_GLAMOUR "glamour"
diff --git a/code/__defines/mobs.dm b/code/__defines/mobs.dm
index b94e4da2bd..3656ac604b 100644
--- a/code/__defines/mobs.dm
+++ b/code/__defines/mobs.dm
@@ -75,6 +75,9 @@
 #define I_GRAB		"grab"
 #define I_HURT		"harm"
 
+#define I_RUN		"run"
+#define I_WALK		"walk"
+
 //These are used Bump() code for living mobs, in the mob_bump_flag, mob_swap_flags, and mob_push_flags vars to determine whom can bump/swap with whom.
 #define HUMAN 1
 #define MONKEY 2
diff --git a/code/_onclick/hud/alien_larva.dm b/code/_onclick/hud/alien_larva.dm
index 123a13819b..e53a1cbd32 100644
--- a/code/_onclick/hud/alien_larva.dm
+++ b/code/_onclick/hud/alien_larva.dm
@@ -12,7 +12,7 @@
 	using.name = "mov_intent"
 	using.set_dir(SOUTHWEST)
 	using.icon = HUD.ui_style
-	using.icon_state = (m_intent == "run" ? "running" : "walking")
+	using.icon_state = (m_intent == I_RUN ? "running" : "walking")
 	using.screen_loc = ui_acti
 	using.layer = HUD_LAYER
 	HUD.adding += using
diff --git a/code/_onclick/hud/human.dm b/code/_onclick/hud/human.dm
index 1f5fc4f497..5536de74d4 100644
--- a/code/_onclick/hud/human.dm
+++ b/code/_onclick/hud/human.dm
@@ -132,7 +132,7 @@
 		using = new /obj/screen()
 		using.name = "mov_intent"
 		using.icon = HUD.ui_style
-		using.icon_state = (m_intent == "run" ? "running" : "walking")
+		using.icon_state = (m_intent == I_RUN ? "running" : "walking")
 		using.screen_loc = ui_movi
 		using.color = HUD.ui_color
 		using.alpha = HUD.ui_alpha
diff --git a/code/_onclick/hud/robot.dm b/code/_onclick/hud/robot.dm
index 4b062a6b5f..2aa272bce5 100644
--- a/code/_onclick/hud/robot.dm
+++ b/code/_onclick/hud/robot.dm
@@ -85,7 +85,7 @@ var/obj/screen/robot_inventory
 	using = new /obj/screen()
 	using.name = "mov_intent"
 	using.icon = HUD.ui_style
-	using.icon_state = (m_intent == "run" ? "running" : "walking")
+	using.icon_state = (m_intent == I_RUN ? "running" : "walking")
 	using.screen_loc = ui_movi
 	using.color = HUD.ui_color
 	using.alpha = HUD.ui_alpha
@@ -230,7 +230,7 @@ var/obj/screen/robot_inventory
 			else if(speed == -1)
 				using.icon_state = "speed_2"
 			HUD.control_vtec = using
-			m_intent = "run"
+			m_intent = I_RUN
 			HUD.move_intent.icon_state = "running"
 			client.screen += HUD.control_vtec
 
@@ -254,7 +254,7 @@ var/obj/screen/robot_inventory
 			control_vtec.icon_state = "speed_1"
 		else if(R.speed == -1)
 			control_vtec.icon_state = "speed_2"
-		R.m_intent = "run"
+		R.m_intent = I_RUN
 		R.hud_used.move_intent.icon_state = "running"
 		R.client?.screen += control_vtec
 	else
diff --git a/code/_onclick/hud/screen_objects.dm b/code/_onclick/hud/screen_objects.dm
index 2798a34853..858286c715 100644
--- a/code/_onclick/hud/screen_objects.dm
+++ b/code/_onclick/hud/screen_objects.dm
@@ -291,36 +291,36 @@
 					var/mob/living/carbon/C = usr
 					if(C.legcuffed)
 						to_chat(C, span_notice("You are legcuffed! You cannot run until you get [C.legcuffed] removed!"))
-						C.m_intent = "walk"	//Just incase
+						C.m_intent = I_WALK	//Just incase
 						C.hud_used.move_intent.icon_state = "walking"
 						return 1
 				var/mob/living/L = usr
 				switch(L.m_intent)
-					if("run")
-						L.m_intent = "walk"
+					if(I_RUN)
+						L.m_intent = I_WALK
 						L.hud_used.move_intent.icon_state = "walking"
-					if("walk")
-						L.m_intent = "run"
+					if(I_WALK)
+						L.m_intent = I_RUN
 						L.hud_used.move_intent.icon_state = "running"
 		if("m_intent")
 			if(!usr.m_int)
 				switch(usr.m_intent)
-					if("run")
+					if(I_RUN)
 						usr.m_int = "13,14"
-					if("walk")
+					if(I_WALK)
 						usr.m_int = "14,14"
 					if("face")
 						usr.m_int = "15,14"
 			else
 				usr.m_int = null
-		if("walk")
-			usr.m_intent = "walk"
+		if(I_WALK)
+			usr.m_intent = I_WALK
 			usr.m_int = "14,14"
 		if("face")
 			usr.m_intent = "face"
 			usr.m_int = "15,14"
-		if("run")
-			usr.m_intent = "run"
+		if(I_RUN)
+			usr.m_intent = I_RUN
 			usr.m_int = "13,14"
 		if("Reset Machine")
 			usr.unset_machine()
diff --git a/code/game/area/areas.dm b/code/game/area/areas.dm
index 5c4e903ff6..3579090a0c 100644
--- a/code/game/area/areas.dm
+++ b/code/game/area/areas.dm
@@ -384,7 +384,7 @@ var/list/mob/living/forced_ambiance_list = new
 	if(!L.lastarea)
 		L.lastarea = src
 	var/area/oldarea = L.lastarea
-	if((oldarea.get_gravity() == 0) && (get_gravity() == 1) && (L.m_intent == "run")) // Being ready when you change areas gives you a chance to avoid falling all together.
+	if((oldarea.get_gravity() == 0) && (get_gravity() == 1) && (L.m_intent == I_RUN)) // Being ready when you change areas gives you a chance to avoid falling all together.
 		thunk(L)
 		L.update_floating( L.Check_Dense_Object() )
 
@@ -450,7 +450,7 @@ var/list/mob/living/forced_ambiance_list = new
 		if(H.species.can_zero_g_move || H.species.can_space_freemove)
 			return
 
-		if(H.m_intent == "run")
+		if(H.m_intent == I_RUN)
 			H.AdjustStunned(1) // CHOMPedit: No longer a supermassive long stun.
 //			H.AdjustWeakened(6) // CHOMPedit: No longer weakens.
 		else
diff --git a/code/game/gamemodes/changeling/powers/visible_camouflage.dm b/code/game/gamemodes/changeling/powers/visible_camouflage.dm
index e83b61bb5c..de31868953 100644
--- a/code/game/gamemodes/changeling/powers/visible_camouflage.dm
+++ b/code/game/gamemodes/changeling/powers/visible_camouflage.dm
@@ -41,13 +41,13 @@
 			to_chat(src, span_notice("We may move at our normal speed while hidden."))
 
 		if(must_walk)
-			H.set_m_intent("walk")
+			H.set_m_intent(I_WALK)
 
 		var/remain_cloaked = TRUE
 		while(remain_cloaked) //This loop will keep going until the player uncloaks.
 			sleep(1 SECOND) // Sleep at the start so that if something invalidates a cloak, it will drop immediately after the check and not in one second.
 
-			if(H.m_intent != "walk" && must_walk) // Moving too fast uncloaks you.
+			if(H.m_intent != I_WALK && must_walk) // Moving too fast uncloaks you.
 				remain_cloaked = 0
 			if(!H.mind.changeling.cloaked)
 				remain_cloaked = 0
@@ -65,7 +65,7 @@
 		H.invisibility = initial(invisibility)
 		visible_message(span_warning("[src] suddenly fades in, seemingly from nowhere!"),
 		span_notice("We revert our camouflage, revealing ourselves."))
-		H.set_m_intent("run")
+		H.set_m_intent(I_RUN)
 		H.mind.changeling.cloaked = 0
 		H.mind.changeling.chem_recharge_rate = old_regen_rate
 
diff --git a/code/game/machinery/flasher.dm b/code/game/machinery/flasher.dm
index e70491fcb3..d6adbd1070 100644
--- a/code/game/machinery/flasher.dm
+++ b/code/game/machinery/flasher.dm
@@ -113,7 +113,7 @@
 
 	if(iscarbon(AM))
 		var/mob/living/carbon/M = AM
-		if(M.m_intent != "walk")
+		if(M.m_intent != I_WALK)
 			flash()
 
 /obj/machinery/flasher/portable/attackby(obj/item/W as obj, mob/user as mob)
diff --git a/code/game/objects/items/bells.dm b/code/game/objects/items/bells.dm
index 457eb80f47..9df665424b 100644
--- a/code/game/objects/items/bells.dm
+++ b/code/game/objects/items/bells.dm
@@ -61,7 +61,7 @@
 			..()
 
 /obj/item/deskbell/proc/ring(mob/user)
-	if(user.a_intent == "harm")
+	if(user.a_intent == I_HURT)
 		playsound(src, 'sound/effects/deskbell_rude.ogg', 50, 1)
 		to_chat(user,span_notice("You hammer [src] rudely!"))
 		if (prob(2))
diff --git a/code/game/objects/items/glassjar.dm b/code/game/objects/items/glassjar.dm
index 12816c6736..157477ac70 100644
--- a/code/game/objects/items/glassjar.dm
+++ b/code/game/objects/items/glassjar.dm
@@ -207,7 +207,7 @@
 /obj/item/glass_jar/fish/afterattack(var/atom/A, var/mob/user, var/proximity)
 	if(!filled)
 		if(istype(A, /obj/structure/sink) || istype(A, /turf/simulated/floor/water))
-			if(contains && user.a_intent == "help")
+			if(contains && user.a_intent == I_HELP)
 				to_chat(user, span_warning("That probably isn't the best idea."))
 				return
 
@@ -221,7 +221,7 @@
 /obj/item/glass_jar/fish/attack_self(var/mob/user)
 	if(filled)
 		if(contains == JAR_ANIMAL)
-			if(user.a_intent == "help")
+			if(user.a_intent == I_HELP)
 				to_chat(user, span_notice("Maybe you shouldn't empty the water..."))
 				return
 
diff --git a/code/game/objects/items/toys/toys.dm b/code/game/objects/items/toys/toys.dm
index d48d8b00b0..cbff3adf33 100644
--- a/code/game/objects/items/toys/toys.dm
+++ b/code/game/objects/items/toys/toys.dm
@@ -257,7 +257,7 @@
 		return
 	if((ishuman(H))) //i guess carp and shit shouldn't set them off
 		var/mob/living/carbon/M = H
-		if(M.m_intent == "run")
+		if(M.m_intent == I_RUN)
 			to_chat(M, span_warning("You step on the snap pop!"))
 
 			var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread
diff --git a/code/game/objects/items/weapons/handcuffs.dm b/code/game/objects/items/weapons/handcuffs.dm
index 41b11771e6..7cc67de51b 100644
--- a/code/game/objects/items/weapons/handcuffs.dm
+++ b/code/game/objects/items/weapons/handcuffs.dm
@@ -274,8 +274,8 @@ var/last_chew = 0
 	lcuffs.loc = target
 	target.legcuffed = lcuffs
 	target.update_inv_legcuffed()
-	if(target.m_intent != "walk")
-		target.m_intent = "walk"
+	if(target.m_intent != I_WALK)
+		target.m_intent = I_WALK
 		if(target.hud_used && user.hud_used.move_intent)
 			target.hud_used.move_intent.icon_state = "walking"
 	return 1
@@ -283,8 +283,8 @@ var/last_chew = 0
 /obj/item/handcuffs/legcuffs/equipped(var/mob/living/user,var/slot)
 	. = ..()
 	if(slot == slot_legcuffed)
-		if(user.m_intent != "walk")
-			user.m_intent = "walk"
+		if(user.m_intent != I_WALK)
+			user.m_intent = I_WALK
 			if(user.hud_used && user.hud_used.move_intent)
 				user.hud_used.move_intent.icon_state = "walking"
 
@@ -325,8 +325,8 @@ var/last_chew = 0
 	lcuffs.loc = target
 	target.legcuffed = lcuffs
 	target.update_inv_legcuffed()
-	if(target.m_intent != "walk")
-		target.m_intent = "walk"
+	if(target.m_intent != I_WALK)
+		target.m_intent = I_WALK
 		if(target.hud_used && user.hud_used.move_intent)
 			target.hud_used.move_intent.icon_state = "walking"
 	return 1
diff --git a/code/game/objects/items/weapons/lego.dm b/code/game/objects/items/weapons/lego.dm
index e7b009d655..8cf70a577d 100644
--- a/code/game/objects/items/weapons/lego.dm
+++ b/code/game/objects/items/weapons/lego.dm
@@ -17,7 +17,7 @@
 		return
 	if(isliving(AM))
 		var/mob/living/L = AM
-		if(L.m_intent == "run")
+		if(L.m_intent == I_RUN)
 			L.visible_message(
 				span_danger("[L] steps on \the [src]."),
 				span_danger("You step on \the [src], you poor bastard!"),
@@ -47,7 +47,7 @@
 		return
 	if(isliving(AM))
 		var/mob/living/L = AM
-		if(L.m_intent == "run")
+		if(L.m_intent == I_RUN)
 			L.visible_message(
 				span_danger("[L] steps on \the [src]."),
 				span_danger("You step on \the [src], you poor bastard!"),
diff --git a/code/game/objects/items/weapons/tools/screwdriver.dm b/code/game/objects/items/weapons/tools/screwdriver.dm
index 7d347535ca..fe865848ec 100644
--- a/code/game/objects/items/weapons/tools/screwdriver.dm
+++ b/code/game/objects/items/weapons/tools/screwdriver.dm
@@ -56,7 +56,7 @@
 	..()
 
 /obj/item/tool/screwdriver/attack(mob/living/carbon/M as mob, mob/living/carbon/user as mob)
-	if(!istype(M) || user.a_intent == "help")
+	if(!istype(M) || user.a_intent == I_HELP)
 		return ..()
 	if(user.zone_sel.selecting != O_EYES && user.zone_sel.selecting != BP_HEAD)
 		return ..()
diff --git a/code/game/objects/items/weapons/traps.dm b/code/game/objects/items/weapons/traps.dm
index 505949019f..3d04d1762a 100644
--- a/code/game/objects/items/weapons/traps.dm
+++ b/code/game/objects/items/weapons/traps.dm
@@ -125,7 +125,7 @@
 		return
 	if(deployed && isliving(AM))
 		var/mob/living/L = AM
-		if(L.m_intent == "run")
+		if(L.m_intent == I_RUN)
 			L.visible_message(
 				span_danger("[L] steps on \the [src]."),
 				span_danger("You step on \the [src]!"),
@@ -272,7 +272,7 @@
 		return
 	if(anchored && isliving(AM))
 		var/mob/living/L = AM
-		if(L.m_intent == "run")
+		if(L.m_intent == I_RUN)
 			L.visible_message(
 				span_danger("[L] steps in \the [src]."),
 				span_danger("You step in \the [src]!"),
diff --git a/code/game/objects/structures/crates_lockers/closets/coffin.dm b/code/game/objects/structures/crates_lockers/closets/coffin.dm
index acb09c9e58..46ad381463 100644
--- a/code/game/objects/structures/crates_lockers/closets/coffin.dm
+++ b/code/game/objects/structures/crates_lockers/closets/coffin.dm
@@ -42,7 +42,7 @@
 		add_fingerprint(M)
 		if(ishuman(M))
 			var/mob/living/carbon/human/H = M
-			if(H.m_intent == "walk")
+			if(H.m_intent == I_WALK)
 				to_chat(H, span_warning("You stop at the edge of \the [src.name]."))
 				return FALSE
 			else
diff --git a/code/game/turfs/simulated.dm b/code/game/turfs/simulated.dm
index 578ebb9289..41e39f6c3b 100644
--- a/code/game/turfs/simulated.dm
+++ b/code/game/turfs/simulated.dm
@@ -125,7 +125,7 @@
 			if(H.shoes)
 				var/obj/item/clothing/shoes/S = H.shoes
 				if(istype(S))
-					S.handle_movement(src,(H.m_intent == "run" ? 1 : 0), H) // CHOMPEdit handle_movement now needs to know who is moving, for inshoe steppies
+					S.handle_movement(src,(H.m_intent == I_RUN ? 1 : 0), H) // CHOMPEdit handle_movement now needs to know who is moving, for inshoe steppies
 					if(S.track_blood && S.blood_DNA)
 						bloodDNA = S.blood_DNA
 						bloodcolor=S.blood_color
@@ -146,7 +146,7 @@
 
 		if(src.wet || (dirtslip && (dirt > 50 || outdoors == 1)))	//CHOMPEdit
 
-			if(M.buckled || (src.wet == 1 && M.m_intent == "walk"))
+			if(M.buckled || (src.wet == 1 && M.m_intent == I_WALK))
 				return
 
 			var/slip_dist = 1
@@ -159,7 +159,7 @@
 					floor_type = "dirty"
 				else if(outdoors)
 					floor_type = "uneven"
-				if(src.wet == 0 && M.m_intent == "walk")
+				if(src.wet == 0 && M.m_intent == I_WALK)
 					return
 			//CHOMPEdit End
 			switch(src.wet)
diff --git a/code/modules/assembly/mousetrap.dm b/code/modules/assembly/mousetrap.dm
index 4ebb2d24e6..473a4bca30 100644
--- a/code/modules/assembly/mousetrap.dm
+++ b/code/modules/assembly/mousetrap.dm
@@ -85,7 +85,7 @@
 	if(armed)
 		if(ishuman(AM))
 			var/mob/living/carbon/H = AM
-			if(H.m_intent == "run")
+			if(H.m_intent == I_RUN)
 				triggered(H)
 				H.visible_message(span_warning("[H] accidentally steps on [src]."), \
 								  span_warning("You accidentally step on [src]"))
diff --git a/code/modules/detectivework/tools/sample_kits.dm b/code/modules/detectivework/tools/sample_kits.dm
index b08dfb0348..30b2724d0d 100644
--- a/code/modules/detectivework/tools/sample_kits.dm
+++ b/code/modules/detectivework/tools/sample_kits.dm
@@ -90,7 +90,7 @@
 		to_chat(user, span_warning("\The [H] is wearing gloves."))
 		return 1
 
-	if(user != H && H.a_intent != "help" && !H.lying)
+	if(user != H && H.a_intent != I_HELP && !H.lying)
 		user.visible_message(span_danger("\The [user] tries to take prints from \the [H], but they move away."))
 		return 1
 
diff --git a/code/modules/detectivework/tools/swabs.dm b/code/modules/detectivework/tools/swabs.dm
index e841541c35..f2c13aed67 100644
--- a/code/modules/detectivework/tools/swabs.dm
+++ b/code/modules/detectivework/tools/swabs.dm
@@ -30,7 +30,7 @@
 		to_chat(user, span_warning("They don't seem to have DNA!"))
 		return
 
-	if(user != H && H.a_intent != "help" && !H.lying)
+	if(user != H && H.a_intent != I_HELP && !H.lying)
 		user.visible_message(span_danger("\The [user] tries to take a swab sample from \the [H], but they move away."))
 		return
 
diff --git a/code/modules/mob/living/carbon/alien/diona/diona_attacks.dm b/code/modules/mob/living/carbon/alien/diona/diona_attacks.dm
index d8376354f0..6ec69a9478 100644
--- a/code/modules/mob/living/carbon/alien/diona/diona_attacks.dm
+++ b/code/modules/mob/living/carbon/alien/diona/diona_attacks.dm
@@ -2,7 +2,7 @@
 	var/mob/living/carbon/human/H = over_object
 	if(!istype(H) || !Adjacent(H))
 		return ..()
-	if(H.a_intent == "grab" && hat && !H.hands_are_full())
+	if(H.a_intent == I_GRAB && hat && !H.hands_are_full())
 		hat.loc = get_turf(src)
 		H.put_in_hands(hat)
 		H.visible_message(span_danger("\The [H] removes \the [src]'s [hat]."))
@@ -12,7 +12,7 @@
 		return ..()
 
 /mob/living/carbon/alien/diona/attackby(var/obj/item/W, var/mob/user)
-	if(user.a_intent == "help" && istype(W, /obj/item/clothing/head))
+	if(user.a_intent == I_HELP && istype(W, /obj/item/clothing/head))
 		if(hat)
 			to_chat(user, span_warning("\The [src] is already wearing \the [hat]."))
 			return
diff --git a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm
index b5d977e501..bb5085f38a 100644
--- a/code/modules/mob/living/carbon/carbon.dm
+++ b/code/modules/mob/living/carbon/carbon.dm
@@ -36,10 +36,10 @@
 	. = ..()
 	if(src.nutrition && src.stat != 2)
 		adjust_nutrition(-DEFAULT_HUNGER_FACTOR / 10)
-		if(src.m_intent == "run")
+		if(src.m_intent == I_RUN)
 			adjust_nutrition(-DEFAULT_HUNGER_FACTOR / 10)
 
-	if((FAT in src.mutations) && src.m_intent == "run" && src.bodytemperature <= 360)
+	if((FAT in src.mutations) && src.m_intent == I_RUN && src.bodytemperature <= 360)
 		src.bodytemperature += 2
 
 	// Moving around increases germ_level faster
diff --git a/code/modules/mob/living/carbon/human/human_movement.dm b/code/modules/mob/living/carbon/human/human_movement.dm
index 22f648c3ef..aba693285c 100644
--- a/code/modules/mob/living/carbon/human/human_movement.dm
+++ b/code/modules/mob/living/carbon/human/human_movement.dm
@@ -314,10 +314,10 @@
 	if(!S) return
 
 	// Play every 20 steps while walking, for the sneak
-	if(m_intent == "walk" && step_count++ % 20 != 0)
+	if(m_intent == I_WALK && step_count++ % 20 != 0)
 		check_vorefootstep(m_intent, T) //CHOMPstation edit: sloshing reagent belly walk system
 	// Play every other step while running
-	if(m_intent == "run" && step_count++ % 2 != 0)
+	if(m_intent == I_RUN && step_count++ % 2 != 0)
 		check_vorefootstep(m_intent, T) //CHOMPstation edit: sloshing reagent belly walk system
 	*/
 	if(shoes && loc == T && get_gravity(loc) && !flying)
@@ -330,7 +330,7 @@
 	var/volume = CONFIG_GET(number/footstep_volume)
 
 	// Reduce volume while walking or barefoot
-	if(!shoes || m_intent == "walk")
+	if(!shoes || m_intent == I_WALK)
 		volume *= 0.5
 	else if(shoes)
 		var/obj/item/clothing/shoes/feet = shoes
diff --git a/code/modules/mob/living/carbon/human/human_movement_ch.dm b/code/modules/mob/living/carbon/human/human_movement_ch.dm
index d203164220..894fe482ca 100644
--- a/code/modules/mob/living/carbon/human/human_movement_ch.dm
+++ b/code/modules/mob/living/carbon/human/human_movement_ch.dm
@@ -14,7 +14,7 @@
 	var/volume = CONFIG_GET(number/vorefootstep_volume) * (vore_footstep_volume/100)
 
 	// Reduce volume while walking or barefoot, but not so much since tummy slosh
-	if(!shoes || m_intent == "walk")
+	if(!shoes || m_intent == I_WALK)
 		volume = CONFIG_GET(number/vorefootstep_volume) * (vore_footstep_volume/100) * 0.75
 	else if(shoes)
 		var/obj/item/clothing/shoes/feet = shoes
diff --git a/code/modules/mob/living/carbon/human/life_vr.dm b/code/modules/mob/living/carbon/human/life_vr.dm
index 25ba3b9f17..31ff8b8391 100644
--- a/code/modules/mob/living/carbon/human/life_vr.dm
+++ b/code/modules/mob/living/carbon/human/life_vr.dm
@@ -28,7 +28,7 @@
 	// Technically this does mean being dragged takes nutrition
 	if(stat != DEAD)
 		adjust_nutrition(hunger_rate/-10)
-		if(m_intent == "run")
+		if(m_intent == I_RUN)
 			adjust_nutrition(hunger_rate/-10)
 
 	// Moving around increases germ_level faster
diff --git a/code/modules/mob/living/carbon/human/species/station/traits_vr/weaver_objs.dm b/code/modules/mob/living/carbon/human/species/station/traits_vr/weaver_objs.dm
index f149636f67..01de1fbda2 100644
--- a/code/modules/mob/living/carbon/human/species/station/traits_vr/weaver_objs.dm
+++ b/code/modules/mob/living/carbon/human/species/station/traits_vr/weaver_objs.dm
@@ -102,7 +102,7 @@
 			return
 	if(isliving(AM) && trap_active)
 		var/mob/living/L = AM
-		if(L.m_intent == "run")
+		if(L.m_intent == I_RUN)
 			L.visible_message(
 				span_danger("[L] steps on \the [src]."),
 				span_danger("You step on \the [src]!"),
diff --git a/code/modules/mob/living/living_movement.dm b/code/modules/mob/living/living_movement.dm
index a2f5f8cae4..c3a7a09aba 100644
--- a/code/modules/mob/living/living_movement.dm
+++ b/code/modules/mob/living/living_movement.dm
@@ -17,7 +17,7 @@
 /mob/living/SelfMove(turf/n, direct, movetime)
 	// If on walk intent, don't willingly step into hazardous tiles.
 	// Unless the walker is confused.
-	if(m_intent == "walk" && confused <= 0)
+	if(m_intent == I_WALK && confused <= 0)
 		if(!n.is_safe_to_enter(src))
 			to_chat(src, span_warning("\The [n] is dangerous to move into."))
 			return FALSE // In case any code wants to know if movement happened.
@@ -184,11 +184,11 @@ default behaviour is:
 	. = ..()
 	if (!istype(AM, /atom/movable) || AM.anchored)
 		//VOREStation Edit - object-specific proc for running into things
-		if(((confused || is_blind()) && stat == CONSCIOUS && prob(50) && m_intent=="run") || flying)
+		if(((confused || is_blind()) && stat == CONSCIOUS && prob(50) && m_intent==I_RUN) || flying)
 			AM.stumble_into(src)
 		//VOREStation Edit End
 		/* VOREStation Removal - See above
-		if(confused && prob(50) && m_intent=="run")
+		if(confused && prob(50) && m_intent==I_RUN)
 			Weaken(2)
 			playsound(src, "punch", 25, 1, -1)
 			visible_message(span_warning("[src] [pick("ran", "slammed")] into \the [AM]!"))
diff --git a/code/modules/mob/living/silicon/pai/pai_hud.dm b/code/modules/mob/living/silicon/pai/pai_hud.dm
index d2f0923239..ea7820927e 100644
--- a/code/modules/mob/living/silicon/pai/pai_hud.dm
+++ b/code/modules/mob/living/silicon/pai/pai_hud.dm
@@ -142,7 +142,7 @@
 	using = new /obj/screen()
 	using.name = "mov_intent"
 	using.icon = ui_style
-	using.icon_state = (m_intent == "run" ? "running" : "walking")
+	using.icon_state = (m_intent == I_RUN ? "running" : "walking")
 	using.screen_loc = ui_movi
 	using.color = ui_color
 	using.alpha = ui_alpha
diff --git a/code/modules/mob/living/silicon/robot/drone/drone.dm b/code/modules/mob/living/silicon/robot/drone/drone.dm
index 4271a67d60..694e315edf 100644
--- a/code/modules/mob/living/silicon/robot/drone/drone.dm
+++ b/code/modules/mob/living/silicon/robot/drone/drone.dm
@@ -216,7 +216,7 @@ var/list/mob_hat_cache = list()
 //Drones cannot be upgraded with borg modules so we need to catch some items before they get used in ..().
 /mob/living/silicon/robot/drone/attackby(var/obj/item/W, var/mob/user)
 
-	if(user.a_intent == "help" && istype(W, /obj/item/clothing/head))
+	if(user.a_intent == I_HELP && istype(W, /obj/item/clothing/head))
 		if(hat)
 			to_chat(user, span_warning("\The [src] is already wearing \the [hat]."))
 			return
diff --git a/code/modules/mob/living/silicon/robot/drone/drone_abilities.dm b/code/modules/mob/living/silicon/robot/drone/drone_abilities.dm
index 3a4bf3e0e2..d243138b31 100644
--- a/code/modules/mob/living/silicon/robot/drone/drone_abilities.dm
+++ b/code/modules/mob/living/silicon/robot/drone/drone_abilities.dm
@@ -25,7 +25,7 @@
 	var/mob/living/carbon/human/H = over_object
 	if(!istype(H) || !Adjacent(H))
 		return ..()
-	if(H.a_intent == "grab" && hat && !(H.l_hand && H.r_hand))
+	if(H.a_intent == I_GRAB && hat && !(H.l_hand && H.r_hand))
 		H.put_in_hands(hat)
 		H.visible_message(span_danger("\The [H] removes \the [src]'s [hat]."))
 		hat = null
diff --git a/code/modules/mob/living/simple_mob/simple_hud.dm b/code/modules/mob/living/simple_mob/simple_hud.dm
index fd1a79c440..63225d7b42 100644
--- a/code/modules/mob/living/simple_mob/simple_hud.dm
+++ b/code/modules/mob/living/simple_mob/simple_hud.dm
@@ -124,7 +124,7 @@
 	using = new /obj/screen()
 	using.name = "mov_intent"
 	using.icon = ui_style
-	using.icon_state = (m_intent == "run" ? "running" : "walking")
+	using.icon_state = (m_intent == I_RUN ? "running" : "walking")
 	using.screen_loc = ui_movi
 	using.color = ui_color
 	using.alpha = ui_alpha
diff --git a/code/modules/mob/living/simple_mob/simple_mob.dm b/code/modules/mob/living/simple_mob/simple_mob.dm
index 8494a51730..ab53a8bc9b 100644
--- a/code/modules/mob/living/simple_mob/simple_mob.dm
+++ b/code/modules/mob/living/simple_mob/simple_mob.dm
@@ -287,7 +287,7 @@
 			. = 1
 		. *= purge
 
-	if(m_intent == "walk")
+	if(m_intent == I_WALK)
 		. *= 1.5
 
 	// VOREStation Edit Start
diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/pets/fox_vr.dm b/code/modules/mob/living/simple_mob/subtypes/animal/pets/fox_vr.dm
index 8ae49ab9da..f6a42c210d 100644
--- a/code/modules/mob/living/simple_mob/subtypes/animal/pets/fox_vr.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/animal/pets/fox_vr.dm
@@ -87,7 +87,7 @@
 	var/mob/living/carbon/H = over_object
 	if(!istype(H) || !Adjacent(H)) return ..()
 
-	if(H.a_intent == "help")
+	if(H.a_intent == I_HELP)
 		get_scooped(H)
 		return
 	else
diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/shadekin/rakshasa_trap.dm b/code/modules/mob/living/simple_mob/subtypes/vore/shadekin/rakshasa_trap.dm
index 467c229dc0..957f616e00 100644
--- a/code/modules/mob/living/simple_mob/subtypes/vore/shadekin/rakshasa_trap.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/vore/shadekin/rakshasa_trap.dm
@@ -61,7 +61,7 @@
 /obj/structure/gootrap/Crossed(AM as mob|obj)
 	if(deployed && isliving(AM))
 		var/mob/living/L = AM
-		if(L.m_intent == "run")
+		if(L.m_intent == I_RUN)
 			L.visible_message(
 				span_danger("[L] steps on \the [src]."),
 				span_danger("You step on \the [src]!"),
diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/slug_ch.dm b/code/modules/mob/living/simple_mob/subtypes/vore/slug_ch.dm
index 486ab7d618..d56710ef22 100644
--- a/code/modules/mob/living/simple_mob/subtypes/vore/slug_ch.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/vore/slug_ch.dm
@@ -214,7 +214,7 @@
 	if(istype(AM, /mob/living/carbon) || istype(AM, /mob/living/silicon))
 		var/mob/living/L = AM
 
-		if(L.m_intent == "run" && !L.buckled)
+		if(L.m_intent == I_RUN && !L.buckled)
 			if(has_buckled_mobs())
 				return
 			buckle_mob(L)
diff --git a/code/modules/mob/mob_defines.dm b/code/modules/mob/mob_defines.dm
index 668c3b6938..4de36ad6ac 100644
--- a/code/modules/mob/mob_defines.dm
+++ b/code/modules/mob/mob_defines.dm
@@ -118,7 +118,7 @@
 	var/shakecamera = 0
 	var/a_intent = I_HELP//Living
 	var/m_int = null//Living
-	var/m_intent = "run"//Living
+	var/m_intent = I_RUN//Living
 	var/lastKnownIP = null
 	var/obj/buckled = null//Living
 
diff --git a/code/modules/mob/mob_helpers.dm b/code/modules/mob/mob_helpers.dm
index ad35e3ac3b..0ca52b3e9b 100644
--- a/code/modules/mob/mob_helpers.dm
+++ b/code/modules/mob/mob_helpers.dm
@@ -342,7 +342,7 @@ var/list/intents = list(I_HELP,I_DISARM,I_GRAB,I_HURT)
 			if(2)			return I_GRAB
 			else			return I_HURT
 
-//change a mob's act-intent. Input the intent as a string such as "help" or use "right"/"left
+//change a mob's act-intent. Input the intent as a string such as I_HELP or use "right"/"left
 /mob/verb/a_intent_change(input as text)
 	set name = "a-intent"
 	set hidden = 1
diff --git a/code/modules/mob/mob_movement.dm b/code/modules/mob/mob_movement.dm
index ca0919e180..b8c0138332 100644
--- a/code/modules/mob/mob_movement.dm
+++ b/code/modules/mob/mob_movement.dm
@@ -21,11 +21,11 @@
 
 	// Movespeed delay based on movement mode
 	switch(m_intent)
-		if("run")
+		if(I_RUN)
 			if(drowsyness > 0)
 				. += 6
 			. += CONFIG_GET(number/run_speed)
-		if("walk")
+		if(I_WALK)
 			. += CONFIG_GET(number/walk_speed)
 
 /client/proc/client_dir(input, direction=-1)
@@ -274,10 +274,10 @@
 			//drunk wheelchair driving
 			else if(my_mob.confused)
 				switch(my_mob.m_intent)
-					if("run")
+					if(I_RUN)
 						if(prob(50))
 							direct = turn(direct, pick(90, -90))
-					if("walk")
+					if(I_WALK)
 						if(prob(25))
 							direct = turn(direct, pick(90, -90))
 			total_delay += 3
@@ -289,11 +289,11 @@
 	// Confused direction randomization
 	if(my_mob.confused)
 		switch(my_mob.m_intent)
-			if("run")
+			if(I_RUN)
 				if(prob(75))
 					direct = turn(direct, pick(90, -90))
 					n = get_step(my_mob, direct)
-			if("walk")
+			if(I_WALK)
 				if(prob(25))
 					direct = turn(direct, pick(90, -90))
 					n = get_step(my_mob, direct)
diff --git a/code/modules/organs/internal/intestine.dm b/code/modules/organs/internal/intestine.dm
index ed5319fb27..50cb2cf692 100644
--- a/code/modules/organs/internal/intestine.dm
+++ b/code/modules/organs/internal/intestine.dm
@@ -16,7 +16,7 @@
 	if (. >= 2)
 		if(prob(1))
 			owner.custom_pain("Your abdomen feels like it's tearing itself apart!",1)
-			owner.m_intent = "walk"
+			owner.m_intent = I_WALK
 			owner.hud_used.move_intent.icon_state = "walking"
 
 /obj/item/organ/internal/intestine/xeno
diff --git a/code/modules/organs/internal/kidneys.dm b/code/modules/organs/internal/kidneys.dm
index daf9954b03..141d249d57 100644
--- a/code/modules/organs/internal/kidneys.dm
+++ b/code/modules/organs/internal/kidneys.dm
@@ -38,7 +38,7 @@
 	if (. >= 2)
 		if(prob(1))
 			owner.custom_pain("You feel extremely tired, like you can't move!",1)
-			owner.m_intent = "walk"
+			owner.m_intent = I_WALK
 			owner.hud_used.move_intent.icon_state = "walking"
 
 /obj/item/organ/internal/kidneys/grey
diff --git a/code/modules/projectiles/targeting/targeting_mob.dm b/code/modules/projectiles/targeting/targeting_mob.dm
index 17aa15eed7..b6796c6ee9 100644
--- a/code/modules/projectiles/targeting/targeting_mob.dm
+++ b/code/modules/projectiles/targeting/targeting_mob.dm
@@ -58,9 +58,9 @@
 		trigger_aiming(TARGET_CAN_MOVE)
 
 /mob/living/proc/set_m_intent(var/intent)
-	if (intent != "walk" && intent != "run")
+	if (intent != I_WALK && intent != I_RUN)
 		return 0
 	m_intent = intent
 	if(hud_used)
 		if (hud_used.move_intent)
-			hud_used.move_intent.icon_state = intent == "walk" ? "walking" : "running"
+			hud_used.move_intent.icon_state = intent == I_WALK ? "walking" : "running"
diff --git a/code/modules/vore/eating/stumblevore_vr.dm b/code/modules/vore/eating/stumblevore_vr.dm
index 992bc1712c..2cd19da9ce 100644
--- a/code/modules/vore/eating/stumblevore_vr.dm
+++ b/code/modules/vore/eating/stumblevore_vr.dm
@@ -14,14 +14,14 @@
 /mob/living/Bump(atom/movable/AM)
 	//. = ..()
 	if(istype(AM, /mob/living))
-		if(buckled != AM && (((confused || is_blind()) && stat == CONSCIOUS && prob(50) && m_intent=="run") || flying && flight_vore))
+		if(buckled != AM && (((confused || is_blind()) && stat == CONSCIOUS && prob(50) && m_intent==I_RUN) || flying && flight_vore))
 			AM.stumble_into(src)
 	return ..()
 // Because flips toggle density
 /mob/living/Crossed(var/atom/movable/AM)
 	if(istype(AM, /mob/living) && isturf(loc) && AM != src)
 		var/mob/living/AMV = AM
-		if(AMV.buckled != src && (((AMV.confused || AMV.is_blind()) && AMV.stat == CONSCIOUS && prob(50) && AMV.m_intent=="run") || AMV.flying && AMV.flight_vore))
+		if(AMV.buckled != src && (((AMV.confused || AMV.is_blind()) && AMV.stat == CONSCIOUS && prob(50) && AMV.m_intent==I_RUN) || AMV.flying && AMV.flight_vore))
 			stumble_into(AMV)
 	..()
 
diff --git a/code/modules/vore/resizing/resize_vr.dm b/code/modules/vore/resizing/resize_vr.dm
index d7f1873ad2..5e43bd358e 100644
--- a/code/modules/vore/resizing/resize_vr.dm
+++ b/code/modules/vore/resizing/resize_vr.dm
@@ -370,7 +370,7 @@
 				equip_to_slot_if_possible(prey.get_scooped(pred), slot_shoes, 0, 1)
 				add_attack_logs(pred, prey, "Grabbed underfoot ([tail ? "taur" : "nontaur"], no shoes)")
 
-		if(m_intent == "run")
+		if(m_intent == I_RUN)
 			switch(a_intent)
 				if(I_DISARM)
 					message_pred = "You quickly push [prey] to the ground with your foot!"
diff --git a/maps/gateway_archive_vr/labyrinth.dm b/maps/gateway_archive_vr/labyrinth.dm
index 9bb1f2264f..87e5462449 100644
--- a/maps/gateway_archive_vr/labyrinth.dm
+++ b/maps/gateway_archive_vr/labyrinth.dm
@@ -218,7 +218,7 @@
 //	speak = list("HONK", "Honk!")
 //	emote_hear = list("honks")
 //	speak_chance = 1
-	a_intent = "harm"
+	a_intent = I_HURT
 	var/corpse = /obj/effect/landmark/mobcorpse/tunnelclown
 	var/weapon1 = /obj/item/material/twohanded/fireaxe
 	stop_when_pulled = 0
@@ -284,7 +284,7 @@
 	response_harm = "euthanizes"
 //	speak = list("HONK!", "Honk!", "H-Honk...", "Honk... Please...","Kill me... Honk.", "It hurts to live... Honk...","The pain... HONK!")
 //	emote_hear = list("honks", "wheeps","sobs","whimpers","honks uncontrollably")
-	a_intent = "harm"
+	a_intent = I_HURT
 	stop_when_pulled = 0
 	maxHealth = 10
 	health = 10
diff --git a/modular_chomp/code/datums/components/squeak.dm b/modular_chomp/code/datums/components/squeak.dm
index 727deebf77..0665864f95 100644
--- a/modular_chomp/code/datums/components/squeak.dm
+++ b/modular_chomp/code/datums/components/squeak.dm
@@ -101,7 +101,7 @@
 	if(CHECK_MOVE_LOOP_FLAGS(owner, MOVEMENT_LOOP_OUTSIDE_CONTROL))
 		return
 	*/
-	if(running == "walk")
+	if(running == I_WALK)
 		running = 0.25
 	else
 		running = 1
diff --git a/modular_chomp/code/datums/elements/footstep.dm b/modular_chomp/code/datums/elements/footstep.dm
index 38bc3bc237..3d8e57262f 100644
--- a/modular_chomp/code/datums/elements/footstep.dm
+++ b/modular_chomp/code/datums/elements/footstep.dm
@@ -81,7 +81,7 @@
 		var/mob/living/carbon/carbon_source = source
 		if(!carbon_source.get_organ(BP_L_LEG) && !carbon_source.get_organ(BP_R_LEG))
 			return
-		if(carbon_source.m_intent == "walk")
+		if(carbon_source.m_intent == I_WALK)
 			return// stealth
 	steps_for_living[source] += 1
 	var/steps = steps_for_living[source]
diff --git a/modular_chomp/code/datums/elements/slosh.dm b/modular_chomp/code/datums/elements/slosh.dm
index 48d757867d..0b72323c1a 100644
--- a/modular_chomp/code/datums/elements/slosh.dm
+++ b/modular_chomp/code/datums/elements/slosh.dm
@@ -26,9 +26,9 @@
 
 	if(ishuman(source))
 		var/mob/living/carbon/human/source_human = source
-		if(source_human.m_intent == "walk" && step_count++ % 20 == 0)
+		if(source_human.m_intent == I_WALK && step_count++ % 20 == 0)
 			return
-		if(source_human.m_intent == "run" && step_count++ % 2 != 0)
+		if(source_human.m_intent == I_RUN && step_count++ % 2 != 0)
 			return
 		choose_vorefootstep(source)
 	if(issilicon(source))
@@ -75,7 +75,7 @@
 	if(ishuman(source))
 		var/mob/living/carbon/human/human_source = source
 
-		if(!human_source.shoes || human_source.m_intent == "walk")
+		if(!human_source.shoes || human_source.m_intent == I_WALK)
 			volume = CONFIG_GET(number/vorefootstep_volume) * (vore_footstep_volume/100) * 0.75
 		else if(human_source.shoes)
 			var/obj/item/clothing/shoes/feet = human_source.shoes
diff --git a/modular_chomp/code/game/objects/structures/desert_planet_structures.dm b/modular_chomp/code/game/objects/structures/desert_planet_structures.dm
index 0675d7a595..db2878b0aa 100644
--- a/modular_chomp/code/game/objects/structures/desert_planet_structures.dm
+++ b/modular_chomp/code/game/objects/structures/desert_planet_structures.dm
@@ -29,7 +29,7 @@
 		return
 	if(istype(AM, /mob/living))
 		var/mob/living/M = AM
-		if(M.m_intent == "run" && prob(5))
+		if(M.m_intent == I_RUN && prob(5))
 			M.Weaken(2)
 			to_chat(M, "You trip over the [src]!")
 
diff --git a/modular_chomp/code/modules/clothing/clothing.dm b/modular_chomp/code/modules/clothing/clothing.dm
index 9327c84517..9b4ee1d7a2 100644
--- a/modular_chomp/code/modules/clothing/clothing.dm
+++ b/modular_chomp/code/modules/clothing/clothing.dm
@@ -40,7 +40,7 @@
 	switch(pred.a_intent)
 		if(I_HELP)
 			if(prob(10)) //Reducing spam exclusively on I_HELP. Still more frequent than old pitiful prob(1)
-				if(pred.m_intent == "run")
+				if(pred.m_intent == I_RUN)
 					message_prey = pick(
 						"You feel weightless for a brief moment as \the [name] move upwards.",
 						"[pred]'s weight bears down on you with each of their steps.",
@@ -61,7 +61,7 @@
 			return  //No message for pred if I_HELP
 
 		if(I_DISARM)
-			if(pred.m_intent == "run")
+			if(pred.m_intent == I_RUN)
 				message_pred = "You step on [prey], squishing and pinning them within your [name]!"
 				message_prey = "[pred] steps on you, squishing and pinning you within their [name]!"
 			else
@@ -71,7 +71,7 @@
 				add_attack_logs(pred, prey, "Pinned inshoe (walk, weaken(5))")
 
 		if(I_GRAB)
-			if(pred.m_intent == "run")
+			if(pred.m_intent == I_RUN)
 				message_pred = "You step down onto [prey], squishing and trapping them inbetween your toes!"
 				message_prey = "[pred] steps down on you, squishing and trapping you inbetween their toes!"
 			else
@@ -89,7 +89,7 @@
 			//Assuming regular micro pickup sizes outside dorms, size_damage multiplier should range from .25 to 1.75... right?
 			var/damage = (rand(5, 15) * size_damage_multiplier) / 10 // This will sting, but not kill unless pred walks. Will range from .125 to 2.625 damage, randomly, to each limb
 
-			if(pred.m_intent == "run")
+			if(pred.m_intent == I_RUN)
 				message_pred = "You carelessly step down onto [prey], crushing them within your [name]!"
 				message_prey = "[pred] steps carelessly on your body, crushing you within their [name]!"
 				add_attack_logs(pred, prey, "Crushed inshoe (run, about [damage] damage per limb)")
diff --git a/modular_chomp/code/modules/mob/living/silicon/robot/robot_movement.dm b/modular_chomp/code/modules/mob/living/silicon/robot/robot_movement.dm
index c66ead11f0..ac1ba207d6 100644
--- a/modular_chomp/code/modules/mob/living/silicon/robot/robot_movement.dm
+++ b/modular_chomp/code/modules/mob/living/silicon/robot/robot_movement.dm
@@ -5,7 +5,7 @@
 
 /mob/living/silicon/robot/handle_footstep(var/turf/T)
 	if(step_count++ % 2)
-		check_vorefootstep("run", T) //CHOMPstation edit: sloshing reagent belly walk system
+		check_vorefootstep(I_RUN, T) //CHOMPstation edit: sloshing reagent belly walk system
 
 // Handle footstep sounds
 /mob/living/silicon/robot/handle_vorefootstep(var/m_intent, var/turf/T)
diff --git a/modular_chomp/code/modules/mob/living/simple_mob/subtypes/animal/tyr/ants.dm b/modular_chomp/code/modules/mob/living/simple_mob/subtypes/animal/tyr/ants.dm
index 6611e63905..0266637711 100644
--- a/modular_chomp/code/modules/mob/living/simple_mob/subtypes/animal/tyr/ants.dm
+++ b/modular_chomp/code/modules/mob/living/simple_mob/subtypes/animal/tyr/ants.dm
@@ -250,7 +250,7 @@ ANT STRUCTURES
 		var/mob/living/L = AM
 		if(L == /mob/living/simple_mob/animal/tyr/mineral_ants)
 			return
-		else if(L.m_intent == "run")
+		else if(L.m_intent == I_RUN)
 			L.visible_message(
 				span_danger("[L] steps in \the [src]."),
 				span_danger("You step in \the [src]!"),
diff --git a/modular_chomp/code/modules/mob/living/simple_mob/subtypes/vore/blackholemobs.dm b/modular_chomp/code/modules/mob/living/simple_mob/subtypes/vore/blackholemobs.dm
index 7f827a5a95..47670c985a 100644
--- a/modular_chomp/code/modules/mob/living/simple_mob/subtypes/vore/blackholemobs.dm
+++ b/modular_chomp/code/modules/mob/living/simple_mob/subtypes/vore/blackholemobs.dm
@@ -13,7 +13,7 @@
 	icon_living = "bhotie"
 	icon_dead = "bhotie-dead"
 	icon_rest = "bhotie-dead"
-	faction = "blackhole"
+	faction = FACTION_BLACKHOLE
 	maxHealth = 200
 	health = 200
 	minbodytemp = 200
@@ -95,7 +95,7 @@
 	to_chat(L, span_danger("\The [src] focuses on you!"))
 
 	do_windup_animation(A, leap_warmup)
-	
+
 	addtimer(CALLBACK(src, PROC_REF(doLeap), L), leap_warmup, TIMER_DELETE_ME)
 	return TRUE
 
@@ -132,7 +132,7 @@
 	name = "Black Hole fanatic"
 	desc = "A tough looking armored feline creature. They wear various insignias identifying them as a member of Black Hole."
 	icon = 'modular_chomp/icons/blackhole/blackhole32x32.dmi'
-	faction = "blackhole"
+	faction = FACTION_BLACKHOLE
 	icon_dead = "trooper-dead"
 	icon_living = "trooper"
 	icon_state = "trooper"
@@ -192,7 +192,7 @@
 	name = "Black Hole bulwark"
 	desc = "A tough looking armored feline creature armed with a shield and an energy lance. They wear various insignias identifying them as a member of Black Hole."
 	icon = 'modular_chomp/icons/blackhole/blackhole32x32.dmi'
-	faction = "blackhole"
+	faction = FACTION_BLACKHOLE
 	icon_dead = "trooper-dead"
 	icon_living = "trooper_shield"
 	icon_state = "trooper_shield"
@@ -220,7 +220,7 @@
 	name = "grotesque"
 	desc = "A horribly mutated, pale creature, poorly morphed into some hyperaggressive feline abomination. This is what tends to happen to those that Black Hole take prisoner-- Cannonfodder."
 	icon = 'modular_chomp/icons/blackhole/blackhole32x32.dmi'
-	faction = "blackhole"
+	faction = FACTION_BLACKHOLE
 	icon_dead = "grotesque-dead"
 	icon_living = "grotesque"
 	icon_state = "grotesque"
@@ -247,7 +247,7 @@
 	name = "Black Hole trooper"
 	desc = "A tough looking armored feline creature armed with a pistol. They wear various insignias identifying them as a member of Black Hole."
 	icon = 'modular_chomp/icons/blackhole/blackhole32x32.dmi'
-	faction = "blackhole"
+	faction = FACTION_BLACKHOLE
 	icon_dead = "trooper-dead"
 	icon_living = "trooper_pistol"
 	icon_state = "trooper_pistol"
@@ -265,7 +265,7 @@
 	name = "Black Hole gunner"
 	desc = "A tough looking armored feline creature armed with an SMG. They wear various insignias identifying them as a member of Black Hole."
 	icon = 'modular_chomp/icons/blackhole/blackhole32x32.dmi'
-	faction = "blackhole"
+	faction = FACTION_BLACKHOLE
 	icon_dead = "trooper-dead"
 	icon_living = "trooper_smg"
 	icon_state = "trooper_smg"
@@ -283,7 +283,7 @@
 	name = "Black Hole rifleman"
 	desc = "A tough looking armored feline creature armed with a rifle. They wear various insignias identifying them as a member of Black Hole."
 	icon = 'modular_chomp/icons/blackhole/blackhole32x32.dmi'
-	faction = "blackhole"
+	faction = FACTION_BLACKHOLE
 	icon_dead = "trooper-dead"
 	icon_living = "trooper_rifle"
 	icon_state = "trooper_rifle"
@@ -301,7 +301,7 @@
 	name = "Black Hole machinegunner"
 	desc = "A tough looking armored feline creature armed with a light machinegun. They wear various insignias identifying them as a member of Black Hole."
 	icon = 'modular_chomp/icons/blackhole/blackhole32x32.dmi'
-	faction = "blackhole"
+	faction = FACTION_BLACKHOLE
 	icon_dead = "trooper-dead"
 	icon_living = "trooper_lmg"
 	icon_state = "trooper_lmg"
@@ -323,7 +323,7 @@
 	name = "Black Hole fanatic"
 	desc = "A tough looking armored feline taur. They wear various insignias identifying them as a member of Black Hole."
 	icon = 'modular_chomp/icons/blackhole/blackhole64x32.dmi'
-	faction = "blackhole"
+	faction = FACTION_BLACKHOLE
 	icon_dead = "heavytrooper-dead"
 	icon_living = "heavytrooper"
 	icon_state = "heavytrooper"
@@ -396,7 +396,7 @@
 	name = "Black Hole machinegunner"
 	desc = "A tough looking armored feline taur wielding a light machinegun. They wear various insignias identifying them as a member of Black Hole."
 	icon = 'modular_chomp/icons/blackhole/blackhole64x32.dmi'
-	faction = "blackhole"
+	faction = FACTION_BLACKHOLE
 	icon_dead = "heavytrooper-dead"
 	icon_living = "heavytrooper_lmg"
 	icon_state = "heavytrooper_lmg"
@@ -435,7 +435,7 @@
 	icon_rest = "heavytrooper_sniper"
 	projectiletype = /obj/item/projectile/bullet/rifle/a145/highvel // Really scary bullet.
 	projectilesound = 'sound/weapons/serdy/molniyab.ogg'
-	faction = "blackhole"
+	faction = FACTION_BLACKHOLE
 	movement_cooldown = 0
 	harm_intent_damage = 5
 	melee_damage_lower = 15
@@ -525,7 +525,7 @@
 	name = "Black Hole mechanized troopers"
 	desc = "A pair of armed Black Hole troops riding an armored motorcycle. Watch out!"
 	icon = 'modular_chomp/icons/blackhole/blackhole64x64.dmi'
-	faction = "blackhole"
+	faction = FACTION_BLACKHOLE
 	icon_dead = "bikeus"
 	icon_living = "bikeus"
 	icon_state = "bikeus"
@@ -590,7 +590,7 @@
 	It also is armed with an array of next-generation weaponry."
 	catalogue_data = list(/datum/category_item/catalogue/fauna/mercenary/blackhole)
 	icon = 'modular_chomp/icons/blackhole/blackhole32x32.dmi'
-	faction = "blackhole"
+	faction = FACTION_BLACKHOLE
 	icon_living = "mech2"
 	icon_state = "mech2"
 	icon_rest = "mech2"
@@ -623,7 +623,7 @@
 	desc = "A robust, advanced exosuit of Black Hole design, utilizing highly dangerous tesla weaponry."
 	catalogue_data = list(/datum/category_item/catalogue/fauna/mercenary/blackhole)
 	icon = 'modular_chomp/icons/blackhole/blackhole32x32.dmi'
-	faction = "blackhole"
+	faction = FACTION_BLACKHOLE
 	icon_living = "mech1"
 	icon_state = "mech1"
 	icon_rest = "mech1"
@@ -684,8 +684,8 @@ GLOBAL_LIST_INIT(obelisk_lure_messages, list(
 	icon_living = "obelisk"
 	icon_dead = "obelisk-dead"
 	icon = 'modular_chomp/icons/blackhole/blackhole64x64.dmi'
-	faction = "blackhole"
-	a_intent = "harm"
+	faction = FACTION_BLACKHOLE
+	a_intent = I_HURT
 	anchored = 1
 	maxHealth = 400
 	health = 400