Release Update

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

# Conflicts:
#	code/__defines/machinery.dm
#	code/controllers/configuration.dm
#	code/game/jobs/jobs.dm
#	code/game/machinery/doors/blast_door.dm
#	code/game/machinery/pipe/pipe_recipes.dm
#	code/game/objects/items/devices/radio/radio_vr.dm
#	code/modules/client/preferences_vr.dm
#	code/modules/clothing/glasses/hud_vr.dm
#	code/modules/clothing/under/accessories/accessory_vr.dm
#	code/modules/events/event_container_vr.dm
#	code/modules/gamemaster/actions/planet_weather_change.dm
#	code/modules/projectiles/guns/energy/netgun_vr.dm
#	code/modules/projectiles/guns/energy/protector_vr.dm
#	code/modules/vore/appearance/sprite_accessories_taur_vr.dm
#	code/modules/vore/appearance/sprite_accessories_vr.dm
#	code/modules/vore/fluffstuff/custom_guns_vr.dm
#	icons/obj/power.dmi
#	vorestation.dme

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

@@ -248,6 +248,12 @@ var/list/_client_preferences_by_type
 	description ="Hear In-game Instruments"
 	key = "SOUND_INSTRUMENT"
 
+/datum/client_preference/vchat_enable
+	description = "Enable/Disable VChat"
+	key = "VCHAT_ENABLE"
+	enabled_description =  "Enabled"
+	disabled_description = "Disabled"
+
 /********************
 * Staff Preferences *
 ********************/

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

@@ -1,3 +1,7 @@
+// Note for newly added fluff items: Ckeys should not contain any spaces, underscores or capitalizations,
+// or else the item will not be usable.
+// Example: Someone whose username is "Master Pred_Man" should be written as "masterpredman" instead
+
 /datum/gear/fluff
 	path = /obj/item
 	sort_category = "Fluff Items"
@@ -14,6 +18,14 @@
 	allowed_roles = list("Station Engineer")
 */
 
+
+/datum/gear/fluff/collar //Use this as a base path for collars if you'd like to set tags in loadout. Make sure you don't use apostrophes in the display name or this breaks!
+	slot = slot_tie
+
+/datum/gear/fluff/collar/New()
+	..()
+	gear_tweaks = list(gear_tweak_collar_tag)
+
 //  0-9 CKEYS
 /datum/gear/fluff/malady_crop
 	path = /obj/item/weapon/material/twohanded/fluff/riding_crop/malady
@@ -41,6 +53,12 @@
 	ckeywhitelist = list("aegisoa")
 	character_name = list("Xander Bevin")
 
+/datum/gear/fluff/xander_medal_2
+	path = /obj/item/clothing/accessory/medal/silver/unity
+	display_name = "Xander's Unity Medal"
+	ckeywhitelist = list("aegisoa")
+	character_name = list("Xander Bevin")
+
 /datum/gear/fluff/lynn_penlight
 	path = /obj/item/device/flashlight/pen/fluff/lynn
 	display_name = "Lynn's Penlight"
@@ -63,6 +81,13 @@
 	ckeywhitelist = list("arokha")
 	character_name = list("Aronai Sieyes")
 
+/datum/gear/fluff/collar/azura
+	path = /obj/item/clothing/accessory/collar/azura
+	display_name = "collar, Azura"
+	description = "For the kobold's pet."
+	ckeywhitelist = list("azurachitin")
+	character_name = list("Azura Chitin")
+
 //  B CKEYS
 /datum/gear/fluff/yuuko_kimono
 	path = /obj/item/clothing/under/fluff/sakura_hokkaido_kimono
@@ -151,6 +176,13 @@
 	ckeywhitelist = list("burritojustice")
 	character_name = list("Jayda Wilson")
 
+/datum/gear/fluff/star_hoodie
+	path = /obj/item/clothing/suit/storage/star
+	display_name = "Star hoodie"
+	slot = slot_wear_suit
+	ckeywhitelist = list("bacon12366")
+	character_name = list("Elly Brown")
+
 //  C CKEYS
 /datum/gear/fluff/cappy_watch
 	path = /obj/item/clothing/accessory/watch
