Initial Commit

code/modules/mob/new_player/login.dm

@@ -0,0 +1,33 @@
+/mob/new_player/Login()
+	update_Login_details()	//handles setting lastKnownIP and computer_id for use by the ban systems as well as checking for multikeying
+	if(join_motd)
+		src << "<div class=\"motd\">[join_motd]</div>"
+
+	if(!mind)
+		mind = new /datum/mind(key)
+		mind.active = 1
+		mind.current = src
+
+	if(length(newplayer_start))
+		loc = pick(newplayer_start)
+	else
+		loc = locate(1,1,1)
+	lastarea = loc
+
+	sight |= SEE_TURFS
+	player_list |= src
+
+/*
+	var/list/watch_locations = list()
+	for(var/obj/effect/landmark/landmark in landmarks_list)
+		if(landmark.tag == "landmark*new_player")
+			watch_locations += landmark.loc
+
+	if(watch_locations.len>0)
+		loc = pick(watch_locations)
+*/
+	new_player_panel()
+	spawn(40)
+		if(client)
+			handle_privacy_poll()
+			client.playtitlemusic()

code/modules/mob/new_player/logout.dm

@@ -0,0 +1,7 @@
+/mob/new_player/Logout()
+	ready = 0
+	..()
+	if(!spawning)//Here so that if they are spawning and log out, the other procs can play out and they will have a mob to come back to.
+		key = null//We null their key before deleting the mob, so they are properly kicked out.
+		del(src)
+	return

code/modules/mob/new_player/new_player.dm

@@ -0,0 +1,419 @@
+//This file was auto-corrected by findeclaration.exe on 25.5.2012 20:42:33
+
+/mob/new_player
+	var/ready = 0
+	var/spawning = 0//Referenced when you want to delete the new_player later on in the code.
+	var/totalPlayers = 0		 //Player counts for the Lobby tab
+	var/totalPlayersReady = 0
+	universal_speak = 1
+
+	invisibility = 101
+
+	density = 0
+	stat = 2
+	canmove = 0
+
+	anchored = 1	//  don't get pushed around
+
+	New()
+		mob_list += src
+
+	verb/new_player_panel()
+		set src = usr
+		new_player_panel_proc()
+
+
+	proc/new_player_panel_proc()
+		var/output = "<div align='center'><B>New Player Options</B>"
+		output +="<hr>"
+		output += "<p><a href='byond://?src=\ref[src];show_preferences=1'>Setup Character</A></p>"
+
+		if(!ticker || ticker.current_state <= GAME_STATE_PREGAME)
+			if(!ready)	output += "<p><a href='byond://?src=\ref[src];ready=1'>Declare Ready</A></p>"
+			else	output += "<p><b>You are ready</b> (<a href='byond://?src=\ref[src];ready=2'>Cancel</A>)</p>"
+
+		else
+			output += "<a href='byond://?src=\ref[src];manifest=1'>View the Crew Manifest</A><br><br>"
+			output += "<p><a href='byond://?src=\ref[src];late_join=1'>Join Game!</A></p>"
+
+		output += "<p><a href='byond://?src=\ref[src];observe=1'>Observe</A></p>"
+
+		if(!IsGuestKey(src.key))
+			establish_db_connection()
+
+			if(dbcon.IsConnected())
+				var/isadmin = 0
+				if(src.client && src.client.holder)
+					isadmin = 1
+				var/DBQuery/query = dbcon.NewQuery("SELECT id FROM erro_poll_question WHERE [(isadmin ? "" : "adminonly = false AND")] Now() BETWEEN starttime AND endtime AND id NOT IN (SELECT pollid FROM erro_poll_vote WHERE ckey = \"[ckey]\") AND id NOT IN (SELECT pollid FROM erro_poll_textreply WHERE ckey = \"[ckey]\")")
+				query.Execute()
+				var/newpoll = 0
+				while(query.NextRow())
+					newpoll = 1
+					break
+
+				if(newpoll)
+					output += "<p><b><a href='byond://?src=\ref[src];showpoll=1'>Show Player Polls</A> (NEW!)</b></p>"
+				else
+					output += "<p><a href='byond://?src=\ref[src];showpoll=1'>Show Player Polls</A></p>"
+
+		output += "</div>"
+
+		src << browse(output,"window=playersetup;size=210x240;can_close=0")
+		return
+
+	Stat()
+		..()
+
+		statpanel("Status")
+		if (client.statpanel == "Status" && ticker)
+			if (ticker.current_state != GAME_STATE_PREGAME)
+				stat(null, "Station Time: [worldtime2text()]")
+		statpanel("Lobby")
+		if(client.statpanel=="Lobby" && ticker)
+			if(ticker.hide_mode)
+				stat("Game Mode:", "Secret")
+			else
+				if(ticker.hide_mode == 0)
+					stat("Game Mode:", "[master_mode]") // Old setting for showing the game mode
+
+			if((ticker.current_state == GAME_STATE_PREGAME) && going)
+				stat("Time To Start:", ticker.pregame_timeleft)
+			if((ticker.current_state == GAME_STATE_PREGAME) && !going)
+				stat("Time To Start:", "DELAYED")
+
+			if(ticker.current_state == GAME_STATE_PREGAME)
+				stat("Players: [totalPlayers]", "Players Ready: [totalPlayersReady]")
+				totalPlayers = 0
+				totalPlayersReady = 0
+				for(var/mob/new_player/player in player_list)
+					stat("[player.key]", (player.ready)?("(Playing)"):(null))
+					totalPlayers++
+					if(player.ready)totalPlayersReady++
+
+	Topic(href, href_list[])
+		if(!client)	return 0
+
+		if(href_list["show_preferences"])
+			client.prefs.ShowChoices(src)
+			return 1
+
+		if(href_list["ready"])
+			ready = !ready
+
+		if(href_list["refresh"])
+			src << browse(null, "window=playersetup") //closes the player setup window
+			new_player_panel_proc()
+
+		if(href_list["observe"])
+
+			if(alert(src,"Are you sure you wish to observe? You will have to wait 30 minutes before being able to respawn!","Player Setup","Yes","No") == "Yes")
+				if(!client)	return 1
+				var/mob/dead/observer/observer = new()
+
+				spawning = 1
+				src << sound(null, repeat = 0, wait = 0, volume = 85, channel = 1) // MAD JAMS cant last forever yo
+
+
+				observer.started_as_observer = 1
+				close_spawn_windows()
+				var/obj/O = locate("landmark*Observer-Start")
+				src << "\blue Now teleporting."
+				observer.loc = O.loc
+				observer.timeofdeath = world.time // Set the time of death so that the respawn timer works correctly.
+
+				client.prefs.update_preview_icon()
+				observer.icon = client.prefs.preview_icon
+				observer.alpha = 127
+
+				if(client.prefs.be_random_name)
+					client.prefs.real_name = random_name(client.prefs.gender)
+				observer.real_name = client.prefs.real_name
+				observer.name = observer.real_name
+				if(!client.holder && !config.antag_hud_allowed)           // For new ghosts we remove the verb from even showing up if it's not allowed.
+					observer.verbs -= /mob/dead/observer/verb/toggle_antagHUD        // Poor guys, don't know what they are missing!
+				observer.key = key
+				del(src)
+
+				return 1
+
+		if(href_list["late_join"])
+			if(!ticker || ticker.current_state != GAME_STATE_PLAYING)
+				usr << "\red The round is either not ready, or has already finished..."
+				return
+
+			if(client.prefs.species != "Human")
+
+				if(!is_alien_whitelisted(src, client.prefs.species) && config.usealienwhitelist)
+					src << alert("You are currently not whitelisted to play [client.prefs.species].")
+					return 0
+
+			LateChoices()
+
+		if(href_list["manifest"])
+			ViewManifest()
+
+		if(href_list["SelectedJob"])
+
+			if(!enter_allowed)
+				usr << "\blue There is an administrative lock on entering the game!"
+				return
+
+			if(!is_alien_whitelisted(src, client.prefs.species) && config.usealienwhitelist)
+				src << alert("You are currently not whitelisted to play [client.prefs.species].")
+				return 0
+
+			AttemptLateSpawn(href_list["SelectedJob"])
+			return
+
+		if(href_list["privacy_poll"])
+			establish_db_connection()
+			if(!dbcon.IsConnected())
+				return
+			var/voted = 0
+
+			//First check if the person has not voted yet.
+			var/DBQuery/query = dbcon.NewQuery("SELECT * FROM erro_privacy WHERE ckey='[src.ckey]'")
+			query.Execute()
+			while(query.NextRow())
+				voted = 1
+				break
+
+			//This is a safety switch, so only valid options pass through
+			var/option = "UNKNOWN"
+			switch(href_list["privacy_poll"])
+				if("signed")
+					option = "SIGNED"
+				if("anonymous")
+					option = "ANONYMOUS"
+				if("nostats")
+					option = "NOSTATS"
+				if("later")
+					usr << browse(null,"window=privacypoll")
+					return
+				if("abstain")
+					option = "ABSTAIN"
+
+			if(option == "UNKNOWN")
+				return
+
+			if(!voted)
+				var/sql = "INSERT INTO erro_privacy VALUES (null, Now(), '[src.ckey]', '[option]')"
+				var/DBQuery/query_insert = dbcon.NewQuery(sql)
+				query_insert.Execute()
+				usr << "<b>Thank you for your vote!</b>"
+				usr << browse(null,"window=privacypoll")
+
+		if(!ready && href_list["preference"])
+			if(client)
+				client.prefs.process_link(src, href_list)
+		else if(!href_list["late_join"])
+			new_player_panel()
+
+		if(href_list["showpoll"])
+
+			handle_player_polling()
+			return
+
+		if(href_list["pollid"])
+
+			var/pollid = href_list["pollid"]
+			if(istext(pollid))
+				pollid = text2num(pollid)
+			if(isnum(pollid))
+				src.poll_player(pollid)
+			return
+
+		if(href_list["votepollid"] && href_list["votetype"])
+			var/pollid = text2num(href_list["votepollid"])
+			var/votetype = href_list["votetype"]
+			switch(votetype)
+				if("OPTION")
+					var/optionid = text2num(href_list["voteoptionid"])
+					vote_on_poll(pollid, optionid)
+				if("TEXT")
+					var/replytext = href_list["replytext"]
+					log_text_poll_reply(pollid, replytext)
+				if("NUMVAL")
+					var/id_min = text2num(href_list["minid"])
+					var/id_max = text2num(href_list["maxid"])
+
+					if( (id_max - id_min) > 100 )	//Basic exploit prevention
+						usr << "The option ID difference is too big. Please contact administration or the database admin."
+						return
+
+					for(var/optionid = id_min; optionid <= id_max; optionid++)
+						if(!isnull(href_list["o[optionid]"]))	//Test if this optionid was replied to
+							var/rating
+							if(href_list["o[optionid]"] == "abstain")
+								rating = null
+							else
+								rating = text2num(href_list["o[optionid]"])
+								if(!isnum(rating))
+									return
+
+							vote_on_numval_poll(pollid, optionid, rating)
+				if("MULTICHOICE")
+					var/id_min = text2num(href_list["minoptionid"])
+					var/id_max = text2num(href_list["maxoptionid"])
+
+					if( (id_max - id_min) > 100 )	//Basic exploit prevention
+						usr << "The option ID difference is too big. Please contact administration or the database admin."
+						return
+
+					for(var/optionid = id_min; optionid <= id_max; optionid++)
+						if(!isnull(href_list["option_[optionid]"]))	//Test if this optionid was selected
+							vote_on_poll(pollid, optionid, 1)
+
+	proc/IsJobAvailable(rank)
+		var/datum/job/job = job_master.GetJob(rank)
+		if(!job)	return 0
+		if((job.current_positions >= job.total_positions) && job.total_positions != -1)	return 0
+		if(jobban_isbanned(src,rank))	return 0
+		if(!job.player_old_enough(src.client))	return 0
+		return 1
+
+
+	proc/AttemptLateSpawn(rank)
+		if (src != usr)
+			return 0
+		if(!ticker || ticker.current_state != GAME_STATE_PLAYING)
+			usr << "\red The round is either not ready, or has already finished..."
+			return 0
+		if(!enter_allowed)
+			usr << "\blue There is an administrative lock on entering the game!"
+			return 0
+		if(!IsJobAvailable(rank))
+			src << alert("[rank] is not available. Please try another.")
+			return 0
+
+		spawning = 1
+		close_spawn_windows()
+
+		job_master.AssignRole(src, rank, 1)
+
+		var/mob/living/carbon/human/character = create_character()	//creates the human and transfers vars and mind
+		job_master.EquipRank(character, rank, 1)					//equips the human
+		EquipCustomItems(character)
+		character.loc = pick(latejoin)
+		character.lastarea = get_area(loc)
+
+		ticker.mode.latespawn(character)
+
+		//ticker.mode.latespawn(character)
+
+		if(character.mind.assigned_role != "Cyborg")
+			data_core.manifest_inject(character)
+			ticker.minds += character.mind//Cyborgs and AIs handle this in the transform proc.	//TODO!!!!! ~Carn
+			AnnounceArrival(character, rank)
+
+		else
+			character.Robotize()
+		del(src)
+
+	proc/AnnounceArrival(var/mob/living/carbon/human/character, var/rank)
+		if (ticker.current_state == GAME_STATE_PLAYING)
+			var/obj/item/device/radio/intercom/a = new /obj/item/device/radio/intercom(null)// BS12 EDIT Arrivals Announcement Computer, rather than the AI.
+			if(character.mind.role_alt_title)
+				rank = character.mind.role_alt_title
+			a.autosay("[character.real_name],[rank ? " [rank]," : " visitor," ] has arrived on the station.", "Arrivals Announcement Computer")
+			del(a)
+
+	proc/LateChoices()
+		var/mills = world.time // 1/10 of a second, not real milliseconds but whatever
+		//var/secs = ((mills % 36000) % 600) / 10 //Not really needed, but I'll leave it here for refrence.. or something
+		var/mins = (mills % 36000) / 600
+		var/hours = mills / 36000
+
+		var/dat = "<html><body><center>"
+		dat += "Round Duration: [round(hours)]h [round(mins)]m<br>"
+
+		if(emergency_shuttle) //In case Nanotrasen decides reposess CentComm's shuttles.
+			if(emergency_shuttle.direction == 2) //Shuttle is going to centcomm, not recalled
+				dat += "<font color='red'><b>The station has been evacuated.</b></font><br>"
+			if(emergency_shuttle.direction == 1 && emergency_shuttle.timeleft() < 300 && emergency_shuttle.alert == 0) // Emergency shuttle is past the point of no recall
+				dat += "<font color='red'>The station is currently undergoing evacuation procedures.</font><br>"
+			if(emergency_shuttle.direction == 1 && emergency_shuttle.alert == 1) // Crew transfer initiated
+				dat += "<font color='red'>The station is currently undergoing crew transfer procedures.</font><br>"
+
+		dat += "Choose from the following open positions:<br>"
+		for(var/datum/job/job in job_master.occupations)
+			if(job && IsJobAvailable(job.title))
+				var/active = 0
+				// Only players with the job assigned and AFK for less than 10 minutes count as active
+				for(var/mob/M in player_list) if(M.mind && M.client && M.mind.assigned_role == job.title && M.client.inactivity <= 10 * 60 * 10)
+					active++
+				dat += "<a href='byond://?src=\ref[src];SelectedJob=[job.title]'>[job.title] ([job.current_positions]) (Active: [active])</a><br>"
+
+		dat += "</center>"
+		src << browse(dat, "window=latechoices;size=300x640;can_close=1")
+
+
+	proc/create_character()
+		spawning = 1
+		close_spawn_windows()
+
+		var/mob/living/carbon/human/new_character = new(loc)
+		new_character.lastarea = get_area(loc)
+
+		var/datum/species/chosen_species
+		if(client.prefs.species)
+			chosen_species = all_species[client.prefs.species]
+		if(chosen_species)
+			if(is_alien_whitelisted(src, client.prefs.species) || !config.usealienwhitelist || !(chosen_species.flags & IS_WHITELISTED) || (client.holder.rights & R_ADMIN) )// Have to recheck admin due to no usr at roundstart. Latejoins are fine though.
+				new_character.set_species(client.prefs.species)
+
+		var/datum/language/chosen_language
+		if(client.prefs.language)
+			chosen_language = all_languages["[client.prefs.language]"]
+		if(chosen_language)
+			if(is_alien_whitelisted(src, client.prefs.language) || !config.usealienwhitelist || !(chosen_language.flags & WHITELISTED))
+				new_character.add_language("[client.prefs.language]")
+
+		if(ticker.random_players)
+			new_character.gender = pick(MALE, FEMALE)
+			client.prefs.real_name = random_name(new_character.gender)
+			client.prefs.randomize_appearance_for(new_character)
+		else
+			client.prefs.copy_to(new_character)
+
+		src << sound(null, repeat = 0, wait = 0, volume = 85, channel = 1) // MAD JAMS cant last forever yo
+
+		if(mind)
+			mind.active = 0					//we wish to transfer the key manually
+			if(mind.assigned_role == "Clown")				//give them a clownname if they are a clown
+				new_character.real_name = pick(clown_names)	//I hate this being here of all places but unfortunately dna is based on real_name!
+				new_character.rename_self("clown")
+			mind.original = new_character
+			mind.transfer_to(new_character)					//won't transfer key since the mind is not active
+
+		new_character.name = real_name
+		new_character.dna.ready_dna(new_character)
+		new_character.dna.b_type = client.prefs.b_type
+
+		if(client.prefs.disabilities)
+			// Set defer to 1 if you add more crap here so it only recalculates struc_enzymes once. - N3X
+			new_character.dna.SetSEState(GLASSESBLOCK,1,0)
+			new_character.disabilities |= NEARSIGHTED
+
+		// And uncomment this, too.
+		//new_character.dna.UpdateSE()
+
+		new_character.key = key		//Manually transfer the key to log them in
+
+		return new_character
+
+	proc/ViewManifest()
+		var/dat = "<html><body>"
+		dat += "<h4>Crew Manifest</h4>"
+		dat += data_core.get_manifest(OOC = 1)
+
+		src << browse(dat, "window=manifest;size=370x420;can_close=1")
+
+	Move()
+		return 0
+
+
+	proc/close_spawn_windows()
+		src << browse(null, "window=latechoices") //closes late choices window
+		src << browse(null, "window=playersetup") //closes the player setup window

