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

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

@@ -50,7 +50,7 @@
 
 /datum/gear/accessory/holster
 	display_name = "holster selection (Security, SM, HoP, Exploration)"
-	allowed_roles = list("Site Manager", "Head of Personnel", "Security Officer", "Warden", "Head of Security","Detective","Explorer","Pathfinder","Talon Guard", "Blueshield Guard","Security Pilot") //YW ADDITIONS
+	allowed_roles = list("Site Manager", "Head of Personnel", "Security Officer", "Warden", "Head of Security","Detective","Field Medic","Explorer","Pathfinder","Talon Captain","Talon Guard","Blueshield Guard","Security Pilot") //YW ADDITIONS)
 
 /datum/gear/accessory/brown_vest
 	display_name = "webbing, brown (Eng, Sec, Med, Exploration, Miner)"

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

@@ -2,7 +2,7 @@
 	allowed_roles = list("Medical Doctor","Chief Medical Officer","Chemist","Paramedic","Geneticist", "Psychiatrist", "Field Medic")
 
 /datum/gear/eyes/meson
-	display_name = "Optical Meson Scanners (Engineering, Science)"
+	display_name = "Optical Meson Scanners (Eng, Sci, Explo)"
 	allowed_roles = list("Station Engineer","Chief Engineer","Atmospheric Technician", "Scientist", "Research Director", "Explorer", "Pathfinder")
 
 /datum/gear/eyes/arglasses
@@ -55,7 +55,7 @@
 	path = /obj/item/clothing/glasses/fluff/science_proper
 
 /datum/gear/eyes/meson/retinal
-	display_name = "retinal projector, meson (Eng, Sci, Mining)"
+	display_name = "retinal projector, meson (Eng, Sci, Explo)"
 	path = /obj/item/clothing/glasses/omnihud/eng/meson
 
 /datum/gear/eyes/security/secpatch

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

@@ -1,3 +1,8 @@
+/datum/gear/head/cap/med
+	display_name = "cap, medical (Medical)"
+	path = /obj/item/clothing/head/soft/med
+	allowed_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Psychiatrist","Paramedic","Field Medic")
+
 /*/datum/gear/head/cap/sol
 	display_name = "cap, sol"
 	path = /obj/item/clothing/head/soft/sol*/

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

@@ -1,6 +1,3 @@
-/datum/gear/shoes/boots/winter/science
-	allowed_roles = list("Research Director","Scientist", "Roboticist", "Xenobiologist", "Xenobotanist", "Explorer", "Pathfinder")
-
 /datum/gear/shoes/boots/winter/medical
 	allowed_roles = list("Medical Doctor","Chief Medical Officer","Chemist","Paramedic","Geneticist", "Psychiatrist", "Field Medic")
 

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

@@ -340,6 +340,8 @@ datum/gear/suit/duster
 	path = /obj/item/clothing/suit/storage/forensics/red
 	allowed_roles = list("Detective")
 
+// winter coats go here
+
 /datum/gear/suit/wintercoat
 	display_name = "winter coat"
 	path = /obj/item/clothing/suit/storage/hooded/wintercoat
@@ -349,38 +351,134 @@ datum/gear/suit/duster
 	path = /obj/item/clothing/suit/storage/hooded/wintercoat/captain
 	allowed_roles = list("Site Manager")
 
+/datum/gear/suit/wintercoat/hop
+	display_name = "winter coat, head of personnel"
+	path = /obj/item/clothing/suit/storage/hooded/wintercoat/hop
+	allowed_roles = list("Head of Personnel")
+
 /datum/gear/suit/wintercoat/security
 	display_name = "winter coat, security"
 	path = /obj/item/clothing/suit/storage/hooded/wintercoat/security
 	allowed_roles = list("Security Officer", "Head of Security", "Warden", "Detective","Blueshield Guard","Security Pilot") //YW ADDITIONS
 
+/datum/gear/suit/wintercoat/security/hos
+	display_name = "winter coat, head of security"
+	path = /obj/item/clothing/suit/storage/hooded/wintercoat/security/hos
+	allowed_roles = list("Head of Security")
+
 /datum/gear/suit/wintercoat/medical
 	display_name = "winter coat, medical"
 	path = /obj/item/clothing/suit/storage/hooded/wintercoat/medical
