Merge remote-tracking branch 'upstream/master' into kk-rings

code/modules/mob/living/carbon/human/ai_controlled/ai_controlled.dm

@@ -126,7 +126,7 @@
 	to_wear_helmet = /obj/item/clothing/head/helmet/dermal
 	to_wear_glasses = /obj/item/clothing/glasses/goggles
 	to_wear_mask = /obj/item/clothing/mask/gas/half
-	to_wear_l_radio = /obj/item/radio/headset/headset_rob
+	to_wear_l_radio = /obj/item/radio/headset
 	to_wear_r_radio = null
 	to_wear_uniform = /obj/item/clothing/under/color/grey
 	to_wear_suit = /obj/item/clothing/suit/armor/vest

code/modules/mob/living/carbon/human/human_defines.dm

@@ -54,6 +54,7 @@
 	var/list/all_underwear = list()
 	var/list/all_underwear_metadata = list()
 	var/list/hide_underwear = list()
+	var/headset = 1		//Which headset type the player has chosen.
 	var/backbag = 2		//Which backpack type the player has chosen.
 	var/pdachoice = 1	//Which PDA type the player has chosen.
 

code/modules/mob/new_player/preferences_setup.dm

@@ -29,6 +29,7 @@
 			all_underwear[WRC.name] = WRI.name
 
 
+	headset = rand(1,3)
 	backbag = rand(1,6)
 	pdachoice = rand(1,7)
 	age = rand(current_species.min_age, current_species.max_age)