Merge branch 'master' of https://github.com/VOREStation/VOREStation

# Conflicts:
#	code/modules/mob/living/carbon/human/species/station/station.dm
#	code/modules/mob/living/silicon/robot/dogborg/dog_sleeper_vr.dm
#	code/modules/vore/weight/fitness_machines_vr.dm
#	config/custom_items.txt

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

@@ -1,72 +1,53 @@
 // Collars
 
 /datum/gear/collar
-	display_name = "Collar, Silver"
+	display_name = "collar, silver"
 	path = /obj/item/clothing/accessory/collar/silver
 	slot = slot_tie
 	sort_category = "Accessories"
 
 /datum/gear/collar/golden
-	display_name = "Collar, Golden"
+	display_name = "collar, golden"
 	path = /obj/item/clothing/accessory/collar/gold
 
 /datum/gear/collar/bell
-	display_name = "Collar, Bell"
+	display_name = "collar, bell"
 	path = /obj/item/clothing/accessory/collar/bell
 
 /datum/gear/collar/shock
-	display_name = "Collar, Shock"
+	display_name = "collar, shock"
 	path = /obj/item/clothing/accessory/collar/shock
 
 /datum/gear/collar/spike
-	display_name = "Collar, Spike"
+	display_name = "collar, spike"
 	path = /obj/item/clothing/accessory/collar/spike
 
 /datum/gear/collar/pink
-	display_name = "Collar, Pink"
+	display_name = "collar, pink"
 	path = /obj/item/clothing/accessory/collar/pink
 
 /datum/gear/collar/holo
-	display_name = "Collar, Holo"
+	display_name = "collar, holo"
 	path = /obj/item/clothing/accessory/collar/holo
+
 /datum/gear/accessory/white_drop_pouches
 	allowed_roles = list("Paramedic","Chief Medical Officer","Medical Doctor","Chemist")
 
 /datum/gear/accessory/white_vest
 	allowed_roles = list("Paramedic","Chief Medical Officer","Medical Doctor","Chemist")
 
-/datum/gear/accessory/saddlebag
-    display_name = "Saddle Bag, Horse"
-    path = /obj/item/weapon/storage/backpack/saddlebag
-    slot = slot_back
-
-/datum/gear/accessory/saddlebag_common
-    display_name = "Saddle Bag, Common"
-    path = /obj/item/weapon/storage/backpack/saddlebag_common
-    slot = slot_back
-
-/datum/gear/accessory/saddlebag_common/robust
-    display_name = "Saddle Bag, Robust"
-    path = /obj/item/weapon/storage/backpack/saddlebag_common/robust
-    slot = slot_back
-
-/datum/gear/accessory/saddlebag_common/vest
-    display_name = "Taur Duty Vest (backpack)"
-    path = /obj/item/weapon/storage/backpack/saddlebag_common/vest
-    slot = slot_back
-
 /datum/gear/accessory/khcrystal
 	display_name = "KH Life Crystal"
 	path = /obj/item/weapon/storage/box/khcrystal
 	description = "A small necklace device that will notify an offsite cloning facility should you expire after activating it."
 
 /datum/gear/accessory/tronket
-    display_name = "Metal necklace"
+    display_name = "metal necklace"
     description = "A shiny steel chain with a vague metallic object dangling off it."
     path = /obj/item/clothing/accessory/tronket
 
 /datum/gear/accessory/flops
-    display_name = "Drop straps"
+    display_name = "drop straps"
     description = "Wearing suspenders over shoulders? That's been so out for centuries and you know better."
     path = /obj/item/clothing/accessory/flops
 

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

@@ -7,9 +7,9 @@
 	path = /obj/item/clothing/glasses/omnihud/prescription
 
 /datum/gear/eyes/spiffygogs
-	display_name = "Slick orange goggles"
+	display_name = "slick orange goggles"
 	path = /obj/item/clothing/glasses/fluff/spiffygogs
 
 /datum/gear/eyes/science_proper
-	display_name = "Science goggles (no overlay)"
+	display_name = "science goggles (no overlay)"
 	path = /obj/item/clothing/glasses/fluff/science_proper

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

@@ -3,7 +3,7 @@
 	path = /obj/item/clothing/head/soft/sol*/
 
 /datum/gear/head/headbando
-	display_name = "Basic Headband"
+	display_name = "basic headband"
 	path = /obj/item/clothing/head/fluff/headbando
 
 /datum/gear/head/headbando/New()

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

@@ -145,7 +145,7 @@ Swimsuits
 */
 
 /datum/gear/uniform/swimsuits
-	display_name = "Swimsuits selection"
+	display_name = "swimsuits selection"
 	path = /obj/item/weapon/storage/box/fluff/swimsuit
 
 /datum/gear/uniform/swimsuits/New()
@@ -158,4 +158,9 @@ Swimsuits
 
 /datum/gear/uniform/suit/gnshorts
 	display_name = "GN shorts"
-	path = /obj/item/clothing/under/fluff/gnshorts
+	path = /obj/item/clothing/under/fluff/gnshorts
+
+//Latex maid dress
+/datum/gear/uniform/latexmaid
+	display_name = "latex maid dress"
+	path = /obj/item/clothing/under/fluff/latexmaid

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