+	allowed_roles = list("Medical Doctor","Chief Medical Officer","Chemist","Paramedic","Geneticist", "Psychiatrist", "Field Medic")
+
+/datum/gear/suit/wintercoat/medical/alt
+	display_name = "winter coat, medical alt"
+	path = /obj/item/clothing/suit/storage/hooded/wintercoat/medical/alt
+	allowed_roles = list("Medical Doctor","Chief Medical Officer","Chemist","Paramedic","Geneticist", "Psychiatrist", "Field Medic")
+
+/datum/gear/suit/wintercoat/medical/viro
+	display_name = "winter coat, virologist"
+	path = /obj/item/clothing/suit/storage/hooded/wintercoat/medical/viro
+	allowed_roles = list("Medical Doctor","Chief Medical Officer")
+
+/datum/gear/suit/wintercoat/medical/para
+	display_name = "winter coat, paramedic"
+	path = /obj/item/clothing/suit/storage/hooded/wintercoat/medical/para
+	allowed_roles = list("Medical Doctor","Chief Medical Officer","Paramedic")
+
+/datum/gear/suit/wintercoat/medical/chemist
+	display_name = "winter coat, chemist"
+	path = /obj/item/clothing/suit/storage/hooded/wintercoat/medical/chemist
+	allowed_roles = list("Chief Medical Officer","Chemist")
+
+/datum/gear/suit/wintercoat/medical/cmo
+	display_name = "winter coat, chief medical officer"
+	path = /obj/item/clothing/suit/storage/hooded/wintercoat/medical/cmo
+	allowed_roles = list("Chief Medical Officer")
+
+/datum/gear/suit/wintercoat/medical/sar
+	display_name = "winter coat, search and rescue"
+	path = /obj/item/clothing/suit/storage/hooded/wintercoat/medical/sar
+	allowed_roles = list("Chief Medical Officer", "Field Medic")
 
 /datum/gear/suit/wintercoat/science
 	display_name = "winter coat, science"
 	path = /obj/item/clothing/suit/storage/hooded/wintercoat/science
+	allowed_roles = list("Research Director","Scientist", "Roboticist", "Xenobiologist", "Xenobotanist")
+
+
+/datum/gear/suit/wintercoat/science/robotics
+	display_name = "winter coat, robotics"
+	path = /obj/item/clothing/suit/storage/hooded/wintercoat/science/robotics
+	allowed_roles = list("Research Director", "Roboticist")
+
+/datum/gear/suit/wintercoat/science/rd
+	display_name = "winter coat, research director"
+	path = /obj/item/clothing/suit/storage/hooded/wintercoat/science/rd
+	allowed_roles = list("Research Director")
 
 /datum/gear/suit/wintercoat/engineering
 	display_name = "winter coat, engineering"
 	path = /obj/item/clothing/suit/storage/hooded/wintercoat/engineering
+	allowed_roles = list("Chief Engineer","Atmospheric Technician", "Station Engineer")
 
-/datum/gear/suit/wintercoat/atmos
+/datum/gear/suit/wintercoat/engineering/atmos
 	display_name = "winter coat, atmospherics"
 	path = /obj/item/clothing/suit/storage/hooded/wintercoat/engineering/atmos
+	allowed_roles = list("Chief Engineer", "Atmospheric Technician")
+
+/datum/gear/suit/wintercoat/engineering/ce
+	display_name = "winter coat, chief engineer"
+	path = /obj/item/clothing/suit/storage/hooded/wintercoat/engineering/ce
+	allowed_roles = list("Chief Engineer")
 
 /datum/gear/suit/wintercoat/hydro
 	display_name = "winter coat, hydroponics"
 	path = /obj/item/clothing/suit/storage/hooded/wintercoat/hydro
+	allowed_roles = list("Botanist", "Xenobotanist")
 
 /datum/gear/suit/wintercoat/cargo
 	display_name = "winter coat, cargo"
 	path = /obj/item/clothing/suit/storage/hooded/wintercoat/cargo
+	allowed_roles = list("Quartermaster","Cargo Technician")
 
 /datum/gear/suit/wintercoat/miner
 	display_name = "winter coat, mining"
 	path = /obj/item/clothing/suit/storage/hooded/wintercoat/miner