code/modules/mob/new_player/poll.dm

@@ -0,0 +1,526 @@
+
+/mob/new_player/proc/handle_privacy_poll()
+	establish_db_connection()
+	if(!dbcon.IsConnected())
+		return
+	var/voted = 0
+
+	var/DBQuery/query = dbcon.NewQuery("SELECT * FROM erro_privacy WHERE ckey='[src.ckey]'")
+	query.Execute()
+	while(query.NextRow())
+		voted = 1
+		break
+
+	if(!voted)
+		privacy_poll()
+
+/mob/new_player/proc/privacy_poll()
+	var/output = "<div align='center'><B>Player poll</B>"
+	output +="<hr>"
+	output += "<b>We would like to expand our stats gathering.</b>"
+	output += "<br>This however involves gathering data about player behavior, play styles, unique player numbers, play times, etc. Data like that cannot be gathered fully anonymously, which is why we're asking you how you'd feel if player-specific data was gathered. Prior to any of this actually happening, a privacy policy will be discussed, but before that can begin, we'd preliminarily like to know how you feel about the concept."
+	output +="<hr>"
+	output += "How do you feel about the game gathering player-specific statistics? This includes statistics about individual players as well as in-game polling/opinion requests."
+
+	output += "<p><a href='byond://?src=\ref[src];privacy_poll=signed'>Signed stats gathering</A>"
+	output += "<br>Pick this option if you think usernames should be logged with stats. This allows us to have personalized stats as well as polls."
+
+	output += "<p><a href='byond://?src=\ref[src];privacy_poll=anonymous'>Anonymous stats gathering</A>"
+	output += "<br>Pick this option if you think only hashed (indecipherable) usernames should be logged with stats. This doesn't allow us to have personalized stats, as we can't tell who is who (hashed values aren't readable), we can however have ingame polls."
+
+	output += "<p><a href='byond://?src=\ref[src];privacy_poll=nostats'>No stats gathering</A>"
+	output += "<br>Pick this option if you don't want player-specific stats gathered. This does not allow us to have player-specific stats or polls."
+
+	output += "<p><a href='byond://?src=\ref[src];privacy_poll=later'>Ask again later</A>"
+	output += "<br>This poll will be brought up again next round."
+
+	output += "<p><a href='byond://?src=\ref[src];privacy_poll=abstain'>Don't ask again</A>"
+	output += "<br>Only pick this if you are fine with whatever option wins."
+
+	output += "</div>"
+
+	src << browse(output,"window=privacypoll;size=600x500")
+	return
+
+/datum/polloption
+	var/optionid
+	var/optiontext
+
+/mob/new_player/proc/handle_player_polling()
+	establish_db_connection()
+	if(dbcon.IsConnected())
+		var/isadmin = 0
+		if(src.client && src.client.holder)
+			isadmin = 1
+
+		var/DBQuery/select_query = dbcon.NewQuery("SELECT id, question FROM erro_poll_question WHERE [(isadmin ? "" : "adminonly = false AND")] Now() BETWEEN starttime AND endtime")
+		select_query.Execute()
+
+		var/output = "<div align='center'><B>Player polls</B>"
+		output +="<hr>"
+
+		var/pollid
+		var/pollquestion
+
+		output += "<table>"
+		var/color1 = "#ececec"
+		var/color2 = "#e2e2e2"
+		var/i = 0
+
+		while(select_query.NextRow())
+			pollid = select_query.item[1]
+			pollquestion = select_query.item[2]
+			output += "<tr bgcolor='[ (i % 2 == 1) ? color1 : color2 ]'><td><a href=\"byond://?src=\ref[src];pollid=[pollid]\"><b>[pollquestion]</b></a></td></tr>"
+			i++
+
+		output += "</table>"
+
+		src << browse(output,"window=playerpolllist;size=500x300")
+
+
+
+/mob/new_player/proc/poll_player(var/pollid = -1)
+	if(pollid == -1) return
+	establish_db_connection()
+	if(dbcon.IsConnected())
+
+		var/DBQuery/select_query = dbcon.NewQuery("SELECT starttime, endtime, question, polltype, multiplechoiceoptions FROM erro_poll_question WHERE id = [pollid]")
+		select_query.Execute()
+
+		var/pollstarttime = ""
+		var/pollendtime = ""
+		var/pollquestion = ""
+		var/polltype = ""
+		var/found = 0
+		var/multiplechoiceoptions = 0
+
+		while(select_query.NextRow())
+			pollstarttime = select_query.item[1]
+			pollendtime = select_query.item[2]
+			pollquestion = select_query.item[3]
+			polltype = select_query.item[4]
+			found = 1
+			break
+
+		if(!found)
+			usr << "\red Poll question details not found."
+			return
+
+		switch(polltype)
+			//Polls that have enumerated options
+			if("OPTION")
+				var/DBQuery/voted_query = dbcon.NewQuery("SELECT optionid FROM erro_poll_vote WHERE pollid = [pollid] AND ckey = '[usr.ckey]'")
+				voted_query.Execute()
+
+				var/voted = 0
+				var/votedoptionid = 0
+				while(voted_query.NextRow())
+					votedoptionid = text2num(voted_query.item[1])
+					voted = 1
+					break
+
+				var/list/datum/polloption/options = list()
+
+				var/DBQuery/options_query = dbcon.NewQuery("SELECT id, text FROM erro_poll_option WHERE pollid = [pollid]")
+				options_query.Execute()
+				while(options_query.NextRow())
+					var/datum/polloption/PO = new()
+					PO.optionid = text2num(options_query.item[1])
+					PO.optiontext = options_query.item[2]
+					options += PO
+
+				var/output = "<div align='center'><B>Player poll</B>"
+				output +="<hr>"
+				output += "<b>Question: [pollquestion]</b><br>"
+				output += "<font size='2'>Poll runs from <b>[pollstarttime]</b> until <b>[pollendtime]</b></font><p>"
+
+				if(!voted)	//Only make this a form if we have not voted yet
+					output += "<form name='cardcomp' action='?src=\ref[src]' method='get'>"
+					output += "<input type='hidden' name='src' value='\ref[src]'>"
+					output += "<input type='hidden' name='votepollid' value='[pollid]'>"
+					output += "<input type='hidden' name='votetype' value='OPTION'>"
+
+				output += "<table><tr><td>"
+				for(var/datum/polloption/O in options)
+					if(O.optionid && O.optiontext)
+						if(voted)
+							if(votedoptionid == O.optionid)
+								output += "<b>[O.optiontext]</b><br>"
+							else
+								output += "[O.optiontext]<br>"
+						else
+							output += "<input type='radio' name='voteoptionid' value='[O.optionid]'> [O.optiontext]<br>"
+				output += "</td></tr></table>"
+
+				if(!voted)	//Only make this a form if we have not voted yet
+					output += "<p><input type='submit' value='Vote'>"
+					output += "</form>"
+
+				output += "</div>"
+
+				src << browse(output,"window=playerpoll;size=500x250")
+
+			//Polls with a text input
+			if("TEXT")
+				var/DBQuery/voted_query = dbcon.NewQuery("SELECT replytext FROM erro_poll_textreply WHERE pollid = [pollid] AND ckey = '[usr.ckey]'")
+				voted_query.Execute()
+
+				var/voted = 0
+				var/vote_text = ""
+				while(voted_query.NextRow())
+					vote_text = voted_query.item[1]
+					voted = 1
+					break
+
+
+				var/output = "<div align='center'><B>Player poll</B>"
+				output +="<hr>"
+				output += "<b>Question: [pollquestion]</b><br>"
+				output += "<font size='2'>Feedback gathering runs from <b>[pollstarttime]</b> until <b>[pollendtime]</b></font><p>"
+
+				if(!voted)	//Only make this a form if we have not voted yet
+					output += "<form name='cardcomp' action='?src=\ref[src]' method='get'>"
+					output += "<input type='hidden' name='src' value='\ref[src]'>"
+					output += "<input type='hidden' name='votepollid' value='[pollid]'>"
+					output += "<input type='hidden' name='votetype' value='TEXT'>"
+
+					output += "<font size='2'>Please provide feedback below. You can use any letters of the English alphabet, numbers and the symbols: . , ! ? : ; -</font><br>"
+					output += "<textarea name='replytext' cols='50' rows='14'></textarea>"
+
+					output += "<p><input type='submit' value='Submit'>"
+					output += "</form>"
+
+					output += "<form name='cardcomp' action='?src=\ref[src]' method='get'>"
+					output += "<input type='hidden' name='src' value='\ref[src]'>"
+					output += "<input type='hidden' name='votepollid' value='[pollid]'>"
+					output += "<input type='hidden' name='votetype' value='TEXT'>"
+					output += "<input type='hidden' name='replytext' value='ABSTAIN'>"
+					output += "<input type='submit' value='Abstain'>"
+					output += "</form>"
+				else
+					output += "[vote_text]"
+
+				src << browse(output,"window=playerpoll;size=500x500")
+
+			//Polls with a text input
+			if("NUMVAL")
+				var/DBQuery/voted_query = dbcon.NewQuery("SELECT o.text, v.rating FROM erro_poll_option o, erro_poll_vote v WHERE o.pollid = [pollid] AND v.ckey = '[usr.ckey]' AND o.id = v.optionid")
+				voted_query.Execute()
+
+				var/output = "<div align='center'><B>Player poll</B>"
+				output +="<hr>"
+				output += "<b>Question: [pollquestion]</b><br>"
+				output += "<font size='2'>Poll runs from <b>[pollstarttime]</b> until <b>[pollendtime]</b></font><p>"
+
+				var/voted = 0
+				while(voted_query.NextRow())
+					voted = 1
+
+					var/optiontext = voted_query.item[1]
+					var/rating = voted_query.item[2]
+
+					output += "<br><b>[optiontext] - [rating]</b>"
+
+				if(!voted)	//Only make this a form if we have not voted yet
+					output += "<form name='cardcomp' action='?src=\ref[src]' method='get'>"
+					output += "<input type='hidden' name='src' value='\ref[src]'>"
+					output += "<input type='hidden' name='votepollid' value='[pollid]'>"
+					output += "<input type='hidden' name='votetype' value='NUMVAL'>"
+
+					var/minid = 999999
+					var/maxid = 0
+
+					var/DBQuery/option_query = dbcon.NewQuery("SELECT id, text, minval, maxval, descmin, descmid, descmax FROM erro_poll_option WHERE pollid = [pollid]")
+					option_query.Execute()
+					while(option_query.NextRow())
+						var/optionid = text2num(option_query.item[1])
+						var/optiontext = option_query.item[2]
+						var/minvalue = text2num(option_query.item[3])
+						var/maxvalue = text2num(option_query.item[4])
+						var/descmin = option_query.item[5]
+						var/descmid = option_query.item[6]
+						var/descmax = option_query.item[7]
+
+						if(optionid < minid)
+							minid = optionid
+						if(optionid > maxid)
+							maxid = optionid
+
+						var/midvalue = round( (maxvalue + minvalue) / 2)
+
+						if(isnull(minvalue) || isnull(maxvalue) || (minvalue == maxvalue))
+							continue
+
+						output += "<br>[optiontext]: <select name='o[optionid]'>"
+						output += "<option value='abstain'>abstain</option>"
+						for (var/j = minvalue; j <= maxvalue; j++)
+							if(j == minvalue && descmin)
+								output += "<option value='[j]'>[j] ([descmin])</option>"
+							else if (j == midvalue && descmid)
+								output += "<option value='[j]'>[j] ([descmid])</option>"
+							else if (j == maxvalue && descmax)
+								output += "<option value='[j]'>[j] ([descmax])</option>"
+							else
+								output += "<option value='[j]'>[j]</option>"
+
+						output += "</select>"
+
+					output += "<input type='hidden' name='minid' value='[minid]'>"
+					output += "<input type='hidden' name='maxid' value='[maxid]'>"
+
+					output += "<p><input type='submit' value='Submit'>"
+					output += "</form>"
+
+				src << browse(output,"window=playerpoll;size=500x500")
+			if("MULTICHOICE")
+				var/DBQuery/voted_query = dbcon.NewQuery("SELECT optionid FROM erro_poll_vote WHERE pollid = [pollid] AND ckey = '[usr.ckey]'")
+				voted_query.Execute()
+
+				var/list/votedfor = list()
+				var/voted = 0
+				while(voted_query.NextRow())
+					votedfor.Add(text2num(voted_query.item[1]))
+					voted = 1
+
+				var/list/datum/polloption/options = list()
+				var/maxoptionid = 0
+				var/minoptionid = 0
+
+				var/DBQuery/options_query = dbcon.NewQuery("SELECT id, text FROM erro_poll_option WHERE pollid = [pollid]")
+				options_query.Execute()
+				while(options_query.NextRow())
+					var/datum/polloption/PO = new()
+					PO.optionid = text2num(options_query.item[1])
+					PO.optiontext = options_query.item[2]
+					if(PO.optionid > maxoptionid)
+						maxoptionid = PO.optionid
+					if(PO.optionid < minoptionid || !minoptionid)
+						minoptionid = PO.optionid
+					options += PO
+
+
+				if(select_query.item[5])
+					multiplechoiceoptions = text2num(select_query.item[5])
+
+				var/output = "<div align='center'><B>Player poll</B>"
+				output +="<hr>"
+				output += "<b>Question: [pollquestion]</b><br>You can select up to [multiplechoiceoptions] options. If you select more, the first [multiplechoiceoptions] will be saved.<br>"
+				output += "<font size='2'>Poll runs from <b>[pollstarttime]</b> until <b>[pollendtime]</b></font><p>"
+
+				if(!voted)	//Only make this a form if we have not voted yet
+					output += "<form name='cardcomp' action='?src=\ref[src]' method='get'>"
+					output += "<input type='hidden' name='src' value='\ref[src]'>"
+					output += "<input type='hidden' name='votepollid' value='[pollid]'>"
+					output += "<input type='hidden' name='votetype' value='MULTICHOICE'>"
+					output += "<input type='hidden' name='maxoptionid' value='[maxoptionid]'>"
+					output += "<input type='hidden' name='minoptionid' value='[minoptionid]'>"
+
+				output += "<table><tr><td>"
+				for(var/datum/polloption/O in options)
+					if(O.optionid && O.optiontext)
+						if(voted)
+							if(O.optionid in votedfor)
+								output += "<b>[O.optiontext]</b><br>"
+							else
+								output += "[O.optiontext]<br>"
+						else
+							output += "<input type='checkbox' name='option_[O.optionid]' value='[O.optionid]'> [O.optiontext]<br>"
+				output += "</td></tr></table>"
+
+				if(!voted)	//Only make this a form if we have not voted yet
+					output += "<p><input type='submit' value='Vote'>"
+					output += "</form>"
+
+				output += "</div>"
+
+				src << browse(output,"window=playerpoll;size=500x250")
+		return
+
+/mob/new_player/proc/vote_on_poll(var/pollid = -1, var/optionid = -1, var/multichoice = 0)
+	if(pollid == -1 || optionid == -1)
+		return
+
+	if(!isnum(pollid) || !isnum(optionid))
+		return
+	establish_db_connection()
+	if(dbcon.IsConnected())
+
+		var/DBQuery/select_query = dbcon.NewQuery("SELECT starttime, endtime, question, polltype, multiplechoiceoptions FROM erro_poll_question WHERE id = [pollid] AND Now() BETWEEN starttime AND endtime")
+		select_query.Execute()
+
+		var/validpoll = 0
+		var/multiplechoiceoptions = 0
+
+		while(select_query.NextRow())
+			if(select_query.item[4] != "OPTION" && select_query.item[4] != "MULTICHOICE")
+				return
+			validpoll = 1
+			if(select_query.item[5])
+				multiplechoiceoptions = text2num(select_query.item[5])
+			break
+
+		if(!validpoll)
+			usr << "\red Poll is not valid."
+			return
+
+		var/DBQuery/select_query2 = dbcon.NewQuery("SELECT id FROM erro_poll_option WHERE id = [optionid] AND pollid = [pollid]")
+		select_query2.Execute()
+
+		var/validoption = 0
+
+		while(select_query2.NextRow())
+			validoption = 1
+			break
+
+		if(!validoption)
+			usr << "\red Poll option is not valid."
+			return
+
+		var/alreadyvoted = 0
+
+		var/DBQuery/voted_query = dbcon.NewQuery("SELECT id FROM erro_poll_vote WHERE pollid = [pollid] AND ckey = '[usr.ckey]'")
+		voted_query.Execute()
+
+		while(voted_query.NextRow())
+			alreadyvoted += 1
+			if(!multichoice)
+				break
+
+		if(!multichoice && alreadyvoted)
+			usr << "\red You already voted in this poll."
+			return
+
+		if(multichoice && (alreadyvoted >= multiplechoiceoptions))
+			usr << "\red You already have more than [multiplechoiceoptions] logged votes on this poll. Enough is enough. Contact the database admin if this is an error."
+			return
+
+		var/adminrank = "Player"
+		if(usr && usr.client && usr.client.holder)
+			adminrank = usr.client.holder.rank
+
+
+		var/DBQuery/insert_query = dbcon.NewQuery("INSERT INTO erro_poll_vote (id ,datetime ,pollid ,optionid ,ckey ,ip ,adminrank) VALUES (null, Now(), [pollid], [optionid], '[usr.ckey]', '[usr.client.address]', '[adminrank]')")
+		insert_query.Execute()
+
+		usr << "\blue Vote successful."
+		usr << browse(null,"window=playerpoll")
+
+
+/mob/new_player/proc/log_text_poll_reply(var/pollid = -1, var/replytext = "")
+	if(pollid == -1 || replytext == "")
+		return
+
+	if(!isnum(pollid) || !istext(replytext))
+		return
+	establish_db_connection()
+	if(dbcon.IsConnected())
+
+		var/DBQuery/select_query = dbcon.NewQuery("SELECT starttime, endtime, question, polltype FROM erro_poll_question WHERE id = [pollid] AND Now() BETWEEN starttime AND endtime")
+		select_query.Execute()
+
+		var/validpoll = 0
+
+		while(select_query.NextRow())
+			if(select_query.item[4] != "TEXT")
+				return
+			validpoll = 1
+			break
+
+		if(!validpoll)
+			usr << "\red Poll is not valid."
+			return
+
+		var/alreadyvoted = 0
+
+		var/DBQuery/voted_query = dbcon.NewQuery("SELECT id FROM erro_poll_textreply WHERE pollid = [pollid] AND ckey = '[usr.ckey]'")
+		voted_query.Execute()
+
+		while(voted_query.NextRow())
+			alreadyvoted = 1
+			break
+
+		if(alreadyvoted)
+			usr << "\red You already sent your feedback for this poll."
+			return
+
+		var/adminrank = "Player"
+		if(usr && usr.client && usr.client.holder)
+			adminrank = usr.client.holder.rank
+
+
+		replytext = replacetext(replytext, "%BR%", "")
+		replytext = replacetext(replytext, "\n", "%BR%")
+		var/text_pass = reject_bad_text(replytext,8000)
+		replytext = replacetext(replytext, "%BR%", "<BR>")
+
+		if(!text_pass)
+			usr << "The text you entered was blank, contained illegal characters or was too long. Please correct the text and submit again."
+			return
+
+		var/DBQuery/insert_query = dbcon.NewQuery("INSERT INTO erro_poll_textreply (id ,datetime ,pollid ,ckey ,ip ,replytext ,adminrank) VALUES (null, Now(), [pollid], '[usr.ckey]', '[usr.client.address]', '[replytext]', '[adminrank]')")
+		insert_query.Execute()
+
+		usr << "\blue Feedback logging successful."
+		usr << browse(null,"window=playerpoll")
+
+
+/mob/new_player/proc/vote_on_numval_poll(var/pollid = -1, var/optionid = -1, var/rating = null)
+	if(pollid == -1 || optionid == -1)
+		return
+
+	if(!isnum(pollid) || !isnum(optionid))
+		return
+	establish_db_connection()
+	if(dbcon.IsConnected())
+
+		var/DBQuery/select_query = dbcon.NewQuery("SELECT starttime, endtime, question, polltype FROM erro_poll_question WHERE id = [pollid] AND Now() BETWEEN starttime AND endtime")
+		select_query.Execute()
+
+		var/validpoll = 0
+
+		while(select_query.NextRow())
+			if(select_query.item[4] != "NUMVAL")
+				return
+			validpoll = 1
+			break
+
+		if(!validpoll)
+			usr << "\red Poll is not valid."
+			return
+
+		var/DBQuery/select_query2 = dbcon.NewQuery("SELECT id FROM erro_poll_option WHERE id = [optionid] AND pollid = [pollid]")
+		select_query2.Execute()
+
+		var/validoption = 0
+
+		while(select_query2.NextRow())
+			validoption = 1
+			break
+
+		if(!validoption)
+			usr << "\red Poll option is not valid."
+			return
+
+		var/alreadyvoted = 0
+
+		var/DBQuery/voted_query = dbcon.NewQuery("SELECT id FROM erro_poll_vote WHERE optionid = [optionid] AND ckey = '[usr.ckey]'")
+		voted_query.Execute()
+
+		while(voted_query.NextRow())
+			alreadyvoted = 1
+			break
+
+		if(alreadyvoted)
+			usr << "\red You already voted in this poll."
+			return
+
+		var/adminrank = "Player"
+		if(usr && usr.client && usr.client.holder)
+			adminrank = usr.client.holder.rank
+
+
+		var/DBQuery/insert_query = dbcon.NewQuery("INSERT INTO erro_poll_vote (id ,datetime ,pollid ,optionid ,ckey ,ip ,adminrank, rating) VALUES (null, Now(), [pollid], [optionid], '[usr.ckey]', '[usr.client.address]', '[adminrank]', [(isnull(rating)) ? "null" : rating])")
+		insert_query.Execute()
+
+		usr << "\blue Vote successful."
+		usr << browse(null,"window=playerpoll")

