This commit is a load of pants.

Credits to PowerfulStation devs for a few of the sprites which are not made by myself. Credits to Cheridan for the kinky stuff.

Minor runtime fix where target was becoming null...somehow.

Moved unused dmis into the icons/unused directory. They won't even be searched through if you are using resources.dm and have 'dream-maker > build > preferences > Automatically set FILE_DIR' off.
Should save a megabyte or two from the resourcefile.

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

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

@@ -1479,7 +1479,8 @@ It can still be worn/put on as normal.
 							target.internals.icon_state = "internal1"
 	//update overlays
 //	source.update_icons()
-	target.update_icons()
+	if(target)
+		target.update_icons()
 
 	spawn(0)	// <-- not sure why this spawn is here
 		if(source)

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

@@ -217,7 +217,7 @@ Please contact me on #coderbus IRC. ~Carn x
 	lying_icon.Blend(new/icon('human_face.dmi', "mouth_[g]_l"), ICON_OVERLAY)
 
 	//Underwear
-	if(underwear < 6 && underwear > 0)
+	if(underwear < 12 && underwear > 0)
 		if(!fat)
 			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)

code/modules/mob/new_player/preferences.dm

@@ -65,8 +65,8 @@ datum/preferences
 		//Just like it sounds
 	var/ooccolor = "#b82e00"
 	var/underwear = 1
-	var/list/underwear_m = list("White", "Grey", "Green", "Blue", "Black", "None") //Curse whoever made male/female underwear diffrent colours
-	var/list/underwear_f = list("Red", "White", "Yellow", "Blue", "Black", "None")
+	var/list/underwear_m = list("White", "Grey", "Green", "Blue", "Black", "Mankini", "Love-Hearts", "Black2", "Grey2", "Stripey", "Kinky", "None") //Curse whoever made male/female underwear diffrent colours
+	var/list/underwear_f = list("Red", "White", "Yellow", "Blue", "Black", "Thong", "Babydoll", "Baby-Blue", "Green", "Pink", "Kinky", "None")
 	var/backbag = 2
 	var/list/backbaglist = list("Nothing", "Backpack", "Satchel")
 
@@ -639,10 +639,7 @@ datum/preferences
 					if(tempUnderwear)
 						underwear = underwear_f.Find(tempUnderwear)
 				if("random")
-					if(prob (75))
-						underwear = pick(1,2,3,4,5)
-					else
-						underwear = 6
+					underwear = rand(1,12)
 
 		if(link_tags["backbag_type"])
 			switch(link_tags["backbag_type"])
@@ -746,7 +743,7 @@ datum/preferences
 		character.hair_style = hair_style
 		character.facial_hair_style = facial_hair_style
 
-		if(underwear > 6 || underwear < 1)
+		if(underwear > 12 || underwear < 1)
 			underwear = 1 //I'm sure this is 100% unnecessary, but I'm paranoid... sue me.
 		character.underwear = underwear
 

code/modules/mob/new_player/preferences_setup.dm

@@ -216,7 +216,7 @@ datum/preferences
 		else
 			preview_icon.Blend(rgb(-s_tone,  -s_tone,  -s_tone), ICON_SUBTRACT)
 
-		if (underwear < 6)
+		if (underwear < 12)
 			preview_icon.Blend(new /icon('human.dmi', "underwear[underwear]_[g]_s"), ICON_OVERLAY)
 
 		var/icon/eyes_s = new/icon("icon" = 'human_face.dmi', "icon_state" = "eyes_s")

code/modules/mob/new_player/savefile.dm

@@ -109,7 +109,7 @@ datum/preferences/proc/savefile_load(mob/user)
 	F["eyes_blue"] >> src.b_eyes
 	F["blood_type"] >> src.b_type
 	F["underwear"] >> src.underwear
-	if(underwear == 0) underwear = 6 //For old players who have 0 in their savefile
+	if(underwear == 0) underwear = 12 //For old players who have 0 in their savefile
 	F["backbag"] >> src.backbag
 	if(isnull(backbag)) backbag = 2
 	F["name_is_always_random"] >> src.be_random_name