+	allowed_roles = list("Shaft Miner")
+
+/datum/gear/suit/wintercoat/cargo/qm
+	display_name = "winter coat, quartermaster"
+	path = /obj/item/clothing/suit/storage/hooded/wintercoat/cargo/qm
+	allowed_roles = list("Quartermaster")
+
+/datum/gear/suit/wintercoat/bar
+	display_name = "winter coat, bartender"
+	path = /obj/item/clothing/suit/storage/hooded/wintercoat/bar
+	allowed_roles = list("Bartender")
+
+/datum/gear/suit/wintercoat/janitor
+	display_name = "winter coat, janitor"
+	path = /obj/item/clothing/suit/storage/hooded/wintercoat/janitor
+	allowed_roles = list("Janitor")
+
+/datum/gear/suit/wintercoat/aformal
+	display_name = "winter coat, assistant formal"
+	path = /obj/item/clothing/suit/storage/hooded/wintercoat/aformal
+
+/datum/gear/suit/wintercoat/ratvar
+	display_name = "winter coat, brassy"
+	path = /obj/item/clothing/suit/storage/hooded/wintercoat/ratvar
+
+/datum/gear/suit/wintercoat/narsie
+	display_name = "winter coat, runed"
+	path = /obj/item/clothing/suit/storage/hooded/wintercoat/narsie
+
+/datum/gear/suit/wintercoat/cosmic
+	display_name = "winter coat, cosmic"
+	path = /obj/item/clothing/suit/storage/hooded/wintercoat/cosmic
+
+// winter coats end here
 
 /datum/gear/suit/varsity
 	display_name = "varsity jacket selection"

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

@@ -1,15 +1,6 @@
-/datum/gear/suit/wintercoat/medical
-	allowed_roles = list("Medical Doctor","Chief Medical Officer","Chemist","Paramedic","Geneticist", "Psychiatrist", "Field Medic")
-
-/datum/gear/suit/wintercoat/science
-	allowed_roles = list("Research Director","Scientist", "Roboticist", "Xenobiologist", "Xenobotanist", "Explorer", "Pathfinder")
-
 /datum/gear/suit/snowsuit/medical
 	allowed_roles = list("Medical Doctor","Chief Medical Officer","Chemist","Paramedic","Geneticist", "Psychiatrist", "Field Medic")
 
-/datum/gear/suit/snowsuit/science
-	allowed_roles = list("Research Director","Scientist", "Roboticist", "Xenobiologist", "Xenobotanist", "Explorer", "Pathfinder")
-
 /datum/gear/suit/labcoat_colorable
 	display_name = "labcoat, colorable"
 	path = /obj/item/clothing/suit/storage/toggle/labcoat
@@ -55,7 +46,7 @@
 /datum/gear/suit/roles/medical/ems_jacket
 	display_name = "first responder jacket"
 	path = /obj/item/clothing/suit/storage/toggle/fr_jacket
-	allowed_roles = list("Chief Medical Officer","Paramedic","Medical Doctor")
+	allowed_roles = list("Chief Medical Officer","Paramedic","Medical Doctor","Field Medic")
 
 //imo-superior 'martian' style jacket with the star-of-life design
 /datum/gear/suit/roles/medical/ems_jacket/alt
@@ -66,7 +57,7 @@
 /datum/gear/suit/roles/medical/paramedic_vest
 	display_name = "paramedic vest"
 	path = /obj/item/clothing/suit/storage/toggle/paramedic
-	allowed_roles = list("Chief Medical Officer","Paramedic","Medical Doctor")
+	allowed_roles = list("Chief Medical Officer","Paramedic","Medical Doctor","Field Medic")
 
 //greek thing
 /datum/gear/suit/chiton

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

@@ -13,6 +13,10 @@
 /datum/gear/uniform/job_turtle/science
 	allowed_roles = list("Research Director", "Scientist", "Roboticist", "Xenobiologist", "Xenobotanist")
 
+/datum/gear/uniform/job_turtle/medical
+	display_name = "turtleneck, medical"
+	path = /obj/item/clothing/under/rank/medical/turtleneck
+	allowed_roles = list("Chief Medical Officer", "Paramedic", "Medical Doctor", "Psychiatrist", "Field Medic", "Chemist")
 
 //KHI Uniforms
 /datum/gear/uniform/job_khi/cmd
@@ -38,7 +42,7 @@
 /datum/gear/uniform/job_khi/sci
 	display_name = "khi uniform, sci"
 	path = /obj/item/clothing/under/rank/khi/sci
-	allowed_roles = list("Research Director", "Scientist", "Roboticist", "Xenobiologist", "Xenobotanist", "Pathfinder", "Explorer")
+	allowed_roles = list("Research Director", "Scientist", "Roboticist", "Xenobiologist", "Xenobotanist")
 
 /datum/gear/uniform/job_khi/crg
 	display_name = "khi uniform, cargo"
