Reverts Most of #9312, Fixes #9394

Reverts the VR_edit versions of the clothes in PR #9312 and brings Teshari clothing in compliance with Polaris upstream
This commit is contained in:
KasparoVy
2020-12-03 22:40:02 -05:00
parent 0d6e6f87b2
commit fa1c991994
9 changed files with 158 additions and 1382 deletions
@@ -96,385 +96,3 @@
display_name = "white wedding dress (Wolf/Horse-taur)"
path = /obj/item/clothing/suit/taur_dress/white
sort_category = "Xenowear"
//Net new alternate job undercoats.
/datum/gear/suit/dept/undercoat/cap
display_name = "facility director undercoat (Teshari)"
path = /obj/item/clothing/under/seromi/undercoat/jobs/cap_vr
allowed_roles = list("Site Manager")
/datum/gear/suit/dept/undercoat/psych
display_name = "psychiatrist undercoat (Teshari)"
path = /obj/item/clothing/under/seromi/undercoat/jobs/psych_vr
allowed_roles = list("Psychiatrist")
/datum/gear/suit/dept/undercoat/rd
display_name = "research director undercoat (Teshari)"
path = /obj/item/clothing/under/seromi/undercoat/jobs/rd_vr
allowed_roles = list("Research Director")
/datum/gear/suit/dept/undercoat/hos
display_name = "head of security undercoat (Teshari)"
path = /obj/item/clothing/under/seromi/undercoat/jobs/hos_vr
allowed_roles = list("Head of Security")
/datum/gear/suit/dept/undercoat/hop
display_name = "head of personnel undercoat (Teshari)"
path = /obj/item/clothing/under/seromi/undercoat/jobs/hop_vr
allowed_roles = list("Head of Personnel")
//Added to allow selection of alternate job undercoats.
./datum/gear/uniform/dept/undercoat/ce/New()
..()
var/list/undercoats = list()
for(var/undercoat in typesof(path))
var/obj/item/clothing/under/seromi/undercoat/jobs/undercoat_type = undercoat
undercoats[initial(undercoat_type.name)] = undercoat_type
gear_tweaks += new/datum/gear_tweak/path(sortAssoc(undercoats))
/datum/gear/uniform/dept/undercoat/qm/New()
..()
var/list/undercoats = list()
for(var/undercoat in typesof(path))
var/obj/item/clothing/under/seromi/undercoat/jobs/undercoat_type = undercoat
undercoats[initial(undercoat_type.name)] = undercoat_type
gear_tweaks += new/datum/gear_tweak/path(sortAssoc(undercoats))
/datum/gear/uniform/dept/undercoat/cmo/New()
..()
var/list/undercoats = list()
for(var/undercoat in typesof(path))
var/obj/item/clothing/under/seromi/undercoat/jobs/undercoat_type = undercoat
undercoats[initial(undercoat_type.name)] = undercoat_type
gear_tweaks += new/datum/gear_tweak/path(sortAssoc(undercoats))
/datum/gear/uniform/dept/undercoat/cargo/New()
..()
var/list/undercoats = list()
for(var/undercoat in typesof(path))
var/obj/item/clothing/under/seromi/undercoat/jobs/undercoat_type = undercoat
undercoats[initial(undercoat_type.name)] = undercoat_type
gear_tweaks += new/datum/gear_tweak/path(sortAssoc(undercoats))
/datum/gear/uniform/dept/undercoat/mining/New()
..()
var/list/undercoats = list()
for(var/undercoat in typesof(path))
var/obj/item/clothing/under/seromi/undercoat/jobs/undercoat_type = undercoat
undercoats[initial(undercoat_type.name)] = undercoat_type
gear_tweaks += new/datum/gear_tweak/path(sortAssoc(undercoats))
/datum/gear/uniform/dept/undercoat/security/New()
..()
var/list/undercoats = list()
for(var/undercoat in typesof(path))
var/obj/item/clothing/under/seromi/undercoat/jobs/undercoat_type = undercoat
undercoats[initial(undercoat_type.name)] = undercoat_type
gear_tweaks += new/datum/gear_tweak/path(sortAssoc(undercoats))
/datum/gear/uniform/dept/undercoat/service/New()
..()
var/list/undercoats = list()
for(var/undercoat in typesof(path))
var/obj/item/clothing/under/seromi/undercoat/jobs/undercoat_type = undercoat
undercoats[initial(undercoat_type.name)] = undercoat_type
gear_tweaks += new/datum/gear_tweak/path(sortAssoc(undercoats))
/datum/gear/uniform/dept/undercoat/engineer/New()
..()
var/list/undercoats = list()
for(var/undercoat in typesof(path))
var/obj/item/clothing/under/seromi/undercoat/jobs/undercoat_type = undercoat
undercoats[initial(undercoat_type.name)] = undercoat_type
gear_tweaks += new/datum/gear_tweak/path(sortAssoc(undercoats))
/datum/gear/uniform/dept/undercoat/atmos/New()
..()
var/list/undercoats = list()
for(var/undercoat in typesof(path))
var/obj/item/clothing/under/seromi/undercoat/jobs/undercoat_type = undercoat
undercoats[initial(undercoat_type.name)] = undercoat_type
gear_tweaks += new/datum/gear_tweak/path(sortAssoc(undercoats))
/datum/gear/uniform/dept/undercoat/research/New()
..()
var/list/undercoats = list()
for(var/undercoat in typesof(path))
var/obj/item/clothing/under/seromi/undercoat/jobs/undercoat_type = undercoat
undercoats[initial(undercoat_type.name)] = undercoat_type
gear_tweaks += new/datum/gear_tweak/path(sortAssoc(undercoats))
/datum/gear/uniform/dept/undercoat/robo/New()
..()
var/list/undercoats = list()
for(var/undercoat in typesof(path))
var/obj/item/clothing/under/seromi/undercoat/jobs/undercoat_type = undercoat
undercoats[initial(undercoat_type.name)] = undercoat_type
gear_tweaks += new/datum/gear_tweak/path(sortAssoc(undercoats))
/datum/gear/uniform/dept/undercoat/medical/New()
..()
var/list/undercoats = list()
for(var/undercoat in typesof(path))
var/obj/item/clothing/under/seromi/undercoat/jobs/undercoat_type = undercoat
undercoats[initial(undercoat_type.name)] = undercoat_type
gear_tweaks += new/datum/gear_tweak/path(sortAssoc(undercoats))
/datum/gear/uniform/dept/undercoat/chemistry/New()
..()
var/list/undercoats = list()
for(var/undercoat in typesof(path))
var/obj/item/clothing/under/seromi/undercoat/jobs/undercoat_type = undercoat
undercoats[initial(undercoat_type.name)] = undercoat_type
gear_tweaks += new/datum/gear_tweak/path(sortAssoc(undercoats))
/datum/gear/uniform/dept/undercoat/virology/New()
..()
var/list/undercoats = list()
for(var/undercoat in typesof(path))
var/obj/item/clothing/under/seromi/undercoat/jobs/undercoat_type = undercoat
undercoats[initial(undercoat_type.name)] = undercoat_type
gear_tweaks += new/datum/gear_tweak/path(sortAssoc(undercoats))
/datum/gear/uniform/dept/undercoat/paramedic/New()
..()
var/list/undercoats = list()
for(var/undercoat in typesof(path))
var/obj/item/clothing/under/seromi/undercoat/jobs/undercoat_type = undercoat
undercoats[initial(undercoat_type.name)] = undercoat_type
gear_tweaks += new/datum/gear_tweak/path(sortAssoc(undercoats))
/datum/gear/uniform/dept/undercoat/iaa/New()
..()
var/list/undercoats = list()
for(var/undercoat in typesof(path))
var/obj/item/clothing/under/seromi/undercoat/jobs/undercoat_type = undercoat
undercoats[initial(undercoat_type.name)] = undercoat_type
gear_tweaks += new/datum/gear_tweak/path(sortAssoc(undercoats))
//Net new alternate cloak sprites.
/datum/gear/suit/cloak_vr
display_name = "cloak selection (Teshari) (VR)"
path = /obj/item/clothing/suit/storage/teshari/cloak_vr/standard
whitelisted = SPECIES_TESHARI
sort_category = "Xenowear"
/datum/gear/suit/cloak_vr/New()
..()
var/list/cloaks = list()
for(var/cloak in typesof(/obj/item/clothing/suit/storage/teshari/cloak_vr/standard))
var/obj/item/clothing/suit/storage/teshari/cloak_vr/standard/cloak_type = cloak
cloaks[initial(cloak_type.name)] = cloak_type
gear_tweaks += new/datum/gear_tweak/path(sortAssoc(cloaks))
/datum/gear/suit/cloak_vr_color
display_name = "cloak, recolorable (Teshari) (VR)"
path = /obj/item/clothing/suit/storage/teshari/cloak_vr/standard/white
whitelisted = SPECIES_TESHARI
sort_category = "Xenowear"
/datum/gear/suit/cloak_vr_color/New()
..()
gear_tweaks += gear_tweak_free_color_choice
//Net new alternate job cloaks
/datum/gear/suit/dept/cloak/cap
display_name = "facility director cloak (Teshari)"
path = /obj/item/clothing/suit/storage/seromi/cloak/jobs/cap_vr
allowed_roles = list("Site Manager")
/datum/gear/suit/dept/cloak/psych
display_name = "psychiatrist cloak (Teshari)"
path = /obj/item/clothing/suit/storage/seromi/cloak/jobs/psych_vr
allowed_roles = list("Psychiatrist")
/datum/gear/suit/dept/cloak/rd
display_name = "research director cloak (Teshari)"
path = /obj/item/clothing/suit/storage/seromi/cloak/jobs/rd_vr
allowed_roles = list("Research Director")
/datum/gear/suit/dept/cloak/hos
display_name = "head of security cloak (Teshari)"
path = /obj/item/clothing/suit/storage/seromi/cloak/jobs/hos_vr
allowed_roles = list("Head of Security")
/datum/gear/suit/dept/cloak/hop
display_name = "head of personnel cloak (Teshari)"
path = /obj/item/clothing/suit/storage/seromi/cloak/jobs/hop_vr
allowed_roles = list("Head of Personnel")
//Added to allow selection of alternate job cloaks.
/datum/gear/suit/dept/cloak/ce/New()
..()
var/list/cloaks = list()
for(var/cloak in typesof(path))
var/obj/item/clothing/suit/storage/seromi/cloak/jobs/cloak_type = cloak
cloaks[initial(cloak_type.name)] = cloak_type
gear_tweaks += new/datum/gear_tweak/path(sortAssoc(cloaks))
/datum/gear/suit/dept/cloak/qm/New()
..()
var/list/cloaks = list()
for(var/cloak in typesof(path))
var/obj/item/clothing/suit/storage/seromi/cloak/jobs/cloak_type = cloak
cloaks[initial(cloak_type.name)] = cloak_type
gear_tweaks += new/datum/gear_tweak/path(sortAssoc(cloaks))
/datum/gear/suit/dept/cloak/command/New()
..()
var/list/cloaks = list()
for(var/cloak in typesof(path))
var/obj/item/clothing/suit/storage/seromi/cloak/jobs/cloak_type = cloak
cloaks[initial(cloak_type.name)] = cloak_type
gear_tweaks += new/datum/gear_tweak/path(sortAssoc(cloaks))
/datum/gear/suit/dept/cloak/cmo/New()
..()
var/list/cloaks = list()
for(var/cloak in typesof(path))
var/obj/item/clothing/suit/storage/seromi/cloak/jobs/cloak_type = cloak
cloaks[initial(cloak_type.name)] = cloak_type
gear_tweaks += new/datum/gear_tweak/path(sortAssoc(cloaks))
/datum/gear/suit/dept/cloak/cargo/New()
..()
var/list/cloaks = list()
for(var/cloak in typesof(path))
var/obj/item/clothing/suit/storage/seromi/cloak/jobs/cloak_type = cloak
cloaks[initial(cloak_type.name)] = cloak_type
gear_tweaks += new/datum/gear_tweak/path(sortAssoc(cloaks))
/datum/gear/suit/dept/cloak/mining/New()
..()
var/list/cloaks = list()
for(var/cloak in typesof(path))
var/obj/item/clothing/suit/storage/seromi/cloak/jobs/cloak_type = cloak
cloaks[initial(cloak_type.name)] = cloak_type
gear_tweaks += new/datum/gear_tweak/path(sortAssoc(cloaks))
/datum/gear/suit/dept/cloak/security/New()
..()
var/list/cloaks = list()
for(var/cloak in typesof(path))
var/obj/item/clothing/suit/storage/seromi/cloak/jobs/cloak_type = cloak
cloaks[initial(cloak_type.name)] = cloak_type
gear_tweaks += new/datum/gear_tweak/path(sortAssoc(cloaks))
/datum/gear/suit/dept/cloak/service/New()
..()
var/list/cloaks = list()
for(var/cloak in typesof(path))
var/obj/item/clothing/suit/storage/seromi/cloak/jobs/cloak_type = cloak
cloaks[initial(cloak_type.name)] = cloak_type
gear_tweaks += new/datum/gear_tweak/path(sortAssoc(cloaks))
/datum/gear/suit/dept/cloak/engineer/New()
..()
var/list/cloaks = list()
for(var/cloak in typesof(path))
var/obj/item/clothing/suit/storage/seromi/cloak/jobs/cloak_type = cloak
cloaks[initial(cloak_type.name)] = cloak_type
gear_tweaks += new/datum/gear_tweak/path(sortAssoc(cloaks))
/datum/gear/suit/dept/cloak/atmos/New()
..()
var/list/cloaks = list()
for(var/cloak in typesof(path))
var/obj/item/clothing/suit/storage/seromi/cloak/jobs/cloak_type = cloak
cloaks[initial(cloak_type.name)] = cloak_type
gear_tweaks += new/datum/gear_tweak/path(sortAssoc(cloaks))
/datum/gear/suit/dept/cloak/research/New()
..()
var/list/cloaks = list()
for(var/cloak in typesof(path))
var/obj/item/clothing/suit/storage/seromi/cloak/jobs/cloak_type = cloak
cloaks[initial(cloak_type.name)] = cloak_type
gear_tweaks += new/datum/gear_tweak/path(sortAssoc(cloaks))
/datum/gear/suit/dept/cloak/robo/New()
..()
var/list/cloaks = list()
for(var/cloak in typesof(path))
var/obj/item/clothing/suit/storage/seromi/cloak/jobs/cloak_type = cloak
cloaks[initial(cloak_type.name)] = cloak_type
gear_tweaks += new/datum/gear_tweak/path(sortAssoc(cloaks))
/datum/gear/suit/dept/cloak/medical/New()
..()
var/list/cloaks = list()
for(var/cloak in typesof(path))
var/obj/item/clothing/suit/storage/seromi/cloak/jobs/cloak_type = cloak
cloaks[initial(cloak_type.name)] = cloak_type
gear_tweaks += new/datum/gear_tweak/path(sortAssoc(cloaks))
/datum/gear/suit/dept/cloak/chemistry/New()
..()
var/list/cloaks = list()
for(var/cloak in typesof(path))
var/obj/item/clothing/suit/storage/seromi/cloak/jobs/cloak_type = cloak
cloaks[initial(cloak_type.name)] = cloak_type
gear_tweaks += new/datum/gear_tweak/path(sortAssoc(cloaks))
/datum/gear/suit/dept/cloak/virology/New()
..()
var/list/cloaks = list()
for(var/cloak in typesof(path))
var/obj/item/clothing/suit/storage/seromi/cloak/jobs/cloak_type = cloak
cloaks[initial(cloak_type.name)] = cloak_type
gear_tweaks += new/datum/gear_tweak/path(sortAssoc(cloaks))
/datum/gear/suit/dept/cloak/paramedic/New()
..()
var/list/cloaks = list()
for(var/cloak in typesof(path))
var/obj/item/clothing/suit/storage/seromi/cloak/jobs/cloak_type = cloak
cloaks[initial(cloak_type.name)] = cloak_type
gear_tweaks += new/datum/gear_tweak/path(sortAssoc(cloaks))
/datum/gear/suit/dept/cloak/iaa/New()
..()
var/list/cloaks = list()
for(var/cloak in typesof(path))
var/obj/item/clothing/suit/storage/seromi/cloak/jobs/cloak_type = cloak
cloaks[initial(cloak_type.name)] = cloak_type
gear_tweaks += new/datum/gear_tweak/path(sortAssoc(cloaks))
//Added from CHOMP
/datum/gear/suit/cloak_hood
display_name = "hooded cloak selection (Teshari)"
path = /obj/item/clothing/suit/storage/hooded/teshari/standard
whitelisted = SPECIES_TESHARI
sort_category = "Xenowear"
/datum/gear/suit/cloak_hood/New()
..()
var/list/cloaks = list()
for(var/cloak in typesof(/obj/item/clothing/suit/storage/hooded/teshari/standard))
var/obj/item/clothing/suit/storage/seromi/cloak/cloak_type = cloak
cloaks[initial(cloak_type.name)] = cloak_type
gear_tweaks += new/datum/gear_tweak/path(sortAssoc(cloaks))
/datum/gear/suit/beltcloak
display_name = "belted cloak selection (Teshari)"
path = /obj/item/clothing/suit/storage/seromi/beltcloak/standard
whitelisted = SPECIES_TESHARI
sort_category = "Xenowear"
/datum/gear/suit/beltcloak/New()
..()
var/list/cloaks = list()
for(var/cloak in typesof(/obj/item/clothing/suit/storage/seromi/beltcloak/standard))
var/obj/item/clothing/suit/storage/seromi/beltcloak/standard/cloak_type = cloak
cloaks[initial(cloak_type.name)] = cloak_type
gear_tweaks += new/datum/gear_tweak/path(sortAssoc(cloaks))
/datum/gear/suit/beltcloak_color
display_name = "belted cloak, recolorable (Teshari)"
path = /obj/item/clothing/suit/storage/seromi/beltcloak/standard/white_grey
whitelisted = SPECIES_TESHARI
sort_category = "Xenowear"
/datum/gear/suit/beltcloak_color/New()
..()
gear_tweaks += gear_tweak_free_color_choice