Merge resolution with PDA nanoui.

code/modules/mob/dead/observer/observer.dm

@@ -69,15 +69,15 @@
 	..()
 
 
-
-/mob/dead/observer/Topic(href, href_list)
-	if (href_list["track"])
-		var/mob/target = locate(href_list["track"]) in mob_list
-		if(target)
-			ManualFollow(target)
-
-
-
+
+/mob/dead/observer/Topic(href, href_list)
+	if (href_list["track"])
+		var/mob/target = locate(href_list["track"]) in mob_list
+		if(target)
+			ManualFollow(target)
+
+
+
 /mob/dead/attackby(obj/item/W, mob/user)
 	if(istype(W,/obj/item/weapon/tome))
 		var/mob/dead/M = src
@@ -111,7 +111,7 @@ Works together with spawning an observer, noted above.
 		for(var/image/hud in client.images)
 			if(copytext(hud.icon_state,1,4) == "hud")
 				client.images.Remove(hud)
-
+
 	if(antagHUD)
 		var/list/target_list = list()
 		for(var/mob/living/target in oview(src, 14))
@@ -123,19 +123,19 @@ Works together with spawning an observer, noted above.
 		process_medHUD(src)
 
 
-/mob/dead/proc/process_medHUD(var/mob/M)
-	var/client/C = M.client
-	for(var/mob/living/carbon/human/patient in oview(M, 14))
-		C.images += patient.hud_list[HEALTH_HUD]
-		C.images += patient.hud_list[STATUS_HUD_OOC]
-
-/mob/dead/proc/assess_targets(list/target_list, mob/dead/observer/U)
-	var/client/C = U.client
-	for(var/mob/living/carbon/human/target in target_list)
-		C.images += target.hud_list[SPECIALROLE_HUD]
-
-
-/*
+/mob/dead/proc/process_medHUD(var/mob/M)
+	var/client/C = M.client
+	for(var/mob/living/carbon/human/patient in oview(M, 14))
+		C.images += patient.hud_list[HEALTH_HUD]
+		C.images += patient.hud_list[STATUS_HUD_OOC]
+
+/mob/dead/proc/assess_targets(list/target_list, mob/dead/observer/U)
+	var/client/C = U.client
+	for(var/mob/living/carbon/human/target in target_list)
+		C.images += target.hud_list[SPECIALROLE_HUD]
+
+
+/*
 		else//If the silicon mob has no law datum, no inherent laws, or a law zero, add them to the hud.
 			var/mob/living/silicon/silicon_target = target
 			if(!silicon_target.laws||(silicon_target.laws&&(silicon_target.laws.zeroth||!silicon_target.laws.inherent.len))||silicon_target.mind.special_role=="traitor")
@@ -143,9 +143,9 @@ Works together with spawning an observer, noted above.
 					U.client.images += image(tempHud,silicon_target,"hudmalborg")
 				else
 					U.client.images += image(tempHud,silicon_target,"hudmalai")
-*/
-	return 1
-
+*/
+	return 1
+
 /mob/proc/ghostize(var/can_reenter_corpse = 1)
 	if(key)
 		var/mob/dead/observer/ghost = new(src)	//Transfer safety to observer spawning proc.
@@ -180,7 +180,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
 	if(NewLoc)
 		loc = NewLoc
 		for(var/obj/effect/step_trigger/S in NewLoc)
-			S.HasEntered(src)
+			S.Crossed(src)
 
 		return
 	loc = get_turf(src) //Get out of closets and such as a ghost
@@ -194,7 +194,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
 		x--
 
 	for(var/obj/effect/step_trigger/S in locate(x, y, z))	//<-- this is dumb
-		S.HasEntered(src)
+		S.Crossed(src)
 
 /mob/dead/observer/examine()
 	if(usr)
@@ -256,10 +256,10 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
 	set category = "Ghost"
 	set name = "Toggle AntagHUD"
 	set desc = "Toggles AntagHUD allowing you to see who is the antagonist"
-
-	if(!client)
-		return
-	var/mentor = is_mentor(usr.client)
+
+	if(!client)
+		return
+	var/mentor = is_mentor(usr.client)
 	if(!config.antag_hud_allowed && (!client.holder || mentor))
 		src << "\red Admins have disabled this for this round."
 		return
@@ -387,9 +387,9 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
 /mob/dead/observer/verb/analyze_air()
 	set name = "Analyze Air"
 	set category = "Ghost"
-	
+
 	if(!istype(usr, /mob/dead/observer)) return
-	
+
 	// Shamelessly copied from the Gas Analyzers
 	if (!( istype(usr.loc, /turf) ))
 		return
@@ -397,7 +397,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
 	var/datum/gas_mixture/environment = usr.loc.return_air()
 
 	var/pressure = environment.return_pressure()
-	var/total_moles = environment.total_moles()
+	var/total_moles = environment.total_moles
 
 	src << "\blue <B>Results:</B>"
 	if(abs(pressure - ONE_ATMOSPHERE) < 10)
@@ -405,33 +405,8 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
 	else
 		src << "\red Pressure: [round(pressure,0.1)] kPa"
 	if(total_moles)
-		var/o2_concentration = environment.oxygen/total_moles
-		var/n2_concentration = environment.nitrogen/total_moles
-		var/co2_concentration = environment.carbon_dioxide/total_moles
-		var/phoron_concentration = environment.phoron/total_moles
-
-		var/unknown_concentration =  1-(o2_concentration+n2_concentration+co2_concentration+phoron_concentration)
-		if(abs(n2_concentration - N2STANDARD) < 20)
-			src << "\blue Nitrogen: [round(n2_concentration*100)]% ([round(environment.nitrogen,0.01)] moles)"
-		else
-			src << "\red Nitrogen: [round(n2_concentration*100)]% ([round(environment.nitrogen,0.01)] moles)"
-
-		if(abs(o2_concentration - O2STANDARD) < 2)
-			src << "\blue Oxygen: [round(o2_concentration*100)]% ([round(environment.oxygen,0.01)] moles)"
-		else
-			src << "\red Oxygen: [round(o2_concentration*100)]% ([round(environment.oxygen,0.01)] moles)"
-
-		if(co2_concentration > 0.01)
-			src << "\red CO2: [round(co2_concentration*100)]% ([round(environment.carbon_dioxide,0.01)] moles)"
-		else
-			src << "\blue CO2: [round(co2_concentration*100)]% ([round(environment.carbon_dioxide,0.01)] moles)"
-
-		if(phoron_concentration > 0.01)
-			src << "\red Phoron: [round(phoron_concentration*100)]% ([round(environment.phoron,0.01)] moles)"
-
-		if(unknown_concentration > 0.01)
-			src << "\red Unknown: [round(unknown_concentration*100)]% ([round(unknown_concentration*total_moles,0.01)] moles)"
-
+		for(var/g in environment.gas)
+			src << "\blue [gas_data.name[g]]: [round((environment.gas[g] / total_moles) * 100)]% ([round(environment.gas[g], 0.01)] moles)"
 		src << "\blue Temperature: [round(environment.temperature-T0C,0.1)]&deg;C"
 		src << "\blue Heat Capacity: [round(environment.heat_capacity(),0.1)]"
 
@@ -572,4 +547,4 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
 		W.update_icon()
 		W.message = message
 		W.add_hiddenprint(src)
-		W.visible_message("\red Invisible fingers crudely paint something in blood on [T]...")
+		W.visible_message("\red Invisible fingers crudely paint something in blood on [T]...")

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

@@ -177,7 +177,7 @@
 
 		var/damage = rand(1, 3)
 
-		if(istype(M, /mob/living/carbon/slime/adult))
+		if(M.is_adult)
 			damage = rand(10, 40)
 		else
 			damage = rand(5, 35)

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

@@ -123,7 +123,7 @@
 						breath_moles = (ONE_ATMOSPHERE*BREATH_VOLUME/R_IDEAL_GAS_EQUATION*environment.temperature)
 					else*/
 						// Not enough air around, take a percentage of what's there to model this properly
-					breath_moles = environment.total_moles()*BREATH_PERCENTAGE
+					breath_moles = environment.total_moles*BREATH_PERCENTAGE
 
 					breath = loc.remove_air(breath_moles)
 
@@ -172,24 +172,24 @@
 			return 0
 
 		var/phoron_used = 0
-		var/breath_pressure = (breath.total_moles()*R_IDEAL_GAS_EQUATION*breath.temperature)/BREATH_VOLUME
+		var/breath_pressure = (breath.total_moles * R_IDEAL_GAS_EQUATION * breath.temperature) / BREATH_VOLUME
 
 		//Partial pressure of the phoron in our breath
-		var/Toxins_pp = (breath.phoron/breath.total_moles())*breath_pressure
+		var/Toxins_pp = (breath.gas["phoron"] / breath.total_moles) * breath_pressure
 
 		if(Toxins_pp) // Detect phoron in air
 
-			adjustToxLoss(breath.phoron*250)
+			adjustToxLoss(breath.gas["phoron"] * 250)
 			phoron_alert = max(phoron_alert, 1)
 
-			phoron_used = breath.phoron
+			phoron_used = breath.gas["phoron"]
 
 		else
 			phoron_alert = 0
 
 		//Breathe in phoron and out oxygen
-		breath.phoron -= phoron_used
-		breath.oxygen += phoron_used
+		breath.adjust_gas("phoron", -phoron_used)
+		breath.adjust_gas("oxygen", phoron_used)
 
 		if(breath.temperature > (T0C+66) && !(COLD_RESISTANCE in mutations)) // Hot air hurts :(
 			if(prob(20))

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

@@ -198,7 +198,7 @@
 
 		var/damage = rand(1, 3)
 
-		if(istype(src, /mob/living/carbon/slime/adult))
+		if(M.is_adult)
 			damage = rand(20, 40)
 		else
 			damage = rand(5, 35)

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

@@ -98,7 +98,7 @@
 						breath_moles = (ONE_ATMOSPHERE*BREATH_VOLUME/R_IDEAL_GAS_EQUATION*environment.temperature)
 					else*/
 						// Not enough air around, take a percentage of what's there to model this properly
-					breath_moles = environment.total_moles()*BREATH_PERCENTAGE
+					breath_moles = environment.total_moles*BREATH_PERCENTAGE
 
 					breath = loc.remove_air(breath_moles)
 
@@ -147,24 +147,24 @@
 			return 0
 
 		var/phoron_used = 0
-		var/breath_pressure = (breath.total_moles()*R_IDEAL_GAS_EQUATION*breath.temperature)/BREATH_VOLUME
+		var/breath_pressure = (breath.total_moles * R_IDEAL_GAS_EQUATION * breath.temperature) / BREATH_VOLUME
 
 		//Partial pressure of the phoron in our breath
-		var/Toxins_pp = (breath.phoron/breath.total_moles())*breath_pressure
+		var/Toxins_pp = (breath.gas["phoron"] / breath.total_moles) * breath_pressure
 
 		if(Toxins_pp) // Detect phoron in air
 
-			adjustToxLoss(breath.phoron*250)
+			adjustToxLoss(breath.gas["phoron"] * 250)
 			phoron_alert = max(phoron_alert, 1)
 
-			phoron_used = breath.phoron
+			phoron_used = breath.gas["phoron"]
 
 		else
 			phoron_alert = 0
 
 		//Breathe in phoron and out oxygen
-		breath.phoron -= phoron_used
-		breath.oxygen += phoron_used
+		breath.adjust_gas("phoron", -phoron_used)
+		breath.adjust_gas("oxygen", phoron_used)
 
 		if(breath.temperature > (T0C+66) && !(COLD_RESISTANCE in mutations)) // Hot air hurts :(
 			if(prob(20))

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

@@ -80,7 +80,7 @@ var/const/MAX_ACTIVE_TIME = 400
 /obj/item/clothing/mask/facehugger/equipped(mob/M)
 	Attach(M)
 
-/obj/item/clothing/mask/facehugger/HasEntered(atom/target)
+/obj/item/clothing/mask/facehugger/Crossed(atom/target)
 	HasProximity(target)
 	return
 

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

@@ -317,6 +317,16 @@
 		if(armor >= 2)	return
 
 
+/mob/living/carbon/human/proc/implant_loyalty(mob/living/carbon/human/M, override = FALSE) // Won't override by default.
+	if(!config.use_loyalty_implants && !override) return // Nuh-uh.
+
+	var/obj/item/weapon/implant/loyalty/L = new/obj/item/weapon/implant/loyalty(M)
+	L.imp_in = M
+	L.implanted = 1
+	var/datum/organ/external/affected = M.organs_by_name["head"]
+	affected.implants += L
+	L.part = affected
+
 /mob/living/carbon/human/proc/is_loyalty_implanted(mob/living/carbon/human/M)
 	for(var/L in M.contents)
 		if(istype(L, /obj/item/weapon/implant/loyalty))
@@ -336,7 +346,7 @@
 
 		var/damage = rand(1, 3)
 
-		if(istype(M, /mob/living/carbon/slime/adult))
+		if(M.is_adult)
 			damage = rand(10, 35)
 		else
 			damage = rand(5, 25)
@@ -440,7 +450,7 @@
 
 // called when something steps onto a human
 // this handles mulebots and vehicles
-/mob/living/carbon/human/HasEntered(var/atom/movable/AM)
+/mob/living/carbon/human/Crossed(var/atom/movable/AM)
 	if(istype(AM, /obj/machinery/bot/mulebot))
 		var/obj/machinery/bot/mulebot/MB = AM
 		MB.RunOver(src)

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

@@ -354,26 +354,15 @@
 						breath_moles = (ONE_ATMOSPHERE*BREATH_VOLUME/R_IDEAL_GAS_EQUATION*environment.temperature)
 					else*/
 						// Not enough air around, take a percentage of what's there to model this properly
-					breath_moles = environment.total_moles()*BREATH_PERCENTAGE
+					breath_moles = environment.total_moles*BREATH_PERCENTAGE
 
 					breath = loc.remove_air(breath_moles)
 
-					if(istype(wear_mask, /obj/item/clothing/mask/gas) && breath)
-						var/obj/item/clothing/mask/gas/G = wear_mask
-						var/datum/gas_mixture/filtered = new
-
-						filtered.copy_from(breath)
-						filtered.phoron *= G.gas_filter_strength
-						for(var/datum/gas/gas in filtered.trace_gases)
-							gas.moles *= G.gas_filter_strength
-						filtered.update_values()
+					if(istype(wear_mask, /obj/item/clothing/mask) && breath)
+						var/obj/item/clothing/mask/M = wear_mask
+						var/datum/gas_mixture/filtered = M.filter_air(breath)
 						loc.assume_air(filtered)
 
-						breath.phoron *= 1 - G.gas_filter_strength
-						for(var/datum/gas/gas in breath.trace_gases)
-							gas.moles *= 1 - G.gas_filter_strength
-						breath.update_values()
-
 					if(!is_lung_ruptured())
 						if(!breath || breath.total_moles < BREATH_MOLES / 5 || breath.total_moles > BREATH_MOLES * 5)
 							if(prob(5))
@@ -436,7 +425,7 @@
 		if(status_flags & GODMODE)
 			return
 
-		if(!breath || (breath.total_moles() == 0) || suiciding)
+		if(!breath || (breath.total_moles == 0) || suiciding)
 			if(suiciding)
 				adjustOxyLoss(2)//If you are suiciding, you should die a little bit faster
 				failed_last_breath = 1
@@ -461,51 +450,41 @@
 		var/SA_sleep_min = 5
 		var/inhaled_gas_used = 0
 
-		var/breath_pressure = (breath.total_moles()*R_IDEAL_GAS_EQUATION*breath.temperature)/BREATH_VOLUME
+		var/breath_pressure = (breath.total_moles*R_IDEAL_GAS_EQUATION*breath.temperature)/BREATH_VOLUME
 
 		var/inhaling
-		var/exhaling
 		var/poison
+		var/exhaling
 		var/no_exhale
 
+		var/breath_type
+		var/poison_type
+		var/exhale_type
+
 		var/failed_inhale = 0
 		var/failed_exhale = 0
 
-		switch(species.breath_type)
-			if("nitrogen")
-				inhaling = breath.nitrogen
-			if("phoron")
-				inhaling = breath.phoron
-			if("carbon_dioxide")
-				inhaling = breath.carbon_dioxide
-			else
-				inhaling = breath.oxygen
+		if(species.breath_type)
+			breath_type = species.breath_type
+			inhaling = breath.gas[breath_type]
+		else
+			inhaling = "oxygen"
 
-		switch(species.poison_type)
-			if("oxygen")
-				poison = breath.oxygen
-			if("nitrogen")
-				poison = breath.nitrogen
-			if("carbon_dioxide")
-				poison = breath.carbon_dioxide
-			else
-				poison = breath.phoron
+		if(species.poison_type)
+			poison_type = species.poison_type
+			poison = breath.gas[poison_type]
+		else
+			poison = "phoron"
 
-		switch(species.exhale_type)
-			if("carbon_dioxide")
-				exhaling = breath.carbon_dioxide
-			if("oxygen")
-				exhaling = breath.oxygen
-			if("nitrogen")
-				exhaling = breath.nitrogen
-			if("phoron")
-				exhaling = breath.phoron
-			else
-				no_exhale = 1
+		if(species.exhale_type)
+			exhale_type = species.exhale_type
+			exhaling = breath.gas[exhale_type]
+		else
+			no_exhale = 1
 
-		var/inhale_pp = (inhaling/breath.total_moles())*breath_pressure
-		var/toxins_pp = (poison/breath.total_moles())*breath_pressure
-		var/exhaled_pp = (exhaling/breath.total_moles())*breath_pressure
+		var/inhale_pp = (inhaling/breath.total_moles)*breath_pressure
+		var/toxins_pp = (poison/breath.total_moles)*breath_pressure
+		var/exhaled_pp = (exhaling/breath.total_moles)*breath_pressure
 
 		// Not enough to breathe
 		if(inhale_pp < safe_pressure_min)
@@ -532,32 +511,16 @@
 			inhaled_gas_used = inhaling/6
 			oxygen_alert = 0
 
-		switch(species.breath_type)
-			if("nitrogen")
-				breath.nitrogen -= inhaled_gas_used
-			if("phoron")
-				breath.phoron -= inhaled_gas_used
-			if("carbon_dioxide")
-				breath.carbon_dioxide-= inhaled_gas_used
-			else
-				breath.oxygen -= inhaled_gas_used
+		breath.adjust_gas(breath_type, -inhaled_gas_used)
 
 		if(!no_exhale)
-			switch(species.exhale_type)
-				if("oxygen")
-					breath.oxygen += inhaled_gas_used
-				if("nitrogen")
-					breath.nitrogen += inhaled_gas_used
-				if("phoron")
-					breath.phoron += inhaled_gas_used
-				if("CO2")
-					breath.carbon_dioxide += inhaled_gas_used
+			breath.adjust_gas(exhale_type, inhaled_gas_used)
 
 		// Too much exhaled gas in the air
 		if(exhaled_pp > safe_exhaled_max)
 			if (!co2_alert|| prob(15))
 				var/word = pick("extremely dizzy","short of breath","faint","confused")
-				src << "\red <b>You feel [word].</b>"
+				src << "<span class='danger'>You feel [word].</span>"
 
 			adjustOxyLoss(HUMAN_MAX_OXYLOSS)
 			co2_alert = 1
@@ -566,7 +529,7 @@
 		else if(exhaled_pp > safe_exhaled_max * 0.7)
 			if (!co2_alert || prob(1))
 				var/word = pick("dizzy","short of breath","faint","momentarily confused")
-				src << "\red You feel [word]."
+				src << "<span class='warning>You feel [word].</span>"
 
 			//scale linearly from 0 to 1 between safe_exhaled_max and safe_exhaled_max*0.7
 			var/ratio = 1.0 - (safe_exhaled_max - exhaled_pp)/(safe_exhaled_max*0.3)
