Merge branch 'master' of https://github.com/PolarisSS13/Polaris into clothes

Conflicts:
	icons/mob/uniform.dmi
	icons/obj/clothing/uniforms.dmi

code/modules/client/preference_setup/general/01_basic.dm

@@ -1,12 +1,20 @@
+datum/preferences
+	var/biological_gender = MALE
+	var/identifying_gender = MALE
+
+datum/preferences/proc/set_biological_gender(var/gender)
+	biological_gender = gender
+	identifying_gender = gender
+
 /datum/category_item/player_setup_item/general/basic
 	name = "Basic"
 	sort_order = 1
-	var/list/valid_player_genders = list(MALE, FEMALE, NEUTER, PLURAL)
 
 /datum/category_item/player_setup_item/general/basic/load_character(var/savefile/S)
 	S["real_name"]				>> pref.real_name
 	S["name_is_always_random"]	>> pref.be_random_name
-	S["gender"]					>> pref.gender
+	S["gender"]					>> pref.biological_gender
+	S["id_gender"]				>> pref.identifying_gender
 	S["age"]					>> pref.age
 	S["spawnpoint"]				>> pref.spawnpoint
 	S["OOC_Notes"]				>> pref.metadata
@@ -14,7 +22,8 @@
 /datum/category_item/player_setup_item/general/basic/save_character(var/savefile/S)
 	S["real_name"]				<< pref.real_name
 	S["name_is_always_random"]	<< pref.be_random_name
-	S["gender"]					<< pref.gender
+	S["gender"]					<< pref.biological_gender
+	S["id_gender"]				<< pref.identifying_gender
 	S["age"]					<< pref.age
 	S["spawnpoint"]				<< pref.spawnpoint
 	S["OOC_Notes"]				<< pref.metadata
@@ -22,13 +31,14 @@
 /datum/category_item/player_setup_item/general/basic/sanitize_character()
 	if(!pref.species) pref.species = "Human"
 	var/datum/species/S = all_species[pref.species ? pref.species : "Human"]
-	pref.age			= sanitize_integer(pref.age, S.min_age, S.max_age, initial(pref.age))
-	pref.gender 		= sanitize_inlist(pref.gender, valid_player_genders, pick(valid_player_genders))
-	pref.real_name		= sanitize_name(pref.real_name, pref.species)
+	pref.age                = sanitize_integer(pref.age, S.min_age, S.max_age, initial(pref.age))
+	pref.biological_gender  = sanitize_inlist(pref.biological_gender, get_genders(), pick(get_genders()))
+	pref.identifying_gender = (pref.identifying_gender in all_genders_define_list) ? pref.identifying_gender : pref.biological_gender
+	pref.real_name          = sanitize_name(pref.real_name, pref.species)
 	if(!pref.real_name)
-		pref.real_name	= random_name(pref.gender, pref.species)
-	pref.spawnpoint		= sanitize_inlist(pref.spawnpoint, spawntypes, initial(pref.spawnpoint))
-	pref.be_random_name	= sanitize_integer(pref.be_random_name, 0, 1, initial(pref.be_random_name))
+		pref.real_name      = random_name(pref.identifying_gender, pref.species)
+	pref.spawnpoint         = sanitize_inlist(pref.spawnpoint, spawntypes, initial(pref.spawnpoint))
+	pref.be_random_name     = sanitize_integer(pref.be_random_name, 0, 1, initial(pref.be_random_name))
 
 /datum/category_item/player_setup_item/general/basic/content()
 	. = "<b>Name:</b> "
@@ -36,13 +46,15 @@
 	. += "(<a href='?src=\ref[src];random_name=1'>Random Name</A>) "
 	. += "(<a href='?src=\ref[src];always_random_name=1'>Always Random Name: [pref.be_random_name ? "Yes" : "No"]</a>)"
 	. += "<br>"
