Standardize mutations

code/modules/admin/verbs/honksquad.dm

@@ -119,7 +119,7 @@ var/global/sent_honksquad = 0
 	equip_to_slot_or_del(new /obj/item/toy/crayon/rainbow(src), slot_in_backpack)
 	equip_to_slot_or_del(new /obj/item/weapon/gun/energy/clown(src), slot_in_backpack)
 	equip_to_slot_or_del(new /obj/item/weapon/reagent_containers/spray/waterflower(src), slot_in_backpack)
-	src.mutations.Add(M_CLUMSY)
+	src.mutations.Add(CLUMSY)
 
 
 

code/modules/assembly/mousetrap.dm

@@ -19,7 +19,7 @@
 			if(!armed)
 				if(ishuman(usr))
 					var/mob/living/carbon/human/user = usr
-					if(((user.getBrainLoss() >= 60 || (M_CLUMSY in user.mutations)) && prob(50)))
+					if(((user.getBrainLoss() >= 60 || (CLUMSY in user.mutations)) && prob(50)))
 						user << "Your hand slips, setting off the trigger."
 						pulse(0)
 			update_icon()
@@ -69,7 +69,7 @@
 		if(!armed)
 			user << "<span class='notice'>You arm [src].</span>"
 		else
-			if(((user.getBrainLoss() >= 60 || (M_CLUMSY in user.mutations)) && prob(50)))
+			if(((user.getBrainLoss() >= 60 || (CLUMSY in user.mutations)) && prob(50)))
 				var/which_hand = "l_hand"
 				if(!user.hand)
 					which_hand = "r_hand"
@@ -85,7 +85,7 @@
 
 	attack_hand(mob/living/user as mob)
 		if(armed)
-			if(((user.getBrainLoss() >= 60 || M_CLUMSY in user.mutations)) && prob(50))
+			if(((user.getBrainLoss() >= 60 || CLUMSY in user.mutations)) && prob(50))
 				var/which_hand = "l_hand"
 				if(!user.hand)
 					which_hand = "r_hand"

code/modules/awaymissions/mission_code/wildwest.dm

@@ -77,9 +77,9 @@
 			if("Power")
 				user << "<B>Your wish is granted, but at a terrible cost...</B>"
 				user << "The Wish Granter punishes you for your selfishness, claiming your soul and warping your body to match the darkness in your heart."
-				user.mutations.Add(M_LASER)
-				user.mutations.Add(M_RESIST_COLD)
-				user.mutations.Add(M_XRAY)
+				user.mutations.Add(LASER)
+				user.mutations.Add(RESIST_COLD)
+				user.mutations.Add(XRAY)
 				user.dna.mutantrace = "shadow"
 				user.regenerate_icons()
 			if("Wealth")

code/modules/client/preferences.dm

@@ -1464,8 +1464,8 @@ datum/preferences
 			else continue
 
 		if(disabilities & DISABILITY_FLAG_FAT && character.species.flags & CAN_BE_FAT)//character.species.flags & CAN_BE_FAT)
-			character.mutations += M_FAT
-			character.mutations += M_OBESITY
+			character.mutations += FAT
+			character.mutations += OBESITY
 		if(disabilities & DISABILITY_FLAG_NEARSIGHTED)
 			character.disabilities|=NEARSIGHTED
 		if(disabilities & DISABILITY_FLAG_EPILEPTIC)

code/modules/mob/living/carbon/alien/alien.dm

@@ -125,7 +125,7 @@
 
 /mob/living/carbon/alien/proc/handle_mutations_and_radiation()
 	if(getFireLoss())
-		if((M_RESIST_HEAT in mutations) || prob(5))
+		if((RESIST_HEAT in mutations) || prob(5))
 			adjustFireLoss(-1)
 
 	// Aliens love radiation nom nom nom

code/modules/mob/living/carbon/alien/humanoid/humanoid.dm

@@ -250,7 +250,7 @@
 		if ("harm")
 			var/damage = rand(1, 9)
 			if (prob(90))
-				if (M_HULK in M.mutations)//M_HULK SMASH
+				if (HULK in M.mutations)//HULK SMASH
 					damage += 14
 					spawn(0)
 						Paralyse(1)

code/modules/mob/living/carbon/alien/humanoid/life.dm

@@ -187,7 +187,7 @@
 
 /mob/living/carbon/alien/humanoid/proc/handle_regular_hud_updates()
 
-	if (stat == 2 || (M_XRAY in mutations))
+	if (stat == 2 || (XRAY in mutations))
 		sight |= SEE_TURFS
 		sight |= SEE_MOBS
 		sight |= SEE_OBJS

code/modules/mob/living/carbon/alien/larva/larva.dm

@@ -36,7 +36,7 @@
 		now_pushing = 1
 		if(ismob(AM))
 			var/mob/tmob = AM
-			if(istype(tmob, /mob/living/carbon/human) && (M_FAT in tmob.mutations))
+			if(istype(tmob, /mob/living/carbon/human) && (FAT in tmob.mutations))
 				if(prob(70))
 					src << "\red <B>You fail to push [tmob]'s fat ass out of the way.</B>"
 					now_pushing = 0
@@ -146,7 +146,7 @@
 	if(..())
 		var/damage = rand(1, 9)
 		if (prob(90))
-			if (M_HULK in M.mutations)
+			if (HULK in M.mutations)
 				damage += 5
 				spawn(0)
 					Paralyse(1)

code/modules/mob/living/carbon/alien/larva/life.dm

@@ -135,7 +135,7 @@
 
 /mob/living/carbon/alien/larva/proc/handle_regular_hud_updates()
 
-	if (stat == 2 || (M_XRAY in mutations))
+	if (stat == 2 || (XRAY in mutations))
 		sight |= SEE_TURFS
 		sight |= SEE_MOBS
 		sight |= SEE_OBJS

code/modules/mob/living/carbon/alien/life.dm