@@ -16,7 +16,7 @@
 /datum/gear/utility/communicator/New()
 	..()
 	var/list/communicators = list()
-	for(var/communicator in typesof(/obj/item/device/communicator) - list(/obj/item/device/communicator/integrated))
+	for(var/communicator in typesof(/obj/item/device/communicator) - list(/obj/item/device/communicator/integrated,/obj/item/device/communicator/commlink)) //VOREStation Edit - Remove Commlink
 		var/obj/item/device/communicator_type = communicator
 		communicators[initial(communicator_type.name)] = communicator_type
 	gear_tweaks += new/datum/gear_tweak/path(sortAssoc(communicators))
@@ -29,6 +29,12 @@
 	display_name = "the traveler's guide to vir"
 	path = /obj/item/weapon/book/codex //VOREStation Edit
 	cost = 0
+
+/datum/gear/utility/news
+	display_name = "daedalus pocket newscaster"
+	path = /obj/item/weapon/book/codex/lore/news
+	cost = 0
+
 /* //VORESTATION REMOVAL
 /datum/gear/utility/corp_regs
 	display_name = "corporate regulations and legal code"

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

@@ -0,0 +1,57 @@
+/datum/gear/utility/saddlebag
+    display_name = "saddle bag, horse"
+    path = /obj/item/weapon/storage/backpack/saddlebag
+    slot = slot_back
+    cost = 2
+
+/datum/gear/utility/saddlebag_common
+    display_name = "saddle bag, common"
+    path = /obj/item/weapon/storage/backpack/saddlebag_common
+    slot = slot_back
+    cost = 2
+
+/datum/gear/utility/saddlebag_common/robust
+    display_name = "saddle bag, robust"
+    path = /obj/item/weapon/storage/backpack/saddlebag_common/robust
+    slot = slot_back
+    cost = 2
+
+/datum/gear/utility/saddlebag_common/vest
+    display_name = "taur duty vest (backpack)"
+    path = /obj/item/weapon/storage/backpack/saddlebag_common/vest
+    slot = slot_back
+    cost = 1
+
+/datum/gear/utility/dufflebag
+    display_name = "dufflebag"
+    path = /obj/item/weapon/storage/backpack/dufflebag
+    slot = slot_back
+    cost = 2
+
+/datum/gear/utility/dufflebag/black
+    display_name = "black dufflebag"
+    path = /obj/item/weapon/storage/backpack/dufflebag/fluff
+
+/datum/gear/utility/dufflebag/med
+    display_name = "medical dufflebag"
+    path = /obj/item/weapon/storage/backpack/dufflebag/med
+    allowed_roles = list("Medical Doctor","Chief Medical Officer","Chemist","Paramedic","Geneticist","Psychiatrist","Search and Rescue")
+
+/datum/gear/utility/dufflebag/med/emt
+    display_name = "EMT dufflebag"
+    path = /obj/item/weapon/storage/backpack/dufflebag/emt
+
+/datum/gear/utility/dufflebag/sec
+    display_name = "security Dufflebag"
+    path = /obj/item/weapon/storage/backpack/dufflebag/sec
+    allowed_roles = list("Head of Security","Warden","Detective","Security Officer")
+
+/datum/gear/utility/dufflebag/eng
+    display_name = "engineering dufflebag"
+    path = /obj/item/weapon/storage/backpack/dufflebag/eng
+    allowed_roles = list("Chief Engineer","Atmospheric Technician","Station Engineer")
+
+/datum/gear/utility/dufflebag/sci
+    display_name = "science dufflebag"
+    path = /obj/item/weapon/storage/backpack/dufflebag/sci
+    allowed_roles = list("Research Director","Scientist","Roboticist","Xenobiologist","Explorer")

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

@@ -54,7 +54,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 = 18, list/splitJobs = list("Chief Medical Officer"))
+/datum/category_item/player_setup_item/occupation/content(mob/user, limit = 18, list/splitJobs = list("Chief Engineer"))
 	if(!job_master)
 		return
 
@@ -94,7 +94,7 @@
 		if(job.minimum_character_age && user.client && (user.client.prefs.age < job.minimum_character_age))
 			. += "<del>[rank]</del></td><td> \[MINIMUM CHARACTER AGE: [job.minimum_character_age]]</td></tr>"
 			continue
-		if((pref.job_civilian_low & ASSISTANT) && (rank != "Assistant"))
+		if((pref.job_civilian_low & ASSISTANT) && job.type != /datum/job/assistant)
 			. += "<font color=grey>[rank]</font></td><td></td></tr>"
 			continue
 		if((rank in command_positions) || (rank == "AI"))//Bold head jobs
@@ -106,7 +106,7 @@
 
 		. += "<a href='?src=\ref[src];set_job=[rank]'>"
 
-		if(rank == "Assistant")//Assistant is special
+		if(job.type == /datum/job/assistant)//Assistant is special
 			if(pref.job_civilian_low & ASSISTANT)
 				. += " <font color=55cc55>\[Yes]</font>"
 			else
@@ -180,7 +180,7 @@
 	if(!job)
 		return 0
 
-	if(role == "Assistant")
+	if(job.type == /datum/job/assistant)
 		if(pref.job_civilian_low & job.flag)
 			pref.job_civilian_low &= ~job.flag
 		else