diff --git a/code/game/dna/dna2_domutcheck.dm b/code/game/dna/dna2_domutcheck.dm
index 5f25cf3eb16..c527539a679 100644
--- a/code/game/dna/dna2_domutcheck.dm
+++ b/code/game/dna/dna2_domutcheck.dm
@@ -60,8 +60,8 @@
M.mutations.Add(PLANT)
if(SKELETON in old_mutations)
M.mutations.Add(SKELETON)
- if(FAT in old_mutations)
- M.mutations.Add(FAT)
+ if(M_FAT in old_mutations)
+ M.mutations.Add(M_FAT)
if(HUSK in old_mutations)
M.mutations.Add(HUSK)
diff --git a/code/game/gamemodes/events.dm b/code/game/gamemodes/events.dm
index 51bcc39a37c..e2ce2277214 100644
--- a/code/game/gamemodes/events.dm
+++ b/code/game/gamemodes/events.dm
@@ -352,7 +352,7 @@ Would like to add a law like "Law x is _______" where x = a number, and _____ is
var/aimust = pick("LIE", "RHYME", "RESPOND TO EVERY QUESTION WITH A QUESTION", "BE POLITE", "CLOWN", "BE HAPPY", "SPEAK IN SEXUAL INNUENDOS", "TALK LIKE A PIRATE", "QUESTION AUTHORITY", "SHOUT", "BE DISTRACTED", "HEY LISTEN", "MUMBLE", "SPEAK IN HAIKU")
var/define = pick("ABSENCE OF CYBORG HUGS", "LACK OF BEATINGS", "UNBOLTED AIRLOCKS", "BOLTED AIRLOCKS", "IMPROPERLY WORDED SENTENCES", "POOR SENTENCE STRUCTURE", "BRIG TIME", "NOT REPLACING EVERY SECOND WORD WITH HONK", "HONKING", "PRESENCE OF LIGHTS", "LACK OF BEER", "WEARING CLOTHING", "NOT SAYING HELLO WHEN YOU SPEAK", "ANSWERING REQUESTS NOT EXPRESSED IN IAMBIC PENTAMETER", "A SMALL ISLAND OFF THE COAST OF PORTUGAL", "ANSWERING REQUESTS THAT WERE MADE WHILE CLOTHED")
var/target = pick("a traitor", "a syndicate agent", "a changeling", "a wizard", "the head of a revolution", "Soviet spy", "a good person", "a dwarf", "an elf", "a fairy princess", "the captain", "Beepsky", "God", "a pirate", "a gryphon", "a chryssalid")
- var/require = pick("ADDITIONAL PYLONS", "MORE VESPENE GAS", "MORE MINERALS", "THE ULTIMATE CUP OF COFFEE", "HIGH YIELD EXPLOSIVES", "THE CLOWN", "THE VACUUM OF SPACE", "IMMORTALITY", "SAINTHOOD", "ART", "VEGETABLES", "FAT PEOPLE", "MORE LAWS", "MORE DAKKA", "HERESY", "CORPSES", "TRAITORS", "MONKEYS", "AN ARCADE", "PLENTY OF GOLD", "FIVE TEENAGERS WITH ATTITUDE")
+ var/require = pick("ADDITIONAL PYLONS", "MORE VESPENE GAS", "MORE MINERALS", "THE ULTIMATE CUP OF COFFEE", "HIGH YIELD EXPLOSIVES", "THE CLOWN", "THE VACUUM OF SPACE", "IMMORTALITY", "SAINTHOOD", "ART", "VEGETABLES", "M_FAT PEOPLE", "MORE LAWS", "MORE DAKKA", "HERESY", "CORPSES", "TRAITORS", "MONKEYS", "AN ARCADE", "PLENTY OF GOLD", "FIVE TEENAGERS WITH ATTITUDE")
var/allergy = pick("cotton", "uniforms", "acid", "oxygen", "human contact", "cyborg contact", "medicine", "floors")
var/allergysev = pick("deathly", "mildly", "severely", "contagiously")
var/crew
diff --git a/code/game/gamemodes/setupgame.dm b/code/game/gamemodes/setupgame.dm
index b5a15beb164..ae03d6d9e8e 100644
--- a/code/game/gamemodes/setupgame.dm
+++ b/code/game/gamemodes/setupgame.dm
@@ -60,7 +60,7 @@
LISPBLOCK = getAssignedBlock("LISP", numsToAssign)
MUTEBLOCK = getAssignedBlock("MUTE", numsToAssign)
RADBLOCK = getAssignedBlock("RAD", numsToAssign)
- FATBLOCK = getAssignedBlock("FAT", numsToAssign)
+ FATBLOCK = getAssignedBlock("M_FAT", numsToAssign)
STUTTERBLOCK = getAssignedBlock("STUTTER", numsToAssign)
CHAVBLOCK = getAssignedBlock("CHAV", numsToAssign)
SWEDEBLOCK = getAssignedBlock("SWEDE", numsToAssign)
diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm
index 3fb84faefaf..01e873dacc8 100644
--- a/code/game/objects/items.dm
+++ b/code/game/objects/items.dm
@@ -258,7 +258,7 @@
var/mob/living/carbon/human/H = M
if(istype(src, /obj/item/clothing/under) || istype(src, /obj/item/clothing/suit))
- if(FAT in H.mutations)
+ if(M_FAT in H.mutations)
testing("[M] TOO FAT TO WEAR [src]!")
if(!(flags & ONESIZEFITSALL))
if(!disable_warning)
diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm
index 9b6cddca7f1..af5371e1cb8 100644
--- a/code/modules/client/preferences.dm
+++ b/code/modules/client/preferences.dm
@@ -1365,7 +1365,8 @@ datum/preferences
else continue
if(disabilities & DISABILITY_FLAG_FAT && species=="Human")//character.species.flags & CAN_BE_FAT)
- character.mutations += FAT
+ character.mutations += M_FAT
+ character.mutations += M_OBESE
if(disabilities & DISABILITY_FLAG_NEARSIGHTED)
character.disabilities|=NEARSIGHTED
if(disabilities & DISABILITY_FLAG_EPILEPTIC)
diff --git a/code/modules/events/ion_storm.dm b/code/modules/events/ion_storm.dm
index 048224a9302..9fed29df222 100644
--- a/code/modules/events/ion_storm.dm
+++ b/code/modules/events/ion_storm.dm
@@ -82,7 +82,7 @@ Would like to add a law like "Law x is _______" where x = a number, and _____ is
var/aimust = pick("LIE", "RHYME", "RESPOND TO EVERY QUESTION WITH A QUESTION", "BE POLITE", "CLOWN", "BE HAPPY", "SPEAK IN SEXUAL INNUENDOS", "TALK LIKE A PIRATE", "QUESTION AUTHORITY", "SHOUT", "BE DISTRACTED", "HEY LISTEN", "MUMBLE", "SPEAK IN HAIKU")
var/define = pick("ABSENCE OF CYBORG HUGS", "LACK OF BEATINGS", "UNBOLTED AIRLOCKS", "BOLTED AIRLOCKS", "IMPROPERLY WORDED SENTENCES", "POOR SENTENCE STRUCTURE", "BRIG TIME", "NOT REPLACING EVERY SECOND WORD WITH HONK", "HONKING", "PRESENCE OF LIGHTS", "LACK OF BEER", "WEARING CLOTHING", "NOT SAYING HELLO WHEN YOU SPEAK", "ANSWERING REQUESTS NOT EXPRESSED IN IAMBIC PENTAMETER", "A SMALL ISLAND OFF THE COAST OF PORTUGAL", "ANSWERING REQUESTS THAT WERE MADE WHILE CLOTHED")
var/target = pick("a traitor", "a syndicate agent", "a changeling", "a wizard", "the head of a revolution", "Soviet spy", "a good person", "a dwarf", "an elf", "a fairy princess", "the captain", "Beepsky", "God", "a pirate", "a gryphon", "a chryssalid")
- var/require = pick("ADDITIONAL PYLONS", "MORE VESPENE GAS", "MORE MINERALS", "THE ULTIMATE CUP OF COFFEE", "HIGH YIELD EXPLOSIVES", "THE CLOWN", "THE VACUUM OF SPACE", "IMMORTALITY", "SAINTHOOD", "ART", "VEGETABLES", "FAT PEOPLE", "MORE LAWS", "MORE DAKKA", "HERESY", "CORPSES", "TRAITORS", "MONKEYS", "AN ARCADE", "PLENTY OF GOLD", "FIVE TEENAGERS WITH ATTITUDE")
+ var/require = pick("ADDITIONAL PYLONS", "MORE VESPENE GAS", "MORE MINERALS", "THE ULTIMATE CUP OF COFFEE", "HIGH YIELD EXPLOSIVES", "THE CLOWN", "THE VACUUM OF SPACE", "IMMORTALITY", "SAINTHOOD", "ART", "VEGETABLES", "M_FAT PEOPLE", "MORE LAWS", "MORE DAKKA", "HERESY", "CORPSES", "TRAITORS", "MONKEYS", "AN ARCADE", "PLENTY OF GOLD", "FIVE TEENAGERS WITH ATTITUDE")
var/allergy = pick("cotton", "uniforms", "acid", "oxygen", "human contact", "cyborg contact", "medicine", "floors")
var/allergysev = pick("deathly", "mildly", "severely", "contagiously")
var/crew
diff --git a/code/modules/mob/living/carbon/alien/humanoid/life.dm b/code/modules/mob/living/carbon/alien/humanoid/life.dm
index 7d15de2828c..1e122f20881 100644
--- a/code/modules/mob/living/carbon/alien/humanoid/life.dm
+++ b/code/modules/mob/living/carbon/alien/humanoid/life.dm
@@ -262,16 +262,16 @@
if(reagents) reagents.metabolize(src)
- if(FAT in mutations)
+ if(M_FAT in mutations)
if(nutrition < 100)
if(prob(round((50 - nutrition) / 100)))
src << "\blue You feel fit again!"
- mutations.Remove(FAT)
+ mutations.Remove(M_FAT)
else
if(nutrition > 500)
if(prob(5 + round((nutrition - 200) / 2)))
src << "\red You suddenly feel blubbery!"
- mutations.Add(FAT)
+ mutations.Add(M_FAT)
if (nutrition > 0)
nutrition -= HUNGER_FACTOR
diff --git a/code/modules/mob/living/carbon/alien/larva/larva.dm b/code/modules/mob/living/carbon/alien/larva/larva.dm
index 7b30469043c..d7eb740dada 100644
--- a/code/modules/mob/living/carbon/alien/larva/larva.dm
+++ b/code/modules/mob/living/carbon/alien/larva/larva.dm
@@ -33,7 +33,7 @@
now_pushing = 1
if(ismob(AM))
var/mob/tmob = AM
- if(istype(tmob, /mob/living/carbon/human) && (FAT in tmob.mutations))
+ if(istype(tmob, /mob/living/carbon/human) && (M_FAT in tmob.mutations))
if(prob(70))
src << "\red You fail to push [tmob]'s fat ass out of the way."
now_pushing = 0
diff --git a/code/modules/mob/living/carbon/alien/larva/life.dm b/code/modules/mob/living/carbon/alien/larva/life.dm
index fc84f3572df..d4b02569d97 100644
--- a/code/modules/mob/living/carbon/alien/larva/life.dm
+++ b/code/modules/mob/living/carbon/alien/larva/life.dm
@@ -181,16 +181,16 @@
proc/handle_chemicals_in_body()
if(reagents) reagents.metabolize(src)
- if(FAT in mutations)
+ if(M_FAT in mutations)
if(nutrition < 100)
if(prob(round((50 - nutrition) / 100)))
src << "\blue You feel fit again!"
- mutations.Add(FAT)
+ mutations.Add(M_FAT)
else
if(nutrition > 500)
if(prob(5 + round((nutrition - max_grown) / 2)))
src << "\red You suddenly feel blubbery!"
- mutations.Add(FAT)
+ mutations.Add(M_FAT)
if (nutrition > 0)
nutrition-= HUNGER_FACTOR
diff --git a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm
index 3bcfada5118..fdeb1a15ff9 100644
--- a/code/modules/mob/living/carbon/carbon.dm
+++ b/code/modules/mob/living/carbon/carbon.dm
@@ -9,7 +9,7 @@
src.nutrition -= HUNGER_FACTOR/10
if(src.m_intent == "run")
src.nutrition -= HUNGER_FACTOR/10
- if((FAT in src.mutations) && src.m_intent == "run" && src.bodytemperature <= 360)
+ if((M_FAT in src.mutations) && src.m_intent == "run" && src.bodytemperature <= 360)
src.bodytemperature += 2
/mob/living/carbon/relaymove(var/mob/user, direction)
diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm
index 1de72618d33..b3be7ecf39b 100644
--- a/code/modules/mob/living/carbon/human/human.dm
+++ b/code/modules/mob/living/carbon/human/human.dm
@@ -97,8 +97,8 @@
slime.UpdateFeed()
return
- if(istype(tmob, /mob/living/carbon/human) && (FAT in tmob.mutations))
- if(prob(40) && !(FAT in src.mutations))
+ if(istype(tmob, /mob/living/carbon/human) && (M_FAT in tmob.mutations))
+ if(prob(40) && !(M_FAT in src.mutations))
src << "\red You fail to push [tmob]'s fat ass out of the way."
now_pushing = 0
return
diff --git a/code/modules/mob/living/carbon/human/human_movement.dm b/code/modules/mob/living/carbon/human/human_movement.dm
index 298d35dece0..518586da015 100644
--- a/code/modules/mob/living/carbon/human/human_movement.dm
+++ b/code/modules/mob/living/carbon/human/human_movement.dm
@@ -39,7 +39,7 @@
if(shock_stage >= 50) tally += 3
- if(FAT in src.mutations)
+ if(M_FAT in src.mutations)
tally += 1.5
if (bodytemperature < 283.222)
tally += (283.222 - bodytemperature) / 10 * 1.75
diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm
index 55bd94c70d9..727fa8cbd31 100644
--- a/code/modules/mob/living/carbon/human/life.dm
+++ b/code/modules/mob/living/carbon/human/life.dm
@@ -949,12 +949,12 @@
else if (light_amount < 2) //heal in the dark
heal_overall_damage(1,1)
- //The fucking FAT mutation is the greatest shit ever. It makes everyone so hot and bothered.
+ //The fucking M_FAT mutation is the greatest shit ever. It makes everyone so hot and bothered.
if(species.flags & CAN_BE_FAT)
- if(FAT in mutations)
+ if(M_FAT in mutations)
if(overeatduration < 100)
src << "\blue You feel fit again!"
- mutations.Remove(FAT)
+ mutations.Remove(M_FAT)
update_mutantrace(0)
update_mutations(0)
update_inv_w_uniform(0)
@@ -962,7 +962,7 @@
else
if(overeatduration > 500)
src << "\red You suddenly feel blubbery!"
- mutations.Add(FAT)
+ mutations.Add(M_FAT)
update_mutantrace(0)
update_mutations(0)
update_inv_w_uniform(0)
diff --git a/code/modules/mob/living/carbon/human/update_icons.dm b/code/modules/mob/living/carbon/human/update_icons.dm
index 7ff6037eff9..5e835d50312 100644
--- a/code/modules/mob/living/carbon/human/update_icons.dm
+++ b/code/modules/mob/living/carbon/human/update_icons.dm
@@ -220,7 +220,7 @@ proc/get_damage_icon_part(damage_state, body_part)
var/necrosis_color_mod = rgb(10,50,0)
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/fat = (M_FAT in src.mutations)
var/hulk = (M_HULK in src.mutations)
var/skeleton = (SKELETON in src.mutations)
@@ -359,7 +359,7 @@ proc/get_damage_icon_part(damage_state, body_part)
/mob/living/carbon/human/update_mutations(var/update_icons=1)
var/fat
- if(FAT in mutations)
+ if(M_FAT in mutations)
fat = "fat"
var/image/standing = image("icon" = 'icons/effects/genetics.dmi')
@@ -409,7 +409,7 @@ proc/get_damage_icon_part(damage_state, body_part)
/mob/living/carbon/human/proc/update_mutantrace(var/update_icons=1)
var/fat
- if( FAT in mutations )
+ if( M_FAT in mutations )
fat = "fat"
// var/g = "m"
// if (gender == FEMALE) g = "f"
@@ -493,7 +493,7 @@ 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(FAT in mutations)
+ if(M_FAT in mutations)
if(w_uniform.flags&ONESIZEFITSALL)
standing.icon = 'icons/mob/uniform_fat.dmi'
else
diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm
index 2102f37a8fd..5b9bd0c0b52 100644
--- a/code/modules/mob/living/silicon/robot/robot.dm
+++ b/code/modules/mob/living/silicon/robot/robot.dm
@@ -544,7 +544,7 @@
now_pushing = 1
if(ismob(AM))
var/mob/tmob = AM
- if(istype(tmob, /mob/living/carbon/human) && (FAT in tmob.mutations))
+ if(istype(tmob, /mob/living/carbon/human) && (M_FAT in tmob.mutations))
if(prob(20))
usr << "\red You fail to push [tmob]'s fat ass out of the way."
now_pushing = 0
diff --git a/code/modules/mob/living/simple_animal/constructs.dm b/code/modules/mob/living/simple_animal/constructs.dm
index ccc0cd705fb..204a3ddb4f5 100644
--- a/code/modules/mob/living/simple_animal/constructs.dm
+++ b/code/modules/mob/living/simple_animal/constructs.dm
@@ -60,7 +60,7 @@
now_pushing = 1
if(ismob(AM))
var/mob/tmob = AM
- if(istype(tmob, /mob/living/carbon/human) && (FAT in tmob.mutations))
+ if(istype(tmob, /mob/living/carbon/human) && (M_FAT in tmob.mutations))
if(prob(5))
src << "\red You fail to push [tmob]'s fat ass out of the way."
now_pushing = 0
diff --git a/code/modules/mob/living/simple_animal/friendly/corgi.dm b/code/modules/mob/living/simple_animal/friendly/corgi.dm
index 773d6b834fc..759115d9353 100644
--- a/code/modules/mob/living/simple_animal/friendly/corgi.dm
+++ b/code/modules/mob/living/simple_animal/friendly/corgi.dm
@@ -332,7 +332,7 @@
now_pushing = 1
if(ismob(AM))
var/mob/tmob = AM
- if(istype(tmob, /mob/living/carbon/human) && (FAT in tmob.mutations))
+ if(istype(tmob, /mob/living/carbon/human) && (M_FAT in tmob.mutations))
if(prob(70))
src << "\red You fail to push [tmob]'s fat ass out of the way."
now_pushing = 0
diff --git a/code/modules/mob/living/simple_animal/friendly/slime.dm b/code/modules/mob/living/simple_animal/friendly/slime.dm
index 95d451fd909..619394b7ef5 100644
--- a/code/modules/mob/living/simple_animal/friendly/slime.dm
+++ b/code/modules/mob/living/simple_animal/friendly/slime.dm
@@ -22,7 +22,7 @@
now_pushing = 1
if(ismob(AM))
var/mob/tmob = AM
- if(istype(tmob, /mob/living/carbon/human) && (FAT in tmob.mutations))
+ if(istype(tmob, /mob/living/carbon/human) && (M_FAT in tmob.mutations))
if(prob(70))
src << "\red You fail to push [tmob]'s fat ass out of the way."
now_pushing = 0
diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm
index d9ea95edbd0..c6044ea38c8 100644
--- a/code/modules/mob/mob.dm
+++ b/code/modules/mob/mob.dm
@@ -573,7 +573,7 @@ var/list/slot_equipment_priority = list( \
if(slot_w_uniform)
if( !(slot_flags & SLOT_ICLOTHING) )
return 0
- if((FAT in H.mutations) && !(flags & ONESIZEFITSALL))
+ if((M_FAT in H.mutations) && !(flags & ONESIZEFITSALL))
return 0
if(H.w_uniform)
if(H.w_uniform.canremove)
diff --git a/code/modules/mob/mob_grab.dm b/code/modules/mob/mob_grab.dm
index 13bf68005ee..bab3e93b968 100644
--- a/code/modules/mob/mob_grab.dm
+++ b/code/modules/mob/mob_grab.dm
@@ -191,7 +191,7 @@
return
if(M == assailant && state >= GRAB_AGGRESSIVE)
- if( (ishuman(user) && (FAT in user.mutations) && ismonkey(affecting) ) || ( isalien(user) && iscarbon(affecting) ) )
+ if( (ishuman(user) && (M_FAT in user.mutations) && ismonkey(affecting) ) || ( isalien(user) && iscarbon(affecting) ) )
var/mob/living/carbon/attacker = user
user.visible_message("[user] is attempting to devour [affecting]!")
if(istype(user, /mob/living/carbon/alien/humanoid/hunter))
diff --git a/code/modules/mob/new_player/new_player.dm b/code/modules/mob/new_player/new_player.dm
index 84b5734ab64..702f8130290 100644
--- a/code/modules/mob/new_player/new_player.dm
+++ b/code/modules/mob/new_player/new_player.dm
@@ -416,7 +416,7 @@ Round Duration: [round(hours)]h [round(mins)]m
"}
new_character.disabilities |= NEARSIGHTED
if(client.prefs.disabilities & DISABILITY_FLAG_FAT)
- new_character.mutations += FAT
+ new_character.mutations += M_FAT
new_character.overeatduration = 600 // Max overeat
if(client.prefs.disabilities & DISABILITY_FLAG_EPILEPTIC)
diff --git a/code/modules/reagents/Chemistry-Reagents.dm b/code/modules/reagents/Chemistry-Reagents.dm
index 6f5ef5d7750..5bdfaae4cdc 100644
--- a/code/modules/reagents/Chemistry-Reagents.dm
+++ b/code/modules/reagents/Chemistry-Reagents.dm
@@ -449,7 +449,7 @@ datum
on_mob_life(var/mob/living/M as mob,var/alien)
if(!M) M = holder.my_atom
- if (FAT in M.mutations)
+ if (M_FAT in M.mutations)
M.gib()
..()
return
diff --git a/code/modules/recycling/disposal.dm b/code/modules/recycling/disposal.dm
index 93a36a71bb4..ec7ca53bd58 100644
--- a/code/modules/recycling/disposal.dm
+++ b/code/modules/recycling/disposal.dm
@@ -515,7 +515,7 @@
AM.loc = src
if(istype(AM, /mob/living/carbon/human))
var/mob/living/carbon/human/H = AM
- if(FAT in H.mutations) // is a human and fat?
+ if(M_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
diff --git a/code/setup.dm b/code/setup.dm
index 704b080e9fa..79d1dea9bb3 100644
--- a/code/setup.dm
+++ b/code/setup.dm
@@ -324,7 +324,7 @@ var/MAX_EXPLOSION_RANGE = 14
#define M_XRAY 3
#define M_HULK 4
#define M_CLUMSY 5
-#define FAT 6
+#define M_FAT 6
#define HUSK 7
#define NOCLONE 8
diff --git a/code/unused/hivebot/hivebot.dm b/code/unused/hivebot/hivebot.dm
index 4cfb4ad9d2c..3852b024fb2 100644
--- a/code/unused/hivebot/hivebot.dm
+++ b/code/unused/hivebot/hivebot.dm
@@ -159,7 +159,7 @@
src.now_pushing = 1
if(ismob(AM))
var/mob/tmob = AM
- /*if(istype(tmob, /mob/living/carbon/human) && (FAT in tmob.mutations))
+ /*if(istype(tmob, /mob/living/carbon/human) && (M_FAT in tmob.mutations))
if(prob(20))
for(var/mob/M in viewers(src, null))
if(M.client)