@@ -580,7 +543,7 @@
 		else if(exhaled_pp > safe_exhaled_max * 0.6)
 			if (prob(0.3))
 				var/word = pick("a little dizzy","short of breath")
-				src << "\red You feel [word]."
+				src << "<span class='warning>You feel [word].</span>"
 
 		else
 			co2_alert = 0
@@ -594,26 +557,27 @@
 		else
 			phoron_alert = 0
 
+
+
 		// If there's some other shit in the air lets deal with it here.
-		if(breath.trace_gases.len)
-			for(var/datum/gas/sleeping_agent/SA in breath.trace_gases)
-				var/SA_pp = (SA.moles/breath.total_moles())*breath_pressure
+		if(breath.gas["sleeping_agent"])
+			var/SA_pp = (breath.gas["sleeping_agent"] / breath.total_moles) * breath_pressure
 
-				// Enough to make us paralysed for a bit
-				if(SA_pp > SA_para_min)
+			// Enough to make us paralysed for a bit
+			if(SA_pp > SA_para_min)
 
-					// 3 gives them one second to wake up and run away a bit!
-					Paralyse(3)
+				// 3 gives them one second to wake up and run away a bit!
+				Paralyse(3)
 
-					// Enough to make us sleep as well
-					if(SA_pp > SA_sleep_min)
-						sleeping = min(sleeping+2, 10)
+				// Enough to make us sleep as well
+				if(SA_pp > SA_sleep_min)
+					sleeping = min(sleeping+2, 10)
 
-				// There is sleeping gas in their lungs, but only a little, so give them a bit of a warning
-				else if(SA_pp > 0.15)
-					if(prob(20))
-						spawn(0) emote(pick("giggle", "laugh"))
-				SA.moles = 0
+			// There is sleeping gas in their lungs, but only a little, so give them a bit of a warning
+			else if(SA_pp > 0.15)
+				if(prob(20))
+					spawn(0) emote(pick("giggle", "laugh"))
+			breath.adjust_gas("sleeping_agent", -breath.gas["sleeping_agent"])
 
 		// Were we able to breathe?
 		if (failed_inhale || failed_exhale)
@@ -630,10 +594,10 @@
 
 			if(breath.temperature < species.cold_level_1)
 				if(prob(20))
-					src << "\red You feel your face freezing and icicles forming in your lungs!"
+					src << "<span class='danger'>You feel your face freezing and icicles forming in your lungs!</span>"
 			else if(breath.temperature > species.heat_level_1)
 				if(prob(20))
-					src << "\red You feel your face burning and a searing heat in your lungs!"
+					src << "<span class='danger'>You feel your face burning and a searing heat in your lungs!</span>"
 
 			switch(breath.temperature)
 				if(-INFINITY to species.cold_level_3)
@@ -662,7 +626,7 @@
 			else
 				temp_adj /= (BODYTEMP_HEAT_DIVISOR * 5)	//don't raise temperature as much as if we were directly exposed
 
-			var/relative_density = breath.total_moles() / (MOLES_CELLSTANDARD * BREATH_PERCENTAGE)
+			var/relative_density = breath.total_moles / (MOLES_CELLSTANDARD * BREATH_PERCENTAGE)
 			temp_adj *= relative_density
 
 			if (temp_adj > BODYTEMP_HEATING_MAX) temp_adj = BODYTEMP_HEATING_MAX
@@ -689,7 +653,7 @@
 			else
 				loc_temp = environment.temperature
 
-			if(adjusted_pressure < species.warning_high_pressure && adjusted_pressure > species.warning_low_pressure && abs(loc_temp - bodytemperature) < 20 && bodytemperature < species.heat_level_1 && bodytemperature > species.cold_level_1 && environment.phoron < MOLES_PHORON_VISIBLE)
+			if(adjusted_pressure < species.warning_high_pressure && adjusted_pressure > species.warning_low_pressure && abs(loc_temp - bodytemperature) < 20 && bodytemperature < species.heat_level_1 && bodytemperature > species.cold_level_1)
 				pressure_alert = 0
 				return // Temperatures are within normal ranges, fuck all this processing. ~Ccomp
 
@@ -705,7 +669,7 @@
 					temp_adj = (1-thermal_protection) * ((loc_temp - bodytemperature) / BODYTEMP_HEAT_DIVISOR)
 
 			//Use heat transfer as proportional to the gas density. However, we only care about the relative density vs standard 101 kPa/20 C air. Therefore we can use mole ratios
-			var/relative_density = environment.total_moles() / MOLES_CELLSTANDARD
+			var/relative_density = environment.total_moles / MOLES_CELLSTANDARD
 			temp_adj *= relative_density
 
 			if (temp_adj > BODYTEMP_HEATING_MAX) temp_adj = BODYTEMP_HEATING_MAX
@@ -765,8 +729,10 @@
 			else
 				pressure_alert = -1
 
-		if(environment.phoron > MOLES_PHORON_VISIBLE)
-			pl_effects()
+		for(var/g in environment.gas)
+			if(gas_data.flags[g] & XGM_GAS_CONTAMINANT && environment.gas[g] > gas_data.overlay_limit[g] + 1)
+				pl_effects()
+				break
 		return
 
 	/*

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

@@ -1,23 +1,28 @@
 /mob/living/carbon/slime/death(gibbed)
+	if(!gibbed)
+		if(is_adult)
+			var/mob/living/carbon/slime/M = new /mob/living/carbon/slime(loc)
+			M.colour = colour
+			M.rabid = 1
+			is_adult = 0
+			maxHealth = 150
+			revive()
+			regenerate_icons()
+			number = rand(1, 1000)
+			name = "[colour] [is_adult ? "adult" : "baby"] slime ([number])"
+			return
+
 	if(stat == DEAD)	return
 	stat = DEAD
 	icon_state = "[colour] baby slime dead"
-
-	if(!gibbed)
-		if(istype(src, /mob/living/carbon/slime/adult))
-			ghostize()
-			var/mob/living/carbon/slime/M1 = new primarytype(loc)
-			M1.rabid = 1
-			var/mob/living/carbon/slime/M2 = new primarytype(loc)
-			M2.rabid = 1
-			if(src)	del(src)
-		else
-			for(var/mob/O in viewers(src, null))
-				O.show_message("<b>The [name]</b> seizes up and falls limp...", 1) //ded -- Urist
+	overlays.len = 0
+	for(var/mob/O in viewers(src, null))
+		O.show_message("<b>The [name]</b> seizes up and falls limp...", 1) //ded -- Urist
 
 	update_canmove()
 	if(blind)	blind.layer = 0
 
-	ticker.mode.check_win()
+	if(ticker && ticker.mode)
+		ticker.mode.check_win()
 
 	return ..(gibbed)

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

@@ -1,4 +1,4 @@
-/mob/living/carbon/slime/emote(var/act,var/m_type=1,var/message = null)
+/mob/living/carbon/slime/emote(var/act, var/m_type=1, var/message = null)
 
 
 	if (findtext(act, "-", 1, null))
@@ -9,7 +9,7 @@
 	if(findtext(act,"s",-1) && !findtext(act,"_",-2))//Removes ending s's unless they are prefixed with a '_'
 		act = copytext(act,1,length(act))
 
-	switch(act)
+	switch(act) //Alphabetical please
 		if ("me")
 			if(silent)
 				return
@@ -19,40 +19,51 @@
 					return
 				if (src.client.handle_spam_prevention(message,MUTE_IC))
 					return
-			if (stat)
-				return
-			if(!(message))
-				return
-			return custom_emote(m_type, message)
-
-		if ("custom")
-			return custom_emote(m_type, message)
-		if("moan")
-			message = "<B>The [src.name]</B> moans."
-			m_type = 2
-		if("shiver")
-			message = "<B>The [src.name]</B> shivers."
-			m_type = 2
-		if("sway")
-			message = "<B>The [src.name]</B> sways around dizzily."
-			m_type = 1
-		if("twitch")
-			message = "<B>The [src.name]</B> twitches."
-			m_type = 1
-		if("vibrate")
-			message = "<B>The [src.name]</B> vibrates!"
-			m_type = 1
-		if("light")
-			message = "<B>The [src.name]</B> lights up for a bit, then stops."
-			m_type = 1
-		if("jiggle")
-			message = "<B>The [src.name]</B> jiggles!"
-			m_type = 1
+				if (stat)
+					return
+				if(!(message))
+					return
+				return custom_emote(m_type, message)
 		if("bounce")
 			message = "<B>The [src.name]</B> bounces in place."
 			m_type = 1
+
+		if ("custom")
+			return custom_emote(m_type, message)
+
+		if("jiggle")
+			message = "<B>The [src.name]</B> jiggles!"
+			m_type = 1
+
+		if("light")
+			message = "<B>The [src.name]</B> lights up for a bit, then stops."
+			m_type = 1
+
+		if("moan")
+			message = "<B>The [src.name]</B> moans."
+			m_type = 2
+
+		if("shiver")
+			message = "<B>The [src.name]</B> shivers."
+			m_type = 2
+
+		if("sway")
+			message = "<B>The [src.name]</B> sways around dizzily."
+			m_type = 1
+
+		if("twitch")
+			message = "<B>The [src.name]</B> twitches."
+			m_type = 1
+
+		if("vibrate")
+			message = "<B>The [src.name]</B> vibrates!"
+			m_type = 1
+
+		if ("help") //This is an exception
+			src << "Help for slime emotes. You can use these emotes with say \"*emote\":\n\nbounce, custom, jiggle, light, moan, shiver, sway, twitch, vibrate"
+
 		else
-			src << text("Invalid Emote: []", act)
+			src << "\blue Unusable emote '[act]'. Say *help for a list."
 	if ((message && src.stat == 0))
 		if (m_type & 1)
 			for(var/mob/O in viewers(src, null))

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

@@ -1,4 +1,2 @@
-
 /mob/living/carbon/slime/proc/regular_hud_updates()
-	return
-
+	return

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

@@ -1,3 +1,10 @@
+/mob/living/carbon/slime
+	var/AIproc = 0 // determines if the AI loop is activated
+	var/Atkcool = 0 // attack cooldown
+	var/Tempstun = 0 // temporary temperature stuns
+	var/Discipline = 0 // if a slime has been hit with a freeze gun, or wrestled/attacked off a human, they become disciplined and don't attack anymore for a while
+	var/SStun = 0 // stun variable
+
 /mob/living/carbon/slime/Life()
 	set invisibility = 0
 	set background = 1
@@ -15,114 +22,80 @@
 
 		handle_targets()
 
+		if (!ckey)
+			handle_speech_and_mood()
 
-	var/datum/gas_mixture/environment // Added to prevent null location errors-- TLE
+	var/datum/gas_mixture/environment
 	if(src.loc)
 		environment = loc.return_air()
 
-
 	//Apparently, the person who wrote this code designed it so that
 	//blinded get reset each cycle and then get activated later in the
 	//code. Very ugly. I dont care. Moving this stuff here so its easy
 	//to find it.
 	src.blinded = null
 
-	// Basically just deletes any screen objects :<
-	regular_hud_updates()
+	regular_hud_updates() // Basically just deletes any screen objects :<
 
-	//Handle temperature/pressure differences between body and environment
 	if(environment)
-		handle_environment(environment)
+		handle_environment(environment) // Handle temperature/pressure differences between body and environment
 
-	//Status updates, death etc.
-	handle_regular_status_updates()
-
-
-
-
-
-/mob/living/carbon/slime
-	var/AIproc = 0 // determines if the AI loop is activated
-	var/Atkcool = 0 // attack cooldown
-	var/Tempstun = 0 // temporary temperature stuns
-	var/Discipline = 0 // if a slime has been hit with a freeze gun, or wrestled/attacked off a human, they become disciplined and don't attack anymore for a while
-	var/SStun = 0 // stun variable
+	handle_regular_status_updates() // Status updates, death etc.
 
 /mob/living/carbon/slime/proc/AIprocess()  // the master AI process
 
-	//world << "AI proc started."
 	if(AIproc || stat == DEAD || client) return
 
 	var/hungry = 0
-	var/starving = 0
-	if(istype(src, /mob/living/carbon/slime/adult))
-		switch(nutrition)
-			if(400 to 1100) hungry = 1
-			if(0 to 399)
-				starving = 1
-	else
-		switch(nutrition)
-			if(150 to 900) hungry = 1
-			if(0 to 149) starving = 1
+	if (nutrition < get_starve_nutrition())
+		hungry = 2
+	else if (nutrition < get_grow_nutrition() && prob(25) || nutrition < get_hunger_nutrition())
+		hungry = 1
+
 	AIproc = 1
-	//world << "AIproc [AIproc] && stat != 2 [stat] && (attacked > 0 [attacked] || starving [starving] || hungry [hungry] || rabid [rabid] || Victim [Victim] || Target [Target]"
-	while(AIproc && stat != 2 && (attacked > 0 || starving || hungry || rabid || Victim))
+
+	while(AIproc && stat != 2 && (attacked || hungry || rabid || Victim))
 		if(Victim) // can't eat AND have this little process at the same time
-			//world << "break 1"
 			break
 
 		if(!Target || client)
-			//world << "break 2"
 			break
 
-
 		if(Target.health <= -70 || Target.stat == 2)
 			Target = null
 			AIproc = 0
-			//world << "break 3"
 			break
 
 		if(Target)
-			//world << "[Target] Target Found"
 			for(var/mob/living/carbon/slime/M in view(1,Target))
 				if(M.Victim == Target)
 					Target = null
 					AIproc = 0
-					//world << "break 4"
 					break
 			if(!AIproc)
-				//world << "break 5"
 				break
 
 			if(Target in view(1,src))
-
 				if(istype(Target, /mob/living/silicon))
 					if(!Atkcool)
-						spawn()
-							Atkcool = 1
-							sleep(15)
+						Atkcool = 1
+						spawn(45)
 							Atkcool = 0
 
 						if(Target.Adjacent(src))
 							Target.attack_slime(src)
-					//world << "retrun 1"
 					return
 				if(!Target.lying && prob(80))
 
 					if(Target.client && Target.health >= 20)
 						if(!Atkcool)
-							spawn()
-								Atkcool = 1
-								sleep(25)
+							Atkcool = 1
+							spawn(45)
 								Atkcool = 0
 
 							if(Target.Adjacent(src))
 								Target.attack_slime(src)
 
-
-						if(prob(30))
-							step_to(src, Target)
-
 					else
 						if(!Atkcool && Target.Adjacent(src))
 							Feedon(Target)
@@ -133,13 +106,13 @@
 
 			else
 				if(Target in view(7, src))
-					if(Target.Adjacent(src))
+					if(!Target.Adjacent(src)) // Bug of the month candidate: slimes were attempting to move to target only if it was directly next to them, which caused them to target things, but not approach them
 						step_to(src, Target)
+						sleep(5)
 
 				else
 					Target = null
 					AIproc = 0
-					//world << "break 6"
 					break
 
 		var/sleeptime = movement_delay()
@@ -148,7 +121,6 @@
 		sleep(sleeptime + 2) // this is about as fast as a player slime can go
 
 	AIproc = 0
-	//world << "AI proc ended."
 
 /mob/living/carbon/slime/proc/handle_environment(datum/gas_mixture/environment)
 	if(!environment)
@@ -166,28 +138,11 @@
 	else
 		loc_temp = environment.temperature
 
-	/*
-	if((environment.temperature > (T0C + 50)) || (environment.temperature < (T0C + 10)))
-		var/transfer_coefficient
-
-		transfer_coefficient = 1
-		if(wear_mask && (wear_mask.body_parts_covered & HEAD) && (environment.temperature < wear_mask.protective_temperature))
-			transfer_coefficient *= wear_mask.heat_transfer_coefficient
-
-		// handle_temperature_damage(HEAD, environment.temperature, environment_heat_capacity*transfer_coefficient)
-	*/
-
-
 	if(loc_temp < 310.15) // a cold place
 		bodytemperature += adjust_body_temperature(bodytemperature, loc_temp, 1)
 	else // a hot place
 		bodytemperature += adjust_body_temperature(bodytemperature, loc_temp, 1)
 
-	/*
-	if(stat==2)
-		bodytemperature += 0.1*(environment.temperature - bodytemperature)*environment_heat_capacity/(environment_heat_capacity + 270000)
-
-	*/
 	//Account for massive pressure differences
 
 	if(bodytemperature < (T0C + 5)) // start calculating temperature damage etc
@@ -207,7 +162,6 @@
 
 	return //TODO: DEFERRED
 
-
 /mob/living/carbon/slime/proc/adjust_body_temperature(current, loc_temp, boost)
 	var/temperature = current
 	var/difference = abs(current-loc_temp)	//get difference
@@ -229,33 +183,28 @@
 
 	if(reagents) reagents.metabolize(src)
 
-
 	src.updatehealth()
 
 	return //TODO: DEFERRED
 
-
 /mob/living/carbon/slime/proc/handle_regular_status_updates()
 
-	if(istype(src, /mob/living/carbon/slime/adult))
+	if(is_adult)
 		health = 200 - (getOxyLoss() + getToxLoss() + getFireLoss() + getBruteLoss() + getCloneLoss())
 	else
 		health = 150 - (getOxyLoss() + getToxLoss() + getFireLoss() + getBruteLoss() + getCloneLoss())
 
-
-
-
 	if(health < config.health_threshold_dead && stat != 2)
 		death()
 		return
 
 	else if(src.health < config.health_threshold_crit)
-		// if(src.health <= 20 && prob(1)) spawn(0) emote("gasp")
 
-		//if(!src.rejuv) src.oxyloss++
-		if(!src.reagents.has_reagent("inaprovaline")) src.adjustOxyLoss(10)
+		if(!src.reagents.has_reagent("inaprovaline"))
+			src.adjustOxyLoss(10)
 
-		if(src.stat != DEAD)	src.stat = UNCONSCIOUS
+		if(src.stat != DEAD)
+			src.stat = UNCONSCIOUS
 
 	if(prob(30))
 		adjustOxyLoss(-1)
@@ -264,12 +213,9 @@
 		adjustCloneLoss(-1)
 		adjustBruteLoss(-1)
 
-
 	if (src.stat == DEAD)
-
 		src.lying = 1
 		src.blinded = 1
-
 	else
 		if (src.paralysis || src.stunned || src.weakened || (status_flags && FAKEDEATH)) //Stunned etc.
 			if (src.stunned > 0)
@@ -314,89 +260,25 @@
 
 	return 1
 
-
 /mob/living/carbon/slime/proc/handle_nutrition()
 
-	if(prob(20))
-		if(istype(src, /mob/living/carbon/slime/adult)) nutrition-=rand(4,6)
-		else nutrition-=rand(2,3)
+	if (prob(15))
+		nutrition -= 1 + is_adult
 
 	if(nutrition <= 0)
 		nutrition = 0
 		if(prob(75))
-
 			adjustToxLoss(rand(0,5))
 
-	else
-		if(istype(src, /mob/living/carbon/slime/adult))
-			if(nutrition >= 1000)
-				if(prob(40)) amount_grown++
+	else if (nutrition >= get_grow_nutrition() && amount_grown < 10)
+		nutrition -= 20
+		amount_grown++
 
+	if(amount_grown >= 10 && !Victim && !Target && !ckey)
+		if(is_adult)
+			Reproduce()
 		else
