Merge remote-tracking branch 'upstream/master'

code/game/machinery/vending.dm

@@ -370,11 +370,11 @@
 	if(src.seconds_electrified > 0)
 		src.seconds_electrified--
 
-	//Pitch to the people!  Really sell it!
+	/*Pitch to the people!  Really sell it!
 	if(prob(5) && ((src.last_slogan + src.slogan_delay) <= world.time) && (src.slogan_list.len > 0) && (!src.shut_up))
 		var/slogan = pick(src.slogan_list)
 		src.speak(slogan)
-		src.last_slogan = world.time
+		src.last_slogan = world.time*/
 
 	if((prob(2)) && (src.shoot_inventory))
 		src.throw_item()

code/modules/mob/new_player/sprite_accessories.dm

@@ -52,6 +52,10 @@
 
 	longer
 		name = "Longer Hair"
+		icon_state = "hair_b2"
+
+	longest
+		name = "Longest Hair"
 		icon_state = "hair_vlong"
 
 	halfbang
@@ -66,10 +70,18 @@
 		name = "Kusanagi Hair"
 		icon_state = "hair_kusanagi"
 
-	ponytail
-		name = "Ponytail"
+	ponytail1
+		name = "Ponytail 1"
 		icon_state = "hair_ponytail"
 
+	ponytail2
+		name = "Ponytail 2"
+		icon_state = "hair_pa"
+
+	ponytail3
+		name = "Ponytail 3"
+		icon_state = "hair_ponytail3"
+
 	cut
 		name = "Cut Hair"
 		icon_state = "hair_c"
@@ -77,7 +89,6 @@
 	mohawk
 		name = "Mohawk"
 		icon_state = "hair_d"
-		choose_female = 0 // gross
 
 	balding
 		name = "Balding Hair"
@@ -88,14 +99,17 @@
 		name = "Flow Hair"
 		icon_state = "hair_f"
 
-	bedhead
-		name = "Bedhead"
+	bedhead1
+		name = "Bedhead 1"
+		icon_state = "hair_bedheadold"
+
+	bedhead2
+		name = "Bedhead 2"
 		icon_state = "hair_bedhead"
 
 	dreadlocks
 		name = "Dreadlocks"
 		icon_state = "hair_dreads"
-		choose_female = 0 // okay.jpg
 
 	jensen
 		name = "Adam Jensen Hair"