@@ -58,7 +62,7 @@
 /datum/gear/suit/job_fed/medsci
 	display_name = "fed uniform, med/sci"
 	path = /obj/item/clothing/suit/storage/fluff/fedcoat/fedblue
-	allowed_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Paramedic","Geneticist","Research Director","Scientist", "Roboticist", "Xenobiologist","Xenobotanist","Pathfinder","Explorer","Field Medic")
+	allowed_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Paramedic","Geneticist","Research Director","Scientist", "Roboticist", "Xenobiologist","Xenobotanist","Field Medic")
 
 /datum/gear/suit/job_fed/eng
 	display_name = "fed uniform, eng"
@@ -75,7 +79,7 @@
 /datum/gear/uniform/job_trek/medsci/tos
 	display_name = "TOS uniform, med/sci"
 	path = /obj/item/clothing/under/rank/trek/medsci
-	allowed_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Paramedic","Geneticist","Research Director","Scientist", "Roboticist", "Xenobiologist", "Xenobotanist", "Pathfinder", "Explorer", "Field Medic")
+	allowed_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Paramedic","Geneticist","Research Director","Scientist", "Roboticist", "Xenobiologist", "Xenobotanist", "Field Medic")
 
 /datum/gear/uniform/job_trek/eng/tos
 	display_name = "TOS uniform, eng/sec"
@@ -91,7 +95,7 @@
 /datum/gear/uniform/job_trek/medsci/tng
 	display_name = "TNG uniform, med/sci"
 	path = /obj/item/clothing/under/rank/trek/medsci/next
-	allowed_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Paramedic","Geneticist","Research Director","Scientist", "Roboticist", "Xenobiologist", "Xenobotanist", "Pathfinder", "Explorer", "Field Medic")
+	allowed_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Paramedic","Geneticist","Research Director","Scientist", "Roboticist", "Xenobiologist", "Xenobotanist", "Field Medic")
 
 /datum/gear/uniform/job_trek/eng/tng
 	display_name = "TNG uniform, eng/sec"
@@ -107,7 +111,7 @@
 /datum/gear/uniform/job_trek/medsci/voy
 	display_name = "VOY uniform, med/sci"
 	path = /obj/item/clothing/under/rank/trek/medsci/voy
-	allowed_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Paramedic","Geneticist","Research Director","Scientist", "Roboticist", "Xenobiologist", "Xenobotanist", "Pathfinder", "Explorer", "Field Medic")
+	allowed_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Paramedic","Geneticist","Research Director","Scientist", "Roboticist", "Xenobiologist", "Xenobotanist", "Field Medic")
 
 /datum/gear/uniform/job_trek/eng/voy
 	display_name = "VOY uniform, eng/sec"
@@ -133,7 +137,7 @@
 /datum/gear/uniform/job_trek/medsci/ds9
 	display_name = "DS9 uniform, med/sci"
 	path = /obj/item/clothing/under/rank/trek/medsci/ds9
-	allowed_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Paramedic","Geneticist","Research Director","Scientist", "Roboticist", "Xenobiologist", "Xenobotanist", "Pathfinder", "Explorer", "Field Medic")
+	allowed_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Paramedic","Geneticist","Research Director","Scientist", "Roboticist", "Xenobiologist", "Xenobotanist", "Field Medic")
 
 /datum/gear/uniform/job_trek/eng/ds9
 	display_name = "DS9 uniform, eng/sec"
@@ -150,7 +154,7 @@
 /datum/gear/uniform/job_trek/medsci/ent
 	display_name = "ENT uniform, med/sci"
 	path = /obj/item/clothing/under/rank/trek/medsci/ent
-	allowed_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Paramedic","Geneticist","Research Director","Scientist", "Roboticist", "Xenobiologist", "Xenobotanist", "Pathfinder", "Explorer", "Field Medic")
+	allowed_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Paramedic","Geneticist","Research Director","Scientist", "Roboticist", "Xenobiologist", "Xenobotanist", "Field Medic")
 
 /datum/gear/uniform/job_trek/eng/ent
 	display_name = "ENT uniform, eng/sec"

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

@@ -54,7 +54,7 @@
 /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","Xenobotanist","Explorer","Pathfinder")
+	allowed_roles = list("Research Director","Scientist","Roboticist","Xenobiologist","Xenobotanist")
 
 /datum/gear/utility/ID
 	display_name = "contractor identification card"