Merge remote-tracking branch 'upstream/master'

code/modules/client/preference_setup/global/03_pai.dm

@@ -7,11 +7,16 @@
 /datum/category_item/player_setup_item/player_global/pai/load_preferences(var/savefile/S)
 	if(!candidate)
 		candidate = new()
-
-	if(!preference_mob())
+	var/preference_mob = preference_mob()
+	if(!preference_mob)// No preference mob - this happens when we're called from client/New() before it calls ..()  (via datum/preferences/New())
+		spawn()
+			preference_mob = preference_mob()
+			if(!preference_mob)
+				return
+			candidate.savefile_load(preference_mob)
 		return
 
-	candidate.savefile_load(preference_mob())
+	candidate.savefile_load(preference_mob)
 
 /datum/category_item/player_setup_item/player_global/pai/save_preferences(var/savefile/S)
 	if(!candidate)

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

@@ -9,6 +9,6 @@
 
 /datum/gear_tweak/collar_tag/tweak_item(var/obj/item/clothing/accessory/collar/C, var/metadata)
 	if(metadata == "")
-		return
+		return ..()
 	else
 		C.initialize_tag(metadata)

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

@@ -337,6 +337,8 @@
 	ckeywhitelist = list("jemli")
 	character_name = list("Jemli")
 
+//TFF 28/11/19 - Expired permit removal
+/*
 /datum/gear/fluff/jeremiah_permit
 	path = /obj/item/clothing/accessory/permit/gun/fluff/ace
 	display_name = "Ace's Gun Permit"
@@ -357,6 +359,7 @@
 	ckeywhitelist = list("jertheace")
 	character_name = list("Jeremiah Acacius")
 	allowed_roles = list("Colony Director", "Warden", "Head of Security")
+*/
 
 /datum/gear/fluff/jeremiah_holster
 	path = /obj/item/clothing/accessory/holster/armpit
@@ -887,7 +890,7 @@
 	character_name = list("Chakat Tempest Venosare")
 	allowed_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Psychiatrist","Paramedic", "Field Medic")
 	slot = slot_glasses
-	
+
 /datum/gear/fluff/tempest_hypospray
 	path = /obj/item/weapon/reagent_containers/hypospray/vial/tempest
 	display_name = "Tempest's Hypospray"
@@ -895,14 +898,14 @@
 	character_name = list("Chakat Tempest Venosare")
 	allowed_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Psychiatrist","Paramedic", "Field Medic")
 	slot = slot_belt
-	
+
 /datum/gear/fluff/tempest_backpack
 	path = /obj/item/weapon/storage/backpack/saddlebag/tempest
 	display_name = "Tempest's Saddlebag"
 	ckeywhitelist = list("wickedtemp")
 	character_name = list("Chakat Tempest Venosare")
 	slot = slot_back
-	
+
 /datum/gear/fluff/tempest_implant
 	path = /obj/item/weapon/implanter/reagent_generator/tempest
 	display_name = "Tempest's Implant"

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

@@ -34,6 +34,11 @@
 	sort_category = "Xenowear"
 	whitelisted = "Vox"
 
+/datum/gear/mask/transparent
+	display_name = "transparent breath mask"
+	path = /obj/item/clothing/mask/breath/transparent
+	sort_category = "Xenowear"
+
 /datum/gear/uniform/loincloth
 	display_name = "loincloth"
 	path = /obj/item/clothing/suit/storage/fluff/loincloth