-			if(nutrition >= 800)
-				if(prob(40)) amount_grown++
-
-	if(amount_grown >= 10 && !Victim && !Target)
-		if(istype(src, /mob/living/carbon/slime/adult))
-			if(!client)
-				for(var/i=1,i<=4,i++)
-					if(prob(70))
-						var/mob/living/carbon/slime/M = new primarytype(loc)
-						M.powerlevel = round(powerlevel/4)
-						M.Friends = Friends
-						M.tame = tame
-						M.rabid = rabid
-						M.Discipline = Discipline
-						if(i != 1) step_away(M,src)
-					else
-						var/mutations = pick("one","two","three","four")
-						switch(mutations)
-							if("one")
-								var/mob/living/carbon/slime/M = new mutationone(loc)
-								M.powerlevel = round(powerlevel/4)
-								M.Friends = Friends
-								M.tame = tame
-								M.rabid = rabid
-								M.Discipline = Discipline
-								if(i != 1) step_away(M,src)
-							if("two")
-								var/mob/living/carbon/slime/M = new mutationtwo(loc)
-								M.powerlevel = round(powerlevel/4)
-								M.Friends = Friends
-								M.tame = tame
-								M.rabid = rabid
-								M.Discipline = Discipline
-								if(i != 1) step_away(M,src)
-							if("three")
-								var/mob/living/carbon/slime/M = new mutationthree(loc)
-								M.powerlevel = round(powerlevel/4)
-								M.Friends = Friends
-								M.tame = tame
-								M.rabid = rabid
-								M.Discipline = Discipline
-								if(i != 1) step_away(M,src)
-							if("four")
-								var/mob/living/carbon/slime/M = new mutationfour(loc)
-								M.powerlevel = round(powerlevel/4)
-								M.Friends = Friends
-								M.tame = tame
-								M.rabid = rabid
-								M.Discipline = Discipline
-								if(i != 1) step_away(M,src)
-
-				del(src)
-
-		else
-			if(!client)
-				var/mob/living/carbon/slime/adult/A = new adulttype(src.loc)
-				A.nutrition = nutrition
-//				A.nutrition += 100
-				A.powerlevel = max(0, powerlevel-1)
-				A.Friends = Friends
-				A.tame = tame
-				A.rabid = rabid
-				del(src)
-
+			Evolve()
 
 /mob/living/carbon/slime/proc/handle_targets()
 	if(Tempstun)
@@ -408,8 +290,7 @@
 	if(attacked > 50) attacked = 50
 
 	if(attacked > 0)
-		if(prob(85))
-			attacked--
+		attacked--
 
 	if(Discipline > 0)
 
@@ -419,136 +300,278 @@
 		if(prob(10))
 			Discipline--
 
-
 	if(!client)
-
 		if(!canmove) return
 
-		// DO AI STUFF HERE
-
-		if(Target)
-			if(attacked <= 0)
-				Target = null
-
 		if(Victim) return // if it's eating someone already, continue eating!
 
-
-		if(prob(1))
-			emote(pick("bounce","sway","light","vibrate","jiggle"))
+		if(Target)
+			--target_patience
+			if (target_patience <= 0 || SStun || Discipline || attacked) // Tired of chasing or something draws out attention
+				target_patience = 0
+				Target = null
 
 		if(AIproc && SStun) return
 
-
 		var/hungry = 0 // determines if the slime is hungry
-		var/starving = 0 // determines if the slime is starving-hungry
-		if(istype(src, /mob/living/carbon/slime/adult)) // 1200 max nutrition
-			switch(nutrition)
-				if(601 to 900)
-					if(prob(25)) hungry = 1//Ensures they continue eating, but aren't as aggressive at the same time
-				if(301 to 600) hungry = 1
-				if(0 to 300)
-					starving = 1
 
-		else
-			switch(nutrition)			// 1000 max nutrition
-				if(501 to 700)
-					if(prob(25)) hungry = 1
-				if(201 to 500) hungry = 1
-				if(0 to 200) starving = 1
+		if (nutrition < get_starve_nutrition())
+			hungry = 2
+		else if (nutrition < get_grow_nutrition() && prob(25) || nutrition < get_hunger_nutrition())
+			hungry = 1
 
-
-		if(starving && !client) // if a slime is starving, it starts losing its friends
+		if(hungry == 2 && !client) // if a slime is starving, it starts losing its friends
 			if(Friends.len > 0 && prob(1))
 				var/mob/nofriend = pick(Friends)
-				Friends -= nofriend
+				--Friends[nofriend]
 
 		if(!Target)
-			var/list/targets = list()
+			if(will_hunt() && hungry || attacked || rabid) // Only add to the list if we need to
+				var/list/targets = list()
 
-			if(hungry || starving) //Only add to the list if we need to
 				for(var/mob/living/L in view(7,src))
 
-					//Ignore other slimes, dead mobs and simple_animals
-					if(isslime(L) || L.stat != CONSCIOUS || isanimal(L))
+					if(isslime(L) || L.stat == DEAD) // Ignore other slimes and dead mobs
 						continue
 
-					if(issilicon(L))
-						if(!istype(src, /mob/living/carbon/slime/adult)) //Non-starving diciplined adult slimes wont eat things
-							if(!starving && Discipline > 0)
+					if(L in Friends) // No eating friends!
+						continue
+
+					if(issilicon(L) && (rabid || attacked)) // They can't eat silicons, but they can glomp them in defence
+						targets += L // Possible target found!
+
+					if(istype(L, /mob/living/carbon/human) && dna) //Ignore slime(wo)men
+						var/mob/living/carbon/human/H = L
+						if(H.dna)
+							if(H.dna.mutantrace == "slime")
 								continue
 
-						if(tame) //Tame slimes ignore electronic life
+					if(!L.canmove) // Only one slime can latch on at a time.
+						var/notarget = 0
+						for(var/mob/living/carbon/slime/M in view(1,L))
+							if(M.Victim == L)
+								notarget = 1
+						if(notarget)
 							continue
 
-						targets += L //Possible target found!
+					targets += L // Possible target found!
 
-					else if(iscarbon(L))
-
-						if(istype(L, /mob/living/carbon/human)) //Ignore slime(wo)men
-							var/mob/living/carbon/human/H = L
-							if(H.dna)
-								if(H.dna.mutantrace == "slime")
-									continue
-
-						if(!istype(src, /mob/living/carbon/slime/adult)) //Non-starving diciplined adult slimes wont eat things
-							if(!starving && Discipline > 0)
-								continue
-
-						if(L in Friends) //No eating friends!
-							continue
-
-						if(tame && ishuman(L)) //Tame slimes dont eat people.
-							continue
-
-						if(!L.canmove) //Only one slime can latch on at a time.
-
-							var/notarget = 0
-							for(var/mob/living/carbon/slime/M in view(1,L))
-								if(M.Victim == L)
-									notarget = 1
-							if(notarget)
-								continue
-
-						targets += L //Possible target found!
-
-
-
-			if((hungry || starving) && targets.len > 0)
-				if(!istype(src, /mob/living/carbon/slime/adult))
-					if(!starving)
+				if(targets.len > 0)
+					if(attacked || rabid || hungry == 2)
+						Target = targets[1] // I am attacked and am fighting back or so hungry I don't even care
+					else
 						for(var/mob/living/carbon/C in targets)
 							if(!Discipline && prob(5))
-								if(ishuman(C))
-									Target = C
-									break
-								if(isalienadult(C))
+								if(ishuman(C) || isalienadult(C))
 									Target = C
 									break
 
-							if(islarva(C))
+							if(islarva(C) || ismonkey(C))
 								Target = C
 								break
-							if(ismonkey(C))
-								Target = C
-								break
-					else
-						Target = targets[1]
-				else
-					Target = targets[1] // closest target
 
-			if(targets.len > 0)
-				if(attacked > 0 || rabid)
-					Target = targets[1] //closest mob probably attacked it, so override Target and attack the nearest!
+			if (Target)
+				target_patience = rand(5,7)
+				if (is_adult)
+					target_patience += 3
 
+		if(!Target) // If we have no target, we are wandering or following orders
+			if (Leader)
+				if (holding_still)
+					holding_still = max(holding_still - 1, 0)
+				else if(canmove && isturf(loc))
+					step_to(src, Leader)
 
-		if(!Target)
-			if(hungry || starving)
-				if(canmove && isturf(loc) && prob(50))
+			else if(hungry)
+				if (holding_still)
+					holding_still = max(holding_still - hungry, 0)
+				else if(canmove && isturf(loc) && prob(50))
 					step(src, pick(cardinal))
 
 			else
-				if(canmove && isturf(loc) && prob(33))
+				if (holding_still)
+					holding_still = max(holding_still - 1, 0)
+				else if(canmove && isturf(loc) && prob(33))
 					step(src, pick(cardinal))
-		else
-			if(!AIproc)
-				spawn() AIprocess()
+		else if(!AIproc)
+			spawn()
+				AIprocess()
+
+/mob/living/carbon/slime/proc/handle_speech_and_mood()
+	//Mood starts here
+	var/newmood = ""
+	if (rabid || attacked) newmood = "angry"
+	else if (Target) newmood = "mischevous"
+
+	if (!newmood)
+		if (Discipline && prob(25))
+			newmood = "pout"
+		else if (prob(1))
+			newmood = pick("sad", ":3", "pout")
+
+	if ((mood == "sad" || mood == ":3" || mood == "pout") && !newmood)
+		if (prob(75)) newmood = mood
+
+	if (newmood != mood) // This is so we don't redraw them every time
+		mood = newmood
+		regenerate_icons()
+
+	//Speech understanding starts here
+	var/to_say
+	if (speech_buffer.len > 0)
+		var/who = speech_buffer[1] // Who said it?
+		var/phrase = speech_buffer[2] // What did they say?
+		if ((findtext(phrase, num2text(number)) || findtext(phrase, "slimes"))) // Talking to us
+			if (findtext(phrase, "hello") || findtext(phrase, "hi"))
+				to_say = pick("Hello...", "Hi...")
+			else if (findtext(phrase, "follow"))
+				if (Leader)
+					if (Leader == who) // Already following him
+						to_say = pick("Yes...", "Lead...", "Following...")
+					else if (Friends[who] > Friends[Leader]) // VIVA
+						Leader = who
+						to_say = "Yes... I follow [who]..."
+					else
+						to_say = "No... I follow [Leader]..."
+				else
+					if (Friends[who] > 2)
+						Leader = who
+						to_say = "I follow..."
+					else // Not friendly enough
+						to_say = pick("No...", "I won't follow...")
+			else if (findtext(phrase, "stop"))
+				if (Victim) // We are asked to stop feeding
+					if (Friends[who] > 4)
+						Victim = null
+						Target = null
+						if (Friends[who] < 7)
+							--Friends[who]
+							to_say = "Grrr..." // I'm angry but I do it
+						else
+							to_say = "Fine..."
+				else if (Target) // We are asked to stop chasing
+					if (Friends[who] > 3)
+						Target = null
+						if (Friends[who] < 6)
+							--Friends[who]
+							to_say = "Grrr..." // I'm angry but I do it
+						else
+							to_say = "Fine..."
+				else if (Leader) // We are asked to stop following
+					if (Leader == who)
+						to_say = "Yes... I'll stay..."
+						Leader = null
+					else
+						if (Friends[who] > Friends[Leader])
+							Leader = null
+							to_say = "Yes... I'll stop..."
+						else
+							to_say = "No... I'll keep following..."
+			else if (findtext(phrase, "stay"))
+				if (Leader)
+					if (Leader == who)
+						holding_still = Friends[who] * 10
+						to_say = "Yes... Staying..."
+					else if (Friends[who] > Friends[Leader])
+						holding_still = (Friends[who] - Friends[Leader]) * 10
+						to_say = "Yes... Staying..."
+					else
+						to_say = "No... I'll keep following..."
+				else
+					if (Friends[who] > 2)
+						holding_still = Friends[who] * 10
+						to_say = "Yes... Staying..."
+					else
+						to_say = "No... I won't stay..."
+		speech_buffer = list()
+
+	//Speech starts here
+	if (to_say)
+		say (to_say)
+	else if(prob(1))
+		emote(pick("bounce","sway","light","vibrate","jiggle"))
+	else
+		var/t = 10
+		var/slimes_near = -1 // Don't count myself
+		var/dead_slimes = 0
+		var/friends_near = list()
+		for (var/mob/living/carbon/M in view(7,src))
+			if (isslime(M))
+				++slimes_near
+				if (M.stat == DEAD)
+					++dead_slimes
+			if (M in Friends)
+				t += 20
+				friends_near += M
+		if (nutrition < get_hunger_nutrition()) t += 10
+		if (nutrition < get_starve_nutrition()) t += 10
+		if (prob(2) && prob(t))
+			var/phrases = list()
+			if (Target) phrases += "[Target]... looks tasty..."
+			if (nutrition < get_starve_nutrition())
+				phrases += "So... hungry..."
+				phrases += "Very... hungry..."
+				phrases += "Need... food..."
+				phrases += "Must... eat..."
+			else if (nutrition < get_hunger_nutrition())
+				phrases += "Hungry..."
+				phrases += "Where is the food?"
+				phrases += "I want to eat..."
+			phrases += "Rawr..."
+			phrases += "Blop..."
+			phrases += "Blorble..."
+			if (rabid || attacked)
+				phrases += "Hrr..."
+				phrases += "Nhuu..."
+				phrases += "Unn..."
+			if (mood == ":3")
+				phrases += "Purr..."
+			if (attacked)
+				phrases += "Grrr..."
+			if (getToxLoss() > 30)
+				phrases += "Cold..."
+			if (getToxLoss() > 60)
+				phrases += "So... cold..."
+				phrases += "Very... cold..."
+			if (getToxLoss() > 90)
+				phrases += "..."
+				phrases += "C... c..."
+			if (Victim)
+				phrases += "Nom..."
+				phrases += "Tasty..."
+			if (powerlevel > 3) phrases += "Bzzz..."
+			if (powerlevel > 5) phrases += "Zap..."
+			if (powerlevel > 8) phrases += "Zap... Bzz..."
+			if (mood == "sad") phrases += "Bored..."
+			if (slimes_near) phrases += "Brother..."
+			if (slimes_near > 1) phrases += "Brothers..."
+			if (dead_slimes) phrases += "What happened?"
+			if (!slimes_near)
+				phrases += "Lonely..."
+			for (var/M in friends_near)
+				phrases += "[M]... friend..."
+				if (nutrition < get_hunger_nutrition())
+					phrases += "[M]... feed me..."
+			say (pick(phrases))
+
+/mob/living/carbon/slime/proc/get_max_nutrition() // Can't go above it
+	if (is_adult) return 1200
+	else return 1000
+
+/mob/living/carbon/slime/proc/get_grow_nutrition() // Above it we grow, below it we can eat
+	if (is_adult) return 1000
+	else return 800
+
+/mob/living/carbon/slime/proc/get_hunger_nutrition() // Below it we will always eat
+	if (is_adult) return 600
+	else return 500
+
+/mob/living/carbon/slime/proc/get_starve_nutrition() // Below it we will eat before everything else
+	if (is_adult) return 300
+	else return 200
+
+/mob/living/carbon/slime/proc/will_hunt(var/hunger = -1) // Check for being stopped from feeding and chasing
+	if (hunger == 2 || rabid || attacked) return 1
+	if (Leader) return 0
+	if (holding_still) return 0
+	return 1

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

@@ -3,7 +3,8 @@
 	icon = 'icons/mob/slimes.dmi'
 	icon_state = "grey baby slime"
 	pass_flags = PASSTABLE
-	speak_emote = list("hums")
+	var/is_adult = 0
+	speak_emote = list("telepathically chirps")
 
 	layer = 5
 
@@ -12,7 +13,7 @@
 	gender = NEUTER
 
 	update_icon = 0
-	nutrition = 700 // 1000 = max
+	nutrition = 700
 
 	see_in_dark = 8
 	update_slimes = 0
@@ -22,67 +23,58 @@
 	status_flags = CANPARALYSE|CANPUSH
 
 	var/cores = 1 // the number of /obj/item/slime_extract's the slime has left inside
+	var/mutation_chance = 30 // Chance of mutating, should be between 25 and 35
 
-	var/powerlevel = 0 	// 1-10 controls how much electricity they are generating
-	var/amount_grown = 0 // controls how long the slime has been overfed, if 10, grows into an adult
-						 // if adult: if 10: reproduces
+	var/powerlevel = 0 // 1-10 controls how much electricity they are generating
+	var/amount_grown = 0 // controls how long the slime has been overfed, if 10, grows or reproduces
 
+	var/number = 0 // Used to understand when someone is talking to it
 
 	var/mob/living/Victim = null // the person the slime is currently feeding on
 	var/mob/living/Target = null // AI variable - tells the slime to hunt this down
+	var/mob/living/Leader = null // AI variable - tells the slime to follow this person
 
-	var/attacked = 0 // determines if it's been attacked recently. Can be any number, is a cooloff-ish variable
-	var/tame = 0 // if set to 1, the slime will not eat humans ever, or attack them
-	var/rabid = 0 // if set to 1, the slime will attack and eat anything it comes in contact with
+	var/attacked = 0 // Determines if it's been attacked recently. Can be any number, is a cooloff-ish variable
+	var/rabid = 0 // If set to 1, the slime will attack and eat anything it comes in contact with
+	var/holding_still = 0 // AI variable, cooloff-ish for how long it's going to stay in one place
+	var/target_patience = 0 // AI variable, cooloff-ish for how long it's going to follow its target
 
-	var/list/Friends = list() // A list of potential friends
-	var/list/FriendsWeight = list() // A list containing values respective to Friends. This determines how many times a slime "likes" something. If the slime likes it more than 2 times, it becomes a friend
+	var/list/Friends = list() // A list of friends; they are not considered targets for feeding; passed down after splitting
 
-	// slimes pass on genetic data, so all their offspring have the same "Friends",
+	var/list/speech_buffer = list() // Last phrase said near it and person who said it
+
+	var/mood = "" // To show its face
 
 	///////////TIME FOR SUBSPECIES
 
 	var/colour = "grey"
-	var/primarytype = /mob/living/carbon/slime
-	var/mutationone = /mob/living/carbon/slime/orange
-	var/mutationtwo = /mob/living/carbon/slime/metal
-	var/mutationthree = /mob/living/carbon/slime/blue
-	var/mutationfour = /mob/living/carbon/slime/purple
-	var/adulttype = /mob/living/carbon/slime/adult
 	var/coretype = /obj/item/slime_extract/grey
-
-/mob/living/carbon/slime/adult
-	name = "adult slime"
-	icon = 'icons/mob/slimes.dmi'
-	icon_state = "grey adult slime"
-	speak_emote = list("telepathically chirps")
-
-	health = 200
-	gender = NEUTER
-
-	update_icon = 0
-	nutrition = 800 // 1200 = max
-
+	var/list/slime_mutation[4]
 
 /mob/living/carbon/slime/New()
-	var/datum/reagents/R = new/datum/reagents(100)
-	reagents = R
-	R.my_atom = src
-	if(name == "baby slime")
-		name = text("[colour] baby slime ([rand(1, 1000)])")
-	else
-		name = text("[colour] adult slime ([rand(1,1000)])")
-	real_name = name
-	spawn (1)
-		regenerate_icons()
-		src << "\blue Your icons have been generated!"
+	create_reagents(100)
+	spawn (0)
+		number = rand(1, 1000)
+		name = "[colour] [is_adult ? "adult" : "baby"] slime ([number])"
+		icon_state = "[colour] [is_adult ? "adult" : "baby"] slime"
+		real_name = name
+		slime_mutation = mutation_table(colour)
+		mutation_chance = rand(25, 35)
+		var/sanitizedcolour = replacetext(colour, " ", "")
+		coretype = text2path("/obj/item/slime_extract/[sanitizedcolour]")
 	..()
 
-/mob/living/carbon/slime/adult/New()
-	//verbs.Remove(/mob/living/carbon/slime/verb/ventcrawl)
+/mob/living/carbon/slime/regenerate_icons()
+	icon_state = "[colour] [is_adult ? "adult" : "baby"] slime"
+	overlays.len = 0
+	if (mood)
+		overlays += image('icons/mob/slimes.dmi', icon_state = "aslime-[mood]")
 	..()
 
 /mob/living/carbon/slime/movement_delay()
+	if (bodytemperature >= 330.23) // 135 F
+		return -1	// slimes become supercharged at high temperatures
+
 	var/tally = 0
 
 	var/health_deficiency = (100 - health)