code/modules/mob/new_player/preferences_setup.dm

@@ -0,0 +1,570 @@
+datum/preferences
+	//The mob should have a gender you want before running this proc. Will run fine without H
+	proc/randomize_appearance_for(var/mob/living/carbon/human/H)
+		if(H)
+			if(H.gender == MALE)
+				gender = MALE
+			else
+				gender = FEMALE
+		s_tone = random_skin_tone()
+		h_style = random_hair_style(gender, species)
+		f_style = random_facial_hair_style(gender, species)
+		randomize_hair_color("hair")
+		randomize_hair_color("facial")
+		randomize_eyes_color()
+		underwear = rand(1,underwear_m.len)
+		backbag = 2
+		age = rand(AGE_MIN,AGE_MAX)
+		if(H)
+			copy_to(H,1)
+
+
+	proc/randomize_hair_color(var/target = "hair")
+		if(prob (75) && target == "facial") // Chance to inherit hair color
+			r_facial = r_hair
+			g_facial = g_hair
+			b_facial = b_hair
+			return
+
+		var/red
+		var/green
+		var/blue
+
+		var/col = pick ("blonde", "black", "chestnut", "copper", "brown", "wheat", "old", "punk")
+		switch(col)
+			if("blonde")
+				red = 255
+				green = 255
+				blue = 0
+			if("black")
+				red = 0
+				green = 0
+				blue = 0
+			if("chestnut")
+				red = 153
+				green = 102
+				blue = 51
+			if("copper")
+				red = 255
+				green = 153
+				blue = 0
+			if("brown")
+				red = 102
+				green = 51
+				blue = 0
+			if("wheat")
+				red = 255
+				green = 255
+				blue = 153
+			if("old")
+				red = rand (100, 255)
+				green = red
+				blue = red
+			if("punk")
+				red = rand (0, 255)
+				green = rand (0, 255)
+				blue = rand (0, 255)
+
+		red = max(min(red + rand (-25, 25), 255), 0)
+		green = max(min(green + rand (-25, 25), 255), 0)
+		blue = max(min(blue + rand (-25, 25), 255), 0)
+
+		switch(target)
+			if("hair")
+				r_hair = red
+				g_hair = green
+				b_hair = blue
+			if("facial")
+				r_facial = red
+				g_facial = green
+				b_facial = blue
+
+	proc/randomize_eyes_color()
+		var/red
+		var/green
+		var/blue
+
+		var/col = pick ("black", "grey", "brown", "chestnut", "blue", "lightblue", "green", "albino")
+		switch(col)
+			if("black")
+				red = 0
+				green = 0
+				blue = 0
+			if("grey")
+				red = rand (100, 200)
+				green = red
+				blue = red
+			if("brown")
+				red = 102
+				green = 51
+				blue = 0
+			if("chestnut")
+				red = 153
+				green = 102
+				blue = 0
+			if("blue")
+				red = 51
+				green = 102
+				blue = 204
+			if("lightblue")
+				red = 102
+				green = 204
+				blue = 255
+			if("green")
+				red = 0
+				green = 102
+				blue = 0
+			if("albino")
+				red = rand (200, 255)
+				green = rand (0, 150)
+				blue = rand (0, 150)
+
+		red = max(min(red + rand (-25, 25), 255), 0)
+		green = max(min(green + rand (-25, 25), 255), 0)
+		blue = max(min(blue + rand (-25, 25), 255), 0)
+
+		r_eyes = red
+		g_eyes = green
+		b_eyes = blue
+
+
+	proc/update_preview_icon()		//seriously. This is horrendous.
+		del(preview_icon_front)
+		del(preview_icon_side)
+		del(preview_icon)
+
+		var/g = "m"
+		if(gender == FEMALE)	g = "f"
+
+		var/icon/icobase
+		var/datum/species/current_species = all_species[species]
+
+		if(current_species)
+			icobase = current_species.icobase
+		else
+			icobase = 'icons/mob/human_races/r_human.dmi'
+
+		preview_icon = new /icon(icobase, "torso_[g]")
+		preview_icon.Blend(new /icon(icobase, "groin_[g]"), ICON_OVERLAY)
+		preview_icon.Blend(new /icon(icobase, "head_[g]"), ICON_OVERLAY)
+
+		for(var/name in list("l_arm","r_arm","l_leg","r_leg","l_foot","r_foot","l_hand","r_hand"))
+			// make sure the organ is added to the list so it's drawn
+			if(organ_data[name] == null)
+				organ_data[name] = null
+
+		for(var/name in organ_data)
+			if(organ_data[name] == "amputated") continue
+
+			var/icon/temp = new /icon(icobase, "[name]")
+			if(organ_data[name] == "cyborg")
+				temp.MapColors(rgb(77,77,77), rgb(150,150,150), rgb(28,28,28), rgb(0,0,0))
+
+			preview_icon.Blend(temp, ICON_OVERLAY)
+
+		// Skin tone
+		if(current_species && (current_species.flags & HAS_SKIN_TONE))
+			if (s_tone >= 0)
+				preview_icon.Blend(rgb(s_tone, s_tone, s_tone), ICON_ADD)
+			else
+				preview_icon.Blend(rgb(-s_tone,  -s_tone,  -s_tone), ICON_SUBTRACT)
+
+		var/icon/eyes_s = new/icon("icon" = 'icons/mob/human_face.dmi', "icon_state" = current_species ? current_species.eyes : "eyes_s")
+		eyes_s.Blend(rgb(r_eyes, g_eyes, b_eyes), ICON_ADD)
+
+		var/datum/sprite_accessory/hair_style = hair_styles_list[h_style]
+		if(hair_style)
+			var/icon/hair_s = new/icon("icon" = hair_style.icon, "icon_state" = "[hair_style.icon_state]_s")
+			hair_s.Blend(rgb(r_hair, g_hair, b_hair), ICON_ADD)
+			eyes_s.Blend(hair_s, ICON_OVERLAY)
+
+		var/datum/sprite_accessory/facial_hair_style = facial_hair_styles_list[f_style]
+		if(facial_hair_style)
+			var/icon/facial_s = new/icon("icon" = facial_hair_style.icon, "icon_state" = "[facial_hair_style.icon_state]_s")
+			facial_s.Blend(rgb(r_facial, g_facial, b_facial), ICON_ADD)
+			eyes_s.Blend(facial_s, ICON_OVERLAY)
+
+		var/icon/clothes_s = null
+		if(job_civilian_low & ASSISTANT)//This gives the preview icon clothes depending on which job(if any) is set to 'high'
+			clothes_s = new /icon('icons/mob/uniform.dmi', "grey_s")
+			clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY)
+			if(backbag == 2)
+				clothes_s.Blend(new /icon('icons/mob/back.dmi', "backpack"), ICON_OVERLAY)
+			else if(backbag == 3 || backbag == 4)
+				clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
+
+		else if(job_civilian_high)//I hate how this looks, but there's no reason to go through this switch if it's empty
+			switch(job_civilian_high)
+				if(HOP)
+					clothes_s = new /icon('icons/mob/uniform.dmi', "hop_s")
+					clothes_s.Blend(new /icon('icons/mob/feet.dmi', "brown"), ICON_UNDERLAY)
+					clothes_s.Blend(new /icon('icons/mob/suit.dmi', "armor"), ICON_OVERLAY)
+					clothes_s.Blend(new /icon('icons/mob/head.dmi', "helmet"), ICON_OVERLAY)
+					switch(backbag)
+						if(2)
+							clothes_s.Blend(new /icon('icons/mob/back.dmi', "backpack"), ICON_OVERLAY)
+						if(3)
+							clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-norm"), ICON_OVERLAY)
+						if(4)
+							clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
+				if(BARTENDER)
+					clothes_s = new /icon('icons/mob/uniform.dmi', "ba_suit_s")
+					clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY)
+					clothes_s.Blend(new /icon('icons/mob/suit.dmi', "armor"), ICON_OVERLAY)
+					switch(backbag)
+						if(2)
+							clothes_s.Blend(new /icon('icons/mob/back.dmi', "backpack"), ICON_OVERLAY)
+						if(3)
+							clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-norm"), ICON_OVERLAY)
+						if(4)
+							clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
+				if(BOTANIST)
+					clothes_s = new /icon('icons/mob/uniform.dmi', "hydroponics_s")
+					clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY)
+					clothes_s.Blend(new /icon('icons/mob/hands.dmi', "ggloves"), ICON_UNDERLAY)
+					clothes_s.Blend(new /icon('icons/mob/suit.dmi', "apron"), ICON_OVERLAY)
+					switch(backbag)
+						if(2)
+							clothes_s.Blend(new /icon('icons/mob/back.dmi', "backpack"), ICON_OVERLAY)
+						if(3)
+							clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-hyd"), ICON_OVERLAY)
+						if(4)
+							clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
+				if(CHEF)
+					clothes_s = new /icon('icons/mob/uniform.dmi', "chef_s")
+					clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY)
+					clothes_s.Blend(new /icon('icons/mob/head.dmi', "chef"), ICON_OVERLAY)
+					switch(backbag)
+						if(2)
+							clothes_s.Blend(new /icon('icons/mob/back.dmi', "backpack"), ICON_OVERLAY)
+						if(3)
+							clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-norm"), ICON_OVERLAY)
+						if(4)
+							clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
+				if(JANITOR)
+					clothes_s = new /icon('icons/mob/uniform.dmi', "janitor_s")
+					clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY)
+					switch(backbag)
+						if(2)
+							clothes_s.Blend(new /icon('icons/mob/back.dmi', "backpack"), ICON_OVERLAY)
+						if(3)
+							clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-norm"), ICON_OVERLAY)
+						if(4)
+							clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
+				if(LIBRARIAN)
+					clothes_s = new /icon('icons/mob/uniform.dmi', "red_suit_s")
+					clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY)
+					switch(backbag)
+						if(2)
+							clothes_s.Blend(new /icon('icons/mob/back.dmi', "backpack"), ICON_OVERLAY)
+						if(3)
+							clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-norm"), ICON_OVERLAY)
+						if(4)
+							clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
+				if(QUARTERMASTER)
+					clothes_s = new /icon('icons/mob/uniform.dmi', "qm_s")
+					clothes_s.Blend(new /icon('icons/mob/feet.dmi', "brown"), ICON_UNDERLAY)
+					clothes_s.Blend(new /icon('icons/mob/hands.dmi', "bgloves"), ICON_UNDERLAY)
+					clothes_s.Blend(new /icon('icons/mob/eyes.dmi', "sun"), ICON_OVERLAY)
+					clothes_s.Blend(new /icon('icons/mob/items_righthand.dmi', "clipboard"), ICON_UNDERLAY)
+					switch(backbag)
+						if(2)
+							clothes_s.Blend(new /icon('icons/mob/back.dmi', "backpack"), ICON_OVERLAY)
+						if(3)
+							clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-norm"), ICON_OVERLAY)
+						if(4)
+							clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
+				if(CARGOTECH)
+					clothes_s = new /icon('icons/mob/uniform.dmi', "cargotech_s")
+					clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY)
+					clothes_s.Blend(new /icon('icons/mob/hands.dmi', "bgloves"), ICON_UNDERLAY)
+					switch(backbag)
+						if(2)
+							clothes_s.Blend(new /icon('icons/mob/back.dmi', "backpack"), ICON_OVERLAY)
+						if(3)
+							clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-norm"), ICON_OVERLAY)
+						if(4)
+							clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
+				if(MINER)
+					clothes_s = new /icon('icons/mob/uniform.dmi', "miner_s")
+					clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY)
+					clothes_s.Blend(new /icon('icons/mob/hands.dmi', "bgloves"), ICON_UNDERLAY)
+					switch(backbag)
+						if(2)
+							clothes_s.Blend(new /icon('icons/mob/back.dmi', "backpack"), ICON_OVERLAY)
+						if(3)
+							clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-eng"), ICON_OVERLAY)
+						if(4)
+							clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
+				if(LAWYER)
+					clothes_s = new /icon('icons/mob/uniform.dmi', "internalaffairs_s")
+					clothes_s.Blend(new /icon('icons/mob/feet.dmi', "brown"), ICON_UNDERLAY)
+					clothes_s.Blend(new /icon('icons/mob/items_righthand.dmi', "briefcase"), ICON_UNDERLAY)
+
+					switch(backbag)
+						if(2)
+							clothes_s.Blend(new /icon('icons/mob/back.dmi', "backpack"), ICON_OVERLAY)
+						if(3)
+							clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-norm"), ICON_OVERLAY)
+						if(4)
+							clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
+				if(CHAPLAIN)
+					clothes_s = new /icon('icons/mob/uniform.dmi', "chapblack_s")
+					clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY)
+					switch(backbag)
+						if(2)
+							clothes_s.Blend(new /icon('icons/mob/back.dmi', "backpack"), ICON_OVERLAY)
+						if(3)
+							clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-norm"), ICON_OVERLAY)
+						if(4)
+							clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
+				if(CLOWN)
+					clothes_s = new /icon('icons/mob/uniform.dmi', "clown_s")
+					clothes_s.Blend(new /icon('icons/mob/feet.dmi', "clown"), ICON_UNDERLAY)
+					clothes_s.Blend(new /icon('icons/mob/mask.dmi', "clown"), ICON_OVERLAY)
+					clothes_s.Blend(new /icon('icons/mob/back.dmi', "clownpack"), ICON_OVERLAY)
+				if(MIME)
+					clothes_s = new /icon('icons/mob/uniform.dmi', "mime_s")
+					clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY)
+					clothes_s.Blend(new /icon('icons/mob/hands.dmi', "lgloves"), ICON_UNDERLAY)
+					clothes_s.Blend(new /icon('icons/mob/mask.dmi', "mime"), ICON_OVERLAY)
+					clothes_s.Blend(new /icon('icons/mob/head.dmi', "beret"), ICON_OVERLAY)
+					clothes_s.Blend(new /icon('icons/mob/suit.dmi', "suspenders"), ICON_OVERLAY)
+					switch(backbag)
+						if(2)
+							clothes_s.Blend(new /icon('icons/mob/back.dmi', "backpack"), ICON_OVERLAY)
+						if(3)
+							clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-norm"), ICON_OVERLAY)
+						if(4)
+							clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
+
+		else if(job_medsci_high)
+			switch(job_medsci_high)
+				if(RD)
+					clothes_s = new /icon('icons/mob/uniform.dmi', "director_s")
+					clothes_s.Blend(new /icon('icons/mob/feet.dmi', "brown"), ICON_UNDERLAY)
+					clothes_s.Blend(new /icon('icons/mob/items_righthand.dmi', "clipboard"), ICON_UNDERLAY)
+					clothes_s.Blend(new /icon('icons/mob/suit.dmi', "labcoat_open"), ICON_OVERLAY)
+					switch(backbag)
+						if(2)
+							clothes_s.Blend(new /icon('icons/mob/back.dmi', "backpack"), ICON_OVERLAY)
+						if(3)
+							clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-tox"), ICON_OVERLAY)
+						if(4)
+							clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
+				if(SCIENTIST)
+					clothes_s = new /icon('icons/mob/uniform.dmi', "toxinswhite_s")
+					clothes_s.Blend(new /icon('icons/mob/feet.dmi', "white"), ICON_UNDERLAY)
+					clothes_s.Blend(new /icon('icons/mob/suit.dmi', "labcoat_tox_open"), ICON_OVERLAY)
+					switch(backbag)
+						if(2)
+							clothes_s.Blend(new /icon('icons/mob/back.dmi', "backpack"), ICON_OVERLAY)
+						if(3)
+							clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-tox"), ICON_OVERLAY)
+						if(4)
+							clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
+				if(CHEMIST)
+					clothes_s = new /icon('icons/mob/uniform.dmi', "chemistrywhite_s")
+					clothes_s.Blend(new /icon('icons/mob/feet.dmi', "white"), ICON_UNDERLAY)
+					clothes_s.Blend(new /icon('icons/mob/suit.dmi', "labcoat_chem_open"), ICON_OVERLAY)
+					switch(backbag)
+						if(2)
+							clothes_s.Blend(new /icon('icons/mob/back.dmi', "backpack"), ICON_OVERLAY)
+						if(3)
+							clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-chem"), ICON_OVERLAY)
+						if(4)
+							clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
+				if(CMO)
+					clothes_s = new /icon('icons/mob/uniform.dmi', "cmo_s")
+					clothes_s.Blend(new /icon('icons/mob/feet.dmi', "brown"), ICON_UNDERLAY)
+					clothes_s.Blend(new /icon('icons/mob/items_lefthand.dmi', "firstaid"), ICON_UNDERLAY)
+					clothes_s.Blend(new /icon('icons/mob/suit.dmi', "labcoat_cmo_open"), ICON_OVERLAY)
+					switch(backbag)
+						if(2)
+							clothes_s.Blend(new /icon('icons/mob/back.dmi', "medicalpack"), ICON_OVERLAY)
+						if(3)
+							clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-med"), ICON_OVERLAY)
+						if(4)
+							clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
+				if(DOCTOR)
+					clothes_s = new /icon('icons/mob/uniform.dmi', "medical_s")
+					clothes_s.Blend(new /icon('icons/mob/feet.dmi', "white"), ICON_UNDERLAY)
+					clothes_s.Blend(new /icon('icons/mob/items_lefthand.dmi', "firstaid"), ICON_UNDERLAY)
+					clothes_s.Blend(new /icon('icons/mob/suit.dmi', "labcoat_open"), ICON_OVERLAY)
+					switch(backbag)
+						if(2)
+							clothes_s.Blend(new /icon('icons/mob/back.dmi', "medicalpack"), ICON_OVERLAY)
+						if(3)
+							clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-med"), ICON_OVERLAY)
+						if(4)
+							clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
+				if(GENETICIST)
+					clothes_s = new /icon('icons/mob/uniform.dmi', "geneticswhite_s")
+					clothes_s.Blend(new /icon('icons/mob/feet.dmi', "white"), ICON_UNDERLAY)
+					clothes_s.Blend(new /icon('icons/mob/suit.dmi', "labcoat_gen_open"), ICON_OVERLAY)
+					switch(backbag)
+						if(2)
+							clothes_s.Blend(new /icon('icons/mob/back.dmi', "backpack"), ICON_OVERLAY)
+						if(3)
+							clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-gen"), ICON_OVERLAY)
+						if(4)
+							clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
+				if(VIROLOGIST)
+					clothes_s = new /icon('icons/mob/uniform.dmi', "virologywhite_s")
+					clothes_s.Blend(new /icon('icons/mob/feet.dmi', "white"), ICON_UNDERLAY)
+					clothes_s.Blend(new /icon('icons/mob/mask.dmi', "sterile"), ICON_OVERLAY)
+					clothes_s.Blend(new /icon('icons/mob/suit.dmi', "labcoat_vir_open"), ICON_OVERLAY)
+					switch(backbag)
+						if(2)
+							clothes_s.Blend(new /icon('icons/mob/back.dmi', "medicalpack"), ICON_OVERLAY)
+						if(3)
+							clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-vir"), ICON_OVERLAY)
+						if(4)
+							clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
+				if(ROBOTICIST)
+					clothes_s = new /icon('icons/mob/uniform.dmi', "robotics_s")
+					clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY)
+					clothes_s.Blend(new /icon('icons/mob/hands.dmi', "bgloves"), ICON_UNDERLAY)
+					clothes_s.Blend(new /icon('icons/mob/items_righthand.dmi', "toolbox_blue"), ICON_OVERLAY)
+					clothes_s.Blend(new /icon('icons/mob/suit.dmi', "labcoat_open"), ICON_OVERLAY)
+					switch(backbag)
+						if(2)
+							clothes_s.Blend(new /icon('icons/mob/back.dmi', "backpack"), ICON_OVERLAY)
+						if(3)
+							clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-norm"), ICON_OVERLAY)
+						if(4)
+							clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
+
+		else if(job_engsec_high)
+			switch(job_engsec_high)
+				if(CAPTAIN)
+					clothes_s = new /icon('icons/mob/uniform.dmi', "captain_s")
+					clothes_s.Blend(new /icon('icons/mob/feet.dmi', "brown"), ICON_UNDERLAY)
+					clothes_s.Blend(new /icon('icons/mob/head.dmi', "captain"), ICON_OVERLAY)
+					clothes_s.Blend(new /icon('icons/mob/mask.dmi', "cigaron"), ICON_OVERLAY)
+					clothes_s.Blend(new /icon('icons/mob/eyes.dmi', "sun"), ICON_OVERLAY)
+					clothes_s.Blend(new /icon('icons/mob/suit.dmi', "caparmor"), ICON_OVERLAY)
+					switch(backbag)
+						if(2)
+							clothes_s.Blend(new /icon('icons/mob/back.dmi', "backpack"), ICON_OVERLAY)
+						if(3)
+							clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-cap"), ICON_OVERLAY)
+						if(4)
+							clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
+				if(HOS)
+					clothes_s = new /icon('icons/mob/uniform.dmi', "hosred_s")
+					clothes_s.Blend(new /icon('icons/mob/feet.dmi', "jackboots"), ICON_UNDERLAY)
+					clothes_s.Blend(new /icon('icons/mob/hands.dmi', "bgloves"), ICON_UNDERLAY)
+					clothes_s.Blend(new /icon('icons/mob/head.dmi', "helmet"), ICON_OVERLAY)
+					clothes_s.Blend(new /icon('icons/mob/suit.dmi', "armor"), ICON_OVERLAY)
+					switch(backbag)
+						if(2)
+							clothes_s.Blend(new /icon('icons/mob/back.dmi', "securitypack"), ICON_OVERLAY)
+						if(3)
+							clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-sec"), ICON_OVERLAY)
+						if(4)
+							clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
+				if(WARDEN)
+					clothes_s = new /icon('icons/mob/uniform.dmi', "warden_s")
+					clothes_s.Blend(new /icon('icons/mob/feet.dmi', "jackboots"), ICON_UNDERLAY)
+					clothes_s.Blend(new /icon('icons/mob/hands.dmi', "bgloves"), ICON_UNDERLAY)
+					clothes_s.Blend(new /icon('icons/mob/head.dmi', "helmet"), ICON_OVERLAY)
+					clothes_s.Blend(new /icon('icons/mob/suit.dmi', "armor"), ICON_OVERLAY)
+					switch(backbag)
+						if(2)
+							clothes_s.Blend(new /icon('icons/mob/back.dmi', "securitypack"), ICON_OVERLAY)
+						if(3)
+							clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-sec"), ICON_OVERLAY)
+						if(4)
+							clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
+				if(DETECTIVE)
+					clothes_s = new /icon('icons/mob/uniform.dmi', "detective_s")
+					clothes_s.Blend(new /icon('icons/mob/feet.dmi', "brown"), ICON_UNDERLAY)
+					clothes_s.Blend(new /icon('icons/mob/hands.dmi', "bgloves"), ICON_UNDERLAY)
+					clothes_s.Blend(new /icon('icons/mob/mask.dmi', "cigaron"), ICON_OVERLAY)
+					clothes_s.Blend(new /icon('icons/mob/head.dmi', "detective"), ICON_OVERLAY)
+					clothes_s.Blend(new /icon('icons/mob/suit.dmi', "detective"), ICON_OVERLAY)
+					switch(backbag)
+						if(2)
+							clothes_s.Blend(new /icon('icons/mob/back.dmi', "backpack"), ICON_OVERLAY)
+						if(3)
+							clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-norm"), ICON_OVERLAY)
+						if(4)
+							clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
+				if(OFFICER)
+					clothes_s = new /icon('icons/mob/uniform.dmi', "secred_s")
+					clothes_s.Blend(new /icon('icons/mob/feet.dmi', "jackboots"), ICON_UNDERLAY)
+					clothes_s.Blend(new /icon('icons/mob/head.dmi', "helmet"), ICON_OVERLAY)
+					clothes_s.Blend(new /icon('icons/mob/suit.dmi', "armor"), ICON_OVERLAY)
+					switch(backbag)
+						if(2)
+							clothes_s.Blend(new /icon('icons/mob/back.dmi', "securitypack"), ICON_OVERLAY)
+						if(3)
+							clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-sec"), ICON_OVERLAY)
+						if(4)
+							clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
+				if(CHIEF)
+					clothes_s = new /icon('icons/mob/uniform.dmi', "chief_s")
+					clothes_s.Blend(new /icon('icons/mob/feet.dmi', "brown"), ICON_UNDERLAY)
+					clothes_s.Blend(new /icon('icons/mob/hands.dmi', "bgloves"), ICON_UNDERLAY)
+					clothes_s.Blend(new /icon('icons/mob/belt.dmi', "utility"), ICON_OVERLAY)
+					clothes_s.Blend(new /icon('icons/mob/mask.dmi', "cigaron"), ICON_OVERLAY)
+					clothes_s.Blend(new /icon('icons/mob/head.dmi', "hardhat0_white"), ICON_OVERLAY)
+					switch(backbag)
+						if(2)
+							clothes_s.Blend(new /icon('icons/mob/back.dmi', "engiepack"), ICON_OVERLAY)
+						if(3)
+							clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-eng"), ICON_OVERLAY)
+						if(4)
+							clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
+				if(ENGINEER)
+					clothes_s = new /icon('icons/mob/uniform.dmi', "engine_s")
+					clothes_s.Blend(new /icon('icons/mob/feet.dmi', "orange"), ICON_UNDERLAY)
+					clothes_s.Blend(new /icon('icons/mob/belt.dmi', "utility"), ICON_OVERLAY)
+					clothes_s.Blend(new /icon('icons/mob/head.dmi', "hardhat0_yellow"), ICON_OVERLAY)
+					switch(backbag)
+						if(2)
+							clothes_s.Blend(new /icon('icons/mob/back.dmi', "engiepack"), ICON_OVERLAY)
+						if(3)
+							clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-eng"), ICON_OVERLAY)
+						if(4)
+							clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
+				if(ATMOSTECH)
+					clothes_s = new /icon('icons/mob/uniform.dmi', "atmos_s")
+					clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY)
+					clothes_s.Blend(new /icon('icons/mob/hands.dmi', "bgloves"), ICON_UNDERLAY)
+					clothes_s.Blend(new /icon('icons/mob/belt.dmi', "utility"), ICON_OVERLAY)
+					switch(backbag)
+						if(2)
+							clothes_s.Blend(new /icon('icons/mob/back.dmi', "backpack"), ICON_OVERLAY)
+						if(3)
+							clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-norm"), ICON_OVERLAY)
+						if(4)
+							clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
+
+				if(AI)//Gives AI and borgs assistant-wear, so they can still customize their character
+					clothes_s = new /icon('icons/mob/uniform.dmi', "grey_s")
+					clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY)
+					if(backbag == 2)
+						clothes_s.Blend(new /icon('icons/mob/back.dmi', "backpack"), ICON_OVERLAY)
+					else if(backbag == 3 || backbag == 4)
+						clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
+				if(CYBORG)
+					clothes_s = new /icon('icons/mob/uniform.dmi', "grey_s")
+					clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY)
+					if(backbag == 2)
+						clothes_s.Blend(new /icon('icons/mob/back.dmi', "backpack"), ICON_OVERLAY)
+					else if(backbag == 3 || backbag == 4)
+						clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
+
+		if(disabilities & NEARSIGHTED)
+			preview_icon.Blend(new /icon('icons/mob/eyes.dmi', "glasses"), ICON_OVERLAY)
+
+		preview_icon.Blend(eyes_s, ICON_OVERLAY)
+		if(clothes_s)
+			preview_icon.Blend(clothes_s, ICON_OVERLAY)
+		preview_icon_front = new(preview_icon, dir = SOUTH)
+		preview_icon_side = new(preview_icon, dir = WEST)
+
+		del(eyes_s)
+		del(clothes_s)