@@ -101,7 +101,7 @@
 	breath.toxins -= toxins_used
 	breath.oxygen += toxins_used
 
-	if(breath.temperature > (T0C+66) && !(M_RESIST_COLD  in mutations)) // Hot air hurts :(
+	if(breath.temperature > (T0C+66) && !(RESIST_COLD  in mutations)) // Hot air hurts :(
 		if(prob(20))
 			src << "<span class='danger'>You feel a searing heat in your lungs!</span>"
 		fire_alert = max(fire_alert, 1)

code/modules/mob/living/carbon/alien/special/snakeman.dm

@@ -33,7 +33,7 @@
 		M.client.mob = new/mob/living/carbon/alien/humanoid/special/snakeman(new/obj/effect/snake_egg(src.loc))
 		visible_message("[src] injects [M] with an egg.")
 		visible_message("The egg absorbs [M]")
-		M.mutations |= M_NOCLONE
+		M.mutations |= NOCLONE
 		M.update_body()
 		M.death()
 	else

code/modules/mob/living/carbon/brain/life.dm

@@ -193,7 +193,7 @@
 
 	proc/handle_regular_hud_updates()
 
-		if (stat == 2 || (M_XRAY in src.mutations))
+		if (stat == 2 || (XRAY in src.mutations))
 			sight |= SEE_TURFS
 			sight |= SEE_MOBS
 			sight |= SEE_OBJS

code/modules/mob/living/carbon/carbon.dm

@@ -17,7 +17,7 @@
 			src.nutrition -= HUNGER_FACTOR/10
 			if(src.m_intent == "run")
 				src.nutrition -= HUNGER_FACTOR/10
-		if((M_FAT in src.mutations) && src.m_intent == "run" && src.bodytemperature <= 360)
+		if((FAT in src.mutations) && src.m_intent == "run" && src.bodytemperature <= 360)
 			src.bodytemperature += 2
 
 		// Moving around increases germ_level faster

code/modules/mob/living/carbon/human/death.dm

@@ -151,7 +151,7 @@
 	return
 
 /mob/living/carbon/human/proc/ChangeToHusk()
-	if(M_HUSK in mutations)	return
+	if(HUSK in mutations)	return
 
 	if(f_style)
 		f_style = "Shaved"		//we only change the icon_state of the hair datum, so it doesn't mess up their UI/UE
@@ -159,7 +159,7 @@
 		h_style = "Bald"
 	update_hair(0)
 
-	mutations.Add(M_HUSK)
+	mutations.Add(HUSK)
 	status_flags |= DISFIGURED	//makes them unknown without fucking up other stuff like admintools
 	update_body(0)
 	update_mutantrace()
@@ -167,5 +167,5 @@
 
 /mob/living/carbon/human/proc/Drain()
 	ChangeToHusk()
-	mutations |= M_NOCLONE
+	mutations |= NOCLONE
 	return

code/modules/mob/living/carbon/human/emote.dm

@@ -636,7 +636,7 @@
 		if("fart")
 			if(world.time-lastFart >= 600)
 //				playsound(src.loc, 'sound/effects/fart.ogg', 50, 1, -3) //Admins still vote no to fun
-				if(M_TOXIC_FARTS in mutations)
+				if(TOXIC_FARTS in mutations)
 					message = "<b>[src]</b> unleashes a [pick("horrible","terrible","foul","disgusting","awful")] fart."
 				else
 					message = "<b>[src]</b> [pick("passes wind","farts")]."
@@ -644,7 +644,7 @@
 
 				var/turf/location = get_turf(src)
 				var/aoe_range=2 // Default
-				if(M_SUPER_FART in mutations)
+				if(SUPER_FART in mutations)
 					aoe_range+=3 //Was 5
 
 	/*			// If we're wearing a suit, don't blast or gas those around us.
@@ -656,7 +656,7 @@
 						wearing_mask=1 */
 
 				// Process toxic farts first.
-				if(M_TOXIC_FARTS in mutations)
+				if(TOXIC_FARTS in mutations)
 					for(var/mob/M in range(location,aoe_range))
 						if (M.internal != null && M.wear_mask && (M.wear_mask.flags & MASKINTERNALS))
 							continue
@@ -681,7 +681,7 @@
 							sleep(10)
 							S.start()
 						*/
-				if(M_SUPER_FART in mutations)
+				if(SUPER_FART in mutations)
 					visible_message("\red <b>[name]</b> hunches down and grits their teeth!")
 					if(do_after(usr,30))
 						visible_message("\red <b>[name]</b> unleashes a [pick("tremendous","gigantic","colossal")] fart!","You hear a [pick("tremendous","gigantic","colossal")] fart.")

code/modules/mob/living/carbon/human/examine.dm

@@ -205,7 +205,7 @@
 	if(suiciding)
 		msg += "<span class='warning'>[t_He] appears to have commited suicide... there is no hope of recovery.</span>\n"
 
-	if(M_DWARF in mutations)
+	if(DWARF in mutations)
 		msg += "[t_He] [t_is] a halfling!\n"
 
 	var/distance = get_dist(usr,src)

code/modules/mob/living/carbon/human/human.dm

@@ -143,8 +143,8 @@
 					slime.UpdateFeed()
 			return
 
-		if(istype(tmob, /mob/living/carbon/human) && (M_FAT in tmob.mutations))
-			if(prob(40) && !(M_FAT in src.mutations))
+		if(istype(tmob, /mob/living/carbon/human) && (FAT in tmob.mutations))
+			if(prob(40) && !(FAT in src.mutations))
 				src << "\red <B>You fail to push [tmob]'s fat ass out of the way.</B>"
 				now_pushing = 0
 				return
@@ -590,7 +590,7 @@
 //Returns "Unknown" if facially disfigured and real_name if not. Useful for setting name when polyacided or when updating a human's name variable
 /mob/living/carbon/human/proc/get_face_name()
 	var/datum/organ/external/head/head = get_organ("head")