@@ -92,115 +84,93 @@
 		tally += (283.222 - bodytemperature) / 10 * 1.75
 
 	if(reagents)
-		if(reagents.has_reagent("hyperzine")) // hyperzine slows slimes down
-			tally *= 2 // moves twice as slow
+		if(reagents.has_reagent("hyperzine")) // Hyperzine slows slimes down
+			tally *= 2
 
-		if(reagents.has_reagent("frostoil")) // frostoil also makes them move VEEERRYYYYY slow
+		if(reagents.has_reagent("frostoil")) // Frostoil also makes them move VEEERRYYYYY slow
 			tally *= 5
 
 	if(health <= 0) // if damaged, the slime moves twice as slow
 		tally *= 2
 
-	if (bodytemperature >= 330.23) // 135 F
-		return -1	// slimes become supercharged at high temperatures
-
-	return tally+config.slime_delay
-
+	return tally + config.slime_delay
 
 /mob/living/carbon/slime/Bump(atom/movable/AM as mob|obj, yes)
-	spawn( 0 )
-		if ((!( yes ) || now_pushing))
-			return
-		now_pushing = 1
+	if ((!(yes) || now_pushing))
+		return
+	now_pushing = 1
 
-		if(isobj(AM))
-			if(!client && powerlevel > 0)
-				var/probab = 10
-				switch(powerlevel)
-					if(1 to 2) probab = 20
-					if(3 to 4) probab = 30
-					if(5 to 6) probab = 40
-					if(7 to 8) probab = 60
-					if(9) 	   probab = 70
-					if(10) 	   probab = 95
-				if(prob(probab))
+	if(isobj(AM))
+		if(!client && powerlevel > 0)
+			var/probab = 10
+			switch(powerlevel)
+				if(1 to 2)	probab = 20
+				if(3 to 4)	probab = 30
+				if(5 to 6)	probab = 40
+				if(7 to 8)	probab = 60
+				if(9)		probab = 70
+				if(10)		probab = 95
+			if(prob(probab))
+				if(istype(AM, /obj/structure/window) || istype(AM, /obj/structure/grille))
+					if(nutrition <= get_hunger_nutrition() && !Atkcool)
+						if (is_adult || prob(5))
+							AM.attack_slime(src)
+							spawn()
+								Atkcool = 1
+								sleep(45)
+								Atkcool = 0
 
+	if(ismob(AM))
+		var/mob/tmob = AM
 
-					if(istype(AM, /obj/structure/window) || istype(AM, /obj/structure/grille))
-						if(istype(src, /mob/living/carbon/slime/adult))
-							if(nutrition <= 600 && !Atkcool)
-								AM.attack_slime(src)
-								spawn()
-									Atkcool = 1
-									sleep(15)
-									Atkcool = 0
-						else
-							if(nutrition <= 500 && !Atkcool)
-								if(prob(5))
-									AM.attack_slime(src)
-									spawn()
-										Atkcool = 1
-										sleep(15)
-										Atkcool = 0
-
-		if(ismob(AM))
-			var/mob/tmob = AM
-
-			if(istype(src, /mob/living/carbon/slime/adult))
-				if(istype(tmob, /mob/living/carbon/human))
-					if(prob(90))
-						now_pushing = 0
-						return
-			else
-				if(istype(tmob, /mob/living/carbon/human))
+		if(is_adult)
+			if(istype(tmob, /mob/living/carbon/human))
+				if(prob(90))
 					now_pushing = 0
 					return
+		else
+			if(istype(tmob, /mob/living/carbon/human))
+				now_pushing = 0
+				return
 
-		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
+	now_pushing = 0
+	..()
+	if (!istype(AM, /atom/movable))
 		return
-	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
 
 /mob/living/carbon/slime/Process_Spacemove()
 	return 2
 
-
 /mob/living/carbon/slime/Stat()
 	..()
 
 	statpanel("Status")
-	if(istype(src, /mob/living/carbon/slime/adult))
+	if(is_adult)
 		stat(null, "Health: [round((health / 200) * 100)]%")
 	else
 		stat(null, "Health: [round((health / 150) * 100)]%")
 
-
 	if (client.statpanel == "Status")
-		if(istype(src,/mob/living/carbon/slime/adult))
-			stat(null, "Nutrition: [nutrition]/1200")
-			if(amount_grown >= 10)
+		stat(null, "Nutrition: [nutrition]/[get_max_nutrition()]")
+		if(amount_grown >= 10)
+			if(is_adult)
 				stat(null, "You can reproduce!")
-		else
-			stat(null, "Nutrition: [nutrition]/1000")
-			if(amount_grown >= 10)
+			else
 				stat(null, "You can evolve!")
 
 		stat(null,"Power Level: [powerlevel]")
 
-
 /mob/living/carbon/slime/adjustFireLoss(amount)
 	..(-abs(amount)) // Heals them
 	return
@@ -210,25 +180,18 @@
 	..(Proj)
 	return 0
 
-
 /mob/living/carbon/slime/emp_act(severity)
 	powerlevel = 0 // oh no, the power!
 	..()
 
 /mob/living/carbon/slime/ex_act(severity)
-
-	if (stat == 2 && client)
-		return
-
-	else if (stat == 2 && !client)
-		del(src)
-		return
+	..()
 
 	var/b_loss = null
 	var/f_loss = null
 	switch (severity)
 		if (1.0)
-			b_loss += 500
+			del(src)
 			return
 
 		if (2.0)
@@ -260,7 +223,7 @@
 
 		//paralysis += 1
 
-	show_message("\red The blob attacks you!")
+	show_message("<span class='userdanger'> The blob attacks you!</span>")
 
 	adjustFireLoss(damage)
 
@@ -271,7 +234,6 @@
 /mob/living/carbon/slime/u_equip(obj/item/W as obj)
 	return
 
-
 /mob/living/carbon/slime/attack_ui(slot)
 	return
 
@@ -286,52 +248,48 @@
 		updatehealth()
 	return
 
-
 /mob/living/carbon/slime/attack_slime(mob/living/carbon/slime/M as mob)
 	if (!ticker)
 		M << "You cannot attack people before the game has started."
 		return
 
-	if(Victim) return // can't attack while eating!
+	if (Victim) return // can't attack while eating!
 
 	if (health > -100)
 
-		for(var/mob/O in viewers(src, null))
-			if ((O.client && !( O.blinded )))
-				O.show_message(text("\red <B>The [M.name] has glomped []!</B>", src), 1)
-
+		visible_message("<span class='danger'> The [M.name] has glomped [src]!</span>", \
+				"<span class='userdanger'> The [M.name] has glomped [src]!</span>")
 		var/damage = rand(1, 3)
 		attacked += 5
 
-		if(istype(src, /mob/living/carbon/slime/adult))
+		if(M.is_adult)
 			damage = rand(1, 6)
 		else
 			damage = rand(1, 3)
 
 		adjustBruteLoss(damage)
 
-
 		updatehealth()
-
 	return
 
-
 /mob/living/carbon/slime/attack_animal(mob/living/simple_animal/M as mob)
 	if(M.melee_damage_upper == 0)
 		M.emote("[M.friendly] [src]")
 	else
 		if(M.attack_sound)
 			playsound(loc, M.attack_sound, 50, 1, 1)
-		for(var/mob/O in viewers(src, null))
-			O.show_message("\red <B>[M]</B> [M.attacktext] [src]!", 1)
+		visible_message("<span class='danger'>[M] [M.attacktext] [src]!</span>", \
+				"<span class='userdanger'>[M] [M.attacktext] [src]!</span>")
 		M.attack_log += text("\[[time_stamp()]\] <font color='red'>attacked [src.name] ([src.ckey])</font>")
 		src.attack_log += text("\[[time_stamp()]\] <font color='orange'>was attacked by [M.name] ([M.ckey])</font>")
 		var/damage = rand(M.melee_damage_lower, M.melee_damage_upper)
+		attacked += 10
 		adjustBruteLoss(damage)
 		updatehealth()
 
 /mob/living/carbon/slime/attack_paw(mob/living/carbon/monkey/M as mob)
-	if(!(istype(M, /mob/living/carbon/monkey)))	return//Fix for aliens receiving double messages when attacking other aliens.
+	if(!(istype(M, /mob/living/carbon/monkey)))
+		return // Fix for aliens receiving double messages when attacking other aliens.
 
 	if (!ticker)
 		M << "You cannot attack people before the game has started."
@@ -340,6 +298,7 @@
 	if (istype(loc, /turf) && istype(loc.loc, /area/start))
 		M << "No attacking people at spawn, you jackass."
 		return
+
 	..()
 
 	switch(M.a_intent)
@@ -352,9 +311,8 @@
 			if (health > 0)
 				attacked += 10
 				//playsound(loc, 'sound/weapons/bite.ogg', 50, 1, -1)
-				for(var/mob/O in viewers(src, null))
-					if ((O.client && !( O.blinded )))
-						O.show_message(text("\red <B>[M.name] has attacked [src]!</B>"), 1)
+				visible_message("<span class='danger'>[M.name] has attacked [src]!</span>", \
+						"<span class='userdanger'>[M.name] has attacked [src]!</span>")
 				adjustBruteLoss(rand(1, 3))
 				updatehealth()
 	return
@@ -374,15 +332,11 @@
 	if(Victim)
 		if(Victim == M)
 			if(prob(60))
-				for(var/mob/O in viewers(src, null))
-					if ((O.client && !( O.blinded )))
-						O.show_message("\red [M] attempts to wrestle \the [name] off!", 1)
+				visible_message("<span class='warning'>[M] attempts to wrestle \the [name] off!</span>")
 				playsound(loc, 'sound/weapons/punchmiss.ogg', 25, 1, -1)
 
 			else
-				for(var/mob/O in viewers(src, null))
-					if ((O.client && !( O.blinded )))
-						O.show_message("\red [M] manages to wrestle \the [name] off!", 1)
+				visible_message("<span class='warning'> [M] manages to wrestle \the [name] off!</span>")
 				playsound(loc, 'sound/weapons/thudswoosh.ogg', 50, 1, -1)
 
 				if(prob(90) && !client)
@@ -402,21 +356,17 @@
 
 		else
 			if(prob(30))
-				for(var/mob/O in viewers(src, null))
-					if ((O.client && !( O.blinded )))
-						O.show_message("\red [M] attempts to wrestle \the [name] off of [Victim]!", 1)
+				visible_message("<span class='warning'>[M] attempts to wrestle \the [name] off of [Victim]!</span>")
 				playsound(loc, 'sound/weapons/punchmiss.ogg', 25, 1, -1)
 
 			else
-				for(var/mob/O in viewers(src, null))
-					if ((O.client && !( O.blinded )))
-						O.show_message("\red [M] manages to wrestle \the [name] off of [Victim]!", 1)
+				visible_message("<span class='warning'> [M] manages to wrestle \the [name] off of [Victim]!</span>")
 				playsound(loc, 'sound/weapons/thudswoosh.ogg', 50, 1, -1)
 
 				if(prob(80) && !client)
 					Discipline++
 
-					if(!istype(src, /mob/living/carbon/slime/adult))
+					if(!is_adult)
 						if(Discipline == 1)
 							attacked = 0
 
@@ -432,18 +382,13 @@
 
 			return
 
-
-
-
 	if(M.gloves && istype(M.gloves,/obj/item/clothing/gloves))
 		var/obj/item/clothing/gloves/G = M.gloves
 		if(G.cell)
 			if(M.a_intent == "hurt")//Stungloves. Any contact will stun the alien.
 				if(G.cell.charge >= 2500)
 					G.cell.use(2500)
-					for(var/mob/O in viewers(src, null))
-						if ((O.client && !( O.blinded )))
-							O.show_message("\red <B>[src] has been touched with the stun gloves by [M]!</B>", 1, "\red You hear someone fall.", 2)
+					visible_message("<span class='warning'>[src] has been touched with the stun gloves by [M]!</span>")
 					return
 				else
 					M << "\red Not enough charge! "
@@ -455,21 +400,18 @@
 			help_shake_act(M)
 
 		if ("grab")
-			if (M == src)
+			if (M == src || anchored)
 				return
-			var/obj/item/weapon/grab/G = new /obj/item/weapon/grab( M, src )
+			var/obj/item/weapon/grab/G = new /obj/item/weapon/grab(M, src)
 
 			M.put_in_active_hand(G)
 
-			grabbed_by += G
 			G.synch()
 
 			LAssailant = M
 
 			playsound(loc, 'sound/weapons/thudswoosh.ogg', 50, 1, -1)
-			for(var/mob/O in viewers(src, null))
-				if ((O.client && !( O.blinded )))
-					O.show_message(text("\red [] has grabbed [] passively!", M, src), 1)
+			visible_message("<span class='warning'>[M] has grabbed [src] passively!</span>")
 
 		else
 
@@ -479,8 +421,9 @@
 			if (prob(90))
 				if (HULK in M.mutations)
 					damage += 5
-					if(Victim)
+					if(Victim || Target)
 						Victim = null
+						Target = null
 						anchored = 0
 						if(prob(80) && !client)
 							Discipline++
@@ -492,17 +435,14 @@
 
 
 				playsound(loc, "punch", 25, 1, -1)
-				for(var/mob/O in viewers(src, null))
-					if ((O.client && !( O.blinded )))
-						O.show_message(text("\red <B>[] has punched []!</B>", M, src), 1)
+				visible_message("<span class='danger'>[M] has punched [src]!</span>", \
+						"<span class='userdanger'>[M] has punched [src]!</span>")
 
 				adjustBruteLoss(damage)
 				updatehealth()
 			else
 				playsound(loc, 'sound/weapons/punchmiss.ogg', 25, 1, -1)
-				for(var/mob/O in viewers(src, null))
-					if ((O.client && !( O.blinded )))
-						O.show_message(text("\red <B>[] has attempted to punch []!</B>", M, src), 1)
+				visible_message("<span class='danger'>[M] has attempted to punch [src]!</span>")
 	return
 
 
@@ -518,48 +458,41 @@
 
 	switch(M.a_intent)
 		if ("help")
-			for(var/mob/O in viewers(src, null))
-				if ((O.client && !( O.blinded )))
-					O.show_message(text("\blue [M] caresses [src] with its scythe like arm."), 1)
+			visible_message("<span class='notice'>[M] caresses [src] with its scythe like arm.</span>")
 
 		if ("hurt")
 
-			if ((prob(95) && health > 0))
+			if (prob(95))
 				attacked += 10
 				playsound(loc, 'sound/weapons/slice.ogg', 25, 1, -1)
 				var/damage = rand(15, 30)
 				if (damage >= 25)
 					damage = rand(20, 40)
-					for(var/mob/O in viewers(src, null))
-						if ((O.client && !( O.blinded )))
-							O.show_message(text("\red <B>[] has attacked [name]!</B>", M), 1)
+					visible_message("<span class='danger'>[M] has attacked [name]!</span>", \
+							"<span class='userdanger'>[M] has attacked [name]!</span>")
 				else
-					for(var/mob/O in viewers(src, null))
-						if ((O.client && !( O.blinded )))
-							O.show_message(text("\red <B>[] has wounded [name]!</B>", M), 1)
+					visible_message("<span class='danger'>[M] has wounded [name]!</span>", \
+							"<span class='userdanger'>)[M] has wounded [name]!</span>")
 				adjustBruteLoss(damage)
 				updatehealth()
 			else
 				playsound(loc, 'sound/weapons/slashmiss.ogg', 25, 1, -1)
-				for(var/mob/O in viewers(src, null))
-					if ((O.client && !( O.blinded )))
-						O.show_message(text("\red <B>[] has attempted to lunge at [name]!</B>", M), 1)
+				visible_message("<span class='danger'>[M] has attempted to lunge at [name]!</span>", \
+						"<span class='userdanger'>[M] has attempted to lunge at [name]!</span>")
 
 		if ("grab")
-			if (M == src)
+			if (M == src || anchored)
 				return
-			var/obj/item/weapon/grab/G = new /obj/item/weapon/grab( M, M, src )
+			var/obj/item/weapon/grab/G = new /obj/item/weapon/grab(M, src )
 
 			M.put_in_active_hand(G)
 
-			grabbed_by += G
 			G.synch()
 
 			LAssailant = M
 
 			playsound(loc, 'sound/weapons/thudswoosh.ogg', 50, 1, -1)
-			for(var/mob/O in viewers(src, null))
-				O.show_message(text("\red [] has grabbed [name] passively!", M), 1)
+			visible_message("<span class='warning'> [M] has grabbed [name] passively!</span>")
 
 		if ("disarm")
 			playsound(loc, 'sound/weapons/pierce.ogg', 25, 1, -1)
@@ -567,12 +500,12 @@
 			attacked += 10
 
 			if(prob(95))
-				for(var/mob/O in viewers(src, null))
-					if ((O.client && !( O.blinded )))
-						O.show_message(text("\red <B>[] has tackled [name]!</B>", M), 1)
+				visible_message("<span class='danger'>[M] has tackled [name]!</span>", \
+						"<span class='userdanger'>[M] has tackled [name]!</span>")
 
-				if(Victim)
+				if(Victim || Target)
 					Victim = null
+					Target = null
 					anchored = 0
 					if(prob(80) && !client)
 						Discipline++
@@ -593,68 +526,123 @@
 
 			else
 				drop_item()
-				for(var/mob/O in viewers(src, null))
-					if ((O.client && !( O.blinded )))
-						O.show_message(text("\red <B>[] has disarmed [name]!</B>", M), 1)
+				visible_message("<span class='danger'>[M] has disarmed [name]!</span>",
+						"<span class='userdanger'>[M] has disarmed [name]!</span>")
 			adjustBruteLoss(damage)
 			updatehealth()
 	return
 
+/mob/living/carbon/slime/attackby(obj/item/W, mob/user)
+	if(W.force > 0)
+		attacked += 10
+		if(prob(25))
+			user << "<span class='danger'>[W] passes right through [src]!</span>"
+			return
+		if(Discipline && prob(50)) // wow, buddy, why am I getting attacked??
+			Discipline = 0
+	if(W.force >= 3)
+		if(is_adult)
+			if(prob(5 + round(W.force/2)))
+				if(Victim || Target)
+					if(prob(80) && !client)
+						Discipline++
+
+					Victim = null
+					Target = null
+					anchored = 0
+
+					spawn()
+						SStun = 1
+						sleep(rand(5,20))
+						SStun = 0
+
+					spawn(0)
+						if(user)
+							canmove = 0
+							step_away(src, user)
+							if(prob(25 + W.force))
+								sleep(2)
+								if(user)
+									step_away(src, user)
+								canmove = 1
+
+		else
+			if(prob(10 + W.force*2))
+				if(Victim || Target)
+					if(prob(80) && !client)
+						Discipline++
+					if(Discipline == 1)
+						attacked = 0
+					spawn()
+						SStun = 1
+						sleep(rand(5,20))
+						SStun = 0
+
+					Victim = null
+					Target = null
+					anchored = 0
+
+					spawn(0)
+						if(user)
+							canmove = 0
+							step_away(src, user)
+							if(prob(25 + W.force*4))
+								sleep(2)
+								if(user)
+									step_away(src, user)
+							canmove = 1
+	..()
 
 /mob/living/carbon/slime/restrained()
 	return 0
 
-
 mob/living/carbon/slime/var/co2overloadtime = null
 mob/living/carbon/slime/var/temperature_resistance = T0C+75
 