-	. += "<b>Gender:</b> <a href='?src=\ref[src];gender=1'><b>[capitalize(lowertext(pref.gender))]</b></a><br>"
+	. += "<b>Biological Gender:</b> <a href='?src=\ref[src];bio_gender=1'><b>[gender2text(pref.biological_gender)]</b></a><br>"
+	. += "<b>Gender Identity:</b> <a href='?src=\ref[src];id_gender=1'><b>[gender2text(pref.identifying_gender)]</b></a><br>"
 	. += "<b>Age:</b> <a href='?src=\ref[src];age=1'>[pref.age]</a><br>"
 	. += "<b>Spawn Point</b>: <a href='?src=\ref[src];spawnpoint=1'>[pref.spawnpoint]</a><br>"
 	if(config.allow_Metadata)
 		. += "<b>OOC Notes:</b> <a href='?src=\ref[src];metadata=1'> Edit </a><br>"
 
 /datum/category_item/player_setup_item/general/basic/OnTopic(var/href,var/list/href_list, var/mob/user)
+	var/datum/species/S = all_species[pref.species]
 	if(href_list["rename"])
 		var/raw_name = input(user, "Choose your character's name:", "Character Name")  as text|null
 		if (!isnull(raw_name) && CanUseTopic(user))
@@ -55,20 +67,27 @@
 				return TOPIC_NOACTION
 
 	else if(href_list["random_name"])
-		pref.real_name = random_name(pref.gender, pref.species)
+		pref.real_name = random_name(pref.identifying_gender, pref.species)
 		return TOPIC_REFRESH
 
 	else if(href_list["always_random_name"])
 		pref.be_random_name = !pref.be_random_name
 		return TOPIC_REFRESH
 
-	else if(href_list["gender"])
-		pref.gender = next_in_list(pref.gender, valid_player_genders)
+	else if(href_list["bio_gender"])
+		var/new_gender = input(user, "Choose your character's biological gender:", "Character Preference", pref.biological_gender) as null|anything in get_genders()
+		if(new_gender && CanUseTopic(user))
+			pref.set_biological_gender(new_gender)
+		return TOPIC_REFRESH
+
+	else if(href_list["id_gender"])
+		var/new_gender = input(user, "Choose your character's identifying gender:", "Character Preference", pref.identifying_gender) as null|anything in all_genders_define_list
+		if(new_gender && CanUseTopic(user))
+			pref.identifying_gender = new_gender
 		return TOPIC_REFRESH
 
 	else if(href_list["age"])
 		if(!pref.species) pref.species = "Human"
-		var/datum/species/S = all_species[pref.species]
 		var/new_age = input(user, "Choose your character's age:\n([S.min_age]-[S.max_age])", "Character Preference", pref.age) as num|null
 		if(new_age && CanUseTopic(user))
 			pref.age = max(min(round(text2num(new_age)), S.max_age), S.min_age)
@@ -76,8 +95,8 @@
 
 	else if(href_list["spawnpoint"])
 		var/list/spawnkeys = list()
-		for(var/S in spawntypes)
-			spawnkeys += S
+		for(var/spawntype in spawntypes)
+			spawnkeys += spawntype
 		var/choice = input(user, "Where would you like to spawn when late-joining?") as null|anything in spawnkeys
 		if(!choice || !spawntypes[choice] || !CanUseTopic(user))	return TOPIC_NOACTION
 		pref.spawnpoint = choice
@@ -90,3 +109,12 @@
 			return TOPIC_REFRESH
 
 	return ..()
+
+/datum/category_item/player_setup_item/general/basic/proc/get_genders()
+	var/datum/species/S = all_species[pref.species]
+	var/list/possible_genders = S.genders
+	if(!pref.organ_data || pref.organ_data[BP_TORSO] != "cyborg")
+		return possible_genders
+	possible_genders = possible_genders.Copy()
+	possible_genders |= NEUTER
+	return possible_genders

code/modules/client/preference_setup/general/03_body.dm

@@ -191,7 +191,7 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O
 	return mob_species && (mob_species.appearance_flags & flag)
 
 /datum/category_item/player_setup_item/general/body/OnTopic(var/href,var/list/href_list, var/mob/user)
-	var/mob_species = all_species[pref.species]
+	var/datum/species/mob_species = all_species[pref.species]
 
 	if(href_list["random"])
 		pref.randomize_appearance_for()
@@ -220,13 +220,17 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O
 		var/prev_species = pref.species
 		pref.species = href_list["set_species"]
 		if(prev_species != pref.species)
