Bay Merge

code/modules/admin/admin_verbs.dm

@@ -978,15 +978,12 @@ var/list/admin_verbs_mod = list(
 		return
 
 	var/datum/gas_mixture/environment = usr.loc.return_air()
-	environment.toxins_archived = null
-	environment.toxins = 0
-	environment.carbon_dioxide = 0
-	environment.carbon_dioxide_archived = null
-	environment.oxygen = 21.8366
-	environment.oxygen_archived = null
-	environment.nitrogen = 82.1472
-	environment.nitrogen_archived = null
-	environment.temperature_archived = null
+	environment.gas["phoron"] = 0
+	environment.gas["nitrogen"] = 82.1472
+	environment.gas["oxygen"] = 21.8366
+	environment.gas["carbon_dioxide"] = 0
+	environment.gas["sleeping_agent"] = 0
+	environment.gas["oxygen_agent_b"] = 0
 	environment.temperature = 293.15
 	environment.update_values()
 	var/turf/simulated/location = get_turf(usr)

code/modules/admin/player_panel.dm

@@ -371,7 +371,6 @@
 
 
 		if(usr.client)
-			var/client/C = usr.client
 			if(!check_rights(R_ADMIN|R_MOD, 0))
 				dat += {"<td align=center> N/A </td>"}
 			else

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

@@ -134,8 +134,22 @@ Please contact me on #coderbus IRC. ~Carn x
 
 /mob/living/carbon/human
 	var/list/overlays_standing[TOTAL_LAYERS]
+	var/list/overlays_lying[TOTAL_LAYERS]
 	var/previous_damage_appearance // store what the body last looked like, so we only have to update it if something changed
 
+/mob/living/carbon/human/proc/apply_overlay(cache_index)
+	var/image/I = lying ? overlays_lying[cache_index] : overlays_standing[cache_index]
+	if(I)
+		overlays += I
+
+/mob/living/carbon/human/proc/remove_overlay(cache_index)
+	if(overlays_lying[cache_index])
+		overlays -= overlays_lying[cache_index]
+		overlays_lying[cache_index] = null
+	if(overlays_standing[cache_index])
+		overlays -= overlays_standing[cache_index]
+		overlays_standing[cache_index] = null
+
 //UPDATES OVERLAYS FROM OVERLAYS_LYING/OVERLAYS_STANDING
 //this proc is messy as I was forced to include some old laggy cloaking code to it so that I don't break cloakers
 //I'll work on removing that stuff by rewriting some of the cloaking stuff at a later date.

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

@@ -204,35 +204,35 @@
 			var/new_powerlevel = round(powerlevel / 4)
 			for(var/i=1,i<=4,i++)
 				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/O = new mutationone(loc)
-							O.nutrition = new_nutrition
-							O.powerlevel = new_powerlevel
-							if(i != 1) step_away(M,src)
-							babies += O
-						if("two")
-							var/mob/living/carbon/slime/K = new mutationtwo(loc)
-							K.nutrition = new_nutrition
-							K.powerlevel = new_powerlevel
-							if(i != 1) step_away(M,src)
-							babies += K
-						if("three")
-							var/mob/living/carbon/slime/L = new mutationthree(loc)
-							L.nutrition = new_nutrition
-							L.powerlevel = new_powerlevel
-							if(i != 1) step_away(M,src)
-							babies += L
-						if("four")
-							var/mob/living/carbon/slime/N = new mutationfour(loc)
-							N.nutrition = new_nutrition
-							N.powerlevel = new_powerlevel
-							if(i != 1) step_away(M,src)
-							babies += N
+//				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/O = new mutationone(loc)
+						O.nutrition = new_nutrition
+						O.powerlevel = new_powerlevel
+						if(i != 1) step_away(M,src)
+						babies += O
+					if("two")
+						var/mob/living/carbon/slime/K = new mutationtwo(loc)
+						K.nutrition = new_nutrition
+						K.powerlevel = new_powerlevel
+						if(i != 1) step_away(M,src)
+						babies += K
+					if("three")
+						var/mob/living/carbon/slime/L = new mutationthree(loc)
+						L.nutrition = new_nutrition
+						L.powerlevel = new_powerlevel
+						if(i != 1) step_away(M,src)
+						babies += L
+					if("four")
+						var/mob/living/carbon/slime/N = new mutationfour(loc)
+						N.nutrition = new_nutrition
+						N.powerlevel = new_powerlevel
+						if(i != 1) step_away(M,src)
+						babies += N
 
 			var/mob/living/carbon/slime/new_slime = pick(babies)
 			new_slime.universal_speak = universal_speak

code/modules/mob/living/living_defense.dm

@@ -197,7 +197,8 @@
 	if(!on_fire)
 		return 1
 	var/datum/gas_mixture/G = loc.return_air() // Check if we're standing in an oxygenless environment
-	if(G.oxygen < 1) //Investigate this when it's NOT 2332hrs local, K? - Skull132
+	if(!G.gas["oxygen"])
+//	if(G.oxygen < 1) //Investigate this when it's NOT 2332hrs local, K? - Skull132
 		ExtinguishMob() //If there's no oxygen in the tile we're on, put out the fire
 		return
 	var/turf/location = get_turf(src)

code/modules/supermatter/supermatter.dm

@@ -204,16 +204,8 @@
 			equilibrium_power = 250
 			icon_state = base_icon_state
 
-<<<<<<< HEAD
 		temp_factor = ( (equilibrium_power/DECAY_FACTOR)**3 )/800
 		power = max( (removed.temperature * temp_factor) * oxygen + power, 0)
-=======
-	//Also keep in mind we are only adding this temperature to (efficiency)% of the one tile the rock
-	//is on. An increase of 4*C @ 25% efficiency here results in an increase of 1*C / (#tilesincore) overall.
-
-	var/thermal_power = THERMAL_RELEASE_MODIFIER
-	if(removed.total_moles < 35) thermal_power += 750   //If you don't add coolant, you are going to have a bad time.
->>>>>>> master
 
 		//We've generated power, now let's transfer it to the collectors for storing/usage
 		transfer_energy()