@@ -203,6 +235,18 @@
 	ckeywhitelist = list("crossexonar")
 	character_name = list("Sari-E")
 
+/datum/gear/fluff/alexandria_medal
+	path = /obj/item/clothing/accessory/medal/silver/unity
+	display_name = "Alexandria's Unity Medal"
+	ckeywhitelist = list("cgr")
+	character_name = list("Alexandria Kozetto")
+
+/datum/gear/fluff/hisako_medal
+	path = /obj/item/clothing/accessory/medal/silver/unity
+	display_name = "Hisako's Unity Medal"
+	ckeywhitelist = list("chaleur")
+	character_name = list("Hisako Arato")
+
 //  D CKEYS
 /datum/gear/fluff/dhaeleena_medal
 	path = /obj/item/clothing/accessory/medal/silver/security/fluff/dhael
@@ -330,6 +374,18 @@
 	ckeywhitelist = list("ivymoomoo")
 	character_name = list("Ivy Baladeva")
 
+/datum/gear/fluff/farren_medal
+	path = /obj/item/clothing/accessory/medal/silver/unity
+	display_name = "Farren's Unity Medal"
+	ckeywhitelist = list("itsaket")
+	character_name = list("Farren Fruit")
+
+/datum/gear/fluff/myse_monk
+	path = /obj/item/clothing/suit/imperium_monk
+	display_name = "Imperium monk"
+	ckeywhitelist = list("itsaket")
+	character_name = list("Myse Topazian IV")
+
 //  J CKEYS
 /datum/gear/fluff/mor_box
 	path = /obj/item/weapon/storage/box/fluff/morxaina
@@ -478,9 +534,9 @@
 	ckeywhitelist = list("kisukegema")
 	character_name = list("Kisuke Gema")
 
-/datum/gear/fluff/excess_collar
+/datum/gear/fluff/collar/excess
 	path = /obj/item/clothing/accessory/collar/pink/fluff/warning
-	display_name = "Excess's Collar"
+	display_name = "collar, Excess"
 	ckeywhitelist = list("killerdragn")
 	character_name = list("Excess")
 
@@ -612,6 +668,18 @@
 	ckeywhitelist = list("nepox")
 	character_name = list("Annie Rose")
 
+/datum/gear/fluff/damon_medal
+	path = /obj/item/clothing/accessory/medal/silver/unity
+	display_name = "Damon's Unity Medal"
+	ckeywhitelist = list("nickcrazy")
+	character_name = list("Damon Bones Xrim")
+
+/datum/gear/fluff/kt_fishing_rod
+	path = /obj/item/weapon/material/fishing_rod/modern/strong
+	display_name = "K't's fishing rod"
+	ckeywhitelist = list("nerdass")
+	character_name = list("K't")
+
 //  O CKEYS
 /datum/gear/fluff/richard_chain
 	path = /obj/item/weapon/melee/fluff/holochain
@@ -619,6 +687,12 @@
 	ckeywhitelist = list("orbisa")
 	character_name = list("Richard D'angelo")
 
+/datum/gear/fluff/bogen_medal
+	path = /obj/item/clothing/accessory/medal/silver/unity
+	display_name = "Bogen's Unity Medal"
+	ckeywhitelist = list("oscarholmes")
+	character_name = list("Bogen Kellogg")
+
 //  P CKEYS
 /datum/gear/fluff/zaku_sweatervest
 	path = /obj/item/clothing/suit/varsity/green/sweater_vest
@@ -651,6 +725,12 @@
 	ckeywhitelist = list("pontifexminimus")
 	character_name = list("Lucia Null")
 
+/datum/gear/fluff/jamie_medal
+	path = /obj/item/clothing/accessory/medal/silver/unity
+	display_name = "Jamie's Unity Medal"
+	ckeywhitelist = list("phoenixgamma7")
+	character_name = list("Jamie Findlay")
+
 //  Q CKEYS
 
 //  R CKEYS