+			if(!(pref.biological_gender in mob_species.genders))
+				pref.set_biological_gender(mob_species.genders[1])
+
+
 			//grab one of the valid hair styles for the newly chosen species
 			var/list/valid_hairstyles = list()
 			for(var/hairstyle in hair_styles_list)
 				var/datum/sprite_accessory/S = hair_styles_list[hairstyle]
-				if(pref.gender == MALE && S.gender == FEMALE)
+				if(pref.biological_gender == MALE && S.gender == FEMALE)
 					continue
-				if(pref.gender == FEMALE && S.gender == MALE)
+				if(pref.biological_gender == FEMALE && S.gender == MALE)
 					continue
 				if(!(pref.species in S.species_allowed))
 					continue
@@ -242,9 +246,9 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O
 			var/list/valid_facialhairstyles = list()
 			for(var/facialhairstyle in facial_hair_styles_list)
 				var/datum/sprite_accessory/S = facial_hair_styles_list[facialhairstyle]
-				if(pref.gender == MALE && S.gender == FEMALE)
+				if(pref.biological_gender == MALE && S.gender == FEMALE)
 					continue
-				if(pref.gender == FEMALE && S.gender == MALE)
+				if(pref.biological_gender == FEMALE && S.gender == MALE)
 					continue
 				if(!(pref.species in S.species_allowed))
 					continue
@@ -336,9 +340,9 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O
 		var/list/valid_facialhairstyles = list()
 		for(var/facialhairstyle in facial_hair_styles_list)
 			var/datum/sprite_accessory/S = facial_hair_styles_list[facialhairstyle]
-			if(pref.gender == MALE && S.gender == FEMALE)
+			if(pref.biological_gender == MALE && S.gender == FEMALE)
 				continue
-			if(pref.gender == FEMALE && S.gender == MALE)
+			if(pref.biological_gender == FEMALE && S.gender == MALE)
 				continue
 			if(!(pref.species in S.species_allowed))
 				continue

code/modules/client/preference_setup/global/05_ooc.dm

@@ -0,0 +1,38 @@
+/datum/category_item/player_setup_item/player_global/ooc
+	name = "OOC"
+	sort_order = 5
+
+/datum/category_item/player_setup_item/player_global/ooc/load_preferences(var/savefile/S)
+	S["ignored_players"]	>> pref.ignored_players
+
+
+/datum/category_item/player_setup_item/player_global/ooc/save_preferences(var/savefile/S)
+	S["ignored_players"]	<< pref.ignored_players
+
+
+/datum/category_item/player_setup_item/player_global/ooc/sanitize_preferences()
+	if(isnull(pref.ignored_players))
+		pref.ignored_players = list()
+
+/datum/category_item/player_setup_item/player_global/ooc/content(var/mob/user)
+	. += "<b>OOC:</b><br>"
+	. += "Ignored Players<br>"
+	for(var/ignored_player in pref.ignored_players)
+		. += "[ignored_player] (<a href='?src=\ref[src];unignore_player=[ignored_player]'>Unignore</a>)<br>"
+	. += "(<a href='?src=\ref[src];ignore_player=1'>Ignore Player</a>)"
+
+/datum/category_item/player_setup_item/player_global/ooc/OnTopic(var/href,var/list/href_list, var/mob/user)
+	if(href_list["unignore_player"])
+		if(CanUseTopic(user))
+			pref.ignored_players -= href_list["unignore_player"]
+			return TOPIC_REFRESH
+
+	if(href_list["ignore_player"])
+		if(CanUseTopic(user))
+			var/player_to_ignore = input(user, "Who do you want to ignore?","Ignore") as null|text
+			if(player_to_ignore)
+				player_to_ignore = sanitize(ckey(player_to_ignore))
+				pref.ignored_players |= player_to_ignore
+			return TOPIC_REFRESH
+
+	return ..()

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

@@ -136,6 +136,21 @@
 	path = /obj/item/clothing/accessory/storage/white_vest
 	allowed_roles = list("Paramedic","Chief Medical Officer","Medical Doctor")
 
