Standardize FAT

Conflicts:
	code/modules/client/preferences.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/living/silicon/robot/robot.dm
	code/modules/mob/living/simple_animal/constructs.dm
	code/modules/mob/mob.dm
	code/modules/mob/mob_grab.dm

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

@@ -264,16 +264,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

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 <B>You fail to push [tmob]'s fat ass out of the way.</B>"
 					now_pushing = 0

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

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

@@ -11,7 +11,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)

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

@@ -122,8 +122,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 <B>You fail to push [tmob]'s fat ass out of the way.</B>"
 				now_pushing = 0
 				return

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

@@ -43,7 +43,7 @@
 		tally += back.slowdown
 
 
-	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

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

@@ -963,12 +963,12 @@
 			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.
 		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)
@@ -976,7 +976,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)

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

@@ -231,7 +231,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)
 
@@ -376,7 +376,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')
@@ -426,7 +426,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"
@@ -515,7 +515,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
@@ -685,7 +685,7 @@ proc/get_damage_icon_part(damage_state, body_part)
 
 		var/image/standing  = image("icon" = dmi, "icon_state" = "[wear_suit.icon_state]")
 
-		if(FAT in mutations)
+		if(M_FAT in mutations)
 			if(wear_suit.flags&ONESIZEFITSALL)
 				standing.icon	= 'icons/mob/suit_fat.dmi'
 			else

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

@@ -501,6 +501,43 @@
 	return 2
 
 