code/modules/mob/new_player/skill.dm

@@ -0,0 +1,235 @@
+var/global/const
+	SKILL_NONE = 0
+	SKILL_BASIC = 1
+	SKILL_ADEPT = 2
+	SKILL_EXPERT = 3
+
+datum/skill/var
+    ID = "none" // ID of the skill, used in code
+    name = "None" // name of the skill
+    desc = "Placeholder skill" // detailed description of the skill
+    field = "Misc" // the field under which the skill will be listed
+    secondary = 0 // secondary skills only have two levels and cost significantly less
+
+var/global/list/SKILLS = null
+var/list/SKILL_ENGINEER = list("field" = "Engineering", "EVA" = SKILL_BASIC, "construction" = SKILL_ADEPT, "electrical" = SKILL_BASIC, "engines" = SKILL_ADEPT)
+var/list/SKILL_ORGAN_ROBOTICIST = list("field" = "Science", "devices" = SKILL_ADEPT, "electrical" = SKILL_BASIC, "computer" = SKILL_ADEPT, "anatomy" = SKILL_BASIC)
+var/list/SKILL_SECURITY_OFFICER = list("field" = "Security", "combat" = SKILL_BASIC, "weapons" = SKILL_ADEPT, "law" = SKILL_ADEPT, "forensics" = SKILL_BASIC)
+var/list/SKILL_CHEMIST = list("field" = "Science", "chemistry" = SKILL_ADEPT, "science" = SKILL_ADEPT, "medical" = SKILL_BASIC, "devices" = SKILL_BASIC)
+var/global/list/SKILL_PRE = list("Engineer" = SKILL_ENGINEER, "Roboticist" = SKILL_ORGAN_ROBOTICIST, "Security Officer" = SKILL_SECURITY_OFFICER, "Chemist" = SKILL_CHEMIST)
+
+datum/skill/management
+    ID = "management"
+    name = "Command"
+    desc = "Your ability to manage and commandeer other crew members."
+
+datum/skill/combat
+	ID = "combat"
+	name = "Close Combat"
+	desc = "This skill describes your training in hand-to-hand combat or melee weapon usage. While expertise in this area is rare in the era of firearms, experts still exist among athletes."
+	field = "Security"
+
+datum/skill/weapons
+	ID = "weapons"
+	name = "Weapons Expertise"
+	desc = "This skill describes your expertise with and knowledge of weapons. A low level in this skill implies knowledge of simple weapons, for example tazers and flashes. A high level in this skill implies knowledge of complex weapons, such as grenades, riot shields, pulse rifles or bombs. A low level in this skill is typical for security officers, a high level of this skill is typical for special agents and soldiers."
+	field = "Security"
+
+datum/skill/EVA
+    ID = "EVA"
+    name = "Extra-vehicular activity"
+    desc = "This skill describes your skill and knowledge of space-suits and working in vacuum."
+    field = "Engineering"
+    secondary = 1
+
+datum/skill/forensics
+	ID = "forensics"
+	name = "Forensics"
+	desc = "Describes your skill at performing forensic examinations and identifying vital evidence. Does not cover analytical abilities, and as such isn't the only indicator for your investigation skill. Note that in order to perform autopsy, the surgery skill is also required."
+	field = "Security"
+
+datum/skill/construction
+    ID = "construction"
+    name = "Construction"
+    desc = "Your ability to construct various buildings, such as walls, floors, tables and so on. Note that constructing devices such as APCs additionally requires the Electronics skill. A low level of this skill is typical for janitors, a high level of this skill is typical for engineers."
+    field = "Engineering"
+
+datum/skill/management
+    ID = "management"
+    name = "Command"
+    desc = "Your ability to manage and commandeer other crew members."
+
+datum/skill/knowledge/law
+    ID = "law"
+    name = "NanoTrasen Law"
+    desc = "Your knowledge of NanoTrasen law and procedures. This includes Space Law, as well as general station rulings and procedures. A low level in this skill is typical for security officers, a high level in this skill is typical for captains."
+    field = "Security"
+    secondary = 1
+
+datum/skill/devices
+    ID = "devices"
+    name = "Complex Devices"
+    desc = "Describes the ability to assemble complex devices, such as computers, circuits, printers, robots or gas tank assemblies(bombs). Note that if a device requires electronics or programming, those skills are also required in addition to this skill."
+    field = "Science"
+
+datum/skill/electrical
+    ID = "electrical"
+    name = "Electrical Engineering"
+    desc = "This skill describes your knowledge of electronics and the underlying physics. A low level of this skill implies you know how to lay out wiring and configure powernets, a high level of this skill is required for working complex electronic devices such as circuits or bots."
+    field = "Engineering"
+
+datum/skill/atmos
+    ID = "atmos"
+    name = "Atmospherics"
+    desc = "Describes your knowledge of piping, air distribution and gas dynamics."
+    field = "Engineering"
+
+datum/skill/engines
+	ID = "engines"
+	name = "Engines"
+	desc = "Describes your knowledge of the various engine types common on space stations, such as the singularity or anti-matter engine."
+	field = "Engineering"
+	secondary = 1
+
+datum/skill/computer
+    ID = "computer"
+    name = "Information Technology"
+    desc = "Describes your understanding of computers, software and communication. Not a requirement for using computers, but definitely helps. Used in telecommunications and programming of computers and AIs."
+    field = "Science"
+
+datum/skill/pilot
+    ID = "pilot"
+    name = "Heavy Machinery Operation"
+    desc = "Describes your experience and understanding of operating heavy machinery, which includes mechs and other large exosuits. Used in piloting mechs."
+    field = "Engineering"
+
+datum/skill/medical
+    ID = "medical"
+    name = "Medicine"
+    desc = "Covers an understanding of the human body and medicine. At a low level, this skill gives a basic understanding of applying common types of medicine, and a rough understanding of medical devices like the health analyzer. At a high level, this skill grants exact knowledge of all the medicine available on the station, as well as the ability to use complex medical devices like the body scanner or mass spectrometer."
+    field = "Medical"
+
+datum/skill/anatomy
+    ID = "anatomy"
+    name = "Anatomy"
+    desc = "Gives you a detailed insight of the human body. A high skill in this is required to perform surgery.This skill may also help in examining alien biology."
+    field = "Medical"
+
+datum/skill/virology
+    ID = "virology"
+    name = "Virology"
+    desc = "This skill implies an understanding of microorganisms and their effects on humans."
+    field = "Medical"
+
+datum/skill/genetics
+    ID = "genetics"
+    name = "Genetics"
+    desc = "Implies an understanding of how DNA works and the structure of the human DNA."
+    field = "Science"
+
+datum/skill/chemistry
+	ID = "chemistry"
+	name = "Chemistry"
+	desc = "Experience with mixing chemicals, and an understanding of what the effect will be. This doesn't cover an understanding of the effect of chemicals on the human body, as such the medical skill is also required for medical chemists."
+	field = "Science"
+
+datum/skill/botany
+	ID = "botany"
+	name = "Botany"
+	desc = "Describes how good a character is at growing and maintaining plants."
+
+datum/skill/cooking
+	ID = "cooking"
+	name = "Cooking"
+	desc = "Describes a character's skill at preparing meals and other consumable goods. This includes mixing alcoholic beverages."
+
+datum/skill/science
+	ID = "science"
+	name = "Science"
+	desc = "Your experience and knowledge with scientific methods and processes."
+	field = "Science"
+
+datum/attribute/var
+	ID = "none"
+	name = "None"
+	desc = "This is a placeholder"
+
+
+proc/setup_skills()
+	if(SKILLS == null)
+		SKILLS = list()
+		for(var/T in (typesof(/datum/skill)-/datum/skill))
+			var/datum/skill/S = new T
+			if(S.ID != "none")
+				if(!SKILLS.Find(S.field))
+					SKILLS[S.field] = list()
+				var/list/L = SKILLS[S.field]
+				L += S
+
+
+mob/living/carbon/human/proc/GetSkillClass(points)
+	// skill classes describe how your character compares in total points
+	var/original_points = points
+	points -= min(round((age - 20) / 2.5), 4) // every 2.5 years after 20, one extra skillpoint
+	if(age > 30)
+		points -= round((age - 30) / 5) // every 5 years after 30, one extra skillpoint
+	if(original_points > 0 && points <= 0) points = 1
+	switch(points)
+		if(0)
+			return "Unconfigured"
+		if(1 to 3)
+			return "Terrifying"
+		if(4 to 6)
+			return "Below Average"
+		if(7 to 10)
+			return "Average"
+		if(11 to 14)
+			return "Above Average"
+		if(15 to 18)
+			return "Exceptional"
+		if(19 to 24)
+			return "Genius"
+		if(24 to 1000)
+			return "God"
+
+
+proc/show_skill_window(var/mob/user, var/mob/living/carbon/human/M)
+	if(!istype(M)) return
+	if(SKILLS == null)
+		setup_skills()
+
+	if(!M.skills || M.skills.len == 0)
+		user << "There are no skills to display."
+		return
+
+	var/HTML = "<body>"
+	HTML += "<b>Select your Skills</b><br>"
+	HTML += "Current skill level: <b>[M.GetSkillClass(M.used_skillpoints)]</b> ([M.used_skillpoints])<br>"
+	HTML += "<table>"
+	for(var/V in SKILLS)
+		HTML += "<tr><th colspan = 5><b>[V]</b>"
+		HTML += "</th></tr>"
+		for(var/datum/skill/S in SKILLS[V])
+			var/level = M.skills[S.ID]
+			HTML += "<tr style='text-align:left;'>"
+			HTML += "<th>[S.name]</th>"
+			HTML += "<th><font color=[(level == SKILL_NONE) ? "red" : "black"]>\[Untrained\]</font></th>"
+			// secondary skills don't have an amateur level
+			if(S.secondary)
+				HTML += "<th></th>"
+			else
+				HTML += "<th><font color=[(level == SKILL_BASIC) ? "red" : "black"]>\[Amateur\]</font></th>"
+			HTML += "<th><font color=[(level == SKILL_ADEPT) ? "red" : "black"]>\[Trained\]</font></th>"
+			HTML += "<th><font color=[(level == SKILL_EXPERT) ? "red" : "black"]>\[Professional\]</font></th>"
+			HTML += "</tr>"
+	HTML += "</table>"
+
+	user << browse(null, "window=preferences")
+	user << browse(HTML, "window=show_skills;size=600x800")
+	return
+
+mob/living/carbon/human/verb/show_skills()
+	set category = "IC"
+	set name = "Show Own Skills"
+
+	show_skill_window(src, src)