@@ -668,6 +748,12 @@
 	ckeywhitelist = list("sageofaether12")
 	character_name = list("Brynhild Vandradottir")
 
+/datum/gear/fluff/brynhild_medal_2
+	path = /obj/item/clothing/accessory/medal/silver/unity
+	display_name = "Brynhild's Unity Medal"
+	ckeywhitelist = list("sageofaether12")
+	character_name = list("Brynhild Vandradottir")
+
 /datum/gear/fluff/kateryna_voidsuit
 	path = /obj/item/clothing/suit/space/void/engineering/kate
 	display_name = "Kateryna's Voidsuit"
@@ -797,11 +883,17 @@
 
 //  T CKEYS
 /datum/gear/fluff/ascian_medal
-	path = /obj/item/clothing/accessory/medal/silver/unity
+	path = /obj/item/clothing/accessory/medal/silver/unity/tabiranth
 	display_name = "Ascian's Unity Medal"
 	ckeywhitelist = list("tabiranth")
 	character_name = list("Ascian")
 
+/datum/gear/fluff/ascian_medal_2
+	path = /obj/item/clothing/accessory/medal/silver/valor
+	display_name = "Ascian's Valor Medal"
+	ckeywhitelist = list("tabiranth")
+	character_name = list("Ascian")
+
 /datum/gear/fluff/ascian_spiritspawner
 	path = /obj/item/weapon/grenade/spawnergrenade/spirit
 	display_name = "The Best Kitten"
@@ -945,9 +1037,15 @@
 	path = /obj/item/clothing/mask/gas/sexymime
 	display_name = "Silentio's Mime Mask"
 	slot = slot_wear_mask
-	ckeywhitelist = list("Viveret")
+	ckeywhitelist = list("viveret")
 	character_name = list("Silentio")
 
+/datum/gear/fluff/roanna_medal
+	path = /obj/item/clothing/accessory/medal/silver/unity
+	display_name = "Roanna's Unity Medal"
+	ckeywhitelist = list("vitoras")
+	character_name = list("Roanna Ti'Rox")
+
 //  W CKEYS
 /datum/gear/fluff/sthasha_bracer
 	path = /obj/item/clothing/accessory/bracer/fluff/xander_sthasha
@@ -1016,7 +1114,7 @@
 /datum/gear/fluff/tachika_medal
 	path = /obj/item/clothing/accessory/medal/conduct
 	display_name = "Tachika's Conduct Medal"
-	ckeywhitelist = list("zammyman")
+	ckeywhitelist = list("zammyman215")
 	character_name = list("Tachika")
 
 /datum/gear/fluff/zaoozaoo_hat
@@ -1030,11 +1128,4 @@
 	path = /obj/item/device/radio/headset/fluff/zodiacshadow
 	display_name = "Nehi's Radio"
 	ckeywhitelist = list("zodiacshadow")
-	character_name = list("Nehi Maximus")
-
-/datum/gear/fluff/star_hoodie
-	path = /obj/item/clothing/suit/storage/star
-	display_name = "Star hoodie"
-	slot = slot_wear_suit
-	ckeywhitelist = list("bacon12366")
-	character_name = list("Elly Brown")
+	character_name = list("Nehi Maximus")

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

@@ -6,6 +6,10 @@
 	display_name = "basic headband"
 	path = /obj/item/clothing/head/fluff/headbando
 
+/datum/gear/head/maid
+	display_name = "maid headband"
+	path = /obj/item/clothing/head/headband/maid
+
 /datum/gear/head/headbando/New()
 	..()
 	gear_tweaks = list(gear_tweak_free_color_choice)
@@ -14,4 +18,4 @@
 /datum/gear/head/detective_alt
 	display_name = "cyberscope headgear, detective"
 	path = /obj/item/clothing/head/helmet/detective_alt
-	allowed_roles = list("Head of Security", "Detective")
+	allowed_roles = list("Head of Security", "Detective")