-
-/mob/living/carbon/slime/show_inv(mob/user as mob)
-
-	user.set_machine(src)
-	var/dat = {"
-	<B><HR><FONT size=3>[name]</FONT></B>
-	<BR><HR><BR>
-	<BR><A href='?src=\ref[user];mach_close=mob[name]'>Close</A>
-	<BR>"}
-	user << browse(dat, text("window=mob[name];size=340x480"))
-	onclose(user, "mob[name]")
+/mob/living/carbon/slime/show_inv(mob/user)
 	return
 
-/mob/living/carbon/slime/updatehealth()
-	if(status_flags & GODMODE)
-		if(istype(src, /mob/living/carbon/slime/adult))
-			health = 200
-		else
-			health = 150
-		stat = CONSCIOUS
-	else
-		// slimes can't suffocate unless they suicide. They are also not harmed by fire
-		if(istype(src, /mob/living/carbon/slime/adult))
-			health = 200 - (getOxyLoss() + getToxLoss() + getFireLoss() + getBruteLoss() + getCloneLoss())
-		else
-			health = 150 - (getOxyLoss() + getToxLoss() + getFireLoss() + getBruteLoss() + getCloneLoss())
+/mob/living/carbon/slime/toggle_throw_mode()
+	return
 
+/mob/living/carbon/slime/proc/apply_water()
+	adjustToxLoss(rand(15,20))
+	if (!client)
+		if (Target) // Like cats
+			Target = null
+			++Discipline
+	return
 
 /obj/item/slime_extract
 	name = "slime extract"
 	desc = "Goo extracted from a slime. Legends claim these to have \"magical powers\"."
 	icon = 'icons/mob/slimes.dmi'
 	icon_state = "grey slime extract"
-	flags = TABLEPASS
 	force = 1.0
 	w_class = 1.0
-	throwforce = 1.0
+	throwforce = 0
 	throw_speed = 3
 	throw_range = 6
 	origin_tech = "biotech=4"
 	var/Uses = 1 // uses before it goes inert
+	var/enhanced = 0 //has it been enhanced before?
+
+	attackby(obj/item/O as obj, mob/user as mob)
+		if(istype(O, /obj/item/weapon/slimesteroid2))
+			if(enhanced == 1)
+				user << "<span class='warning'> This extract has already been enhanced!</span>"
+				return ..()
+			if(Uses == 0)
+				user << "<span class='warning'> You can't enhance a used extract!</span>"
+				return ..()
+			user <<"You apply the enhancer. It now has triple the amount of uses."
+			Uses = 3
+			enhanced = 1
+			del(O)
 
 /obj/item/slime_extract/New()
 		..()
-		var/datum/reagents/R = new/datum/reagents(100)
-		reagents = R
-		R.my_atom = src
+		create_reagents(100)
 
 /obj/item/slime_extract/grey
 	name = "grey slime extract"
@@ -724,6 +712,26 @@ mob/living/carbon/slime/var/temperature_resistance = T0C+75
 	name = "adamantine slime extract"
 	icon_state = "adamantine slime extract"
 
+/obj/item/slime_extract/bluespace
+	name = "bluespace slime extract"
+	icon_state = "bluespace slime extract"
+
+/obj/item/slime_extract/pyrite
+	name = "pyrite slime extract"
+	icon_state = "pyrite slime extract"
+
+/obj/item/slime_extract/cerulean
+	name = "cerulean slime extract"
+	icon_state = "cerulean slime extract"
+
+/obj/item/slime_extract/sepia
+	name = "sepia slime extract"
+	icon_state = "sepia slime extract"
+
+/obj/item/slime_extract/rainbow
+	name = "rainbow slime extract"
+	icon_state = "rainbow slime extract"
+
 ////Pet Slime Creation///
 
 /obj/item/weapon/slimepotion
@@ -734,28 +742,31 @@ mob/living/carbon/slime/var/temperature_resistance = T0C+75
 
 	attack(mob/living/carbon/slime/M as mob, mob/user as mob)
 		if(!istype(M, /mob/living/carbon/slime))//If target is not a slime.
-			user << "\red The potion only works on baby slimes!"
+			user << "<span class='warning'> The potion only works on baby slimes!</span>"
 			return ..()
-		if(istype(M, /mob/living/carbon/slime/adult)) //Can't tame adults
-			user << "\red Only baby slimes can be tamed!"
+		if(M.is_adult) //Can't tame adults
+			user << "<span class='warning'> Only baby slimes can be tamed!</span>"
 			return..()
 		if(M.stat)
-			user << "\red The slime is dead!"
+			user << "<span class='warning'> The slime is dead!</span>"
 			return..()
+		if(M.mind)
+			user << "<span class='warning'> The slime resists!</span>"
+			return ..()
 		var/mob/living/simple_animal/slime/pet = new /mob/living/simple_animal/slime(M.loc)
 		pet.icon_state = "[M.colour] baby slime"
 		pet.icon_living = "[M.colour] baby slime"
 		pet.icon_dead = "[M.colour] baby slime dead"
 		pet.colour = "[M.colour]"
 		user <<"You feed the slime the potion, removing it's powers and calming it."
-		del (M)
+		del(M)
 		var/newname = copytext(sanitize(input(user, "Would you like to give the slime a name?", "Name your new pet", "pet slime") as null|text),1,MAX_NAME_LEN)
 
 		if (!newname)
 			newname = "pet slime"
 		pet.name = newname
 		pet.real_name = newname
-		del (src)
+		del(src)
 
 /obj/item/weapon/slimepotion2
 	name = "advanced docility potion"
@@ -763,27 +774,30 @@ mob/living/carbon/slime/var/temperature_resistance = T0C+75
 	icon = 'icons/obj/chemical.dmi'
 	icon_state = "bottle19"
 
-	attack(mob/living/carbon/slime/adult/M as mob, mob/user as mob)
-		if(!istype(M, /mob/living/carbon/slime/adult))//If target is not a slime.
-			user << "\red The potion only works on adult slimes!"
+	attack(mob/living/carbon/slime/M as mob, mob/user as mob)
+		if(!istype(M, /mob/living/carbon/slime/))//If target is not a slime.
+			user << "<span class='warning'> The potion only works on slimes!</span>"
 			return ..()
 		if(M.stat)
-			user << "\red The slime is dead!"
+			user << "<span class='warning'> The slime is dead!</span>"
 			return..()
+		if(M.mind)
+			user << "<span class='warning'> The slime resists!</span>"
+			return ..()
 		var/mob/living/simple_animal/adultslime/pet = new /mob/living/simple_animal/adultslime(M.loc)
 		pet.icon_state = "[M.colour] adult slime"
 		pet.icon_living = "[M.colour] adult slime"
 		pet.icon_dead = "[M.colour] baby slime dead"
 		pet.colour = "[M.colour]"
 		user <<"You feed the slime the potion, removing it's powers and calming it."
-		del (M)
+		del(M)
 		var/newname = copytext(sanitize(input(user, "Would you like to give the slime a name?", "Name your new pet", "pet slime") as null|text),1,MAX_NAME_LEN)
 
 		if (!newname)
 			newname = "pet slime"
 		pet.name = newname
 		pet.real_name = newname
-		del (src)
+		del(src)
 
 
 /obj/item/weapon/slimesteroid
@@ -794,25 +808,45 @@ mob/living/carbon/slime/var/temperature_resistance = T0C+75
 
 	attack(mob/living/carbon/slime/M as mob, mob/user as mob)
 		if(!istype(M, /mob/living/carbon/slime))//If target is not a slime.
-			user << "\red The steroid only works on baby slimes!"
+			user << "<span class='warning'> The steroid only works on baby slimes!</span>"
 			return ..()
-		if(istype(M, /mob/living/carbon/slime/adult)) //Can't tame adults
-			user << "\red Only baby slimes can use the steroid!"
+		if(M.is_adult) //Can't tame adults
+			user << "<span class='warning'> Only baby slimes can use the steroid!</span>"
 			return..()
 		if(M.stat)
-			user << "\red The slime is dead!"
+			user << "<span class='warning'> The slime is dead!</span>"
 			return..()
 		if(M.cores == 3)
-			user <<"\red The slime already has the maximum amount of extract!"
+			user <<"<span class='warning'> The slime already has the maximum amount of extract!</span>"
 			return..()
 
 		user <<"You feed the slime the steroid. It now has triple the amount of extract."
 		M.cores = 3
-		del (src)
+		del(src)
 
+/obj/item/weapon/slimesteroid2
+	name = "extract enhancer"
+	desc = "A potent chemical mix that will give a slime extract three uses."
+	icon = 'icons/obj/chemical.dmi'
+	icon_state = "bottle17"
+
+	/*afterattack(obj/target, mob/user , flag)
+		if(istype(target, /obj/item/slime_extract))
+			if(target.enhanced == 1)
+				user << "<span class='warning'> This extract has already been enhanced!</span>"
+				return ..()
+			if(target.Uses == 0)
+				user << "<span class='warning'> You can't enhance a used extract!</span>"
+				return ..()
+			user <<"You apply the enhancer. It now has triple the amount of uses."
+			target.Uses = 3
+			target.enahnced = 1
+			del(src)*/
 
 ////////Adamantine Golem stuff I dunno where else to put it
 
+// This will eventually be removed.
+
 /obj/item/clothing/under/golem
 	name = "adamantine skin"
 	desc = "a golem's skin"
@@ -949,6 +983,7 @@ mob/living/carbon/slime/var/temperature_resistance = T0C+75
 				var/area/A = get_area(src)
 				if(A)
 					G << "Golem rune created in [A.name]."
+
 //////////////////////////////Old shit from metroids/RoRos, and the old cores, would not take much work to re-add them////////////////////////
 
 /*
@@ -958,11 +993,10 @@ mob/living/carbon/slime/var/temperature_resistance = T0C+75
 	desc = "Goo extracted from a slime. Legends claim these to have \"magical powers\"."
 	icon = 'icons/mob/slimes.dmi'
 	icon_state = "slime extract"
-	flags = TABLEPASS
 	force = 1.0
 	w_class = 1.0
 	throwforce = 1.0
-	throw_speed = 3
+	throw_speed = 2
 	throw_range = 6
 	origin_tech = "biotech=4"
 	var/POWERFLAG = 0 // sshhhhhhh
@@ -971,9 +1005,7 @@ mob/living/carbon/slime/var/temperature_resistance = T0C+75
 
 /obj/item/slime_core/New()
 		..()
-		var/datum/reagents/R = new/datum/reagents(100)
-		reagents = R
-		R.my_atom = src
+		create_reagents(100)
 		POWERFLAG = rand(1,10)
 		Uses = rand(7, 25)
 		//flags |= NOREACT
@@ -1017,9 +1049,9 @@ mob/living/carbon/slime/var/temperature_resistance = T0C+75
 /obj/item/weapon/reagent_containers/food/snacks/egg/slime/proc/Hatch()
 	processing_objects.Remove(src)
 	var/turf/T = get_turf(src)
-	src.visible_message("\blue The [name] pulsates and quivers!")
+	src.visible_message("<span class='warning'> The [name] pulsates and quivers!</span>")
 	spawn(rand(50,100))
-		src.visible_message("\blue The [name] bursts open!")
+		src.visible_message("<span class='warning'> The [name] bursts open!</span>")
 		new/mob/living/carbon/slime(T)
 		del(src)
 
@@ -1035,4 +1067,4 @@ mob/living/carbon/slime/var/temperature_resistance = T0C+75
 		return
 	else
 		..()
-*/
+*/

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

@@ -11,12 +11,12 @@
 
 	var/list/choices = list()
 	for(var/mob/living/C in view(1,src))
-		if(C!=src && !istype(C,/mob/living/carbon/slime))
+		if(C!=src && !istype(C,/mob/living/carbon/slime) && Adjacent(C))
 			choices += C
 
-	var/mob/living/carbon/M = input(src,"Who do you wish to feed on?") in null|choices
+	var/mob/living/M = input(src,"Who do you wish to feed on?") in null|choices
 	if(!M) return
-	if(M in view(1, src))
+	if(Adjacent(M))
 
 		if(!istype(src, /mob/living/carbon/brain))
 			if(!istype(M, /mob/living/carbon/slime))
@@ -42,76 +42,72 @@
 
 
 
-/mob/living/carbon/slime/proc/Feedon(var/mob/living/carbon/M)
+/mob/living/carbon/slime/proc/Feedon(var/mob/living/M)
 	Victim = M
 	src.loc = M.loc
 	canmove = 0
 	anchored = 1
 	var/lastnut = nutrition
-	//if(M.client) M << "\red You legs become paralyzed!"
-	if(istype(src, /mob/living/carbon/slime/adult))
+	var/fed_succesfully = 0
+	if(is_adult)
 		icon_state = "[colour] adult slime eat"
 	else
 		icon_state = "[colour] baby slime eat"
 
 	while(Victim && M.health > -70 && stat != 2)
-		// M.canmove = 0
 		canmove = 0
 
-		if(M in view(1, src))
+		if(Adjacent(M))
 			loc = M.loc
 
 			if(prob(15) && M.client && istype(M, /mob/living/carbon))
-				M << "\red [pick("You can feel your body becoming weak!", \
+				M << "<span class='danger'>[pick("You can feel your body becoming weak!", \
 				"You feel like you're about to die!", \
 				"You feel every part of your body screaming in agony!", \
 				"A low, rolling pain passes through your body!", \
 				"Your body feels as if it's falling apart!", \
 				"You feel extremely weak!", \
-				"A sharp, deep pain bathes every inch of your body!")]"
+				"A sharp, deep pain bathes every inch of your body!")]</span>"
 
 			if(istype(M, /mob/living/carbon))
-				Victim.adjustCloneLoss(rand(1,10))
+				Victim.adjustCloneLoss(rand(5,6))
 				Victim.adjustToxLoss(rand(1,2))
 				if(Victim.health <= 0)
 					Victim.adjustToxLoss(rand(2,4))
 
-				// Heal yourself
-				adjustToxLoss(-10)
-				adjustOxyLoss(-10)
-				adjustBruteLoss(-10)
-				adjustFireLoss(-10)
-				adjustCloneLoss(-10)
+				fed_succesfully = 1
 
-				if(Victim)
-					for(var/mob/living/carbon/slime/slime in view(1,M))
-						if(slime.Victim == M && slime != src)
-							slime.Feedstop()
+			else if(istype(M, /mob/living/simple_animal))
+				Victim.adjustBruteLoss(is_adult ? rand(7, 15) : rand(4, 12))
+				fed_succesfully = 1
 
-				nutrition += rand(10,25)
+			else
+				if(prob(25))
+					src << "<span class='warning'>[pick("This subject is incompatable", \
+					"This subject does not have a life energy", "This subject is empty", \
+					"I am not satisified", "I can not feed from this subject", \
+					"I do not feel nourished", "This subject is not food")]...</span>"
+
+			if(fed_succesfully)
+				//I have no idea why this is not in handle_nutrition()
+				nutrition += rand(15,30)
 				if(nutrition >= lastnut + 50)
 					if(prob(80))
 						lastnut = nutrition
 						powerlevel++
 						if(powerlevel > 10)
 							powerlevel = 10
+							adjustToxLoss(-10)
 
-				if(istype(src, /mob/living/carbon/slime/adult))
-					if(nutrition > 1200)
-						nutrition = 1200
-				else
-					if(nutrition > 1000)
-						nutrition = 1000
-
-				Victim.updatehealth()
+				//Heal yourself.
+				adjustOxyLoss(-10)
+				adjustBruteLoss(-10)
+				adjustFireLoss(-10)
+				adjustCloneLoss(-10)
+				
 				updatehealth()
-
-			else
-				if(prob(25))
-					src << "\red <i>[pick("This subject is incompatable", \
-					"This subject does not have a life energy", "This subject is empty", \
-					"I am not satisified", "I can not feed from this subject", \
-					"I do not feel nourished", "This subject is not food")]...</i>"
+				if(Victim)
+					Victim.updatehealth()
 
 			sleep(rand(15,45))
 
@@ -119,11 +115,11 @@
 			break
 
 	if(stat == 2)
-		if(!istype(src, /mob/living/carbon/slime/adult))
+		if(!is_adult)
 			icon_state = "[colour] baby slime dead"
 
 	else
-		if(istype(src, /mob/living/carbon/slime/adult))
+		if(is_adult)
 			icon_state = "[colour] adult slime"
 		else
 			icon_state = "[colour] baby slime"
@@ -139,7 +135,11 @@
 					if(Victim.LAssailant && Victim.LAssailant != Victim)
 						if(prob(50))
 							if(!(Victim.LAssailant in Friends))
-								Friends.Add(Victim.LAssailant) // no idea why i was using the |= operator
+								Friends[Victim.LAssailant] = 1
+								//Friends.Add(Victim.LAssailant) // no idea why i was using the |= operator
+							else
+								++Friends[Victim.LAssailant]
+
 
 			if(M.client && istype(src, /mob/living/carbon/human))
 				if(prob(85))
@@ -173,16 +173,13 @@
 	if(stat)
 		src << "<i>I must be conscious to do this...</i>"
 		return
-	if(!istype(src, /mob/living/carbon/slime/adult))
+	if(!is_adult)
 		if(amount_grown >= 10)
-			var/mob/living/carbon/slime/adult/new_slime = new adulttype(loc)
-			new_slime.nutrition = nutrition
-			new_slime.powerlevel = max(0, powerlevel-1)
-			new_slime.a_intent = "hurt"
-			new_slime.key = key
-			new_slime.universal_speak = universal_speak
-			new_slime << "<B>You are now an adult slime.</B>"
-			del(src)
+			is_adult = 1
+			maxHealth = 200
+			amount_grown = 0
+			regenerate_icons()
+			name = text("[colour] [is_adult ? "adult" : "baby"] slime ([number])")
 		else
 			src << "<i>I am not ready to evolve yet...</i>"
 	else
@@ -190,15 +187,14 @@
 
 /mob/living/carbon/slime/verb/Reproduce()
 	set category = "Slime"
-	set desc = "This will make you split into four Slimes. NOTE: this will KILL you, but you will be transferred into one of the babies."
+	set desc = "This will make you split into four Slimes."
 
 	if(stat)
 		src << "<i>I must be conscious to do this...</i>"
 		return
 
-	if(istype(src, /mob/living/carbon/slime/adult))
+	if(is_adult)
 		if(amount_grown >= 10)
-			//if(input("Are you absolutely sure you want to reproduce? Your current body will cease to be, but your consciousness will be transferred into a produced slime.") in list("Yes","No")=="Yes")
 			if(stat)
 				src << "<i>I must be conscious to do this...</i>"
 				return
@@ -207,54 +203,30 @@
 			var/new_nutrition = round(nutrition * 0.9)
 			var/new_powerlevel = round(powerlevel / 4)
 			for(var/i=1,i<=4,i++)
-				if(prob(80))
-					var/mob/living/carbon/slime/M = new primarytype(loc)
-					M.nutrition = new_nutrition
-					M.powerlevel = new_powerlevel
-					if(i != 1) step_away(M,src)
-					babies += M
+				var/mob/living/carbon/slime/M = new /mob/living/carbon/slime/(loc)
+				if(prob(mutation_chance))
+					M.colour = slime_mutation[rand(1,4)]
 				else
-					var/mutations = pick("one","two","three","four")
-					switch(mutations)
-						if("one")
-							var/mob/living/carbon/slime/M = new mutationone(loc)
-							M.nutrition = new_nutrition
-							M.powerlevel = new_powerlevel
-							if(i != 1) step_away(M,src)
-							babies += M
-						if("two")
-							var/mob/living/carbon/slime/M = new mutationtwo(loc)
-							M.nutrition = new_nutrition
-							M.powerlevel = new_powerlevel
-							if(i != 1) step_away(M,src)
-							babies += M
-						if("three")
-							var/mob/living/carbon/slime/M = new mutationthree(loc)
-							M.nutrition = new_nutrition
-							M.powerlevel = new_powerlevel
-							if(i != 1) step_away(M,src)
-							babies += M
-						if("four")
-							var/mob/living/carbon/slime/M = new mutationfour(loc)
-							M.nutrition = new_nutrition
-							M.powerlevel = new_powerlevel
-							if(i != 1) step_away(M,src)
-							babies += M
+					M.colour = colour
+				if(ckey)	M.nutrition = new_nutrition //Player slimes are more robust at spliting. Once an oversight of poor copypasta, now a feature!
+				M.powerlevel = new_powerlevel
+				if(i != 1) step_away(M,src)
+				M.Friends = Friends.Copy()
+				babies += M
+				feedback_add_details("slime_babies_born","slimebirth_[replacetext(M.colour," ","_")]")
 
 			var/mob/living/carbon/slime/new_slime = pick(babies)