-	if( !head || head.disfigured || (head.status & ORGAN_DESTROYED) || !real_name || (M_HUSK in mutations) )	//disfigured. use id-name if possible
+	if( !head || head.disfigured || (head.status & ORGAN_DESTROYED) || !real_name || (HUSK in mutations) )	//disfigured. use id-name if possible
 		return "Unknown"
 	return real_name
 

code/modules/mob/living/carbon/human/human_attackhand.dm

@@ -31,7 +31,7 @@
 			var/datum/organ/external/affecting = get_organ(ran_zone(M.zone_sel.selecting))
 			var/armor_block = run_armor_check(affecting, "melee")
 
-			if(M_HULK in M.mutations)			damage += 5
+			if(HULK in M.mutations)			damage += 5
 
 			playsound(loc, "punch", 25, 1, -1)
 
@@ -137,7 +137,7 @@
 			var/datum/organ/external/affecting = get_organ(ran_zone(M.zone_sel.selecting))
 			var/armor_block = run_armor_check(affecting, "melee")
 
-			if(M_HULK in M.mutations)			damage += 5
+			if(HULK in M.mutations)			damage += 5
 
 
 			playsound(loc, attack.attack_sound, 25, 1, -1)

code/modules/mob/living/carbon/human/human_damage.dm

@@ -110,15 +110,15 @@
 	hud_updateflag |= 1 << HEALTH_HUD
 
 /mob/living/carbon/human/Stun(amount)
-	if(M_HULK in mutations)	return
+	if(HULK in mutations)	return
 	..()
 
 /mob/living/carbon/human/Weaken(amount)
-	if(M_HULK in mutations)	return
+	if(HULK in mutations)	return
 	..()
 
 /mob/living/carbon/human/Paralyse(amount)
-	if(M_HULK in mutations)	return
+	if(HULK in mutations)	return
 	..()
 
 

code/modules/mob/living/carbon/human/human_movement.dm

@@ -11,7 +11,7 @@
 	if(embedded_flag)
 		handle_embedded_objects() //Moving with objects stuck in you can cause bad times.
 
-	if((M_RUN in mutations)) return -1
+	if((RUN in mutations)) return -1
 
 	var/health_deficiency = (100 - health + staminaloss)
 	if(health_deficiency >= 40)
@@ -55,12 +55,12 @@
 		tally += back.slowdown
 
 
-	if(M_FAT in src.mutations)
+	if(FAT in src.mutations)
 		tally += 1.5
 	if (bodytemperature < 283.222)
 		tally += (283.222 - bodytemperature) / 10 * 1.75
 
-	if(M_RUN in mutations)
+	if(RUN in mutations)
 		tally = 0
 
 	return (tally+config.human_delay)

code/modules/mob/living/carbon/human/life.dm

