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

code/modules/client/preference_setup/general/03_body.dm

@@ -901,7 +901,7 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O
 		dat += "<td width = 400>[current_species.blurb]</td>"
 	//vorestation edit end
 	dat += "<td width = 200 align='center'>"
-	if("preview" in icon_states(current_species.icobase))
+	if("preview" in cached_icon_states(current_species.icobase))
 		usr << browse_rsc(icon(current_species.icobase,"preview"), "species_preview_[current_species.name].png")
 		dat += "<img src='species_preview_[current_species.name].png' width='64px' height='64px'><br/><br/>"
 	dat += "<b>Language:</b> [current_species.species_language]<br/>"

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

@@ -13,6 +13,27 @@
 	display_name = "AR glasses, prescription"
 	path = /obj/item/clothing/glasses/omnihud/prescription
 
+/datum/gear/eyes/arglasses/sec
+	display_name = "AR-S glasses (Sec)"
+	path = /obj/item/clothing/glasses/omnihud/sec
+	allowed_roles = list("Security Officer","Head of Security","Warden","Detective")
+
+/datum/gear/eyes/arglasses/eng
+	display_name = "AR-E glasses (Eng)"
+	path = /obj/item/clothing/glasses/omnihud/eng
+	allowed_roles = list("Station Engineer","Chief Engineer","Atmospheric Technician")
+
+/datum/gear/eyes/arglasses/med
+	display_name = "AR-M glasses (Medical)"
+	path = /obj/item/clothing/glasses/omnihud/med
+	allowed_roles = list("Medical Doctor","Chief Medical Officer","Chemist","Paramedic","Geneticist", "Psychiatrist", "Field Medic")
+
+/datum/gear/eyes/arglasses/all
+	display_name = "AR-B glasses (CD, HoP)"
+	path = /obj/item/clothing/glasses/omnihud/all
+	cost = 2
+	allowed_roles = list("Colony Director","Head of Personnel")
+
 /datum/gear/eyes/spiffygogs
 	display_name = "slick orange goggles"
 	path = /obj/item/clothing/glasses/fluff/spiffygogs

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

@@ -92,7 +92,7 @@
 /datum/gear/fluff/aurora
 	path = /obj/item/clothing/accessory/solgov/department/security/aurora
 	display_name = "Aurora's keepsake"
-	description = "An old solgov sec insignia given to Aurora"
+	description = "An old solcom sec insignia given to Aurora"
 	ckeywhitelist = list("storesund97")
 	character_name = list("Aurora")
 
@@ -150,27 +150,6 @@
 	ckeywhitelist = list("bwoincognito")
 	character_name = list("Tasald Corlethian")
 
-/datum/gear/fluff/tasald_cartographer_jumpsuit
-	path = /obj/item/clothing/under/solgov/utility/sifguard/officer/exploration
-	display_name = "Tasald's Cartographer's uniform - jumpsuit"
-	slot = slot_w_uniform
-	ckeywhitelist = list("bwoincognito")
-	character_name = list("Tasald Corlethian")
-
-/datum/gear/fluff/tasald_cartographer_jacket
-	path = /obj/item/clothing/suit/storage/service/sifguard/command
-	display_name = "Tasald's Cartographer's uniform - jacket"
-	slot = slot_wear_suit
-	ckeywhitelist = list("bwoincognito")
-	character_name = list("Tasald Corlethian")
-
-/datum/gear/fluff/tasald_cartographer_beret
-	path = /obj/item/clothing/head/beret/sol/expedition/command
-	display_name = "Tasald's Cartographer's uniform - beret"
-	slot = slot_head
-	ckeywhitelist = list("bwoincognito")
-	character_name = list("Tasald Corlethian")
-
 /datum/gear/fluff/octavius_box
 	path = /obj/item/weapon/storage/box/fluff/octavious
 	display_name = "Octavious' Box"

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

@@ -143,6 +143,12 @@
 			var/available_in_days = job.available_in_days(user.client)
 			. += "<del>[rank]</del></td></a><td> \[IN [(available_in_days)] DAYS]</td></tr>"
 			continue
+		//VOREStation Add
+		if(!job.player_has_enough_playtime(user.client))
+			var/available_in_hours = job.available_in_playhours(user.client)
+			. += "<del>[rank]</del></td></a><td> \[IN [(available_in_hours)] DEPTHOURS]</td></tr>"
+			continue
+		//VOREStation Add End
 		if(job.minimum_character_age && user.client && (user.client.prefs.age < job.minimum_character_age))
 			. += "<del>[rank]</del></td></a><td> \[MINIMUM CHARACTER AGE: [job.minimum_character_age]]</td></tr>"
 			continue