-			new_slime.a_intent = "hurt"
 			new_slime.universal_speak = universal_speak
-			new_slime.key = key
-
-			new_slime << "<B>You are now a slime!</B>"
+			if(src.mind)
+				src.mind.transfer_to(new_slime)
+			else
+				new_slime.key = src.key
 			del(src)
 		else
 			src << "<i>I am not ready to reproduce yet...</i>"
 	else
 		src << "<i>I am not old enough to reproduce yet...</i>"
 
-
-
 /mob/living/carbon/slime/verb/ventcrawl()
 	set name = "Crawl through Vent"
 	set desc = "Enter an air vent and crawl through the pipe system."

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

@@ -0,0 +1,23 @@
+/mob/living/carbon/slime/say(var/message)
+	var/verb = say_quote(message)
+
+	if(copytext(message,1,2) == "*")
+		return emote(copytext(message,2))
+
+	return ..(message, null, verb)
+
+/mob/living/carbon/slime/say_quote(var/text)
+	var/ending = copytext(text, length(text))
+
+	if (ending == "?")
+		return "telepathically asks";
+	else if (ending == "!")
+		return "telepathically cries";
+
+	return "telepathically chirps";
+
+/mob/living/carbon/slime/say_understands(var/other)
+	if (istype(other, /mob/living/carbon/slime))
+		return 1
+	return ..()
+

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

@@ -1,372 +1,79 @@
-
-////////////////Tier 2
-
-/mob/living/carbon/slime/purple
-	colour = "purple"
-	icon_state = "purple baby slime"
-	primarytype = /mob/living/carbon/slime/purple
-	mutationone = /mob/living/carbon/slime/darkpurple
-	mutationtwo = /mob/living/carbon/slime/darkblue
-	mutationthree = /mob/living/carbon/slime/green
-	mutationfour = /mob/living/carbon/slime/green
-	adulttype = /mob/living/carbon/slime/adult/purple
-	coretype = /obj/item/slime_extract/purple
-
-/mob/living/carbon/slime/adult/purple
-	icon_state = "purple adult slime"
-	colour = "purple"
-	primarytype = /mob/living/carbon/slime/purple
-	mutationone = /mob/living/carbon/slime/darkpurple
-	mutationtwo = /mob/living/carbon/slime/darkblue
-	mutationthree = /mob/living/carbon/slime/green
-	mutationfour = /mob/living/carbon/slime/green
-	adulttype = /mob/living/carbon/slime/adult/purple
-	coretype = /obj/item/slime_extract/purple
-
-/mob/living/carbon/slime/metal
-	colour = "metal"
-	icon_state = "metal baby slime"
-	primarytype = /mob/living/carbon/slime/metal
-	mutationone = /mob/living/carbon/slime/silver
-	mutationtwo = /mob/living/carbon/slime/yellow
-	mutationthree = /mob/living/carbon/slime/gold
-	mutationfour = /mob/living/carbon/slime/gold
-	adulttype = /mob/living/carbon/slime/adult/metal
-	coretype = /obj/item/slime_extract/metal
-
-/mob/living/carbon/slime/adult/metal
-	icon_state = "metal adult slime"
-	colour = "metal"
-	primarytype = /mob/living/carbon/slime/metal
-	mutationone = /mob/living/carbon/slime/silver
-	mutationtwo = /mob/living/carbon/slime/yellow
-	mutationthree = /mob/living/carbon/slime/gold
-	mutationfour = /mob/living/carbon/slime/gold
-	adulttype = /mob/living/carbon/slime/adult/metal
-	coretype = /obj/item/slime_extract/metal
-
-/mob/living/carbon/slime/orange
-	colour = "orange"
-	icon_state = "orange baby slime"
-	primarytype = /mob/living/carbon/slime/orange
-	mutationone = /mob/living/carbon/slime/red
-	mutationtwo = /mob/living/carbon/slime/red
-	mutationthree = /mob/living/carbon/slime/darkpurple
-	mutationfour = /mob/living/carbon/slime/yellow
-	adulttype = /mob/living/carbon/slime/adult/orange
-	coretype = /obj/item/slime_extract/orange
-
-/mob/living/carbon/slime/adult/orange
-	colour = "orange"
-	icon_state = "orange adult slime"
-	primarytype = /mob/living/carbon/slime/orange
-	mutationone = /mob/living/carbon/slime/red
-	mutationtwo = /mob/living/carbon/slime/red
-	mutationthree = /mob/living/carbon/slime/darkpurple
-	mutationfour = /mob/living/carbon/slime/yellow
-	adulttype = /mob/living/carbon/slime/adult/orange
-	coretype = /obj/item/slime_extract/orange
-
-/mob/living/carbon/slime/blue
-	colour = "blue"
-	icon_state = "blue baby slime"
-	primarytype = /mob/living/carbon/slime/blue
-	mutationone = /mob/living/carbon/slime/darkblue
-	mutationtwo = /mob/living/carbon/slime/pink
-	mutationthree = /mob/living/carbon/slime/pink
-	mutationfour = /mob/living/carbon/slime/silver
-	adulttype = /mob/living/carbon/slime/adult/blue
-	coretype = /obj/item/slime_extract/blue
-
-/mob/living/carbon/slime/adult/blue
-	icon_state = "blue adult slime"
-	colour = "blue"
-	primarytype = /mob/living/carbon/slime/blue
-	mutationone = /mob/living/carbon/slime/darkblue
-	mutationtwo = /mob/living/carbon/slime/pink
-	mutationthree = /mob/living/carbon/slime/silver
-	mutationfour = /mob/living/carbon/slime/pink
-	adulttype = /mob/living/carbon/slime/adult/blue
-	coretype = /obj/item/slime_extract/blue
-
-
-
-
-//Tier 3
-
-/mob/living/carbon/slime/darkblue
-	colour = "dark blue"
-	icon_state = "dark blue baby slime"
-	primarytype = /mob/living/carbon/slime/darkblue
-	mutationone = /mob/living/carbon/slime/purple
-	mutationtwo = /mob/living/carbon/slime/purple
-	mutationthree = /mob/living/carbon/slime/blue
-	mutationfour = /mob/living/carbon/slime/blue
-	adulttype = /mob/living/carbon/slime/adult/darkblue
-	coretype = /obj/item/slime_extract/darkblue
-
-/mob/living/carbon/slime/adult/darkblue
-	icon_state = "dark blue adult slime"
-	colour = "dark blue"
-	primarytype = /mob/living/carbon/slime/darkblue
-	mutationone = /mob/living/carbon/slime/purple
-	mutationtwo = /mob/living/carbon/slime/purple
-	mutationthree = /mob/living/carbon/slime/blue
-	mutationfour = /mob/living/carbon/slime/blue
-	adulttype = /mob/living/carbon/slime/adult/darkblue
-	coretype = /obj/item/slime_extract/darkblue
-
-/mob/living/carbon/slime/darkpurple
-	colour = "dark purple"
-	icon_state = "dark purple baby slime"
-	primarytype = /mob/living/carbon/slime/darkpurple
-	mutationone = /mob/living/carbon/slime/purple
-	mutationtwo = /mob/living/carbon/slime/purple
-	mutationthree = /mob/living/carbon/slime/orange
-	mutationfour = /mob/living/carbon/slime/orange
-	adulttype = /mob/living/carbon/slime/adult/darkpurple
-	coretype = /obj/item/slime_extract/darkpurple
-
-/mob/living/carbon/slime/adult/darkpurple
-	icon_state = "dark purple adult slime"
-	colour = "dark purple"
-	primarytype = /mob/living/carbon/slime/darkpurple
-	mutationone = /mob/living/carbon/slime/purple
-	mutationtwo = /mob/living/carbon/slime/purple
-	mutationthree = /mob/living/carbon/slime/orange
-	mutationfour = /mob/living/carbon/slime/orange
-	adulttype = /mob/living/carbon/slime/adult/darkpurple
-	coretype = /obj/item/slime_extract/darkpurple
-
-
-/mob/living/carbon/slime/yellow
-	icon_state = "yellow baby slime"
-	colour = "yellow"
-	primarytype = /mob/living/carbon/slime/yellow
-	mutationone = /mob/living/carbon/slime/metal
-	mutationtwo = /mob/living/carbon/slime/metal
-	mutationthree = /mob/living/carbon/slime/orange
-	mutationfour = /mob/living/carbon/slime/orange
-	adulttype = /mob/living/carbon/slime/adult/yellow
-	coretype = /obj/item/slime_extract/yellow
-
-/mob/living/carbon/slime/adult/yellow
-	icon_state = "yellow adult slime"
-	colour = "yellow"
-	primarytype = /mob/living/carbon/slime/yellow
-	mutationone = /mob/living/carbon/slime/metal
-	mutationtwo = /mob/living/carbon/slime/metal
-	mutationthree = /mob/living/carbon/slime/orange
-	mutationfour = /mob/living/carbon/slime/orange
-	adulttype = /mob/living/carbon/slime/adult/yellow
-	coretype = /obj/item/slime_extract/yellow
-
-
-/mob/living/carbon/slime/silver
-	colour = "silver"
-	icon_state = "silver baby slime"
-	primarytype = /mob/living/carbon/slime/silver
-	mutationone = /mob/living/carbon/slime/metal
-	mutationtwo = /mob/living/carbon/slime/metal
-	mutationthree = /mob/living/carbon/slime/blue
-	mutationfour = /mob/living/carbon/slime/blue
-	adulttype = /mob/living/carbon/slime/adult/silver
-	coretype = /obj/item/slime_extract/silver
-
-/mob/living/carbon/slime/adult/silver
-	icon_state = "silver adult slime"
-	colour = "silver"
-	primarytype = /mob/living/carbon/slime/silver
-	mutationone = /mob/living/carbon/slime/metal
-	mutationtwo = /mob/living/carbon/slime/metal
-	mutationthree = /mob/living/carbon/slime/blue
-	mutationfour = /mob/living/carbon/slime/blue
-	adulttype = /mob/living/carbon/slime/adult/silver
-	coretype = /obj/item/slime_extract/silver
-
-
-
-/////////////Tier 4
-
-
-/mob/living/carbon/slime/pink
-	colour = "pink"
-	icon_state = "pink baby slime"
-	primarytype = /mob/living/carbon/slime/pink
-	mutationone = /mob/living/carbon/slime/pink
-	mutationtwo = /mob/living/carbon/slime/pink
-	mutationthree = /mob/living/carbon/slime/lightpink
-	mutationfour = /mob/living/carbon/slime/lightpink
-	adulttype = /mob/living/carbon/slime/adult/pink
-	coretype = /obj/item/slime_extract/pink
-
-/mob/living/carbon/slime/adult/pink
-	icon_state = "pink adult slime"
-	colour = "pink"
-	primarytype = /mob/living/carbon/slime/pink
-	mutationone = /mob/living/carbon/slime/pink
-	mutationtwo = /mob/living/carbon/slime/pink
-	mutationthree = /mob/living/carbon/slime/lightpink
-	mutationfour = /mob/living/carbon/slime/lightpink
-	adulttype = /mob/living/carbon/slime/adult/pink
-	coretype = /obj/item/slime_extract/pink
-
-/mob/living/carbon/slime/red
-	colour = "red"
-	icon_state = "red baby slime"
-	primarytype = /mob/living/carbon/slime/red
-	mutationone = /mob/living/carbon/slime/red
-	mutationtwo = /mob/living/carbon/slime/red
-	mutationthree = /mob/living/carbon/slime/oil
-	mutationfour = /mob/living/carbon/slime/oil
-	adulttype = /mob/living/carbon/slime/adult/red
-	coretype = /obj/item/slime_extract/red
-
-/mob/living/carbon/slime/adult/red
-	icon_state = "red adult slime"
-	colour = "red"
-	primarytype = /mob/living/carbon/slime/red
-	mutationone = /mob/living/carbon/slime/red
-	mutationtwo = /mob/living/carbon/slime/red
-	mutationthree = /mob/living/carbon/slime/oil
-	mutationfour = /mob/living/carbon/slime/oil
-	adulttype = /mob/living/carbon/slime/adult/red
-	coretype = /obj/item/slime_extract/red
-
-/mob/living/carbon/slime/gold
-	colour = "gold"
-	icon_state = "gold baby slime"
-	primarytype = /mob/living/carbon/slime/gold
-	mutationone = /mob/living/carbon/slime/gold
-	mutationtwo = /mob/living/carbon/slime/gold
-	mutationthree = /mob/living/carbon/slime/adamantine
-	mutationfour = /mob/living/carbon/slime/adamantine
-	adulttype = /mob/living/carbon/slime/adult/gold
-	coretype = /obj/item/slime_extract/gold
-
-/mob/living/carbon/slime/adult/gold
-	icon_state = "gold adult slime"
-	colour = "gold"
-	primarytype = /mob/living/carbon/slime/gold
-	mutationone = /mob/living/carbon/slime/gold
-	mutationtwo = /mob/living/carbon/slime/gold
-	mutationthree = /mob/living/carbon/slime/adamantine
-	mutationfour = /mob/living/carbon/slime/adamantine
-	adulttype = /mob/living/carbon/slime/adult/gold
-	coretype = /obj/item/slime_extract/gold
-
-/mob/living/carbon/slime/green
-	colour = "green"
-	icon_state = "green baby slime"
-	primarytype = /mob/living/carbon/slime/green
-	mutationone = /mob/living/carbon/slime/green
-	mutationtwo = /mob/living/carbon/slime/green
-	mutationthree = /mob/living/carbon/slime/black
-	mutationfour = /mob/living/carbon/slime/black
-	adulttype = /mob/living/carbon/slime/adult/green
-	coretype = /obj/item/slime_extract/green
-
-/mob/living/carbon/slime/adult/green
-	icon_state = "green adult slime"
-	colour = "green"
-	primarytype = /mob/living/carbon/slime/green
-	mutationone = /mob/living/carbon/slime/green
-	mutationtwo = /mob/living/carbon/slime/green
-	mutationthree = /mob/living/carbon/slime/black
-	mutationfour = /mob/living/carbon/slime/black
-	adulttype = /mob/living/carbon/slime/adult/green
-	coretype = /obj/item/slime_extract/green
-
-
-
-// Tier 5
-
-/mob/living/carbon/slime/lightpink
-	colour = "light pink"
-	icon_state = "light pink baby slime"
-	primarytype = /mob/living/carbon/slime/lightpink
-	mutationone = /mob/living/carbon/slime/lightpink
-	mutationtwo = /mob/living/carbon/slime/lightpink
-	mutationthree = /mob/living/carbon/slime/lightpink
-	mutationfour = /mob/living/carbon/slime/lightpink
-	adulttype = /mob/living/carbon/slime/adult/lightpink
-	coretype = /obj/item/slime_extract/lightpink
-
-/mob/living/carbon/slime/adult/lightpink
-	icon_state = "light pink adult slime"
-	colour = "light pink"
-	primarytype = /mob/living/carbon/slime/lightpink
-	mutationone = /mob/living/carbon/slime/lightpink
-	mutationtwo = /mob/living/carbon/slime/lightpink
-	mutationthree = /mob/living/carbon/slime/lightpink
-	mutationfour = /mob/living/carbon/slime/lightpink
-	adulttype = /mob/living/carbon/slime/adult/lightpink
-	coretype = /obj/item/slime_extract/lightpink
-
-
-/mob/living/carbon/slime/oil
-	icon_state = "oil baby slime"
-	colour = "oil"
-	primarytype = /mob/living/carbon/slime/oil
-	mutationone = /mob/living/carbon/slime/oil
-	mutationtwo = /mob/living/carbon/slime/oil
-	mutationthree = /mob/living/carbon/slime/oil
-	mutationfour = /mob/living/carbon/slime/oil
-	adulttype = /mob/living/carbon/slime/adult/oil
-	coretype = /obj/item/slime_extract/oil
-
-/mob/living/carbon/slime/adult/oil
-	icon_state = "oil adult slime"
-	colour = "oil"
-	primarytype = /mob/living/carbon/slime/oil
-	mutationone = /mob/living/carbon/slime/oil
-	mutationtwo = /mob/living/carbon/slime/oil
-	mutationthree = /mob/living/carbon/slime/oil
-	mutationfour = /mob/living/carbon/slime/oil
-	adulttype = /mob/living/carbon/slime/adult/oil
-	coretype = /obj/item/slime_extract/oil
-
-
-/mob/living/carbon/slime/black
-	icon_state = "black baby slime"
-	colour = "black"
-	primarytype = /mob/living/carbon/slime/black
-	mutationone = /mob/living/carbon/slime/black
-	mutationtwo = /mob/living/carbon/slime/black
-	mutationthree = /mob/living/carbon/slime/black
-	mutationfour = /mob/living/carbon/slime/black
-	adulttype = /mob/living/carbon/slime/adult/black
-	coretype = /obj/item/slime_extract/black
-
-/mob/living/carbon/slime/adult/black
-	icon_state = "black adult slime"
-	colour = "black"
-	primarytype = /mob/living/carbon/slime/black
-	mutationone = /mob/living/carbon/slime/black
-	mutationtwo = /mob/living/carbon/slime/black
-	mutationthree = /mob/living/carbon/slime/black
-	mutationfour = /mob/living/carbon/slime/black
-	adulttype = /mob/living/carbon/slime/adult/black
-	coretype = /obj/item/slime_extract/black
-
-/mob/living/carbon/slime/adamantine
-	icon_state = "adamantine baby slime"
-	colour = "adamantine"
-	primarytype = /mob/living/carbon/slime/adamantine
-	mutationone = /mob/living/carbon/slime/adamantine
-	mutationtwo = /mob/living/carbon/slime/adamantine
-	mutationthree = /mob/living/carbon/slime/adamantine
-	mutationfour = /mob/living/carbon/slime/adamantine
-	adulttype = /mob/living/carbon/slime/adult/adamantine
-	coretype = /obj/item/slime_extract/adamantine
-
-/mob/living/carbon/slime/adult/adamantine
-	icon_state = "adamantine adult slime"
-	colour = "adamantine"
-	primarytype = /mob/living/carbon/slime/adamantine
-	mutationone = /mob/living/carbon/slime/adamantine
-	mutationtwo = /mob/living/carbon/slime/adamantine
-	mutationthree = /mob/living/carbon/slime/adamantine
-	mutationfour = /mob/living/carbon/slime/adamantine
-	adulttype = /mob/living/carbon/slime/adult/adamantine
-	coretype = /obj/item/slime_extract/adamantine
+proc/mutation_table(var/colour)
+	var/list/slime_mutation[4]
+	switch(colour)
+		//Tier 1
+		if("grey")
+			slime_mutation[1] = "orange"
+			slime_mutation[2] = "metal"
+			slime_mutation[3] = "blue"
+			slime_mutation[4] = "purple"
+		//Tier 2
+		if("purple")
+			slime_mutation[1] = "dark purple"
+			slime_mutation[2] = "dark blue"
+			slime_mutation[3] = "green"
+			slime_mutation[4] = "green"
+		if("metal")
+			slime_mutation[1] = "silver"
+			slime_mutation[2] = "yellow"
+			slime_mutation[3] = "gold"
+			slime_mutation[4] = "gold"
+		if("orange")
+			slime_mutation[1] = "dark purple"
+			slime_mutation[2] = "yellow"
+			slime_mutation[3] = "red"
+			slime_mutation[4] = "red"
+		if("blue")
+			slime_mutation[1] = "dark blue"
+			slime_mutation[2] = "silver"
+			slime_mutation[3] = "pink"
+			slime_mutation[4] = "pink"
+		//Tier 3
+		if("dark blue")
+			slime_mutation[1] = "purple"
+			slime_mutation[2] = "blue"
+			slime_mutation[3] = "cerulean"
+			slime_mutation[4] = "cerulean"
+		if("dark purple")
+			slime_mutation[1] = "purple"
+			slime_mutation[2] = "orange"
+			slime_mutation[3] = "sepia"
+			slime_mutation[4] = "sepia"
+		if("yellow")
+			slime_mutation[1] = "metal"
+			slime_mutation[2] = "orange"
+			slime_mutation[3] = "bluespace"
+			slime_mutation[4] = "bluespace"
+		if("silver")
+			slime_mutation[1] = "metal"
+			slime_mutation[2] = "blue"
+			slime_mutation[3] = "pyrite"
+			slime_mutation[4] = "pyrite"
+		//Tier 4
+		if("pink")
+			slime_mutation[1] = "pink"
+			slime_mutation[2] = "pink"
+			slime_mutation[3] = "light pink"
+			slime_mutation[4] = "light pink"
+		if("red")
+			slime_mutation[1] = "red"
+			slime_mutation[2] = "red"
+			slime_mutation[3] = "oil"
+			slime_mutation[4] = "oil"
+		if("gold")
+			slime_mutation[1] = "gold"
+			slime_mutation[2] = "gold"
+			slime_mutation[3] = "adamantine"
+			slime_mutation[4] = "adamantine"
+		if("green")
+			slime_mutation[1] = "green"
+			slime_mutation[2] = "green"
+			slime_mutation[3] = "black"
+			slime_mutation[4] = "black"
+		// Tier 5
+		else
+			slime_mutation[1] = colour
+			slime_mutation[2] = colour
+			slime_mutation[3] = colour
+			slime_mutation[4] = colour
+	return(slime_mutation)

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

