Merge remote-tracking branch 'origin/master' into motivation

code/modules/clothing/under/accessories.dm

@@ -166,15 +166,10 @@
 	icon_state = "sweater_uglyxmas"
 	item_state = "sweater_uglyxmas"
 
-/obj/item/clothing/accessory/sweater/uglyxmas
-	name = "ugly xmas sweater"
-	icon_state = "sweater_uglyxmas"
-	item_state = "sweater_uglyxmas"
-
 /obj/item/clothing/accessory/sweater/flower
 	name = "flower sweater"
-	icon_state = "sweater_uglyxmas"
-	item_state = "sweater_uglyxmas"
+	icon_state = "sweater_flower"
+	item_state = "sweater_flower"
 
 ////////////////
 //Suit Jackets//
@@ -223,6 +218,11 @@
 	icon_state = "turtleneck_red"
 	item_state = "turtleneck_red"
 
+/obj/item/clothing/accessory/turtleneck/comfy
+	name = "comfy turtleneck"
+	icon_state = "turtleneck_comfy"
+	item_state = "turtleneck_comfy"
+
 /obj/item/clothing/accessory/turtleneck/tactifool
 	name = "black sweaterneck"
 	desc = "Extra fool. Extra cool."

code/modules/mob/dead/new_player/sprite_accessories/hair_head.dm

@@ -73,6 +73,14 @@
 	name = "Beehive 2"
 	icon_state = "hair_beehive2"
 
+/datum/sprite_accessory/hair/belenko
+	name = "Beleneko"
+	icon_state = "hair_belenko"
+
+/datum/sprite_accessory/hair/belenkotied
+	name = "Belenko (Tied)"
+	icon_state = "hair_belenkotied"
+
 /datum/sprite_accessory/hair/belle
 	name = "Belle"
 	icon_state = "hair_belle"
@@ -325,6 +333,10 @@
 	name = "Flow Hair"
 	icon_state = "hair_f"
 
+/datum/sprite_accessory/hair/fluffy
+	name = "Fluffy"
+	icon_state = "hair_fluffy"
+
 /datum/sprite_accessory/hair/fringetail
 	name = "Fringe Tail"
 	icon_state = "hair_fringetail"
@@ -607,6 +619,10 @@
 	name = "Ponytail (Side) 4"
 	icon_state = "hair_sidetail4"
 
+/datum/sprite_accessory/hair/sharptail
+	name = "Ponytail (Sharp)"
+	icon_state = "hair_sharptail"
+
 /datum/sprite_accessory/hair/spikytail
 	name = "Ponytail (Spiky)"
 	icon_state = "hair_spikyponytail"
@@ -711,6 +727,26 @@
 	name = "Skinhead"
 	icon_state = "hair_skinhead"
 
+/datum/sprite_accessory/hair/simple
+	name = "Simple"
+	icon_state = "hair_simple"
+
+/datum/sprite_accessory/hair/skrellvshort
+	name = "Skrell Replicant (Very Short)"
+	icon_state = "hair_skrellvshort"
+
+/datum/sprite_accessory/hair/skrellshort
+	name = "Skrell Replicant (Short)"
+	icon_state = "hair_skrellshort"
+
+/datum/sprite_accessory/hair/skrell
+	name = "Skrell Replicant (Average)"
+	icon_state = "hair_skrell"
+
+/datum/sprite_accessory/hair/skrelllong
+	name = "Skrell Replicant (Long)"
+	icon_state = "hair_skrelllong"
+
 /datum/sprite_accessory/hair/sleaze
 	name = "Sleaze"
 	icon_state = "hair_sleaze"

code/modules/vending/clothesmate.dm

@@ -34,7 +34,6 @@
 					/obj/item/clothing/under/costume/kilt = 3,
 					/obj/item/clothing/under/misc/overalls = 3,
 					/obj/item/clothing/under/suit/sl = 3,
-					/obj/item/clothing/under/sweater = 3,
 					/obj/item/clothing/accessory/sweater = 3,
 					/obj/item/clothing/accessory/sweater/pink = 3,
 					/obj/item/clothing/accessory/sweater/heart = 3,
@@ -45,9 +44,11 @@
 					/obj/item/clothing/accessory/sweater/flower = 3,
 					/obj/item/clothing/accessory/turtleneck = 2,
 					/obj/item/clothing/accessory/turtleneck/red = 2,
+					/obj/item/clothing/accessory/turtleneck/comfy = 2,
 					/obj/item/clothing/accessory/turtleneck/tactifool = 2,
 					/obj/item/clothing/accessory/turtleneck/tactifool/green = 2,
 					/obj/item/clothing/accessory/turtleneck/tactifool/blue = 2,
+					/obj/item/clothing/under/sweater = 3,
 					/obj/item/clothing/under/sweater/black = 3,
 					/obj/item/clothing/under/sweater/purple = 3,
 					/obj/item/clothing/under/sweater/green = 3,