Merge branch 'release' of https://github.com/VOREStation/VOREStation into voreupdate

code/modules/client/preference_setup/global/setting_datums.dm

@@ -394,6 +394,13 @@ var/list/_client_preferences_by_type
 	enabled_description = "Extended"
 	disabled_description = "Default"
 
+/datum/client_preference/auto_afk
+	description = "Automatic AFK Status"
+	key = "AUTO_AFK"
+	enabled_by_default = TRUE
+	enabled_description = "Automatic"
+	disabled_description = "Manual Only"
+
 
 /********************
 * Staff Preferences *

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

@@ -105,6 +105,15 @@
 	display_name = "Medical HUD Aviators, prescription (Medical)"
 	path = /obj/item/clothing/glasses/hud/health/aviator/prescription
 
+/datum/gear/eyes/janitor
+	display_name = "Contaminant HUD (Janitor)"
+	path = /obj/item/clothing/glasses/hud/janitor
+	allowed_roles = list("Janitor")
+
+/datum/gear/eyes/janitor/prescriptionjan
+	display_name = "Contaminant HUD, prescription (Janitor)"
+	path = /obj/item/clothing/glasses/hud/janitor/prescription
+
 /datum/gear/eyes/meson
 	display_name = "Optical Meson Scanners (Engineering, Science, Mining)"
 	path = /obj/item/clothing/glasses/meson

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

@@ -101,3 +101,8 @@
 	display_name = "EGY playing cards"
 	description = "A deck of cards for playing EGY! Be the first to lose all cards!"
 	path = /obj/item/weapon/deck/egy
+
+/datum/gear/fluff_permit
+	display_name = "Customizable Permit"
+	description = "A customizable permit you can use for... just about anything! Be sure to customize the name and description. It is meant to represent generic driver's or pilot's licenses, and similar fluff items. It includes an irremovable disclaimer and may be freely confiscated or revoked at the discretion of Security and/or Command if you attempt to abuse it!"
+	path = /obj/item/weapon/card_fluff

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

@@ -99,4 +99,19 @@
 
 /datum/gear/gloves/circuitry
 	display_name = "gloves, circuitry (empty)"
-	path = /obj/item/clothing/gloves/circuitry
+	path = /obj/item/clothing/gloves/circuitry
+
+/datum/gear/gloves/watch
+	display_name = "wristwatch selector"
+	description = "Pick from a range of wristwatches."
+	path = /obj/item/clothing/gloves/watch
+
+/datum/gear/gloves/watch/New()
+	..()
+	var/list/selector_watches = list(
+		"plain plastic"=/obj/item/clothing/gloves/watch,
+		"silver"=/obj/item/clothing/gloves/watch/silver,
+		"gold"=/obj/item/clothing/gloves/watch/gold,
+		"survival"=/obj/item/clothing/gloves/watch/survival
+	)
+	gear_tweaks += new/datum/gear_tweak/path(sortAssoc(selector_watches))