Fixed r500 (faces displaying above glasses and such) Cause: face layer was set to MOB_LAYER.

Fixed r501 (underwear not showing) Cause: bad indentation

A possible fix for some very odd bugs caused by restarting the MC related to the usr variable being passed into the MC. *shrug* Very hard to test.

Removed the need for the world to be in Debug2 mode to edit ticklag as the verb is hidden behind another proc now anyway, and it's become more of an annoyance than a thing to stop people accidentally clicking it.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3695 316c924e-a436-60f5-8080-3fe189b3f50e

code/modules/admin/verbs/MC.dm

@@ -1,8 +1,11 @@
 /client/proc/restartcontroller()
 	set category = "Debug"
 	set name = "Restart Master Controller"
+	if(!holder)	return
 	switch(alert("Are you sure?  If the control is still running it will now be running twice.",,"Yes","No"))
 		if("Yes")
+			src = null
+			usr = null	//weird things were happening after restarting MC.
 			spawn(0)
 				master_controller.process()
 		if("No")

code/modules/admin/verbs/ticklag.dm

@@ -4,33 +4,29 @@
 	set category = "Debug"
 	set name = "Set Ticklag"
 	set desc = "Sets a new tick lag. Recommend you don't mess with this too much! Stable, time-tested ticklag value is 0.9"
-	if(Debug2)
-		if(src.holder)
-			if(!src.mob)	return
 
-			if(src.holder.rank in list("Game Admin", "Game Master"))
+	if(src.holder)
-				var/newtick = input("Sets a new tick lag. Please don't mess with this too much! The stable, time-tested ticklag value is 0.9","Lag of Tick", world.tick_lag) as num|null
+		if(!src.mob)	return
-				//I've used ticks of 2 before to help with serious singulo lags
-				if(newtick && newtick <= 2 && newtick > 0)
-					log_admin("[key_name(src)] has modified world.tick_lag to [newtick]", 0)
-					message_admins("[key_name(src)] has modified world.tick_lag to [newtick]", 0)
-					world.tick_lag = newtick
-					feedback_add_details("admin_verb","TICKLAG") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
 
-					switch(alert("Enable Tick Compensation?","Tick Comp is currently: [config.Tickcomp]","Yes","No"))
+		if(src.holder.rank in list("Game Admin", "Game Master"))
-						if("Yes")
+			var/newtick = input("Sets a new tick lag. Please don't mess with this too much! The stable, time-tested ticklag value is 0.9","Lag of Tick", world.tick_lag) as num|null
-							config.Tickcomp = 1
+			//I've used ticks of 2 before to help with serious singulo lags
-						else
+			if(newtick && newtick <= 2 && newtick > 0)
-							config.Tickcomp = 0
+				log_admin("[key_name(src)] has modified world.tick_lag to [newtick]", 0)
+				message_admins("[key_name(src)] has modified world.tick_lag to [newtick]", 0)
+				world.tick_lag = newtick
+				feedback_add_details("admin_verb","TICKLAG") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
 
-					return
+				switch(alert("Enable Tick Compensation?","Tick Comp is currently: [config.Tickcomp]","Yes","No"))
+					if("Yes")
+						config.Tickcomp = 1
+					else
+						config.Tickcomp = 0
 
-
-				src << "\red Error: ticklag(): Invalid world.ticklag value. No changes made."
 				return
 
-			src << "\red Error: ticklag(): You are not authorised to use this. Game Admins and higher only."
+			src << "\red Error: ticklag(): Invalid world.ticklag value. No changes made."
 			return
-	else
+
-		src << "\red Error: ticklag(): You must first enable Debugging mode."
+		src << "\red Error: ticklag(): You are not authorised to use this. Game Admins and higher only."
-		return
+		return

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

@@ -1187,93 +1187,50 @@
 	return 0
 
 /mob/living/carbon/human/proc/update_body()
-	if(stand_icon)
+	if(stand_icon)	del(stand_icon)
-		del(stand_icon)
+	if(lying_icon)	del(lying_icon)
-	if(lying_icon)
+	if(mutantrace)	return
-		del(lying_icon)
-
-	if (mutantrace)
-		return
 
 	var/g = "m"
-	if (gender == MALE)
+	if(gender == FEMALE)	g = "f"
-		g = "m"
-	else if (gender == FEMALE)
-		g = "f"
-
-	stand_icon = new /icon('human.dmi', "blank")
-	lying_icon = new /icon('human.dmi', "blank")
-
 	var/husk = (HUSK in src.mutations)
 	var/obese = (FAT in src.mutations)
 
-	if (husk)
+	//Base mob icon
-		stand_icon.Blend(new /icon('human.dmi', "husk_s"), ICON_OVERLAY)
+	if(husk)
-		lying_icon.Blend(new /icon('human.dmi', "husk_l"), ICON_OVERLAY)
+		stand_icon = new /icon('human.dmi', "husk_s")
-
+		lying_icon = new /icon('human.dmi', "husk_l")
 	else if(obese)