+/datum/gear/accessory/brown_drop_pouches
+	display_name = "drop pouches, engineering"
+	path = /obj/item/clothing/accessory/storage/brown_drop_pouches
+	allowed_roles = list("Station Engineer","Atmospheric Technician","Chief Engineer")
+
+/datum/gear/accessory/black_drop_pouches
+	display_name = "drop pouches, security"
+	path = /obj/item/clothing/accessory/storage/black_drop_pouches
+	allowed_roles = list("Security Officer","Head of Security","Warden")
+
+/datum/gear/accessory/white_drop_pouches
+	display_name = "drop pouches, medical"
+	path = /obj/item/clothing/accessory/storage/white_drop_pouches
+	allowed_roles = list("Paramedic","Chief Medical Officer","Medical Doctor")
+
 /datum/gear/accessory/webbing
 	display_name = "webbing, simple"
 	path = /obj/item/clothing/accessory/storage/webbing

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

@@ -149,7 +149,7 @@
 	display_name = "poncho, cargo"
 	path = /obj/item/clothing/suit/poncho/roles/cargo
 	allowed_roles = list("Quartermaster","Cargo Technician")
-	
+
 /datum/gear/suit/unathi_robe
 	display_name = "roughspun robe"
 	path = /obj/item/clothing/suit/unathi/robe
@@ -195,3 +195,52 @@
 	display_name = "forensics, red"
 	path = /obj/item/clothing/suit/storage/forensics/red
 	allowed_roles = list("Detective")
+
+/datum/gear/suit/wintercoat
+	display_name = "winter coat"
+	path = /obj/item/clothing/suit/storage/hooded/wintercoat
+
+/datum/gear/suit/wintercoat/captain
+	display_name = "winter coat, captain"
+	path = /obj/item/clothing/suit/storage/hooded/wintercoat/captain
+	allowed_roles = list("Captain")
+
+/datum/gear/suit/wintercoat/security
+	display_name = "winter coat, security"
+	path = /obj/item/clothing/suit/storage/hooded/wintercoat/security
+	allowed_roles = list("Security Officer, Head of Security, Warden, Detective")
+
+/datum/gear/suit/wintercoat/medical
+	display_name = "winter coat, medical"
+	path = /obj/item/clothing/suit/storage/hooded/wintercoat/medical
+	allowed_roles = list("Medical Doctor","Chief Medical Officer","Chemist","Paramedic","Geneticist")
+
+/datum/gear/suit/wintercoat/science
+	display_name = "winter coat, science"
+	path = /obj/item/clothing/suit/storage/hooded/wintercoat/science
+	allowed_roles = list("Research Director","Scientist", "Roboticist", "Xenobotanist")
+
+/datum/gear/suit/wintercoat/engineering
+	display_name = "winter coat, engineering"
+	path = /obj/item/clothing/suit/storage/hooded/wintercoat/engineering
+	allowed_roles = list("Chief Engineer","Atmospheric Technician", "Station Engineer")
+
+/datum/gear/suit/wintercoat/atmos
+	display_name = "winter coat, atmospherics"
+	path = /obj/item/clothing/suit/storage/hooded/wintercoat/engineering/atmos
+	allowed_roles = list("Chief Engineer", "Atmospheric Technician")
+
+/datum/gear/suit/wintercoat/hydro
+	display_name = "winter coat, hydroponics"
+	path = /obj/item/clothing/suit/storage/hooded/wintercoat/hydro
+	allowed_roles = list("Botanist", "Xenobotanist")
+
+/datum/gear/suit/wintercoat/cargo
+	display_name = "winter coat, cargo"
+	path = /obj/item/clothing/suit/storage/hooded/wintercoat/cargo
+	allowed_roles = list("Quartermaster","Cargo Technician")
+
+/datum/gear/suit/wintercoat/miner
+	display_name = "winter coat, mining"
+	path = /obj/item/clothing/suit/storage/hooded/wintercoat/miner
+	allowed_roles = list("Shaft Miner")

code/modules/client/preferences.dm

@@ -25,7 +25,6 @@ datum/preferences
 	//character preferences
 	var/real_name						//our character's name
 	var/be_random_name = 0				//whether we are a random name every round
-	var/gender = MALE					//gender of character (well duh)
 	var/age = 30						//age of character
 	var/spawnpoint = "Arrivals Shuttle" //where this character will spawn (0-2).
 	var/b_type = "A+"					//blood type (not-chooseable)