code/modules/client/preference_setup/occupation/occupation.dm

@@ -18,6 +18,11 @@
 	S["job_engsec_high"]	>> pref.job_engsec_high
 	S["job_engsec_med"]		>> pref.job_engsec_med
 	S["job_engsec_low"]		>> pref.job_engsec_low
+	//VOREStation Add
+	S["job_talon_low"]		>> pref.job_talon_low
+	S["job_talon_med"]		>> pref.job_talon_med
+	S["job_talon_high"]		>> pref.job_talon_high
+	//VOREStation Add End
 	S["player_alt_titles"]	>> pref.player_alt_titles
 
 /datum/category_item/player_setup_item/occupation/save_character(var/savefile/S)
@@ -31,6 +36,11 @@
 	S["job_engsec_high"]	<< pref.job_engsec_high
 	S["job_engsec_med"]		<< pref.job_engsec_med
 	S["job_engsec_low"]		<< pref.job_engsec_low
+	//VOREStation Add
+	S["job_talon_low"]		<< pref.job_talon_low
+	S["job_talon_med"]		<< pref.job_talon_med
+	S["job_talon_high"]		<< pref.job_talon_high
+	//VOREStation Add End
 	S["player_alt_titles"]	<< pref.player_alt_titles
 
 /datum/category_item/player_setup_item/occupation/sanitize_character()
@@ -44,6 +54,11 @@
 	pref.job_engsec_high	= sanitize_integer(pref.job_engsec_high, 0, 65535, initial(pref.job_engsec_high))
 	pref.job_engsec_med 	= sanitize_integer(pref.job_engsec_med, 0, 65535, initial(pref.job_engsec_med))
 	pref.job_engsec_low 	= sanitize_integer(pref.job_engsec_low, 0, 65535, initial(pref.job_engsec_low))
+	//VOREStation Add
+	pref.job_talon_high		= sanitize_integer(pref.job_talon_high, 0, 65535, initial(pref.job_talon_high))
+	pref.job_talon_med 		= sanitize_integer(pref.job_talon_med, 0, 65535, initial(pref.job_talon_med))
+	pref.job_talon_low 		= sanitize_integer(pref.job_talon_low, 0, 65535, initial(pref.job_talon_low))
+	//VOREStation Add End
 	if(!(pref.player_alt_titles)) pref.player_alt_titles = new()
 
 	if(!job_master)
@@ -54,7 +69,7 @@
 		if(alt_title && !(alt_title in job.alt_titles))
 			pref.player_alt_titles -= job.title
 
-/datum/category_item/player_setup_item/occupation/content(mob/user, limit = 20, list/splitJobs = list())
+/datum/category_item/player_setup_item/occupation/content(mob/user, limit = 25, list/splitJobs = list())
 	if(!job_master)
 		return
 
@@ -281,14 +296,17 @@
 			pref.job_civilian_high = 0
 			pref.job_medsci_high = 0
 			pref.job_engsec_high = 0
+			pref.job_talon_high = 0 //VOREStation Add
 			return 1
 		if(2)//Set current highs to med, then reset them
 			pref.job_civilian_med |= pref.job_civilian_high
 			pref.job_medsci_med |= pref.job_medsci_high
 			pref.job_engsec_med |= pref.job_engsec_high
+			pref.job_talon_med |= pref.job_talon_high //VOREStation Add
 			pref.job_civilian_high = 0
 			pref.job_medsci_high = 0
 			pref.job_engsec_high = 0
+			pref.job_talon_high = 0 //VOREStation Add
 
 	switch(job.department_flag)
 		if(CIVILIAN)
@@ -336,6 +354,12 @@
 	pref.job_engsec_med = 0
 	pref.job_engsec_low = 0
 
+	//VOREStation Add
+	pref.job_talon_high = 0
+	pref.job_talon_med = 0
+	pref.job_talon_low = 0
+	//VOREStation Add End
+
 	pref.player_alt_titles.Cut()
 
 /datum/preferences/proc/GetPlayerAltTitle(datum/job/job)