Merge branch 'incremental_tg' r4967 (27/10/2012) into bs12_with_tgport

Conflicts:
	baystation12.dme
	code/__HELPERS/game.dm
	code/__HELPERS/type2type.dm
	code/datums/helper_datums/getrev.dm
	code/game/atoms.dm
	code/game/gamemodes/events.dm
	code/game/machinery/atmo_control.dm
	code/game/machinery/atmoalter/area_atmos_computer.dm
	code/game/machinery/computer/HolodeckControl.dm
	code/game/machinery/computer/atmos_alert.dm
	code/game/machinery/computer/card.dm
	code/game/machinery/computer/cloning.dm
	code/game/machinery/computer/computer.dm
	code/game/machinery/computer/pod.dm
	code/game/machinery/computer/prisoner.dm
	code/game/machinery/computer/syndicate_shuttle.dm
	code/game/machinery/newscaster.dm
	code/game/machinery/spaceheater.dm
	code/game/machinery/telecomms/broadcaster.dm
	code/game/machinery/telecomms/logbrowser.dm
	code/game/machinery/telecomms/machine_interactions.dm
	code/game/machinery/telecomms/telemonitor.dm
	code/game/machinery/telecomms/traffic_control.dm
	code/game/machinery/wishgranter.dm
	code/game/objects/items/devices/uplinks.dm
	code/game/objects/items/stacks/stack.dm
	code/game/objects/objs.dm
	code/modules/DetectiveWork/detective_work.dm
	code/modules/admin/IsBanned.dm
	code/modules/admin/admin.dm
	code/modules/admin/verbs/adminsay.dm
	code/modules/admin/verbs/getlogs.dm
	code/modules/awaymissions/zlevel.dm
	code/modules/client/client procs.dm
	code/modules/clothing/masks/miscellaneous.dm
	code/modules/clothing/spacesuits/miscellaneous.dm
	code/modules/flufftext/TextFilters.dm
	code/modules/mining/machine_processing.dm
	code/modules/mining/machine_stacking.dm
	code/modules/mining/mine_items.dm
	code/modules/mining/mint.dm
	code/modules/mining/satchel_ore_boxdm.dm
	code/modules/mob/living/carbon/monkey/life.dm
	code/modules/mob/living/living_defense.dm
	code/modules/mob/living/simple_animal/friendly/corgi.dm
	code/modules/mob/mob.dm
	code/modules/paperwork/filingcabinet.dm
	code/modules/paperwork/photocopier.dm
	code/modules/power/gravitygenerator.dm
	html/changelog.html
	icons/mob/head.dmi
	icons/mob/human_face.dmi
	icons/mob/mask.dmi
	icons/mob/suit.dmi
	icons/obj/clothing/hats.dmi
	icons/obj/clothing/masks.dmi
	icons/obj/clothing/suits.dmi

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>

code/modules/mob/new_player/new_player.dm

@@ -16,6 +16,9 @@
 
 	anchored = 1	//  don't get pushed around
 
+	New()
+		mob_list += src
+
 	verb/new_player_panel()
 		set src = usr
 		new_player_panel_proc()

code/modules/mob/new_player/sprite_accessories.dm

@@ -112,6 +112,20 @@
 		name = "Ponytail 3"
 		icon_state = "hair_ponytail3"
 
+	parted
+		name = "Parted"
+		icon_state = "hair_parted"
+
+	pompadour
+		name = "Pompadour"
+		icon_state = "hair_pompadour"
+		choose_female = 0
+
+	quiff
+		name = "Quiff"
+		icon_state = "hair_quiff"
+		choose_female = 0
+
 	bedhead
 		name = "Bedhead"
 		icon_state = "hair_bedhead"
@@ -124,6 +138,45 @@
 		name = "Bedhead 3"
 		icon_state = "hair_bedheadv3"
 
+	beehive
+		name = "Beehive"
+		icon_state = "hair_beehive"
+		choose_male = 0
+
+	bobcurl
+		name = "Bobcurl"
+		icon_state = "hair_bobcurl"
+		choose_male = 0
+
+	bob
+		name = "Bob"
+		icon_state = "hair_bobcut"
+		choose_male = 0
+
+	bowl
+		name = "Bowl"
+		icon_state = "hair_bowlcut"
+		choose_female = 0
+
+	buzz
+		name = "Buzzcut"
+		icon_state = "hair_buzzcut"
+		choose_female = 0
+
+	crew
+		name = "Crewcut"
+		icon_state = "hair_crewcut"
+		choose_female = 0
+
+	combover
+		name = "Combover"
+		icon_state = "hair_combover"
+		choose_female = 0
+
+	devillock
+		name = "Devil Lock"
+		icon_state = "hair_devilock"
+
 	dreadlocks
 		name = "Dreadlocks"
 		icon_state = "hair_dreads"
@@ -137,6 +190,10 @@
 		name = "Afro"
 		icon_state = "hair_afro"
 
+	afro2
+		name = "Afro 2"
+		icon_state = "hair_afro2"
+
 	afro_large
 		name = "Big Afro"
 		icon_state = "hair_bigafro"
@@ -147,10 +204,23 @@
 		icon_state = "hair_sargeant"
 		choose_female = 0
 
+	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"
+		choose_female = 0
+
 	mohawk
 		name = "Mohawk"
 		icon_state = "hair_d"
@@ -190,6 +260,21 @@
 		icon_state = "hair_braid"
 		choose_male = 0
 
+	odango
+		name = "Odango"
+		icon_state = "hair_odango"
+		choose_male = 0
+
+	ombre
+		name = "Ombre"
+		icon_state = "hair_ombre"
+		choose_male = 0
+
+	updo
+		name = "Updo"
+		icon_state = "hair_updo"
+		choose_male = 0
+
 	skinhead
 		name = "Skinhead"
 		icon_state = "hair_skinhead"