+/mob/living/silicon/robot/Bump(atom/movable/AM as mob|obj, yes)
+	spawn( 0 )
+		if ((!( yes ) || now_pushing))
+			return
+		now_pushing = 1
+		if(ismob(AM))
+			var/mob/tmob = AM
+			if(istype(tmob, /mob/living/carbon/human) && (M_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
+					return
+			if(!(tmob.status_flags & CANPUSH))
+				now_pushing = 0
+				return
+		now_pushing = 0
+		..()
+		if (istype(AM, /obj/machinery/recharge_station))
+			var/obj/machinery/recharge_station/F = AM
+			F.move_inside()
+		if (!istype(AM, /atom/movable))
+			return
+		if (!now_pushing)
+			now_pushing = 1
+			if (!AM.anchored)
+				var/t = get_dir(src, AM)
+				if (istype(AM, /obj/structure/window))
+					if(AM:ini_dir == NORTHWEST || AM:ini_dir == NORTHEAST || AM:ini_dir == SOUTHWEST || AM:ini_dir == SOUTHEAST)
+						for(var/obj/structure/window/win in get_step(AM,t))
+							now_pushing = 0
+							return
+				step(AM, t)
+			now_pushing = null
+		return
+	return
+
+
 /mob/living/silicon/robot/triggerAlarm(var/class, area/A, var/O, var/alarmsource)
 	if (stat == 2)
 		return 1

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

@@ -60,31 +60,39 @@
 	return
 
 /mob/living/simple_animal/construct/Bump(atom/movable/AM as mob|obj, yes)
-	if ((!( yes ) || now_pushing))
-		return
-	now_pushing = 1
-	if(ismob(AM))
-		var/mob/tmob = AM
-		if(!(tmob.status_flags & CANPUSH))
-			now_pushing = 0
+	spawn( 0 )
+		if ((!( yes ) || now_pushing))
 			return
-
-		tmob.LAssailant = src
-	now_pushing = 0
-	..()
-	if (!istype(AM, /atom/movable))
-		return
-	if (!( now_pushing ))
 		now_pushing = 1
-		if (!( AM.anchored ))
-			var/t = get_dir(src, AM)
-			if (istype(AM, /obj/structure/window))
-				if(AM:ini_dir == NORTHWEST || AM:ini_dir == NORTHEAST || AM:ini_dir == SOUTHWEST || AM:ini_dir == SOUTHEAST)
-					for(var/obj/structure/window/win in get_step(AM,t))
-						now_pushing = 0
-						return
-			step(AM, t)
-		now_pushing = null
+		if(ismob(AM))
+			var/mob/tmob = AM
+			if(istype(tmob, /mob/living/carbon/human) && (M_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
+					return
+			if(!(tmob.status_flags & CANPUSH))
+				now_pushing = 0
+				return
+
+			tmob.LAssailant = src
+		now_pushing = 0
+		..()
+		if (!( istype(AM, /atom/movable) ))
+			return
+		if (!( now_pushing ))
+			now_pushing = 1
+			if (!( AM.anchored ))
+				var/t = get_dir(src, AM)
+				if (istype(AM, /obj/structure/window))
+					if(AM:ini_dir == NORTHWEST || AM:ini_dir == NORTHEAST || AM:ini_dir == SOUTHWEST || AM:ini_dir == SOUTHEAST)
+						for(var/obj/structure/window/win in get_step(AM,t))
+							now_pushing = 0
+							return
+				step(AM, t)
+			now_pushing = null
+		return
+	return
 
 
 /mob/living/simple_animal/construct/attack_animal(mob/living/simple_animal/M as mob)
@@ -318,4 +326,4 @@
 			if (cultist == usr) //just to be sure.
 				return
 			cultist.loc = usr.loc
-			usr.visible_message("/red [cultist] appears in a flash of red light as [usr] glows with power")*/
+			usr.visible_message("/red [cultist] appears in a flash of red light as [usr] glows with power")*/

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

@@ -340,7 +340,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 <B>You fail to push [tmob]'s fat ass out of the way.</B>"
 					now_pushing = 0
@@ -489,4 +489,4 @@
 	s.start()
 	respawnable_list += src
 	del src
-	return
+	return

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) && (FAT in tmob.mutations))
+			if(istype(tmob, /mob/living/carbon/human) && (M_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

@@ -185,6 +185,212 @@ var/list/slot_equipment_priority = list( \
 
 	return 0
 
+/mob/proc/check_for_open_slot(obj/item/W)
+	if(!istype(W)) return 0
+	var/openslot = 0
+	for(var/slot in slot_equipment_priority)
+		if(W.mob_check_equip(src, slot, 1) == 1)
+			openslot = 1
+			break
+	return openslot
+
+/obj/item/proc/mob_check_equip(M as mob, slot, disable_warning = 0)
+	if(!M) return 0
+	if(!slot) return 0
+	if(ishuman(M))
+		//START HUMAN
+		var/mob/living/carbon/human/H = M
+
+		switch(slot)
+			if(slot_l_hand)
+				if(H.l_hand)
+					return 0
+				return 1
+			if(slot_r_hand)
+				if(H.r_hand)
+					return 0
+				return 1
+			if(slot_wear_mask)
+				if( !(slot_flags & SLOT_MASK) )
+					return 0
+				if(H.wear_mask)
+					return 0
+				return 1
+			if(slot_back)
+				if( !(slot_flags & SLOT_BACK) )
+					return 0
+				if(H.back)
+					if(H.back.canremove)
+						return 2
+					else
+						return 0
+				return 1
+			if(slot_wear_suit)
+				if( !(slot_flags & SLOT_OCLOTHING) )
+					return 0
+				if(H.wear_suit)
+					if(H.wear_suit.canremove)
+						return 2
+					else
+						return 0
+				return 1
+			if(slot_gloves)
+				if( !(slot_flags & SLOT_GLOVES) )
+					return 0
+				if(H.gloves)
+					if(H.gloves.canremove)
+						return 2
+					else
+						return 0
+				return 1
+			if(slot_shoes)
+				if( !(slot_flags & SLOT_FEET) )
+					return 0
+				if(H.shoes)
+					if(H.shoes.canremove)
+						return 2
+					else
+						return 0
+				return 1
+			if(slot_belt)
+				if(!H.w_uniform)
+					if(!disable_warning)
+						H << "\red You need a jumpsuit before you can attach this [name]."
+					return 0
+				if( !(slot_flags & SLOT_BELT) )
+					return 0
+				if(H.belt)
+					if(H.belt.canremove)
+						return 2
+					else
+						return 0
+				return 1
+			if(slot_glasses)
+				if( !(slot_flags & SLOT_EYES) )
+					return 0
+				if(H.glasses)
+					if(H.glasses.canremove)
+						return 2
+					else
+						return 0
+				return 1
+			if(slot_head)
+				if( !(slot_flags & SLOT_HEAD) )
+					return 0
+				if(H.head)
+					if(H.head.canremove)
+						return 2
+					else
+						return 0
+				return 1
+			if(slot_l_ear)
+				if( !(slot_flags & slot_l_ear) )
+					return 0
+				if(H.l_ear)
+					if(H.l_ear.canremove)
+						return 2
+					else
+						return 0
+				return 1
+			if(slot_r_ear)
+				if( !(slot_flags & slot_r_ear) )
+					return 0
+				if(H.r_ear)
+					if(H.r_ear.canremove)
+						return 2
+					else
+						return 0
+				return 1
+			if(slot_w_uniform)
+				if( !(slot_flags & SLOT_ICLOTHING) )
+					return 0
+				if((M_FAT in H.mutations) && !(flags & ONESIZEFITSALL))
+					return 0
+				if(H.w_uniform)
+					if(H.w_uniform.canremove)
+						return 2
+					else
+						return 0
+				return 1
+			if(slot_wear_id)
+				if(!H.w_uniform)
+					if(!disable_warning)
+						H << "\red You need a jumpsuit before you can attach this [name]."
+					return 0
+				if( !(slot_flags & SLOT_ID) )
+					return 0
+				if(H.wear_id)
+					if(H.wear_id.canremove)
+						return 2
+					else
+						return 0
+				return 1
+			if(slot_l_store)
+				if(H.l_store)
+					return 0
+				if(!H.w_uniform)
+					if(!disable_warning)
+						H << "\red You need a jumpsuit before you can attach this [name]."
+					return 0
+				if(slot_flags & SLOT_DENYPOCKET)
+					return
+				if( w_class <= 2 || (slot_flags & SLOT_POCKET) )
+					return 1
+			if(slot_r_store)
+				if(H.r_store)
+					return 0
+				if(!H.w_uniform)
+					if(!disable_warning)
+						H << "\red You need a jumpsuit before you can attach this [name]."
+					return 0
+				if(slot_flags & SLOT_DENYPOCKET)
+					return 0
+				if( w_class <= 2 || (slot_flags & SLOT_POCKET) )
+					return 1
+				return 0
+			if(slot_s_store)
+				if(!H.wear_suit)
+					if(!disable_warning)
+						H << "\red You need a suit before you can attach this [name]."
+					return 0
+				if(!H.wear_suit.allowed)
+					if(!disable_warning)
+						usr << "You somehow have a suit with no defined allowed items for suit storage, stop that."
+					return 0
+				if(src.w_class > 3)
+					if(!disable_warning)
+						usr << "The [name] is too big to attach."
+					return 0
+				if( istype(src, /obj/item/device/pda) || istype(src, /obj/item/weapon/pen) || is_type_in_list(src, H.wear_suit.allowed) )
+					if(H.s_store)
+						if(H.s_store.canremove)
+							return 2
+						else
+							return 0
+					else
+						return 1
+				return 0
+			if(slot_handcuffed)
+				if(H.handcuffed)
+					return 0
+				if(!istype(src, /obj/item/weapon/handcuffs))
+					return 0
+				return 1
+			if(slot_legcuffed)
+				if(H.legcuffed)
+					return 0
+				if(!istype(src, /obj/item/weapon/legcuffs))
+					return 0
+				return 1
+			if(slot_in_backpack)
+				if (H.back && istype(H.back, /obj/item/weapon/storage/backpack))
+					var/obj/item/weapon/storage/backpack/B = H.back
+					if(B.contents.len < B.storage_slots && w_class <= B.max_w_class)
+						return 1
+				return 0
+		return 0 //Unsupported slot
+		//END HUMAN
+
 /mob/proc/reset_view(atom/A)
 	if (client)
 		if (istype(A, /atom/movable))

code/modules/mob/mob_grab.dm

@@ -190,7 +190,7 @@
 		s_click(hud)
 		return
 	if(M == assailant && state >= GRAB_AGGRESSIVE)
-		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) ) )
+		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) ) )
 			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

@@ -438,7 +438,7 @@
 			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)