code/modules/mob/new_player/sprite_accessories.dm

@@ -0,0 +1,626 @@
+/*
+
+	Hello and welcome to sprite_accessories: For sprite accessories, such as hair,
+	facial hair, and possibly tattoos and stuff somewhere along the line. This file is
+	intended to be friendly for people with little to no actual coding experience.
+	The process of adding in new hairstyles has been made pain-free and easy to do.
+	Enjoy! - Doohl
+
+
+	Notice: This all gets automatically compiled in a list in dna2.dm, so you do not
+	have to define any UI values for sprite accessories manually for hair and facial
+	hair. Just add in new hair types and the game will naturally adapt.
+
+	!!WARNING!!: changing existing hair information can be VERY hazardous to savefiles,
+	to the point where you may completely corrupt a server's savefiles. Please refrain
+	from doing this unless you absolutely know what you are doing, and have defined a
+	conversion in savefile.dm
+*/
+
+/datum/sprite_accessory
+
+	var/icon			// the icon file the accessory is located in
+	var/icon_state		// the icon_state of the accessory
+	var/preview_state	// a custom preview state for whatever reason
+
+	var/name			// the preview name of the accessory
+
+	// Determines if the accessory will be skipped or included in random hair generations
+	var/gender = NEUTER
+
+	// Restrict some styles to specific species
+	var/list/species_allowed = list("Human")
+
+	// Whether or not the accessory can be affected by colouration
+	var/do_colouration = 1
+
+
+/*
+////////////////////////////
+/  =--------------------=  /
+/  == Hair Definitions ==  /
+/  =--------------------=  /
+////////////////////////////
+*/
+
+/datum/sprite_accessory/hair
+
+	icon = 'icons/mob/Human_face.dmi'	  // default icon for all hairs
+
+	bald
+		name = "Bald"
+		icon_state = "bald"
+		gender = MALE
+		species_allowed = list("Human","Unathi")
+
+	short
+		name = "Short Hair"	  // try to capatilize the names please~
+		icon_state = "hair_a" // you do not need to define _s or _l sub-states, game automatically does this for you
+
+	cut
+		name = "Cut Hair"
+		icon_state = "hair_c"
+
+	flair
+		name = "Flaired Hair"
+		icon_state = "hair_flair"
+
+	long
+		name = "Shoulder-length Hair"
+		icon_state = "hair_b"
+
+	longalt
+		name = "Shoulder-length Hair Alt"
+		icon_state = "hair_longfringe"
+
+	/*longish
+		name = "Longer Hair"
+		icon_state = "hair_b2"*/
+
+	longer
+		name = "Long Hair"
+		icon_state = "hair_vlong"
+
+	longeralt
+		name = "Long Hair Alt"
+		icon_state = "hair_vlongfringe"
+
+	longest
+		name = "Very Long Hair"
+		icon_state = "hair_longest"
+
+	longfringe
+		name = "Long Fringe"
+		icon_state = "hair_longfringe"
+
+	longestalt
+		name = "Longer Fringe"
+		icon_state = "hair_vlongfringe"
+
+	halfbang
+		name = "Half-banged Hair"
+		icon_state = "hair_halfbang"
+
+	halfbangalt
+		name = "Half-banged Hair Alt"
+		icon_state = "hair_halfbang_alt"
+
+	ponytail1
+		name = "Ponytail 1"
+		icon_state = "hair_ponytail"
+
+	ponytail2
+		name = "Ponytail 2"
+		icon_state = "hair_pa"
+		gender = FEMALE
+
+	ponytail3
+		name = "Ponytail 3"
+		icon_state = "hair_ponytail3"
+
+	sideponytail
+		name = "Side Ponytail"
+		icon_state = "hair_stail"
+		gender = FEMALE
+
+	parted
+		name = "Parted"
+		icon_state = "hair_parted"
+
+	pompadour
+		name = "Pompadour"
+		icon_state = "hair_pompadour"
+		gender = MALE
+		species_allowed = list("Human","Unathi")
+
+	quiff
+		name = "Quiff"
+		icon_state = "hair_quiff"
+		gender = MALE
+
+	bedhead
+		name = "Bedhead"
+		icon_state = "hair_bedhead"
+
+	bedhead2
+		name = "Bedhead 2"
+		icon_state = "hair_bedheadv2"
+
+	bedhead3
+		name = "Bedhead 3"
+		icon_state = "hair_bedheadv3"
+
+	beehive
+		name = "Beehive"
+		icon_state = "hair_beehive"
+		gender = FEMALE
+		species_allowed = list("Human","Unathi")
+
+	bobcurl
+		name = "Bobcurl"
+		icon_state = "hair_bobcurl"
+		gender = FEMALE
+		species_allowed = list("Human","Unathi")
+
+	bob
+		name = "Bob"
+		icon_state = "hair_bobcut"
+		gender = FEMALE
+		species_allowed = list("Human","Unathi")
+
+	bowl
+		name = "Bowl"
+		icon_state = "hair_bowlcut"
+		gender = MALE
+
+	buzz
+		name = "Buzzcut"
+		icon_state = "hair_buzzcut"
+		gender = MALE
+		species_allowed = list("Human","Unathi")
+
+	crew
+		name = "Crewcut"
+		icon_state = "hair_crewcut"
+		gender = MALE
+
+	combover
+		name = "Combover"
+		icon_state = "hair_combover"
+		gender = MALE
+
+	devillock
+		name = "Devil Lock"
+		icon_state = "hair_devilock"
+
+	dreadlocks
+		name = "Dreadlocks"
+		icon_state = "hair_dreads"
+
+	curls
+		name = "Curls"
+		icon_state = "hair_curls"
+
+	afro
+		name = "Afro"
+		icon_state = "hair_afro"
+
+	afro2
+		name = "Afro 2"
+		icon_state = "hair_afro2"
+
+	afro_large
+		name = "Big Afro"
+		icon_state = "hair_bigafro"
+		gender = MALE
+
+	sargeant
+		name = "Flat Top"
+		icon_state = "hair_sargeant"
+		gender = MALE
+
+	emo
+		name = "Emo"
+		icon_state = "hair_emo"
+
+	fag
+		name = "Flow Hair"
+		icon_state = "hair_f"
+
+	feather
+		name = "Feather"
+		icon_state = "hair_feather"
+
+	hitop
+		name = "Hitop"
+		icon_state = "hair_hitop"
+		gender = MALE
+
+	mohawk
+		name = "Mohawk"
+		icon_state = "hair_d"
+		species_allowed = list("Human","Unathi")
+	jensen
+		name = "Adam Jensen Hair"
+		icon_state = "hair_jensen"
+		gender = MALE
+
+	gelled
+		name = "Gelled Back"
+		icon_state = "hair_gelled"
+		gender = FEMALE
+
+	gentle
+		name = "Gentle"
+		icon_state = "hair_gentle"
+		gender = FEMALE
+
+	spiky
+		name = "Spiky"
+		icon_state = "hair_spikey"
+		species_allowed = list("Human","Unathi")
+	kusangi
+		name = "Kusanagi Hair"
+		icon_state = "hair_kusanagi"
+
+	kagami
+		name = "Pigtails"
+		icon_state = "hair_kagami"
+		gender = FEMALE
+
+	himecut
+		name = "Hime Cut"
+		icon_state = "hair_himecut"
+		gender = FEMALE
+
+	braid
+		name = "Floorlength Braid"
+		icon_state = "hair_braid"
+		gender = FEMALE
+
+	braid2
+		name = "Long Braid"
+		icon_state = "hair_hbraid"
+		gender = FEMALE
+
+	odango
+		name = "Odango"
+		icon_state = "hair_odango"
+		gender = FEMALE
+
+	ombre
+		name = "Ombre"
+		icon_state = "hair_ombre"
+		gender = FEMALE
+
+	updo
+		name = "Updo"
+		icon_state = "hair_updo"
+		gender = FEMALE
+
+	skinhead
+		name = "Skinhead"
+		icon_state = "hair_skinhead"
+
+	balding
+		name = "Balding Hair"
+		icon_state = "hair_e"
+		gender = MALE // turnoff!
+
+
+	bald
+		name = "Bald"
+		icon_state = "bald"
+/*
+///////////////////////////////////
+/  =---------------------------=  /
+/  == Facial Hair Definitions ==  /
+/  =---------------------------=  /
+///////////////////////////////////
+*/
+
+/datum/sprite_accessory/facial_hair
+
+	icon = 'icons/mob/Human_face.dmi'
+	gender = MALE // barf (unless you're a dorf, dorfs dig chix /w beards :P)
+
+	shaved
+		name = "Shaved"
+		icon_state = "bald"
+		gender = NEUTER
+		species_allowed = list("Human","Unathi","Tajaran","Skrell","Vox")
+
+	watson
+		name = "Watson Mustache"
+		icon_state = "facial_watson"
+
+	hogan
+		name = "Hulk Hogan Mustache"
+		icon_state = "facial_hogan" //-Neek
+
+	vandyke
+		name = "Van Dyke Mustache"
+		icon_state = "facial_vandyke"
+
+	chaplin
+		name = "Square Mustache"
+		icon_state = "facial_chaplin"
+
+	selleck
+		name = "Selleck Mustache"
+		icon_state = "facial_selleck"
+
+	neckbeard
+		name = "Neckbeard"
+		icon_state = "facial_neckbeard"
+
+	fullbeard
+		name = "Full Beard"
+		icon_state = "facial_fullbeard"
+
+	longbeard
+		name = "Long Beard"
+		icon_state = "facial_longbeard"
+
+	vlongbeard
+		name = "Very Long Beard"
+		icon_state = "facial_wise"
+
+	elvis
+		name = "Elvis Sideburns"
+		icon_state = "facial_elvis"
+		species_allowed = list("Human","Unathi")
+
+	abe
+		name = "Abraham Lincoln Beard"
+		icon_state = "facial_abe"
+
+	chinstrap
+		name = "Chinstrap"
+		icon_state = "facial_chin"
+
+	hip
+		name = "Hipster Beard"
+		icon_state = "facial_hip"
+
+	gt
+		name = "Goatee"
+		icon_state = "facial_gt"
+
+	jensen
+		name = "Adam Jensen Beard"
+		icon_state = "facial_jensen"
+
+	dwarf
+		name = "Dwarf Beard"
+		icon_state = "facial_dwarf"
+
+/*
+///////////////////////////////////
+/  =---------------------------=  /
+/  == Alien Style Definitions ==  /
+/  =---------------------------=  /
+///////////////////////////////////
+*/
+
+/datum/sprite_accessory/hair
+	una_spines_long
+		name = "Long Unathi Spines"
+		icon_state = "soghun_longspines"
+		species_allowed = list("Unathi")
+		do_colouration = 0
+
+	una_spines_short
+		name = "Short Unathi Spines"
+		icon_state = "soghun_shortspines"
+		species_allowed = list("Unathi")
+		do_colouration = 0
+
+	una_frills_long
+		name = "Long Unathi Frills"
+		icon_state = "soghun_longfrills"
+		species_allowed = list("Unathi")
+		do_colouration = 0
+
+	una_frills_short
+		name = "Short Unathi Frills"
+		icon_state = "soghun_shortfrills"
+		species_allowed = list("Unathi")
+		do_colouration = 0
+
+	una_horns
+		name = "Unathi Horns"
+		icon_state = "soghun_horns"
+		species_allowed = list("Unathi")
+		do_colouration = 0
+
+	skr_tentacle_m
+		name = "Skrell Male Tentacles"
+		icon_state = "skrell_hair_m"
+		species_allowed = list("Skrell")
+		gender = MALE
+		do_colouration = 0
+
+	skr_tentacle_f
+		name = "Skrell Female Tentacles"
+		icon_state = "skrell_hair_f"
+		species_allowed = list("Skrell")
+		gender = FEMALE
+		do_colouration = 0
+
+	skr_gold_m
+		name = "Gold plated Skrell Male Tentacles"
+		icon_state = "skrell_goldhair_m"
+		species_allowed = list("Skrell")
+		gender = MALE
+		do_colouration = 0
+
+	skr_gold_f
+		name = "Gold chained Skrell Female Tentacles"
+		icon_state = "skrell_goldhair_f"
+		species_allowed = list("Skrell")
+		gender = FEMALE
+		do_colouration = 0
+
+	skr_clothtentacle_m
+		name = "Cloth draped Skrell Male Tentacles"
+		icon_state = "skrell_clothhair_m"
+		species_allowed = list("Skrell")
+		gender = MALE
+		do_colouration = 0
+
+	skr_clothtentacle_f
+		name = "Cloth draped Skrell Female Tentacles"
+		icon_state = "skrell_clothhair_f"
+		species_allowed = list("Skrell")
+		gender = FEMALE
+		do_colouration = 0
+
+	taj_ears
+		name = "Tajaran Ears"
+		icon_state = "ears_plain"
+		species_allowed = list("Tajaran")
+		do_colouration = 0
+
+	taj_ears_clean
+		name = "Tajara Clean"
+		icon_state = "hair_clean"
+		species_allowed = list("Tajaran")
+		do_colouration = 0
+
+	taj_ears_bangs
+		name = "Tajara Bangs"
+		icon_state = "hair_bangs"
+		species_allowed = list("Tajaran")
+		do_colouration = 0
+
+	taj_ears_braid
+		name = "Tajara Braid"
+		icon_state = "hair_tbraid"
+		species_allowed = list("Tajaran")
+		do_colouration = 0
+
+	taj_ears_shaggy
+		name = "Tajara Shaggy"
+		icon_state = "hair_shaggy"
+		species_allowed = list("Tajaran")
+		do_colouration = 0
+
+	taj_ears_mohawk
+		name = "Tajaran Mohawk"
+		icon_state = "hair_mohawk"
+		species_allowed = list("Tajaran")
+		do_colouration = 0
+
+	taj_ears_plait
+		name = "Tajara Plait"
+		icon_state = "hair_plait"
+		species_allowed = list("Tajaran")
+		do_colouration = 0
+
+	taj_ears_straight
+		name = "Tajara Straight"
+		icon_state = "hair_straight"
+		species_allowed = list("Tajaran")
+		do_colouration = 0
+
+	taj_ears_long
+		name = "Tajara Long"
+		icon_state = "hair_long"
+		species_allowed = list("Tajaran")
+		do_colouration = 0
+
+	taj_ears_rattail
+		name = "Tajara Rat Tail"
+		icon_state = "hair_rattail"
+		species_allowed = list("Tajaran")
+		do_colouration = 0
+
+	taj_ears_spiky
+		name = "Tajara Spiky"
+		icon_state = "hair_tajspiky"
+		species_allowed = list("Tajaran")
+		do_colouration = 0
+
+	taj_ears_messy
+		name = "Tajara Messy"
+		icon_state = "hair_messy"
+		species_allowed = list("Tajaran")
+		do_colouration = 0
+
+	vox_quills_short
+		name = "Short Vox Quills"
+		icon_state = "vox_shortquills"
+		species_allowed = list("Vox")
+
+/datum/sprite_accessory/facial_hair
+
+	taj_sideburns
+		name = "Tajara Sideburns"
+		icon_state = "facial_mutton"
+		species_allowed = list("Tajaran")
+		do_colouration = 0
+
+	taj_mutton
+		name = "Tajara Mutton"
+		icon_state = "facial_mutton"
+		species_allowed = list("Tajaran")
+		do_colouration = 0
+
+	taj_pencilstache
+		name = "Tajara Pencilstache"
+		icon_state = "facial_pencilstache"
+		species_allowed = list("Tajaran")
+		do_colouration = 0
+
+	taj_moustache
+		name = "Tajara Moustache"
+		icon_state = "facial_moustache"
+		species_allowed = list("Tajaran")
+		do_colouration = 0
+
+	taj_goatee
+		name = "Tajara Goatee"
+		icon_state = "facial_goatee"
+		species_allowed = list("Tajaran")
+		do_colouration = 0
+
+	taj_smallstache
+		name = "Tajara Smallsatche"
+		icon_state = "facial_smallstache"
+		species_allowed = list("Tajaran")
+		do_colouration = 0
+
+//skin styles - WIP
+//going to have to re-integrate this with surgery
+//let the icon_state hold an icon preview for now
+/datum/sprite_accessory/skin
+	icon = 'icons/mob/human_races/r_human.dmi'
+
+	human
+		name = "Default human skin"
+		icon_state = "default"
+		species_allowed = list("Human")
+
+	human_tatt01
+		name = "Tatt01 human skin"
+		icon_state = "tatt1"
+		species_allowed = list("Human")
+
+	tajaran
+		name = "Default tajaran skin"
+		icon_state = "default"
+		icon = 'icons/mob/human_races/r_tajaran.dmi'
+		species_allowed = list("Tajaran")
+
+	unathi
+		name = "Default Unathi skin"
+		icon_state = "default"
+		icon = 'icons/mob/human_races/r_lizard.dmi'
+		species_allowed = list("Unathi")
+
+	skrell
+		name = "Default skrell skin"
+		icon_state = "default"
+		icon = 'icons/mob/human_races/r_skrell.dmi'
+		species_allowed = list("Skrell")