-		stand_icon.Blend(new /icon('human.dmi', "fatbody_s"), ICON_OVERLAY)
+		stand_icon = new /icon('human.dmi', "fatbody_s")
-		lying_icon.Blend(new /icon('human.dmi', "fatbody_l"), ICON_OVERLAY)
+		lying_icon = new /icon('human.dmi', "fatbody_l")
-/*
 	else
-		stand_icon.Blend(new /icon('human.dmi', "chest_[g]_s"), ICON_OVERLAY)
+		stand_icon = new /icon('human.dmi', "body_[g]_s")
-		lying_icon.Blend(new /icon('human.dmi', "chest_[g]_l"), ICON_OVERLAY)
+		lying_icon = new /icon('human.dmi', "body_[g]_l")
 
-		stand_icon.Blend(new /icon('human.dmi', "groin_[g]_s"), ICON_OVERLAY)
+	//Skin tone
-		lying_icon.Blend(new /icon('human.dmi', "groin_[g]_l"), ICON_OVERLAY)
+	if(s_tone >= 0)
-
-		if (husk)
-			var/icon/husk_s = new /icon('human.dmi', "husk_s")
-			var/icon/husk_l = new /icon('human.dmi', "husk_l")
-
-			stand_icon.Blend(husk_s, ICON_OVERLAY)
-			lying_icon.Blend(husk_l, ICON_OVERLAY)
-		else if(obese)
-			stand_icon.Blend(new /icon('human.dmi', "fatbody_s"), ICON_OVERLAY)
-			lying_icon.Blend(new /icon('human.dmi', "fatbody_l"), ICON_OVERLAY)
-{R}*/
-	else
-		stand_icon.Blend(new /icon('human.dmi', "chest_[g]_s"), ICON_OVERLAY)
-		lying_icon.Blend(new /icon('human.dmi', "chest_[g]_l"), ICON_OVERLAY)
-
-		for (var/part in list("arm_left", "arm_right", "hand_left", "hand_right", "leg_left", "leg_right", "foot_left", "foot_right"))
-			stand_icon.Blend(new /icon('human.dmi', "[part]_s"), ICON_OVERLAY)
-			lying_icon.Blend(new /icon('human.dmi', "[part]_l"), ICON_OVERLAY)
-
-		for(var/part in list("head","groin"))
-			stand_icon.Blend(new /icon('human.dmi', "[part]_[g]_s"), ICON_OVERLAY)
-			lying_icon.Blend(new /icon('human.dmi', "[part]_[g]_l"), ICON_OVERLAY)
-
-	// Skin tone
-	if (s_tone >= 0)
 		stand_icon.Blend(rgb(s_tone, s_tone, s_tone), ICON_ADD)
 		lying_icon.Blend(rgb(s_tone, s_tone, s_tone), ICON_ADD)
 	else
 		stand_icon.Blend(rgb(-s_tone,  -s_tone,  -s_tone), ICON_SUBTRACT)
 		lying_icon.Blend(rgb(-s_tone,  -s_tone,  -s_tone), ICON_SUBTRACT)
 
-		if (underwear < 6 && underwear > 0)
+	//Underwear
-			if(!obese)
+	if(underwear < 6 && underwear > 0)
-				stand_icon.Blend(new /icon('human.dmi', "underwear[underwear]_[g]_s"), ICON_OVERLAY)
+		if(!obese)
-				lying_icon.Blend(new /icon('human.dmi', "underwear[underwear]_[g]_l"), ICON_OVERLAY)
+			stand_icon.Blend(new /icon('human.dmi', "underwear[underwear]_[g]_s"), ICON_OVERLAY)
-
+			lying_icon.Blend(new /icon('human.dmi', "underwear[underwear]_[g]_l"), ICON_OVERLAY)
 
 
 
 /mob/living/carbon/human/proc/update_face()
-
 	if(!facial_hair_style || !hair_style)	return//Seems people like to lose their icons, this should stop the runtimes for now
-	del(face_standing)
+	if(face_standing)	del(face_standing)
-	del(face_lying)
+	if(face_lying)		del(face_lying)
-
+	if(mutantrace)		return
-	if (mutantrace)
-		return
 
 	var/g = "m"
-	if (gender == MALE)
+	if (gender == FEMALE)	g = "f"
-		g = "m"
-	else if (gender == FEMALE)
-		g = "f"
 
 	var/icon/eyes_s = new/icon("icon" = 'human_face.dmi', "icon_state" = "eyes_s")
 	var/icon/eyes_l = new/icon("icon" = 'human_face.dmi', "icon_state" = "eyes_l")
@@ -1310,9 +1267,7 @@
 	face_standing = new /image()
 	face_lying = new /image()
 	face_standing.icon = eyes_s
-	face_standing.layer = MOB_LAYER
 	face_lying.icon = eyes_l
-	face_lying.layer = MOB_LAYER
 
 	del(mouth_l)
 	del(mouth_s)

code/modules/mob/new_player/preferences_setup.dm

@@ -206,10 +206,7 @@ datum/preferences
 		var/icon/preview_icon = null
 
 		var/g = "m"
-		if (gender == MALE)
+		if (gender == FEMALE)	g = "f"
-			g = "m"
-		else if (gender == FEMALE)
-			g = "f"
 
 		preview_icon = new /icon('human.dmi', "body_[g]_s")