@@ -303,7 +303,7 @@ var/global/list/brutefireloss_overlays = list("1" = image("icon" = 'icons/mob/sc
 			return
 
 		if(getFireLoss())
-			if((M_RESIST_HEAT in mutations) || (prob(1)))
+			if((RESIST_HEAT in mutations) || (prob(1)))
 				heal_organ_damage(0,1)
 
 
@@ -389,7 +389,7 @@ var/global/list/brutefireloss_overlays = list("1" = image("icon" = 'icons/mob/sc
 
 	proc/breathe()
 		if(reagents.has_reagent("lexorin")) return
-		if(M_NO_BREATH in mutations) return // No breath mutation means no breathing.
+		if(NO_BREATH in mutations) return // No breath mutation means no breathing.
 		if(istype(loc, /obj/machinery/atmospherics/unary/cryo_cell)) return
 		if(species && (species.flags & NO_BREATHE)) return
 
@@ -618,7 +618,7 @@ var/global/list/brutefireloss_overlays = list("1" = image("icon" = 'icons/mob/sc
 		else if(adjusted_pressure >= species.hazard_low_pressure)
 			pressure_alert = -1
 		else
-			if( !(M_RESIST_COLD in mutations))
+			if( !(RESIST_COLD in mutations))
 				take_overall_damage(brute=LOW_PRESSURE_DAMAGE, used_weapon = "Low Pressure")
 				pressure_alert = -2
 			else
@@ -720,7 +720,7 @@ var/global/list/brutefireloss_overlays = list("1" = image("icon" = 'icons/mob/sc
 		var/thermal_protection_flags = get_heat_protection_flags(temperature)
 
 		var/thermal_protection = 0.0
-		if(M_RESIST_HEAT in mutations)
+		if(RESIST_HEAT in mutations)
 			return 1
 		if(thermal_protection_flags)
 			if(thermal_protection_flags & HEAD)
@@ -777,7 +777,7 @@ var/global/list/brutefireloss_overlays = list("1" = image("icon" = 'icons/mob/sc
 
 	proc/get_cold_protection(temperature)
 
-		if(M_RESIST_COLD in mutations)
+		if(RESIST_COLD in mutations)
 			return 1 //Fully protected from the cold.
 
 		temperature = max(temperature, 2.7) //There is an occasional bug where the temperature is miscalculated in ares with a small amount of gas on them, so this is necessary to ensure that that bug does not affect this calculation. Space's temperature is 2.7K and most suits that are intended to protect against any cold, protect down to 2.0K.
@@ -934,12 +934,12 @@ var/global/list/brutefireloss_overlays = list("1" = image("icon" = 'icons/mob/sc
 			else if (light_amount < 2) //heal in the dark
 				heal_overall_damage(1,1)
 
-		//The fucking M_FAT mutation is the greatest shit ever. It makes everyone so hot and bothered.
+		//The fucking FAT mutation is the greatest shit ever. It makes everyone so hot and bothered.
 		if(species.flags & CAN_BE_FAT)
-			if(M_FAT in mutations)
+			if(FAT in mutations)
 				if(overeatduration < 100)
 					src << "\blue You feel fit again!"
-					mutations.Remove(M_FAT)
+					mutations.Remove(FAT)
 					update_mutantrace(0)
 					update_mutations(0)
 					update_inv_w_uniform(0)
@@ -947,7 +947,7 @@ var/global/list/brutefireloss_overlays = list("1" = image("icon" = 'icons/mob/sc
 			else
 				if(overeatduration > 500)
 					src << "\red You suddenly feel blubbery!"
-					mutations.Add(M_FAT)
+					mutations.Add(FAT)
 					update_mutantrace(0)
 					update_mutations(0)
 					update_inv_w_uniform(0)
@@ -963,7 +963,7 @@ var/global/list/brutefireloss_overlays = list("1" = image("icon" = 'icons/mob/sc
 
 		else
 			if(overeatduration > 1)
-				if(M_OBESITY in mutations)
+				if(OBESITY in mutations)
 					overeatduration -= 1 // Those with obesity gene take twice as long to unfat
 				else
 					overeatduration -= 2
@@ -1006,7 +1006,7 @@ var/global/list/brutefireloss_overlays = list("1" = image("icon" = 'icons/mob/sc
 			silent = 0
 		else				//ALIVE. LIGHTS ARE ON
 
-			if(M_REGEN in mutations)
+			if(REGEN in mutations)
 				if(nutrition)
 					if(prob(10))
 						var/randumb = rand(1,5)
@@ -1017,7 +1017,7 @@ var/global/list/brutefireloss_overlays = list("1" = image("icon" = 'icons/mob/sc
 
 			// Sobering multiplier.
 			// Sober block grants quadruple the alcohol metabolism.
-//			var/sober_str=!(M_SOBER in mutations)?1:4
+//			var/sober_str=!(SOBER in mutations)?1:4
 
 			updatehealth()	//TODO
 			if(!in_stasis)
@@ -1298,7 +1298,7 @@ var/global/list/brutefireloss_overlays = list("1" = image("icon" = 'icons/mob/sc
 					sight |= SEE_TURFS|SEE_MOBS|SEE_OBJS
 					see_in_dark = 8
 					if(!druggy)		see_invisible = SEE_INVISIBLE_LEVEL_TWO
-			if(M_XRAY in mutations)
+			if(XRAY in mutations)
 				sight |= SEE_TURFS|SEE_MOBS|SEE_OBJS
 				see_in_dark = 8
 				if(!druggy)		see_invisible = SEE_INVISIBLE_LEVEL_TWO
@@ -1509,7 +1509,7 @@ var/global/list/brutefireloss_overlays = list("1" = image("icon" = 'icons/mob/sc
 				if(!machine.check_eye(src))		reset_view(null)
 			else
 				var/isRemoteObserve = 0
-				if((M_REMOTE_VIEW in mutations) && remoteview_target)
+				if((REMOTE_VIEW in mutations) && remoteview_target)
 					isRemoteObserve = 1
 					// Is he unconscious or dead?
 					if(remoteview_target.stat!=CONSCIOUS)
@@ -1517,7 +1517,7 @@ var/global/list/brutefireloss_overlays = list("1" = image("icon" = 'icons/mob/sc
 						isRemoteObserve = 0
 
 					// Does he have psy resist?
-					if(M_PSY_RESIST in remoteview_target.mutations)
+					if(PSY_RESIST in remoteview_target.mutations)
 						src << "\red Your mind is shut out!"
 						isRemoteObserve = 0
 

code/modules/mob/living/carbon/human/plasmaman/species.dm

@@ -130,7 +130,7 @@
 						H.emote(pick("giggle", "laugh"))
 			SA.moles = 0
 
-	if( (abs(310.15 - breath.temperature) > 50) && !(M_RESIST_HEAT in H.mutations)) // Hot air hurts :(
+	if( (abs(310.15 - breath.temperature) > 50) && !(RESIST_HEAT in H.mutations)) // Hot air hurts :(
 		if(H.status_flags & GODMODE)
 			return 1	//godmode
 		if(breath.temperature < cold_level_1)

code/modules/mob/living/carbon/human/say.dm

@@ -286,7 +286,7 @@
 				handled = 1
 
 	if(message != "")
-		if((M_HULK in mutations) && health >= 25 && length(message))
+		if((HULK in mutations) && health >= 25 && length(message))
 			message = "[uppertext(message)]!!!"
 			verb = pick("yells","roars","hollers")
 			handled = 1

code/modules/mob/living/carbon/human/update_icons.dm

@@ -236,9 +236,9 @@ proc/get_damage_icon_part(damage_state, body_part)
 	var/hulk_color_mod = rgb(48,224,40)
 	var/necrosis_color_mod = rgb(10,50,0)
 
-	var/husk = (M_HUSK in src.mutations)  //100% unnecessary -Agouri	//nope, do you really want to iterate through src.mutations repeatedly? -Pete
-	var/fat = (M_FAT in src.mutations)
-	var/hulk = (M_HULK in src.mutations)
+	var/husk = (HUSK in src.mutations)  //100% unnecessary -Agouri	//nope, do you really want to iterate through src.mutations repeatedly? -Pete
+	var/fat = (FAT in src.mutations)
+	var/hulk = (HULK in src.mutations)
 
 	var/g = (gender == FEMALE ? "f" : "m")
 	var/has_head = 0
@@ -456,7 +456,7 @@ proc/get_damage_icon_part(damage_state, body_part)
 
 /mob/living/carbon/human/update_mutations(var/update_icons=1)
 	var/fat
-	if(M_FAT in mutations)
+	if(FAT in mutations)
 		fat = "fat"
 
 	var/image/standing	= image("icon" = 'icons/effects/genetics.dmi')
@@ -475,26 +475,26 @@ proc/get_damage_icon_part(damage_state, body_part)
 	for(var/mut in mutations)
 		switch(mut)
 			/*
-			if(M_HULK)
+			if(HULK)
 				if(fat)
 					standing.underlays	+= "hulk_[fat]_s"
 				else
 					standing.underlays	+= "hulk_[g]_s"
 				add_image = 1
-			if(M_RESIST_COLD)
+			if(RESIST_COLD)
 				standing.underlays	+= "fire[fat]_s"
 				add_image = 1
-			if(M_RESIST_HEAT)
+			if(RESIST_HEAT)
 				standing.underlays	+= "cold[fat]_s"
 				add_image = 1
 			if(TK)
 				standing.underlays	+= "telekinesishead[fat]_s"
 				add_image = 1
 			*/
-			if(M_LASER)
+			if(LASER)
 				standing.overlays	+= "lasereyes_s"
 				add_image = 1
-	if((M_RESIST_COLD in mutations) && (M_RESIST_HEAT in mutations))
+	if((RESIST_COLD in mutations) && (RESIST_HEAT in mutations))
 		standing.underlays	-= "cold[fat]_s"
 		standing.underlays	-= "fire[fat]_s"
 		standing.underlays	+= "coldfire[fat]_s"
@@ -507,7 +507,7 @@ proc/get_damage_icon_part(damage_state, body_part)
 
 /mob/living/carbon/human/proc/update_mutantrace(var/update_icons=1)
 	var/fat
-	if( M_FAT in mutations )
+	if( FAT in mutations )
 		fat = "fat"
 //	var/g = "m"
 //	if (gender == FEMALE)	g = "f"
@@ -594,9 +594,9 @@ proc/get_damage_icon_part(damage_state, body_part)
 		if(!t_color)		t_color = icon_state
 		var/image/standing	= image("icon_state" = "[t_color]_s")
 
-		if(M_FAT in mutations)
+		if(FAT in mutations)
 			if(w_uniform.flags&ONESIZEFITSALL)
-				standing.icon	= 'icons/mob/uniform_fat.dmi'
+				standing.icon	= 'icons/mob/uniforFAT.dmi'
 			else
 				src << "\red You burst out of \the [w_uniform]!"
 				unEquip(w_uniform)
@@ -815,7 +815,7 @@ proc/get_damage_icon_part(damage_state, body_part)
 			standing = image("icon" = wear_suit.icon_override, "icon_state" = "[wear_suit.icon_state]")
 		else if(wear_suit.sprite_sheets && wear_suit.sprite_sheets[species.name])
 			standing = image("icon" = wear_suit.sprite_sheets[species.name], "icon_state" = "[wear_suit.icon_state]")
-		else if(M_FAT in mutations)
+		else if(FAT in mutations)
 			if(wear_suit.flags&ONESIZEFITSALL)
 				standing = image("icon" = 'icons/mob/suit_fat.dmi', "icon_state" = "[wear_suit.icon_state]")
 			else

code/modules/mob/living/carbon/metroid/metroid.dm

@@ -420,7 +420,7 @@
 
 			attacked += 10
 			if (prob(90))
-				if (M_HULK in M.mutations)
+				if (HULK in M.mutations)
 					damage += 5
 					if(Victim || Target)
 						Victim = null
@@ -958,7 +958,7 @@ mob/living/carbon/slime/var/temperature_resistance = T0C+75
 	max_heat_protection_temperature = FIRE_HELMET_MAX_HEAT_PROTECTION_TEMPERATURE
 	armor = list(melee = 80, bullet = 20, laser = 20, energy = 10, bomb = 0, bio = 0, rad = 0)
 
-/obj/effect/golem_rune
+/obj/effect/goleRUNe
 	anchored = 1
 	desc = "a strange rune used to create golems. It glows when spirits are nearby."
 	name = "rune"

code/modules/mob/living/carbon/monkey/life.dm

@@ -112,15 +112,15 @@
 	proc/handle_mutations_and_radiation()
 
 		if(getFireLoss())
-			if((M_RESIST_HEAT in mutations) || prob(50))
+			if((RESIST_HEAT in mutations) || prob(50))
 				switch(getFireLoss())
 					if(1 to 50)
 						adjustFireLoss(-1)
 					if(51 to 100)
 						adjustFireLoss(-5)
 
-		if ((M_HULK in mutations) && health <= 25)
-			mutations.Remove(M_HULK)
+		if ((HULK in mutations) && health <= 25)
+			mutations.Remove(HULK)
 			src << "\red You suddenly feel very weak."
 			Weaken(3)
 			emote("collapse")
@@ -421,7 +421,7 @@
 			if(HAZARD_LOW_PRESSURE to WARNING_LOW_PRESSURE)
 				pressure_alert = -1
 			else
-				if( !(M_RESIST_COLD in mutations) )
+				if( !(RESIST_COLD in mutations) )
 					adjustBruteLoss( LOW_PRESSURE_DAMAGE )
 					pressure_alert = -2
 				else
@@ -561,7 +561,7 @@
 
 	proc/handle_regular_hud_updates()
 
-		if (stat == 2 || (M_XRAY in mutations))
+		if (stat == 2 || (XRAY in mutations))
 			sight |= SEE_TURFS
 			sight |= SEE_MOBS
 			sight |= SEE_OBJS

code/modules/mob/living/carbon/monkey/monkey.dm

@@ -131,7 +131,7 @@
 		now_pushing = 1
 		if(ismob(AM))
 			var/mob/tmob = AM
-			if(istype(tmob, /mob/living/carbon/human) && (M_HULK in tmob.mutations))
+			if(istype(tmob, /mob/living/carbon/human) && (HULK in tmob.mutations))
 				if(prob(70))
 					usr << "\red <B>You fail to push [tmob]'s fat ass out of the way.</B>"
 					now_pushing = 0

code/modules/mob/living/carbon/species.dm

@@ -208,7 +208,7 @@
 					spawn(0) H.emote(pick("giggle", "laugh"))
 			SA.moles = 0
 
-	if( (abs(310.15 - breath.temperature) > 50) && !(M_RESIST_HEAT in H.mutations)) // Hot air hurts :(
+	if( (abs(310.15 - breath.temperature) > 50) && !(RESIST_HEAT in H.mutations)) // Hot air hurts :(
 		if(H.status_flags & GODMODE)	return 1	//godmode
 		if(breath.temperature < cold_level_1)
 			if(prob(20))
@@ -546,7 +546,7 @@
 
 	brute_mod = 1.25 //greys are fragile
 	
-	default_genes = list(M_REMOTE_TALK)
+	default_genes = list(REMOTE_TALK)
 
 	primitive = /mob/living/carbon/monkey // TODO
 
@@ -555,11 +555,11 @@
 /datum/species/grey/handle_dna(var/mob/living/carbon/C, var/remove)
 	if(!remove)
 		C.dna.SetSEState(REMOTETALKBLOCK,1,1)
-		C.mutations |= M_REMOTE_TALK
+		C.mutations |= REMOTE_TALK
 		genemutcheck(C,REMOTETALKBLOCK,null,MUTCHK_FORCED)
 	else
 		C.dna.SetSEState(REMOTETALKBLOCK,0,1)
-		C.mutations -= M_REMOTE_TALK
+		C.mutations -= REMOTE_TALK
 		genemutcheck(C,REMOTETALKBLOCK,null,MUTCHK_FORCED)
 	C.update_mutations()
 	..()

code/modules/mob/living/damage_procs.dm

@@ -15,7 +15,7 @@
 		if(BRUTE)
 			adjustBruteLoss(damage * blocked)
 		if(BURN)
-			if(M_RESIST_HEAT in mutations)	damage = 0
+			if(RESIST_HEAT in mutations)	damage = 0
 			adjustFireLoss(damage * blocked)
 		if(TOX)
 			adjustToxLoss(damage * blocked)

code/modules/mob/living/living.dm

@@ -47,9 +47,9 @@
 /mob/living/proc/burn_skin(burn_amount)
 	if(istype(src, /mob/living/carbon/human))
 		//world << "DEBUG: burn_skin(), mutations=[mutations]"
-		if(M_NO_SHOCK in src.mutations) //shockproof
+		if(NO_SHOCK in src.mutations) //shockproof
 			return 0
-		if (M_RESIST_HEAT in src.mutations) //fireproof
+		if (RESIST_HEAT in src.mutations) //fireproof
 			return 0
 		var/mob/living/carbon/human/H = src	//make this damage method divide the damage to be done among all the body parts, then burn each body part for that much damage. will have better effect then just randomly picking a body part
 		var/divided_damage = (burn_amount)/(H.organs.len)
@@ -61,7 +61,7 @@
 		H.updatehealth()
 		return 1
 	else if(istype(src, /mob/living/carbon/monkey))
-		if (M_RESIST_HEAT in src.mutations) //fireproof
+		if (RESIST_HEAT in src.mutations) //fireproof
 			return 0
 		var/mob/living/carbon/monkey/M = src
 		M.adjustFireLoss(burn_amount)
@@ -642,7 +642,7 @@
 		if(CM.handcuffed && CM.canmove && (CM.last_special <= world.time))
 			CM.changeNext_move(CLICK_CD_BREAKOUT)
 			CM.last_special = world.time + CLICK_CD_BREAKOUT
-			if(isalienadult(CM) || (M_HULK in usr.mutations))//Don't want to do a lot of logic gating here.
+			if(isalienadult(CM) || (HULK in usr.mutations))//Don't want to do a lot of logic gating here.
 				usr << "\red You attempt to break your handcuffs. (This will take around 5 seconds and you need to stand still)"
 				for(var/mob/O in viewers(CM))
 					O.show_message(text("\red <B>[] is trying to break the handcuffs!</B>", CM), 1)
@@ -679,7 +679,7 @@
 		else if(CM.legcuffed && CM.canmove && (CM.last_special <= world.time))
 			CM.changeNext_move(CLICK_CD_BREAKOUT)
 			CM.last_special = world.time + CLICK_CD_BREAKOUT
-			if(isalienadult(CM) || (M_HULK in usr.mutations))//Don't want to do a lot of logic gating here.
+			if(isalienadult(CM) || (HULK in usr.mutations))//Don't want to do a lot of logic gating here.
 				usr << "\red You attempt to break your legcuffs. (This will take around 5 seconds and you need to stand still)"
 				for(var/mob/O in viewers(CM))
 					O.show_message(text("\red <B>[] is trying to break the legcuffs!</B>", CM), 1)

code/modules/mob/living/silicon/mommi/life.dm

@@ -133,7 +133,7 @@
 /
 /mob/living/silicon/robot/mommi/handle_regular_hud_updates()
 
-	if (src.stat == 2 || M_XRAY in mutations || src.sight_mode & BORGXRAY)
+	if (src.stat == 2 || XRAY in mutations || src.sight_mode & BORGXRAY)
 		src.sight |= SEE_TURFS
 		src.sight |= SEE_MOBS
 		src.sight |= SEE_OBJS

code/modules/mob/living/silicon/robot/component.dm

@@ -183,7 +183,7 @@
 	var/mode = 1;
 
 /obj/item/device/robotanalyzer/attack(mob/living/M as mob, mob/living/user as mob)
-	if(( (M_CLUMSY in user.mutations) || user.getBrainLoss() >= 60) && prob(50))
+	if(( (CLUMSY in user.mutations) || user.getBrainLoss() >= 60) && prob(50))
 		user << text("\red You try to analyze the floor's vitals!")
 		for(var/mob/O in viewers(M, null))
 			O.show_message(text("\red [user] has analyzed the floor's vitals!"), 1)

code/modules/mob/living/silicon/robot/life.dm

@@ -154,7 +154,7 @@
 
 /mob/living/silicon/robot/proc/handle_regular_hud_updates()
 
-	if (src.stat == 2 || M_XRAY in mutations || src.sight_mode & BORGXRAY)
+	if (src.stat == 2 || XRAY in mutations || src.sight_mode & BORGXRAY)
 		src.sight |= SEE_TURFS
 		src.sight |= SEE_MOBS
 		src.sight |= SEE_OBJS

code/modules/mob/living/silicon/robot/robot.dm

@@ -566,7 +566,7 @@
 		now_pushing = 1
 		if(ismob(AM))
 			var/mob/tmob = AM
-			if(istype(tmob, /mob/living/carbon/human) && (M_FAT in tmob.mutations))
+			if(istype(tmob, /mob/living/carbon/human) && (FAT in tmob.mutations))
 				if(prob(20))
 					usr << "\red <B>You fail to push [tmob]'s fat ass out of the way.</B>"
 					now_pushing = 0

code/modules/mob/living/simple_animal/constructs.dm

@@ -66,7 +66,7 @@
 		now_pushing = 1
 		if(ismob(AM))
 			var/mob/tmob = AM
-			if(istype(tmob, /mob/living/carbon/human) && (M_FAT in tmob.mutations))
+			if(istype(tmob, /mob/living/carbon/human) && (FAT in tmob.mutations))
 				if(prob(5))
 					src << "\red <B>You fail to push [tmob]'s fat ass out of the way.</B>"
 					now_pushing = 0

code/modules/mob/living/simple_animal/friendly/corgi.dm

@@ -352,7 +352,7 @@
 		now_pushing = 1
 		if(ismob(AM))
 			var/mob/tmob = AM
-			if(istype(tmob, /mob/living/carbon/human) && (M_FAT in tmob.mutations))
+			if(istype(tmob, /mob/living/carbon/human) && (FAT in tmob.mutations))
 				if(prob(70))
 					src << "\red <B>You fail to push [tmob]'s fat ass out of the way.</B>"
 					now_pushing = 0

code/modules/mob/living/simple_animal/friendly/slime.dm

@@ -23,7 +23,7 @@
 		now_pushing = 1
 		if(ismob(AM))
 			var/mob/tmob = AM
-			if(istype(tmob, /mob/living/carbon/human) && (M_FAT in tmob.mutations))
+			if(istype(tmob, /mob/living/carbon/human) && (FAT in tmob.mutations))
 				if(prob(70))
 					src << "\red <B>You fail to push [tmob]'s fat ass out of the way.</B>"
 					now_pushing = 0

code/modules/mob/mob.dm

@@ -331,7 +331,7 @@ var/list/slot_equipment_priority = list( \
 			if(slot_w_uniform)
 				if( !(slot_flags & SLOT_ICLOTHING) )
 					return 0
-				if((M_FAT in H.mutations) && !(flags & ONESIZEFITSALL))
+				if((FAT in H.mutations) && !(flags & ONESIZEFITSALL))
 					return 0
 				if(H.w_uniform)
 					if(!(H.w_uniform.flags & NODROP))

code/modules/mob/mob_grab.dm

@@ -189,7 +189,7 @@
 		s_click(hud)
 		return
 	if(M == assailant && state >= GRAB_AGGRESSIVE)
-		if( (ishuman(user) && (M_FAT in user.mutations) && iscarbon(affecting) ) || ( isalien(user) && iscarbon(affecting) ) || ( istype(user,/mob/living/carbon/human/kidan) && istype(affecting,/mob/living/carbon/monkey/diona) ) )
+		if( (ishuman(user) && (FAT in user.mutations) && iscarbon(affecting) ) || ( isalien(user) && iscarbon(affecting) ) || ( istype(user,/mob/living/carbon/human/kidan) && istype(affecting,/mob/living/carbon/monkey/diona) ) )
 			var/mob/living/carbon/attacker = user
 			user.visible_message("<span class='danger'>[user] is attempting to devour [affecting]!</span>")
 			if(istype(user, /mob/living/carbon/alien/humanoid/hunter))

code/modules/mob/new_player/new_player.dm

@@ -495,7 +495,7 @@
 			new_character.disabilities |= NEARSIGHTED
 
 		if(client.prefs.disabilities & DISABILITY_FLAG_FAT)
-			new_character.mutations += M_FAT
+			new_character.mutations += FAT
 			new_character.overeatduration = 600 // Max overeat
 
 		if(client.prefs.disabilities & DISABILITY_FLAG_EPILEPTIC)

code/modules/mob/new_player/preferences_setup.dm

@@ -261,7 +261,7 @@ datum/preferences
 		var/icon/clothes_s = null
 		var/uniform_dmi='icons/mob/uniform.dmi'
 		if(disabilities&DISABILITY_FLAG_FAT)
-			uniform_dmi='icons/mob/uniform_fat.dmi'
+			uniform_dmi='icons/mob/uniforFAT.dmi'
 		if(job_support_low & CIVILIAN)//This gives the preview icon clothes depending on which job(if any) is set to 'high'
 			clothes_s = new /icon(uniform_dmi, "grey_s")
 			clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY)

code/modules/nano/nanoui.dm

@@ -252,7 +252,7 @@ nanoui is used to open and update nano browser uis
 	. = shared_living_nano_interaction(src_object)
 	if(. == STATUS_INTERACTIVE && be_close)
 		. = shared_living_nano_distance(src_object)
-		if(. == STATUS_UPDATE && (M_TK in mutations))	// If we have telekinesis and remain close enough, allow interaction.
+		if(. == STATUS_UPDATE && (TK in mutations))	// If we have telekinesis and remain close enough, allow interaction.
 			return STATUS_INTERACTIVE
 
  /**

code/modules/paperwork/paper.dm

@@ -73,7 +73,7 @@
 	set category = "Object"
 	set src in usr
 
-	if((M_CLUMSY in usr.mutations) && prob(50))
+	if((CLUMSY in usr.mutations) && prob(50))
 		usr << "<span class='warning'>You cut yourself on the paper.</span>"
 		return
 	var/n_name = sanitize(copytext(input(usr, "What would you like to label the paper?", "Paper Labelling", name) as text, 1, MAX_MESSAGE_LEN))

code/modules/power/lighting.dm

@@ -399,7 +399,7 @@
 					continue
 				M.show_message("[user.name] smashed the light!", 3, "You hear a tinkle of breaking glass", 2)
 			if(on && (W.flags & CONDUCT))
-				//if(!user.mutations & M_RESIST_COLD)
+				//if(!user.mutations & RESIST_COLD)
 				if (prob(12))
 					electrocute_mob(user, get_area(src), src, 0.3)
 			broken()
@@ -435,7 +435,7 @@
 			var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread
 			s.set_up(3, 1, src)
 			s.start()
-			//if(!user.mutations & M_RESIST_COLD)
+			//if(!user.mutations & RESIST_COLD)
 			if (prob(75))
 				electrocute_mob(user, get_area(src), src, rand(0.7,1.0))
 
@@ -511,9 +511,9 @@
 		else
 			prot = 1
 
-		if(prot > 0 || (M_RESIST_HEAT in user.mutations))
+		if(prot > 0 || (RESIST_HEAT in user.mutations))
 			user << "You remove the light [fitting]"
-		else if(M_TK in user.mutations)
+		else if(TK in user.mutations)
 			user << "You telekinetically remove the light [fitting]."
 		else
 			user << "You try to remove the light [fitting], but you burn your hand on it!"

code/modules/projectiles/gun.dm

@@ -78,11 +78,11 @@
 	return 1
 
 /obj/item/weapon/gun/proc/Fire(atom/target as mob|obj|turf|area, mob/living/user as mob|obj, params, reflex = 0)//TODO: go over this
-	//Exclude lasertag guns from the M_CLUMSY check.
+	//Exclude lasertag guns from the CLUMSY check.
 	if(clumsy_check)
 		if(istype(user, /mob/living))
 			var/mob/living/M = user
-			if ((M_CLUMSY in M.mutations) && prob(50))
+			if ((CLUMSY in M.mutations) && prob(50))
 				M << "<span class='danger'>[src] blows up in your face.</span>"
 				M.take_organ_damage(0,20)
 				M.drop_item()
@@ -94,7 +94,7 @@
 		return
 	if(istype(user, /mob/living))
 		var/mob/living/M = user
-		if (M_HULK in M.mutations)
+		if (HULK in M.mutations)
 			M << "\red Your meaty finger is much too large for the trigger guard!"
 			return
 	if(ishuman(user))

code/modules/reagents/Chemistry-Reagents.dm

@@ -398,7 +398,7 @@ datum
 
 			on_mob_life(var/mob/living/M as mob)
 				if(!M) M = holder.my_atom
-				if (M_FAT in M.mutations)
+				if (FAT in M.mutations)
 					M.gib()
 				..()
 				return
@@ -3298,7 +3298,7 @@ datum
 			on_mob_life(var/mob/living/M as mob, var/alien)
 				// Sobering multiplier.
 				// Sober block makes it more difficult to get drunk
-				var/sober_str=!(M_SOBER in M.mutations)?1:2
+				var/sober_str=!(SOBER in M.mutations)?1:2
 				M:nutrition += nutriment_factor
 				holder.remove_reagent(src.id, FOOD_METABOLISM)
 				if(!src.data) data = 1

code/modules/reagents/Chemistry-Recipes.dm

@@ -1469,7 +1469,7 @@ datum
 			required_other = 1
 			on_reaction(var/datum/reagents/holder)
 				feedback_add_details("slime_cores_used","[replacetext(name," ","_")]")
-				var/obj/effect/golem_rune/Z = new /obj/effect/golem_rune
+				var/obj/effect/goleRUNe/Z = new /obj/effect/goleRUNe
 				Z.loc = get_turf(holder.my_atom)
 				Z.announce_to_ghosts()
 //Bluespace

code/modules/reagents/reagent_containers/syringes.dm

@@ -60,7 +60,7 @@
 			return
 
 		if (user.a_intent == "harm" && ismob(target))
-			if((M_CLUMSY in user.mutations) && prob(50))
+			if((CLUMSY in user.mutations) && prob(50))
 				target = user
 			syringestab(target, user)
 			return
@@ -86,7 +86,7 @@
 						if(!T.dna)
 							usr << "You are unable to locate any blood. (To be specific, your target seems to be missing their DNA datum)"
 							return
-						if(M_NOCLONE in T.mutations) //target done been et, no more blood in him
+						if(NOCLONE in T.mutations) //target done been et, no more blood in him
 							user << "\red You are unable to locate any blood."
 							return
 

code/modules/recycling/disposal.dm

@@ -530,7 +530,7 @@
 			AM.loc = src
 			if(istype(AM, /mob/living/carbon/human))
 				var/mob/living/carbon/human/H = AM
-				if(M_FAT in H.mutations)		// is a human and fat?
+				if(FAT in H.mutations)		// is a human and fat?
 					has_fat_guy = 1			// set flag on holder
 			if(istype(AM, /obj/structure/bigDelivery) && !hasmob)
 				var/obj/structure/bigDelivery/T = AM

code/modules/virus2/items_devices.dm

@@ -24,7 +24,7 @@
 		report("Scan Complete: No antibodies detected.", user)
 		return
 
-	if (M_CLUMSY in user.mutations && prob(50))
+	if (CLUMSY in user.mutations && prob(50))
 		// I was tempted to be really evil and rot13 the output.
 		report("Antibodies detected: [reverse_text(antigens2string(C.antibodies))]", user)
 	else