Adds Cyberpunk Hairstyles (#4671)

Courtesy of TheTrollDoctor and Dukica99, of Baystation12 fame.

code/modules/client/preference_setup/loadout/loadout_eyes.dm

@@ -94,4 +94,8 @@
 	display_name = "HUDpatch, Welding"
 	path = /obj/item/clothing/glasses/eyepatch/hud/welder
 	allowed_roles = list("Station Engineer","Atmospheric Technician","Chief Engineer","Engineering Apprentice","Research Director","Roboticist")
-	cost = 2
+	cost = 2
+
+/datum/gear/eyes/spiffygogs
+	display_name = "Orange Goggles"
+	path = /obj/item/clothing/glasses/spiffygogs

code/modules/client/preference_setup/loadout/loadout_head.dm

@@ -173,3 +173,11 @@
 	surgical["surgical cap, green"] = /obj/item/clothing/head/surgery/green
 	surgical["surgical cap, black"] = /obj/item/clothing/head/surgery/black
 	gear_tweaks += new/datum/gear_tweak/path(surgical)
+
+/datum/gear/head/headbando
+	display_name = "Basic Headband"
+	path = /obj/item/clothing/head/headbando
+
+/datum/gear/head/headbando/New()
+	..()
+	gear_tweaks = list(gear_tweak_free_color_choice)

code/modules/client/preference_setup/loadout/loadout_suit.dm

@@ -25,6 +25,10 @@
 	jackets["flannel jacket, grey"] = /obj/item/clothing/suit/storage/toggle/flannel/gray
 	jackets["flannel jacket, purple"] = /obj/item/clothing/suit/storage/toggle/flannel/purple
 	jackets["flannel jacket, yellow"] = /obj/item/clothing/suit/storage/toggle/flannel/yellow
+	jackets["black vest"] = /obj/item/clothing/suit/storage/toggle/leather_vest
+	jackets["brown vest"] = /obj/item/clothing/suit/storage/toggle/brown_jacket/sleeveless
+	jackets["leather coat"] = /obj/item/clothing/suit/leathercoat
+
 	gear_tweaks += new/datum/gear_tweak/path(jackets)
 
 /datum/gear/suit/hazard_vest

code/modules/client/preference_setup/loadout/loadout_uniform.dm

@@ -40,16 +40,23 @@
 
 /datum/gear/uniform/skirt
 	display_name = "skirt selection"
-	path = /obj/item/clothing/under/dress/plaid_blue
+	path = /obj/item/clothing/under/skirt/
 
 /datum/gear/uniform/skirt/New()
 	..()
 	var/skirts = list()
-	skirts["plaid skirt, blue"] = /obj/item/clothing/under/dress/plaid_blue
-	skirts["plaid skirt, purple"] = /obj/item/clothing/under/dress/plaid_purple
-	skirts["plaid skirt, red"] = /obj/item/clothing/under/dress/plaid_red
-	skirts["jumpskirt, black"] = /obj/item/clothing/under/blackjumpskirt
-	skirts["skirt, black"] = /obj/item/clothing/under/blackskirt
+	skirts["plaid skirt, blue"] = /obj/item/clothing/under/skirt/plaid_blue
+	skirts["plaid skirt, purple"] = /obj/item/clothing/under/skirt/plaid_purple
+	skirts["plaid skirt, red"] = /obj/item/clothing/under/skirt/plaid_red
+	skirts["jumpskirt, black"] = /obj/item/clothing/under/skirt/blackjumpskirt
+	skirts["skirt, black"] = /obj/item/clothing/under/skirt/
+	skirts["skirt, khaki"] = /obj/item/clothing/under/skirt/khaki
+	skirts["short skirt, black"] = /obj/item/clothing/under/skirt/short_black
+	skirts["short skirt, blue"] = /obj/item/clothing/under/skirt/blue
+	skirts["short skirt, red"] = /obj/item/clothing/under/skirt/red
+	skirts["skirt, swept"] = /obj/item/clothing/under/skirt/swept
+
+
 	gear_tweaks += new/datum/gear_tweak/path(skirts)
 
 /datum/gear/uniform/suit
@@ -168,6 +175,25 @@
 	pants["khaki pants"] = /obj/item/clothing/under/pants/khaki
 	pants["track pants"] = /obj/item/clothing/under/pants/track
 	pants["camo pants"] = /obj/item/clothing/under/pants/camo
+	pants["athletic shorts, black"] = /obj/item/clothing/under/shorts
+	pants["athletic shorts, red"] = /obj/item/clothing/under/shorts/red
+	pants["athletic shorts, green"] = /obj/item/clothing/under/shorts/green
+	pants["athletic shorts, black"] = /obj/item/clothing/under/shorts/black
+	pants["athletic shorts, grey"] = /obj/item/clothing/under/shorts/grey
+	pants["jean shorts"] = /obj/item/clothing/under/shorts/jeans
+	pants["jean short shorts"] = /obj/item/clothing/under/shorts/jeans/female
+	pants["classic jeans shorts"] = /obj/item/clothing/under/shorts/jeans/classic
+	pants["classic jeans shorts shorts"] = /obj/item/clothing/under/shorts/jeans/classic/female
+	pants["mustang jeans shorts"] = /obj/item/clothing/under/shorts/jeans/mustang
+	pants["mustang jeans shorts shorts"] = /obj/item/clothing/under/shorts/jeans/mustang/female
+	pants["young folks jeans shorts"] = /obj/item/clothing/under/shorts/jeans/youngfolks
+	pants["young folks jeans shorts shorts"] = /obj/item/clothing/under/shorts/jeans/youngfolks/female
+	pants["black jeans shorts"] = /obj/item/clothing/under/shorts/jeans/black
+	pants["black jeans shorts shorts"] = /obj/item/clothing/under/shorts/jeans/black/female
+	pants["grey jeans shorts"] = /obj/item/clothing/under/shorts/jeans/grey
+	pants["grey jeans shorts shorts"] = /obj/item/clothing/under/shorts/jeans
+	pants["khaki shorts"] = /obj/item/clothing/under/shorts/khaki
+	pants["khaki shorts shorts"] = /obj/item/clothing/under/shorts/khaki/female
 	gear_tweaks += new/datum/gear_tweak/path(pants)
 
 /datum/gear/uniform/turtleneck

code/modules/clothing/glasses/glasses.dm

@@ -482,3 +482,41 @@
 	..()
 	overlay = global_hud.nvg
 
+//from verkister
+/obj/item/clothing/glasses/spiffygogs
+	name = "Orange Goggles"
+	desc = "You can almost feel the raw power radiating off these strange specs."
+	icon_state = "spiffygogs"
+	item_state = "spiffygogs"
+	action_button_name = "Adjust Goggles"
+	var/up = 0
+	item_flags = AIRTIGHT
+
+/obj/item/clothing/glasses/spiffygogs/attack_self()
+	toggle()
+
+
+/obj/item/clothing/glasses/spiffygogs/verb/toggle()
+	set category = "Object"
+	set name = "Adjust Goggles"
+	set src in usr
+
+	if(usr.canmove && !usr.stat && !usr.restrained())
+		if(src.up)
+			src.up = !src.up
+			flags_inv |= HIDEEYES
+			body_parts_covered |= EYES
+			icon_state = initial(icon_state)
+			item_state = initial(item_state)
+			item_flags |= AIRTIGHT
+			usr << "You flip \the [src] down over your eyes."
+		else
+			src.up = !src.up
+			flags_inv &= ~HIDEEYES
+			body_parts_covered &= ~EYES
+			icon_state = "[initial(icon_state)]up"
+			item_state = "[initial(item_state)]up"
+			item_flags &= ~AIRTIGHT
+			usr << "You push \the [src] up off your eyes."
+		update_clothing_icon()
+		usr.update_action_buttons()

code/modules/clothing/head/misc.dm

@@ -361,3 +361,10 @@
 /obj/item/clothing/head/turban/yellow
 	icon_state = "turban_yellow"
 	item_state = "turban_yellow"
+
+//praise verkister
+/obj/item/clothing/head/headbando
+	name = "basic headband"
+	desc = "Perfect for martial artists, sweaty rogue operators, and tunnel gangsters."
+	icon_state = "headbando"
+	item_state = "headbando"

code/modules/clothing/suits/miscellaneous.dm

@@ -195,8 +195,11 @@
 /obj/item/clothing/suit/leathercoat
 	name = "leather coat"
 	desc = "A long, thick black leather coat."
-	icon_state = "leathercoat"
-	item_state = "leathercoat"
+	icon_state = "leathercoat_alt"
+	item_state = "leathercoat_alt"
+	body_parts_covered = UPPER_TORSO|ARMS
+	min_cold_protection_temperature = T0C - 20
+	siemens_coefficient = 0.7
 
 /obj/item/clothing/suit/browncoat
 	name = "brown leather coat"
@@ -272,6 +275,15 @@
 	desc = "A black leather coat. A corporate logo is proudly displayed on the back."
 	icon_state = "leather_jacket_nt"
 
+/obj/item/clothing/suit/storage/toggle/leather_vest
+	name = "leather vest"
+	desc = "A black leather vest."
+	icon_state = "leather_jacket_sleeveless"
+	item_state = "leather_jacket_sleeveless"
+	icon_open = "leather_jacket_sleeveless_open"
+	icon_closed = "leather_jacket_sleeveless"
+	body_parts_covered = UPPER_TORSO
+
 //This one has buttons for some reason
 /obj/item/clothing/suit/storage/toggle/brown_jacket
 	name = "leather jacket"
@@ -282,6 +294,15 @@
 	icon_closed = "brown_jacket"
 	body_parts_covered = UPPER_TORSO|ARMS
 
+/obj/item/clothing/suit/storage/toggle/brown_jacket/sleeveless
+	name = "brown vest"
+	desc = "A brown leather vest."
+	icon_state = "brown_jacket_sleeveless"
+	item_state = "brown_jacket_sleeveless"
+	icon_open = "brown_jacket_sleeveless_open"
+	icon_closed = "brown_jacket_sleeveless"
+	body_parts_covered = UPPER_TORSO
+
 /obj/item/clothing/suit/storage/toggle/brown_jacket/nanotrasen
 	desc = "A brown leather coat. A corporate logo is proudly displayed on the back."
 	icon_state = "brown_jacket_nt"

code/modules/clothing/under/miscellaneous.dm

@@ -225,14 +225,6 @@
 	item_state = "r_suit"
 	worn_state = "red_suit"
 
-/obj/item/clothing/under/blackskirt
-	name = "black skirt"
-	desc = "A black skirt, very fancy!"
-	icon_state = "blackskirt"
-	item_state = "bl_suit"
-	worn_state = "blackskirt"
-	body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS
-
 /obj/item/clothing/under/schoolgirl
 	name = "schoolgirl uniform"
 	desc = "It's just like one of my Japanese animes!"
@@ -364,26 +356,6 @@
 	worn_state = "huresource"
 	body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS
 
-/obj/item/clothing/under/dress/plaid_blue
-	name = "blue plaid skirt"
-	desc = "A preppy blue skirt with a white blouse."
-	icon_state = "plaid_blue"
-	worn_state = "plaid_blue"
-
-/obj/item/clothing/under/dress/plaid_red
-	name = "red plaid skirt"
-	desc = "A preppy red skirt with a white blouse."
-	icon_state = "plaid_red"
-	item_state = "kilt"
-	worn_state = "plaid_red"
-
-/obj/item/clothing/under/dress/plaid_purple
-	name = "blue purple skirt"
-	desc = "A preppy purple skirt with a white blouse."
-	icon_state = "plaid_purple"
-	item_state = "kilt"
-	worn_state = "plaid_purple"
-
 //wedding stuff
 /obj/item/clothing/under/wedding/
 	body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS
@@ -445,13 +417,6 @@
 	worn_state = "sundress_white"
 	body_parts_covered = UPPER_TORSO|LOWER_TORSO
 
-/obj/item/clothing/under/blackjumpskirt
-	name = "black jumpskirt"
-	desc = "A black jumpskirt, Sol size 0."
-	icon_state = "blackjumpskirt"
-	item_state = "bl_suit"
-	worn_state = "blackjumpskirt"
-
 /obj/item/clothing/under/captainformal
 	name = "captain's formal uniform"
 	desc = "A captain's formal-wear, for special occasions."

code/modules/clothing/under/shorts.dm

@@ -7,27 +7,99 @@
 /obj/item/clothing/under/shorts/red
 	name = "red athletic shorts"
 	icon_state = "redshorts"
-	worn_state = "redshorts"
+	item_state = "redshorts"
 
 /obj/item/clothing/under/shorts/green
 	name = "green athletic shorts"
 	icon_state = "greenshorts"
-	worn_state = "greenshorts"
+	item_state = "greenshorts"
 
 /obj/item/clothing/under/shorts/blue
 	name = "blue athletic shorts"
 	icon_state = "blueshorts"
-	worn_state = "blueshorts"
+	item_state = "blueshorts"
 
 /obj/item/clothing/under/shorts/black
 	name = "black athletic shorts"
 	icon_state = "blackshorts"
-	worn_state = "blackshorts"
+	item_state = "blackshorts"
 
 /obj/item/clothing/under/shorts/grey
 	name = "grey athletic shorts"
 	icon_state = "greyshorts"
-	worn_state = "greyshorts"
+	item_state = "greyshorts"
+
+/obj/item/clothing/under/shorts/jeans
+	name = "jeans shorts"
+	desc = "Some jeans! Just in short form!"
+	icon_state = "jeans_shorts"
+	item_state = "jeans_shorts"
+
+/obj/item/clothing/under/shorts/jeans/female
+	name = "jeans short shorts"
+	icon_state = "jeans_shorts_f"
+	item_state = "jeans_shorts_f"
+
+/obj/item/clothing/under/shorts/jeans/classic
+	name = "classic jeans shorts"
+	icon_state = "jeansclassic_shorts"
+	item_state = "jeansclassic_shorts"
+
+/obj/item/clothing/under/shorts/jeans/classic/female
+	name = "classic jeans short shorts"
+	icon_state = "jeansclassic_shorts_f"
+	item_state = "jeansclassic_shorts_f"
+
+/obj/item/clothing/under/shorts/jeans/mustang
+	name = "mustang jeans shorts"
+	icon_state = "jeansmustang_shorts"
+	item_state = "jeansmustang_shorts"
+
+/obj/item/clothing/under/shorts/jeans/mustang/female
+	name = "mustang jeans short shorts"
+	icon_state = "jeansmustang_shorts_f"
+	item_state = "jeansmustang_shorts_f"
+
+/obj/item/clothing/under/shorts/jeans/youngfolks
+	name = "young folks jeans shorts"
+	icon_state = "jeansyoungfolks_shorts"
+	item_state = "jeansyoungfolks_shorts"
+
+/obj/item/clothing/under/shorts/jeans/youngfolks/female
+	name = "young folks jeans short shorts"
+	icon_state = "jeansyoungfolks_shorts_f"
+	item_state = "jeansyoungfolks_shorts_f"
+
+/obj/item/clothing/under/shorts/jeans/black
+	name = "black jeans shorts"
+	icon_state = "blackpants_shorts"
+	item_state = "blackpants_shorts"
+
+/obj/item/clothing/under/shorts/jeans/black/female
+	name = "black jeans short shorts"
+	icon_state = "black_shorts_f"
+	item_state = "black_shorts_f"
+
+/obj/item/clothing/under/shorts/jeans/grey
+	name = "grey jeans shorts"
+	icon_state = "greypants_shorts"
+	item_state = "greypants_shorts"
+
+/obj/item/clothing/under/shorts/jeans/grey/female
+	name = "grey jeans short shorts"
+	icon_state = "grey_shorts_f"
+	item_state = "grey_shorts_f"
+
+/obj/item/clothing/under/shorts/khaki
+	name = "khaki shorts"
+	desc = "For that island getaway. It's five o'clock somewhere, right?"
+	icon_state = "tanpants_shorts"
+	item_state = "tanpants_shorts"
+
+/obj/item/clothing/under/shorts/khaki/female
+	name = "khaki short shorts"
+	icon_state = "khaki_shorts_f"
+	item_state = "khaki_shorts_f"
 
 //pants
 

code/modules/clothing/under/skirts.dm

@@ -0,0 +1,67 @@
+//skirts
+
+/obj/item/clothing/under/skirt/
+	name = "black skirt"
+	desc = "A black skirt, very fancy!"
+	icon_state = "blackskirt"
+	item_state = "bl_suit"
+	worn_state = "blackskirt"
+	body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS
+	rolled_sleeves = -1
+
+/obj/item/clothing/under/skirt/khaki
+	name = "khaki skirt"
+	desc = "A skirt that is a khaki color."
+	icon_state = "skirt_khaki"
+	worn_state = "skirt_khaki"
+
+/obj/item/clothing/under/skirt/short_black
+	name = "short black skirt"
+	desc = "A skirt that is a shiny black."
+	icon_state = "skirt_short_black"
+	worn_state = "skirt_short_black"
+
+/obj/item/clothing/under/skirt/blue
+	name = "short blue skirt"
+	desc = "A skirt that is a shiny blue."
+	icon_state = "skirt_short_blue"
+	worn_state = "skirt_short_blue"
+
+/obj/item/clothing/under/skirt/red
+	name = "short red skirt"
+	desc = "A skirt that is a shiny red."
+	icon_state = "skirt_short_red"
+	worn_state = "skirt_short_red"
+
+/obj/item/clothing/under/skirt/swept
+	name = "swept skirt"
+	desc = "A skirt that is swept to one side."
+	icon_state = "skirt_swept"
+	worn_state = "skirt_swept"
+
+/obj/item/clothing/under/skirt/plaid_blue
+	name = "blue plaid skirt"
+	desc = "A preppy blue skirt with a white blouse."
+	icon_state = "plaid_blue"
+	worn_state = "plaid_blue"
+
+/obj/item/clothing/under/skirt/plaid_red
+	name = "red plaid skirt"
+	desc = "A preppy red skirt with a white blouse."
+	icon_state = "plaid_red"
+	item_state = "kilt"
+	worn_state = "plaid_red"
+
+/obj/item/clothing/under/skirt/plaid_purple
+	name = "blue purple skirt"
+	desc = "A preppy purple skirt with a white blouse."
+	icon_state = "plaid_purple"
+	item_state = "kilt"
+	worn_state = "plaid_purple"
+
+/obj/item/clothing/under/skirt/blackjumpskirt
+	name = "black jumpskirt"
+	desc = "A black jumpskirt, Sol size 0."
+	icon_state = "blackjumpskirt"
+	item_state = "bl_suit"
+	worn_state = "blackjumpskirt"

code/modules/mob/abstract/new_player/sprite_accessories.dm

@@ -618,11 +618,6 @@
 		icon_state = "hair_hightight"
 		gender = MALE
 
-	regulationmohawk
-		name = "Shaved Mohawk"
-		icon_state = "hair_shavedmohawk"
-		gender = MALE
-
 	topknot
 		name = "Topknot"
 		icon_state = "hair_topknot"
@@ -658,6 +653,46 @@
 		icon_state = "hair_manbun"
 		gender = MALE
 
+	shavedbun
+		name = "Shaved Bun"
+		icon_state = "hair_shavedbun"
+
+	halfshaved
+		name = "Half-Shaved"
+		icon_state = "hair_halfshaved"
+
+	halfshavedemo
+		name = "Half-Shaved Emo"
+		icon_state = "hair_halfshavedemo"
+
+	longsideemo
+		name = "Long Side Emo"
+		icon_state = "hair_longsideemo"
+
+	sideswept
+		name = "Sideswept Hair"
+		icon_state = "hair_sideswept"
+
+	mohawkshaved
+		name = "Shaved Mohawk"
+		icon_state = "hair_mohawkshaved"
+
+	mohawkshaved2
+		name = "Tight Shaved Mohawk"
+		icon_state = "hair_mohawkshaved2"
+
+	mohawkshavednaomi
+		name = "Naomi Mohawk"
+		icon_state = "hair_mohawkshavednaomi"
+
+	leftsidecut
+		name = "Left Sidecut"
+		icon_state = "hair_leftside"
+
+	rightsidecut
+		name = "Right Sidecut"
+		icon_state = "hair_rightside"
+
 	// TG-format hair - uses ICON_MULTIPLY instead of ICON_ADD
 	uniter
 		icon = 'icons/mob/human_face/hair_multiply.dmi'