@@ -108,6 +107,7 @@ datum/preferences
 
 	// OOC Metadata:
 	var/metadata = ""
+	var/list/ignored_players = list()
 
 	var/client/client = null
 	var/client_ckey = null
@@ -119,8 +119,8 @@ datum/preferences
 
 /datum/preferences/New(client/C)
 	player_setup = new(src)
-	gender = pick(MALE, FEMALE)
-	real_name = random_name(gender,species)
+	set_biological_gender(pick(MALE, FEMALE))
+	real_name = random_name(identifying_gender,species)
 	b_type = pick(4;"O-", 36;"O+", 3;"A-", 28;"A+", 1;"B-", 20;"B+", 1;"AB-", 5;"AB+")
 
 	gear = list()
@@ -254,7 +254,7 @@ datum/preferences
 	// Sanitizing rather than saving as someone might still be editing when copy_to occurs.
 	player_setup.sanitize_setup()
 	if(be_random_name)
-		real_name = random_name(gender,species)
+		real_name = random_name(identifying_gender,species)
 
 	if(config.humans_need_surnames)
 		var/firstspace = findtext(real_name, " ")
@@ -284,7 +284,8 @@ datum/preferences
 	character.gen_record = gen_record
 	character.exploit_record = exploit_record
 
-	character.gender = gender
+	character.gender = biological_gender
+	character.identifying_gender = identifying_gender
 	character.age = age
 	character.b_type = b_type
 

code/modules/client/preferences_toggle_procs.dm

@@ -8,7 +8,7 @@
 
 	toggle_preference(pref_path)
 
-	src << "You will [ (is_preference_enabled(pref_path)) ? "now" : " no longer"] hear all mob speech as a ghost."
+	src << "You will [ (is_preference_enabled(pref_path)) ? "now" : "no longer"] hear all mob speech as a ghost."
 
 	prefs.save_preferences()
 
@@ -23,7 +23,7 @@
 
 	toggle_preference(pref_path)
 
-	src << "You will [ (is_preference_enabled(pref_path)) ? "now" : " no longer"] see all emotes as a ghost."
+	src << "You will [ (is_preference_enabled(pref_path)) ? "now" : "no longer"] see all emotes as a ghost."
 
 	prefs.save_preferences()
 
@@ -222,4 +222,4 @@
 		src << "You will [ (is_preference_enabled(pref_path)) ? "now" : "no longer"] receive attack logs."
 		prefs.save_preferences()
 
-	feedback_add_details("admin_verb","TBeSpecial") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
+	feedback_add_details("admin_verb","TBeSpecial") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!

code/modules/client/ui_style.dm

@@ -9,6 +9,15 @@
 	"minimalist"   = 'icons/mob/screen/minimalist.dmi'
 	)
 
+/var/all_ui_styles_robot = list(
+	"Midnight"     = 'icons/mob/screen1_robot.dmi',
+	"Orange"       = 'icons/mob/screen1_robot.dmi',
+	"old"          = 'icons/mob/screen1_robot.dmi',
+	"White"        = 'icons/mob/screen1_robot.dmi',
+	"old-noborder" = 'icons/mob/screen1_robot.dmi',
+	"minimalist"   = 'icons/mob/screen1_robot_minimalist.dmi'
+	)
+
 /proc/ui_style2icon(ui_style)
 	if(ui_style in all_ui_styles)
 		return all_ui_styles[ui_style]
@@ -21,8 +30,9 @@
 	set desc = "Configure your user interface"
 
 	if(!ishuman(usr))
-		usr << "<span class='warning'>You must be human to use this verb.</span>"
-		return
+		if(!isrobot(usr))
+			usr << "<span class='warning'>You must be a human or a robot to use this verb.</span>"
+			return
 
 	var/UI_style_new = input(usr, "Select a style. White is recommended for customization") as null|anything in all_ui_styles
 	if(!UI_style_new) return
@@ -42,6 +52,8 @@
 	icons.Add(usr.radio_use_icon)
 
 	var/icon/ic = all_ui_styles[UI_style_new]
+	if(isrobot(usr))
+		ic = all_ui_styles_robot[UI_style_new]
 
 	for(var/obj/screen/I in icons)
 		if(I.name in list(I_HELP, I_HURT, I_DISARM, I_GRAB)) continue