Merge pull request #4523 from VOREStation/upstream-merge-5718

[MIRROR] New hair + underwear

code/datums/underwear/socks.dm

@@ -56,4 +56,8 @@
 
 /datum/category_item/underwear/socks/fishnet
 	name = "Fishnet"
-	icon_state = "fishnet"
+	icon_state = "fishnet"
+
+/datum/category_item/underwear/socks/leggings
+	name = "Leggings"
+	icon_state = "leggings"

code/datums/underwear/top.dm

@@ -62,4 +62,12 @@
 /datum/category_item/underwear/top/striped_bra
 	name = "Striped Bra"
 	icon_state = "striped_bra"
-	has_color = TRUE
+	has_color = TRUE
+
+/datum/category_item/underwear/top/binder
+	name = "Binder"
+	icon_state = "binder_s"
+
+/datum/category_item/underwear/top/straplessbinder
+	name = "Binder Strapless"
+	icon_state = "straplessbinder_s"

code/datums/underwear/undershirts.dm

@@ -165,4 +165,16 @@
 
 /datum/category_item/underwear/undershirt/tiedye
 	name = "Tiedye Shirt"
-	icon_state = "tiedye"
+	icon_state = "tiedye"
+
+/datum/category_item/underwear/undershirt/longstripe_pink
+	name = "Longsleeve Striped Shirt, Pink"
+	icon_state = "longstripe_pink_s"
+
+/datum/category_item/underwear/undershirt/wingshirt
+	name = "Pink Wing Shirt"
+	icon_state = "wing_shirt_s"
+
+/datum/category_item/underwear/undershirt/pinkblack_tshirt
+	name = "Pink and Black T-Shirt"
+	icon_state = "pinkblack_tshirt"

code/modules/mob/new_player/sprite_accessories.dm

@@ -750,9 +750,14 @@
 		icon_state = "hair_belenkotied"
 		flags = HAIR_TIEABLE
 
-	belenkotied
+	glossy
-		name = "Supernova"
+		name = "Glossy"
-		icon_state = "hair_supernova"
+		icon_state = "hair_glossy"
+		flags = HAIR_TIEABLE
+
+	sharpponytail
+		name = "Sharp Ponytail"
+		icon_state = "hair_sharpponytail"
 		flags = HAIR_TIEABLE
 
 /*

html/changelogs/kartagrafi-NewHairAndUnderwear.yml

@@ -0,0 +1,39 @@
+################################
+# Example Changelog File
+#
+# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
+#
+# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
+# When it is, any changes listed below will disappear.
+#
+# Valid Prefixes: 
+#   bugfix
+#   wip (For works in progress)
+#   tweak
+#   soundadd
+#   sounddel
+#   rscadd (general adding of nice things)
+#   rscdel (general deleting of nice things)
+#   imageadd
+#   imagedel
+#   maptweak
+#   spellcheck (typo fixes)
+#   experiment
+#################################
+
+# Your name.  
+author: kartagrafi
+
+# Optional: Remove this file after generating master changelog.  Useful for PR changelogs that won't get used again.
+delete-after: True
+
+# Any changes you've made.  See valid prefix list above.
+# INDENT WITH TWO SPACES.  NOT TABS.  SPACES.
+# SCREW THIS UP AND IT WON'T WORK.
+# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
+# Please surround your changes in  double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
+changes: 
+  - rscadd: "Adds new hairstyle ''Sharp Ponytail''"
+  - rscadd: "Adds several new underwear - ''Binder'', ''Strapless Binder'', ''Longsleeve Striped Shirt, Pink'', ''Pink Wing Shirt'', ''Pink and Black T-Shirt'', ''Leggings''"
+  - tweak: "Changes name of ''Supernova'' hairstyle to ''Glossy'', and makes the sprite somewhat neater"
+  - bugfix: "Fixes a hairstyle not appearing"