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

This commit is contained in:
izac112
2020-05-16 23:26:52 +02:00
73 changed files with 902 additions and 361 deletions
@@ -38,3 +38,15 @@
display_name = "Colorful poncho"
description = "A mexican looking poncho. It look like it fits wolf taurs as well."
path = /obj/item/clothing/suit/poncho
//Detective alternative
/datum/gear/uniform/detective_alt
display_name = "sleek modern coat, detective"
path = /obj/item/clothing/suit/storage/det_trench/alt
allowed_roles = list("Head of Security", "Detective")
//Detective alternative
/datum/gear/uniform/detective_alt2
display_name = "sleek modern coat (long), detective"
path = /obj/item/clothing/suit/storage/det_trench/alt2
allowed_roles = list("Head of Security", "Detective")
@@ -174,12 +174,6 @@ Swimsuits
display_name = "Varmacorp nanovest"
path = /obj/item/clothing/under/fluff/v_nanovest
//Detective alternative
/datum/gear/uniform/detective_alt
display_name = "sleek modern coat, detective"
path = /obj/item/clothing/under/detective_alt
allowed_roles = list("Head of Security", "Detective")
/*
Qipao
*/
@@ -146,7 +146,7 @@
//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>"
. += "<del>[rank]</del></td></a><td> \[IN [round(available_in_hours, 0.1)] DEPTHOURS]</td></tr>"
continue
//VOREStation Add End
if(job.minimum_character_age && user.client && (user.client.prefs.age < job.minimum_character_age))