@@ -237,25 +237,14 @@
 					var/obj/location_as_object = loc
 					breath = location_as_object.handle_internal_lifeform(src, BREATH_VOLUME)
 				else if(istype(loc, /turf/))
-					var/breath_moles = environment.total_moles()*BREATH_PERCENTAGE
+					var/breath_moles = environment.total_moles*BREATH_PERCENTAGE
 					breath = loc.remove_air(breath_moles)
 
-					if(istype(wear_mask, /obj/item/clothing/mask/gas))
-						var/obj/item/clothing/mask/gas/G = wear_mask
-						var/datum/gas_mixture/filtered = new
-
-						filtered.copy_from(breath)
-						filtered.phoron *= G.gas_filter_strength
-						for(var/datum/gas/gas in filtered.trace_gases)
-							gas.moles *= G.gas_filter_strength
-						filtered.update_values()
+					if(istype(wear_mask, /obj/item/clothing/mask) && breath)
+						var/obj/item/clothing/mask/M = wear_mask
+						var/datum/gas_mixture/filtered = M.filter_air(breath)
 						loc.assume_air(filtered)
 
-						breath.phoron *= 1 - G.gas_filter_strength
-						for(var/datum/gas/gas in breath.trace_gases)
-							gas.moles *= 1 - G.gas_filter_strength
-						breath.update_values()
-
 					// Handle chem smoke effect  -- Doohl
 					var/block = 0
 					if(wear_mask)
@@ -316,14 +305,14 @@
 		var/SA_para_min = 0.5
 		var/SA_sleep_min = 5
 		var/oxygen_used = 0
-		var/breath_pressure = (breath.total_moles()*R_IDEAL_GAS_EQUATION*breath.temperature)/BREATH_VOLUME
+		var/breath_pressure = (breath.total_moles * R_IDEAL_GAS_EQUATION * breath.temperature) / BREATH_VOLUME
 
 		//Partial pressure of the O2 in our breath
-		var/O2_pp = (breath.oxygen/breath.total_moles())*breath_pressure
+		var/O2_pp = (breath.gas["oxygen"] / breath.total_moles) * breath_pressure
 		// Same, but for the phoron
-		var/Toxins_pp = (breath.phoron/breath.total_moles())*breath_pressure
+		var/Toxins_pp = (breath.gas["phoron"] / breath.total_moles) * breath_pressure
 		// And CO2, lets say a PP of more than 10 will be bad (It's a little less really, but eh, being passed out all round aint no fun)
-		var/CO2_pp = (breath.carbon_dioxide/breath.total_moles())*breath_pressure
+		var/CO2_pp = (breath.gas["carbon_dioxide"] / breath.total_moles) * breath_pressure
 
 		if(O2_pp < safe_oxygen_min) 			// Too little oxygen
 			if(prob(20))
@@ -332,7 +321,7 @@
 				O2_pp = 0.01
 			var/ratio = safe_oxygen_min/O2_pp
 			adjustOxyLoss(min(5*ratio, 7)) // Don't fuck them up too fast (space only does 7 after all!)
-			oxygen_used = breath.oxygen*ratio/6
+			oxygen_used = breath.gas["oxygen"] * ratio / 6
 			oxygen_alert = max(oxygen_alert, 1)
 		/*else if (O2_pp > safe_oxygen_max) 		// Too much oxygen (commented this out for now, I'll deal with pressure damage elsewhere I suppose)
 			spawn(0) emote("cough")
@@ -342,11 +331,11 @@
 			oxygen_alert = max(oxygen_alert, 1)*/
 		else 									// We're in safe limits
 			adjustOxyLoss(-5)
-			oxygen_used = breath.oxygen/6
+			oxygen_used = breath.gas["oxygen"] / 6
 			oxygen_alert = 0
 
-		breath.oxygen -= oxygen_used
-		breath.carbon_dioxide += oxygen_used
+		breath.adjust_gas("oxygen", -oxygen_used)
+		breath.adjust_gas("carbon_dioxide", oxygen_used)
 
 		if(CO2_pp > safe_co2_max)
 			if(!co2overloadtime) // If it's the first breath with too much CO2 in it, lets start a counter, then have them pass out after 12s or so.
@@ -363,7 +352,7 @@
 			co2overloadtime = 0
 
 		if(Toxins_pp > safe_phoron_max) // Too much phoron
-			var/ratio = (breath.phoron/safe_phoron_max) * 10
+			var/ratio = (breath.gas["phoron"] / safe_phoron_max) * 10
 			//adjustToxLoss(Clamp(ratio, MIN_PLASMA_DAMAGE, MAX_PLASMA_DAMAGE))	//Limit amount of damage toxin exposure can do per second
 			if(reagents)
 				reagents.add_reagent("toxin", Clamp(ratio, MIN_TOXIN_DAMAGE, MAX_TOXIN_DAMAGE))
@@ -371,16 +360,15 @@
 		else
 			phoron_alert = 0
 
-		if(breath.trace_gases.len)	// If there's some other shit in the air lets deal with it here.
-			for(var/datum/gas/sleeping_agent/SA in breath.trace_gases)
-				var/SA_pp = (SA.moles/breath.total_moles())*breath_pressure
-				if(SA_pp > SA_para_min) // Enough to make us paralysed for a bit
-					Paralyse(3) // 3 gives them one second to wake up and run away a bit!
-					if(SA_pp > SA_sleep_min) // Enough to make us sleep as well
-						sleeping = max(sleeping+2, 10)
-				else if(SA_pp > 0.01)	// There is sleeping gas in their lungs, but only a little, so give them a bit of a warning
-					if(prob(20))
-						spawn(0) emote(pick("giggle", "laugh"))
+		if(breath.gas["sleeping_agent"])
+			var/SA_pp = (breath.gas["sleeping_agent"] / breath.total_moles) * breath_pressure
+			if(SA_pp > SA_para_min) // Enough to make us paralysed for a bit
+				Paralyse(3) // 3 gives them one second to wake up and run away a bit!
+				if(SA_pp > SA_sleep_min) // Enough to make us sleep as well
+					sleeping = max(sleeping+2, 10)
+			else if(SA_pp > 0.01)	// There is sleeping gas in their lungs, but only a little, so give them a bit of a warning
+				if(prob(20))
+					spawn(0) emote(pick("giggle", "laugh"))
 
 
 		if(breath.temperature > (T0C+66)) // Hot air hurts :(
@@ -403,7 +391,7 @@
 		var/pressure = environment.return_pressure()
 		var/adjusted_pressure = calculate_affecting_pressure(pressure) //Returns how much pressure actually affects the mob.
 
-		if(adjusted_pressure < WARNING_HIGH_PRESSURE && adjusted_pressure > WARNING_LOW_PRESSURE && abs(environment.temperature - 293.15) < 20 && abs(bodytemperature - 310.14) < 0.5 && environment.phoron < MOLES_PHORON_VISIBLE)
+		if(adjusted_pressure < WARNING_HIGH_PRESSURE && adjusted_pressure > WARNING_LOW_PRESSURE && abs(environment.temperature - 293.15) < 20 && abs(bodytemperature - 310.14) < 0.5 && environment.gas["phoron"] < gas_data.overlay_limit["phoron"])
 
 			//Hopefully should fix the walk-inside-still-pressure-warning issue.
 			if(pressure_alert)

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

@@ -403,7 +403,7 @@
 
 		var/damage = rand(1, 3)
 
-		if(istype(src, /mob/living/carbon/slime/adult))
+		if(M.is_adult)
 			damage = rand(20, 40)
 		else
 			damage = rand(5, 35)

code/modules/mob/living/say.dm

@@ -83,28 +83,29 @@ var/list/department_radio_keys = list(
 /mob/living/say(var/message, var/datum/language/speaking = null, var/verb="says", var/alt_name="", var/italics=0, var/message_range = world.view, var/list/used_radios = list(), var/sound/speech_sound, var/sound_vol)
 
 	var/turf/T = get_turf(src)
-	
+
 	//handle nonverbal and sign languages here
 	if (speaking)
 		if (speaking.flags & NONVERBAL)
 			if (prob(30))
 				src.custom_emote(1, "[pick(speaking.signlang_verb)].")
-		
+
 		if (speaking.flags & SIGNLANG)
 			say_signlang(message, pick(speaking.signlang_verb), speaking)
-			return
-	
+			return 1
+
 	//speaking into radios
 	if(used_radios.len)
 		italics = 1
 		message_range = 1
-		
-		for(var/mob/living/M in hearers(5, src))
-			if(M != src)
-				M.show_message("<span class='notice'>[src] talks into [used_radios.len ? used_radios[1] : "the radio."]</span>")
-			if (speech_sound)
-				src.playsound_local(get_turf(src), speech_sound, sound_vol * 0.5, 1)
-		
+
+		if (!istype(src, /mob/living/silicon/ai)) // Atlantis: Prevents nearby people from hearing the AI when it talks using it's integrated radio.
+			for(var/mob/living/M in hearers(5, src))
+				if(M != src)
+					M.show_message("<span class='notice'>[src] talks into [used_radios.len ? used_radios[1] : "the radio."]</span>")
+				if (speech_sound)
+					src.playsound_local(get_turf(src), speech_sound, sound_vol * 0.5, 1)
+
 		speech_sound = null	//so we don't play it twice.
 
 	//make sure the air can transmit speech
@@ -114,13 +115,13 @@ var/list/department_radio_keys = list(
 		if(pressure < SOUND_MINIMUM_PRESSURE)
 			italics = 1
 			message_range = 1
-			
+
 			if (speech_sound)
 				sound_vol *= 0.5	//muffle the sound a bit, so it's like we're actually talking through contact
 
 	var/list/listening = list()
 	var/list/listening_obj = list()
-	
+
 	if(T)
 		var/list/hear = hear(message_range, T)
 		var/list/hearturfs = list()
@@ -132,11 +133,18 @@ var/list/department_radio_keys = list(
 				hearturfs += M.locs[1]
 				for(var/obj/O in M.contents)
 					listening_obj |= O
+				if (isslime(I))
+					var/mob/living/carbon/slime/S = I
+					if (src in S.Friends)
+						S.speech_buffer = list()
+						S.speech_buffer.Add(src)
+						S.speech_buffer.Add(lowertext(html_decode(message)))
 			else if(istype(I, /obj/))
 				var/obj/O = I
 				hearturfs += O.locs[1]
 				listening_obj |= O
 
+
 		for(var/mob/M in player_list)
 			if(M.stat == DEAD && M.client && (M.client.prefs.toggles & CHAT_GHOSTEARS))
 				listening |= M
@@ -156,8 +164,9 @@ var/list/department_radio_keys = list(
 		spawn(0)
 			if(O) //It's possible that it could be deleted in the meantime.
 				O.hear_talk(src, message, verb, speaking)
-	
+
 	log_say("[name]/[key] : [message]")
+	return 1
 
 /mob/living/proc/say_signlang(var/message, var/verb="gestures", var/datum/language/language)
 	for (var/mob/O in viewers(src, null))

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

@@ -27,9 +27,11 @@ var/list/ai_list = list()
 	var/viewalerts = 0
 	var/lawcheck[1]
 	var/ioncheck[1]
+	var/lawchannel = "Common" // Default channel on which to state laws
 	var/icon/holo_icon//Default is assigned when AI is created.
 	var/obj/item/device/pda/ai/aiPDA = null
 	var/obj/item/device/multitool/aiMulti = null
+	var/obj/item/device/radio/headset/heads/ai_integrated/aiRadio = null
 	var/custom_sprite = 0 //For our custom sprites
 //Hud stuff
 
@@ -87,12 +89,14 @@ var/list/ai_list = list()
 	aiPDA.name = name + " (" + aiPDA.ownjob + ")"
 
 	aiMulti = new(src)
+	aiRadio = new(src)
+	aiRadio.myAi = src
 
 	if (istype(loc, /turf))
 		verbs.Add(/mob/living/silicon/ai/proc/ai_call_shuttle,/mob/living/silicon/ai/proc/ai_camera_track, \
 		/mob/living/silicon/ai/proc/ai_camera_list, /mob/living/silicon/ai/proc/ai_network_change, \
 		/mob/living/silicon/ai/proc/ai_statuschange, /mob/living/silicon/ai/proc/ai_hologram_change, \
-		/mob/living/silicon/ai/proc/toggle_camera_light)
+		/mob/living/silicon/ai/proc/toggle_camera_light, /mob/living/silicon/ai/proc/control_integrateed_radio)
 
 	//Languages
 	add_language("Sol Common", 0)
@@ -386,6 +390,13 @@ var/list/ai_list = list()
 //		src << text ("Switching Law [L]'s report status to []", lawcheck[L+1])
 		checklaws()
 
+	if (href_list["lawr"]) // Selects on which channel to state laws
+		var/setchannel = input(usr, "Specify channel.", "Channel selection") in list("State","Common","Science","Command","Medical","Engineering","Security","Supply","Binary","Holopad", "Cancel")
+		if(setchannel == "Cancel")
+			return
+		lawchannel = setchannel
+		checklaws()
+
 	//Uncomment this line of code if you are enabling the AI Vocal (VOX) announcements.
 /*
 	if(href_list["say_word"])
@@ -737,3 +748,12 @@ var/list/ai_list = list()
 			return
 	else
 		return ..()
+
+/mob/living/silicon/ai/proc/control_integrateed_radio()
+	set name = "Radio Settings"
+	set desc = "Allows you to change settings of your radio."
+	set category = "AI Commands"
+
+	src << "Accessing Subspace Transceiver control..."
+	if (src.aiRadio)
+		src.aiRadio.interact(src)

code/modules/mob/living/silicon/ai/freelook/cameranet.dm

@@ -128,6 +128,9 @@ var/datum/cameranet/cameranet = new()
 
 	// 0xf = 15
 	var/turf/position = get_turf(target)
+	return checkTurfVis(position)
+
+/datum/cameranet/proc/checkTurfVis(var/turf/position)
 	var/datum/camerachunk/chunk = getCameraChunk(position.x, position.y, position.z)
 	if(chunk)
 		if(chunk.changed)
@@ -136,7 +139,6 @@ var/datum/cameranet/cameranet = new()
 			return 1
 	return 0
 
-
 // Debug verb for VVing the chunk that the turf is in.
 /*
 /turf/verb/view_chunk()

code/modules/mob/living/silicon/ai/freelook/eye.dm

@@ -51,6 +51,12 @@
 			var/obj/machinery/hologram/holopad/H = ai.current
 			H.move_hologram()
 
+/mob/aiEye/proc/getLoc()
+
+	if(ai)
+		if(!isturf(ai.loc) || !ai.client)
+			return
+		return ai.eyeobj.loc
 
 // AI MOVEMENT
 

code/modules/mob/living/silicon/ai/laws.dm

@@ -51,24 +51,33 @@
 	src.laws_sanity_check()
 	src.laws.clear_supplied_laws()
 
-
-
-
-
 /mob/living/silicon/ai/proc/statelaws() // -- TLE
 //	set category = "AI Commands"
 //	set name = "State Laws"
-	src.say("Current Active Laws:")
+	/var/prefix = ""
+	switch(lawchannel)
+		if("Common") prefix = ";"
+		if("Science") prefix = ":n "
+		if("Command") prefix = ":c "
+		if("Medical") prefix = ":m "
+		if("Engineering") prefix = ":e "
+		if("Security") prefix = ":s "
+		if("Supply") prefix = ":u "
+		if("Binary") prefix = ":b "
+		if("Holopad") prefix = ":h "
+		else prefix = ""
+
+	if(src.say("[prefix]Current Active Laws:") != 1)
+		return
+
 	//src.laws_sanity_check()
 	//src.laws.show_laws(world)
 	var/number = 1
 	sleep(10)
 
-
-
 	if (src.laws.zeroth)
 		if (src.lawcheck[1] == "Yes") //This line and the similar lines below make sure you don't state a law unless you want to. --NeoFite
-			src.say("0. [src.laws.zeroth]")
+			src.say("[prefix]0. [src.laws.zeroth]")
 			sleep(10)
 
 	for (var/index = 1, index <= src.laws.ion.len, index++)
@@ -76,7 +85,7 @@
 		var/num = ionnum()
 		if (length(law) > 0)
 			if (src.ioncheck[index] == "Yes")
-				src.say("[num]. [law]")
+				src.say("[prefix][num]. [law]")
 				sleep(10)
 
 	for (var/index = 1, index <= src.laws.inherent.len, index++)
@@ -84,22 +93,20 @@
 
 		if (length(law) > 0)
 			if (src.lawcheck[index+1] == "Yes")
-				src.say("[number]. [law]")
+				src.say("[prefix][number]. [law]")
 				sleep(10)
 			number++
 
-
 	for (var/index = 1, index <= src.laws.supplied.len, index++)
 		var/law = src.laws.supplied[index]
 
 		if (length(law) > 0)
 			if(src.lawcheck.len >= number+1)
 				if (src.lawcheck[number+1] == "Yes")
-					src.say("[number]. [law]")
+					src.say("[prefix][number]. [law]")
 					sleep(10)
 				number++
 
-
 /mob/living/silicon/ai/verb/checklaws() //Gives you a link-driven interface for deciding what laws the statelaws() proc will share with the crew. --NeoFite
 	set category = "AI Commands"
 	set name = "State Laws"
@@ -144,6 +151,8 @@
 				src.lawcheck[number+1] = "Yes"
 			list += {"<A href='byond://?src=\ref[src];lawc=[number]'>[src.lawcheck[number+1]] [number]:</A> [law]<BR>"}
 			number++
-	list += {"<br><br><A href='byond://?src=\ref[src];laws=1'>State Laws</A>"}
+
+	list += {"<br><A href='byond://?src=\ref[src];lawr=1'>Channel: [src.lawchannel]</A><br>"}
+	list += {"<A href='byond://?src=\ref[src];laws=1'>State Laws</A>"}
 
 	usr << browse(list, "window=laws")

code/modules/mob/living/silicon/ai/say.dm

@@ -1,9 +1,8 @@
 /mob/living/silicon/ai/say(var/message)
 	if(parent && istype(parent) && parent.stat != 2)
-		parent.say(message)
-		return
+		return parent.say(message)
 		//If there is a defined "parent" AI, it is actually an AI, and it is alive, anything the AI tries to say is said by the parent instead.
-	..(message)
+	return ..(message)
 
 // These Verbs are commented out since we've disabled the AI vocal (VOX) announcements.
 // If you re-enable them there is 3 lines in ai.dm Topic() that you need to uncomment as well.

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

@@ -1,10 +1,12 @@
 /mob/living/silicon/pai
 	name = "pAI"
-	icon = 'icons/mob/mob.dmi'//
-	icon_state = "shadow"
+	icon = 'icons/mob/pai.dmi'
+	icon_state = "repairbot"
 
 	robot_talk_understand = 0
 	emote_type = 2		// pAIs emotes are heard, not seen, so they can be seen through a container (eg. person)
+	small = 1
+	pass_flags = 1
 
 	var/network = "SS13"
 	var/obj/machinery/camera/current = null
@@ -15,11 +17,22 @@
 	var/obj/item/device/paicard/card	// The card we inhabit
 	var/obj/item/device/radio/radio		// Our primary radio
 
-	var/speakStatement = "states"
-	var/speakExclamation = "declares"
-	var/speakQuery = "queries"
-
+	var/chassis = "repairbot"   // A record of your chosen chassis.
+	var/global/list/possible_chassis = list(
+		"Drone" = "repairbot",
+		"Cat" = "cat",
+		"Mouse" = "mouse",
+		"Monkey" = "monkey"
+		)
 
+	var/global/list/possible_say_verbs = list(
+		"Robotic" = list("states","declares","queries"),
+		"Natural" = list("says","yells","asks"),
+		"Beep" = list("beeps","beeps loudly","boops"),
+		"Chirp" = list("chirps","chirrups","cheeps"),
+		"Feline" = list("purrs","yowls","meows")
+		)
+	
 	var/obj/item/weapon/pai_cable/cable		// The cable we produce and use when door or camera jacking
 
 	var/master				// Name of the one who commands us
@@ -56,6 +69,7 @@
 
 
 /mob/living/silicon/pai/New(var/obj/item/device/paicard)
+
 	canmove = 0
 	src.loc = paicard
 	card = paicard
@@ -70,6 +84,10 @@
 	add_language("Tradeband", 1)
 	add_language("Gutter", 1)
 
+	verbs += /mob/living/silicon/pai/proc/fold_out
+	verbs += /mob/living/silicon/pai/proc/choose_chassis
+	verbs += /mob/living/silicon/pai/proc/choose_verbs
+
 	//PDA
 	pda = new(src)
 	spawn(5)
@@ -115,7 +133,9 @@
 	return 0
 
 /mob/living/silicon/pai/restrained()
-	return 0
+	if(istype(src.loc,/obj/item/device/paicard))
+		return 0
+	..()
 
 /mob/living/silicon/pai/emp_act(severity)
 	// Silence for 2 minutes
@@ -233,7 +253,6 @@
 	src.reset_view(C)
 	return 1
 
-
 /mob/living/silicon/pai/cancel_camera()
 	set category = "pAI Commands"
 	set name = "Cancel Camera View"
@@ -277,3 +296,144 @@
 	card.setPersonality(pai)
 
 */
+
+// Procs/code after this point is used to convert the stationary pai item into a
+// mobile pai mob. This also includes handling some of the general shit that can occur
+// to it. Really this deserves its own file, but for the moment it can sit here. ~ Z
+
+/mob/living/silicon/pai/proc/fold_out()
+	set category = "pAI Commands"
+	set name = "Unfold Chassis"
+
+	if(stat || sleeping || paralysis || weakened)
+		return
+
+	if(src.loc != card)
+		return
+
+	if(world.time <= last_special)
+		return
+
+	last_special = world.time + 100
+	verbs -= /mob/living/silicon/pai/proc/fold_out
+	verbs += /mob/living/silicon/pai/proc/fold_up
+
+	var/turf/T = get_turf(src)
+	if(istype(T)) T.visible_message("<b>[src]</b> folds outwards, expanding into a mobile form.")
+	canmove = 1
+
+	//I'm not sure how much of this is necessary, but I would rather avoid issues.
+	if(istype(card.loc,/mob))
+		var/mob/M = card.loc
+		M.drop_item(card)
+
+	src.client.perspective = EYE_PERSPECTIVE
+	src.client.eye = src
+
+	src.forceMove(get_turf(card))
+	card.forceMove(src)
+
+/mob/living/silicon/pai/proc/fold_up()
+	set category = "pAI Commands"
+	set name = "Collapse Chassis"
+
+	if(stat || sleeping || paralysis || weakened)
+		return
+
+	if(src.loc == card)
+		return
+
+	if(world.time <= last_special)
+		return
+
+	close_up()
+
+/mob/living/silicon/pai/proc/choose_chassis()
+	set category = "pAI Commands"
+	set name = "Choose Chassis"
+
+	var/choice
+	var/finalized = "No"
+	while(finalized == "No" && src.client)
+
+		choice = input(usr,"What would you like to use for your mobile chassis icon? This decision can only be made once.") as null|anything in possible_chassis
+		if(!choice) return
+
+		icon_state = possible_chassis[choice]
+		finalized = alert("Look at your sprite. Is this what you wish to use?",,"No","Yes")
+
+	chassis = possible_chassis[choice]
+	verbs -= /mob/living/silicon/pai/proc/choose_chassis
+
+/mob/living/silicon/pai/proc/choose_verbs()
+	set category = "pAI Commands"
+	set name = "Choose Speech Verbs"
+
+	var/choice = input(usr,"What theme would you like to use for your speech verbs? This decision can only be made once.") as null|anything in possible_say_verbs
+	if(!choice) return
+
+	var/list/sayverbs = possible_say_verbs[choice]
+	speak_statement = sayverbs[1]
+	speak_exclamation = sayverbs[(sayverbs.len>1 ? 2 : sayverbs.len)]
+	speak_query = sayverbs[(sayverbs.len>2 ? 3 : sayverbs.len)]
+
+	verbs -= /mob/living/silicon/pai/proc/choose_verbs
+
+/mob/living/silicon/pai/lay_down()
+	set name = "Rest"
+	set category = "IC"
+
+	if(istype(src.loc,/obj/item/device/paicard))
+		resting = 0
+	else
+		resting = !resting
+		icon_state = resting ? "[chassis]_rest" : "[chassis]"
+		src << "\blue You are now [resting ? "resting" : "getting up"]"
+
+	canmove = !resting
+
+//Overriding this will stop a number of headaches down the track.
+/mob/living/silicon/pai/attackby(obj/item/weapon/W as obj, mob/user as mob)
+	if(W.force)
+		visible_message("<span class='danger'>[user.name] attacks [src] with [W]!</span>")
+		src.adjustBruteLoss(W.force)
+		src.updatehealth()
+	else
+		visible_message("<span class='warning'>[user.name] bonks [src] harmlessly with [W].</span>")
+	if(stat != 2) close_up()
+	return
+
+/mob/living/silicon/pai/attack_hand(mob/user as mob)
+	visible_message("<span class='danger'>[user.name] boops [src] on the head.</span>")
+	close_up()
+
+//I'm not sure how much of this is necessary, but I would rather avoid issues.
+/mob/living/silicon/pai/proc/close_up()
+
+	last_special = world.time + 100
+
+	verbs -= /mob/living/silicon/pai/proc/fold_up
+	verbs += /mob/living/silicon/pai/proc/fold_out
+
+	var/turf/T = get_turf(src)
+	if(istype(T)) T.visible_message("<b>[src]</b> neatly folds inwards, compacting down to a rectangular card.")
+
+	src.stop_pulling()
+	src.client.perspective = EYE_PERSPECTIVE
+	src.client.eye = card
+
+	//This seems redundant but not including the forced loc setting messes the behavior up.
+	src.loc = card
+	card.loc = get_turf(card)
+	src.forceMove(card)
+	card.forceMove(card.loc)
+	canmove = 0
+
+/mob/living/silicon/pai/start_pulling(var/atom/movable/AM)
+
+	if(istype(AM,/obj/item))
+		var/obj/item/O = AM
+		if(O.w_class == 1)
+			..()
+		else
+			src << "<span class='warning'>You are too small to pull that.</span>"

code/modules/mob/living/silicon/pai/software.dm

@@ -528,14 +528,22 @@
 		dat += {"<h2>Medical Analysis Suite</h2><hr>
 				 <h4>Host Bioscan</h4>
 				"}
-		var/mob/living/M = src.loc
-		if(!istype(M, /mob/living))
-			while (!istype(M, /mob/living))
-				M = M.loc
-				if(istype(M, /turf))
-					src.temp = "Error: No biological host found. <br>"
-					src.subscreen = 0
-					return dat
+
+		var/mob/living/M
+		//If we are not deployed, check the holder of the card.
+		if(src.loc == card)
+			M = card.loc
+
+		//If we are deployed or the card is not held, check the first living mob in our turf.
+		if(!M || !istype(M))
+			var/turf/T = get_turf(src)
+			M = locate(/mob/living/) in T.contents
+
+		if(!M || !istype(M))
+			src.temp = "Error: No biological host found. <br>"
+			src.subscreen = 0
+			return dat
+
 		dat += {"<b>Bioscan Results for [M]</b>: <br>
 		Overall Status: [M.stat > 1 ? "dead" : "[M.health]% healthy"] <br><br>
 
@@ -568,22 +576,13 @@
 		var/datum/gas_mixture/environment = T.return_air()
 
 		var/pressure = environment.return_pressure()
-		var/total_moles = environment.total_moles()
+		var/total_moles = environment.total_moles
 
 		dat += "Air Pressure: [round(pressure,0.1)] kPa<br>"
 
-		if (total_moles)
-			var/o2_level = environment.oxygen/total_moles
-			var/n2_level = environment.nitrogen/total_moles
-			var/co2_level = environment.carbon_dioxide/total_moles
-			var/phoron_level = environment.phoron/total_moles
-			var/unknown_level =  1-(o2_level+n2_level+co2_level+phoron_level)
-			dat += "Nitrogen: [round(n2_level*100)]%<br>"
-			dat += "Oxygen: [round(o2_level*100)]%<br>"
-			dat += "Carbon Dioxide: [round(co2_level*100)]%<br>"
-			dat += "Phoron: [round(phoron_level*100)]%<br>"
-			if(unknown_level > 0.01)
-				dat += "OTHER: [round(unknown_level)]%<br>"
+		if(total_moles)
+			for(var/g in environment.gas)
+				dat += "[gas_data.name[g]]: [round((environment.gas[g] / total_moles) * 100)]%<br>"
 		dat += "Temperature: [round(environment.temperature-T0C)]&deg;C<br>"
 	dat += "<br><a href='byond://?src=\ref[src];software=atmosensor;sub=0'>Refresh Reading</a>"
 	return dat

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

@@ -897,7 +897,7 @@
 
 		var/damage = rand(1, 3)
 
-		if(istype(src, /mob/living/carbon/slime/adult))
+		if(M.is_adult)
 			damage = rand(20, 40)
 		else
 			damage = rand(5, 35)

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

@@ -2,11 +2,11 @@
 	var/ending = copytext(text, length(text))
 
 	if (ending == "?")
-		return "queries"
+		return speak_query
 	else if (ending == "!")
-		return "declares"
+		return speak_exclamation
 
-	return "states"
+	return speak_statement
 
 #define IS_AI 1
 #define IS_ROBOT 2
@@ -85,14 +85,14 @@
 		if("department")
 			switch(bot_type)
 				if(IS_AI)
-					AI.holopad_talk(message)
+					return AI.holopad_talk(message)
 				if(IS_ROBOT)
 					log_say("[key_name(src)] : [message]")
 					R.radio.talk_into(src,message,message_mode,verb,speaking)
 				if(IS_PAI)
 					log_say("[key_name(src)] : [message]")
 					P.radio.talk_into(src,message,message_mode,verb,speaking)
-			return
+			return 1
 
 		if("binary")
 			switch(bot_type)
@@ -105,32 +105,41 @@
 					return
 
 			robot_talk(message)
-			return
+			return 1
 		if("general")
 			switch(bot_type)
 				if(IS_AI)
-					src << "Yeah, not yet, sorry"
+					if (AI.aiRadio.disabledAi)
+						src << "\red System Error - Transceiver Disabled"
+						return
+					else
+						log_say("[key_name(src)] : [message]")
+						AI.aiRadio.talk_into(src,message,null,verb,speaking)
 				if(IS_ROBOT)
 					log_say("[key_name(src)] : [message]")
 					R.radio.talk_into(src,message,null,verb,speaking)
 				if(IS_PAI)
 					log_say("[key_name(src)] : [message]")
 					P.radio.talk_into(src,message,null,verb,speaking)
-			return
+			return 1
 
 		else
 			if(message_mode && message_mode in radiochannels)
 				switch(bot_type)
 					if(IS_AI)
-						src << "You don't have this function yet, I'm working on it"
-						return
+						if (AI.aiRadio.disabledAi)
+							src << "\red System Error - Transceiver Disabled"
+							return
+						else
+							log_say("[key_name(src)] : [message]")
+							AI.aiRadio.talk_into(src,message,message_mode,verb,speaking)
 					if(IS_ROBOT)
 						log_say("[key_name(src)] : [message]")
 						R.radio.talk_into(src,message,message_mode,verb,speaking)
 					if(IS_PAI)
 						log_say("[key_name(src)] : [message]")
 						P.radio.talk_into(src,message,message_mode,verb,speaking)
-				return
+				return 1
 
 	return ..(message,speaking,verb)
 
@@ -165,7 +174,8 @@
 		This is another way of saying that we won't bother dealing with them.*/
 	else
 		src << "No holopad connected."
-	return
+		return
+	return 1
 
 /mob/living/proc/robot_talk(var/message)
 

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

@@ -8,6 +8,11 @@
 	var/list/hud_list[9]
 	var/list/speech_synthesizer_langs = list()	//which languages can be vocalized by the speech synthesizer
 
+	//Used in say.dm.
+	var/speak_statement = "states"
+	var/speak_exclamation = "declares"
+	var/speak_query = "queries"
+
 /mob/living/silicon/proc/show_laws()
 	return
 
@@ -141,7 +146,7 @@
 
 /mob/living/silicon/remove_language(var/rem_language)
 	..(rem_language)
-	
+
 	for (var/datum/language/L in speech_synthesizer_langs)
 		if (L.name == rem_language)
 			speech_synthesizer_langs -= L

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

@@ -126,7 +126,7 @@
 	src << "<span class='warning'>You are too small to pull anything.</span>"
 	return
 
-/mob/living/simple_animal/mouse/HasEntered(AM as mob|obj)
+/mob/living/simple_animal/mouse/Crossed(AM as mob|obj)
 	if( ishuman(AM) )
 		if(!stat)
 			var/mob/M = AM

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

@@ -141,41 +141,41 @@
 	//Atmos
 	var/atmos_suitable = 1
 
-	var/atom/A = src.loc		
+	var/atom/A = src.loc
 
 	if(istype(A,/turf))
-		var/turf/T = A	
-		
+		var/turf/T = A
+
 		var/datum/gas_mixture/Environment = T.return_air()
-	
+
 		if(Environment)
-			
+
 			if( abs(Environment.temperature - bodytemperature) > 40 )
 				bodytemperature += ((Environment.temperature - bodytemperature) / 5)
-			
+
 			if(min_oxy)
-				if(Environment.oxygen < min_oxy)
+				if(Environment.gas["oxygen"] < min_oxy)
 					atmos_suitable = 0
 			if(max_oxy)
-				if(Environment.oxygen > max_oxy)
+				if(Environment.gas["oxygen"] > max_oxy)
 					atmos_suitable = 0
 			if(min_tox)
-				if(Environment.phoron < min_tox)
+				if(Environment.gas["phoron"] < min_tox)
 					atmos_suitable = 0
 			if(max_tox)
-				if(Environment.phoron > max_tox)
+				if(Environment.gas["phoron"] > max_tox)
 					atmos_suitable = 0
 			if(min_n2)
-				if(Environment.nitrogen < min_n2)
+				if(Environment.gas["nitrogen"] < min_n2)
 					atmos_suitable = 0
 			if(max_n2)
-				if(Environment.nitrogen > max_n2)
+				if(Environment.gas["nitrogen"] > max_n2)
 					atmos_suitable = 0
 			if(min_co2)
-				if(Environment.carbon_dioxide < min_co2)
+				if(Environment.gas["carbon_dioxide"] < min_co2)
 					atmos_suitable = 0
 			if(max_co2)
-				if(Environment.carbon_dioxide > max_co2)
+				if(Environment.gas["carbon_dioxide"] > max_co2)
 					atmos_suitable = 0
 
 	//Atmos effect
@@ -335,7 +335,7 @@
 
 	var/damage = rand(1, 3)
 
-	if(istype(src, /mob/living/carbon/slime/adult))
+	if(M.is_adult)
 		damage = rand(20, 40)
 	else
 		damage = rand(5, 35)

code/modules/mob/mob.dm

@@ -13,25 +13,6 @@
 		living_mob_list += src
 	..()
 
-/mob/proc/Cell()
-	set category = "Admin"
-	set hidden = 1
-
-	if(!loc) return 0
-
-	var/datum/gas_mixture/environment = loc.return_air()
-
-	var/t = "\blue Coordinates: [x],[y] \n"
-	t+= "\red Temperature: [environment.temperature] \n"
-	t+= "\blue Nitrogen: [environment.nitrogen] \n"
-	t+= "\blue Oxygen: [environment.oxygen] \n"
-	t+= "\blue Phoron : [environment.phoron] \n"
-	t+= "\blue Carbon Dioxide: [environment.carbon_dioxide] \n"
-	for(var/datum/gas/trace_gas in environment.trace_gases)
-		usr << "\blue [trace_gas.type]: [trace_gas.moles] \n"
-
-	usr.show_message(t, 1)
-
 /mob/proc/show_message(msg, type, alt, alt_type)//Message, type of message (1 or 2), alternative message, alt message type (1 or 2)
 
 	if(!client)	return
@@ -721,7 +702,7 @@ note dizziness decrements automatically in the mob's Life() proc.
 				stat(null,"MasterController-ERROR")
 
 	if(listed_turf && client)
-		if(get_dist(listed_turf,src) > 1)
+		if(!TurfAdjacent(listed_turf))
 			listed_turf = null
 		else
 			statpanel(listed_turf.name, null, listed_turf)

code/modules/mob/mob_helpers.dm

@@ -35,11 +35,6 @@
 		return 1
 	return 0
 
-/proc/isslimeadult(A)
-	if(istype(A, /mob/living/carbon/slime/adult))
-		return 1
-	return 0
-
 /proc/isrobot(A)
 	if(istype(A, /mob/living/silicon/robot))
 		return 1

code/modules/mob/transform_procs.dm

@@ -127,6 +127,9 @@
 	O.verbs += /mob/living/silicon/ai/proc/ai_camera_list
 	O.verbs += /mob/living/silicon/ai/proc/ai_statuschange
 	O.verbs += /mob/living/silicon/ai/proc/ai_roster
+	O.verbs += /mob/living/silicon/ai/proc/ai_store_location
+	O.verbs += /mob/living/silicon/ai/proc/ai_goto_location
+	O.verbs += /mob/living/silicon/ai/proc/ai_remove_location
 
 	O.job = "AI"
 
@@ -245,11 +248,10 @@
 			babies += M
 		new_slime = pick(babies)
 	else
+		new_slime = new /mob/living/carbon/slime(loc)
 		if(adult)
-			new_slime = new /mob/living/carbon/slime/adult(loc)
+			new_slime.is_adult = 1
 		else
-			new_slime = new /mob/living/carbon/slime(loc)
-	new_slime.a_intent = "hurt"
 	new_slime.key = key
 
 	new_slime << "<B>You are now a slime. Skreee!</B>"