Ports a Boatload of Teshari Customization from CitRP, Chomp & YW, Small Update to Protogen Markings

2026-01-21 23:04:12 +00:00 · 2020-11-20 15:44:21 +00:00
parent f4f05417a5
commit 2e15527ef0
24 changed files with 1501 additions and 12 deletions
--- a/code/modules/client/preference_setup/loadout/loadout_eyes_vr.dm
+++ b/code/modules/client/preference_setup/loadout/loadout_eyes_vr.dm
@@ -57,4 +57,4 @@

 /datum/gear/eyes/medical/medpatch
 	display_name = "Health HUDpatch"
-	path = /obj/item/clothing/glasses/hud/health/eyepatch
+	path = /obj/item/clothing/glasses/hud/health/eyepatch
--- a/code/modules/client/preference_setup/loadout/loadout_xeno.dm
+++ b/code/modules/client/preference_setup/loadout/loadout_xeno.dm
@@ -379,6 +379,7 @@
 /datum/gear/suit/cloakcolor/New()
 	..()
 	gear_tweaks += gear_tweak_free_color_choice
+
 /datum/gear/suit/labcoat_tesh
 	display_name = "labcoat, colorable (Teshari)"
 	path = /obj/item/clothing/suit/storage/toggle/labcoat/teshari
@@ -397,7 +398,6 @@

 /datum/gear/suit/teshcoat/New()
 	..()
-
 	gear_tweaks += gear_tweak_free_color_choice

 /datum/gear/suit/teshcoatwhite
@@ -424,11 +424,16 @@
 	display_name = "toe-less jackboots"
 	path = /obj/item/clothing/shoes/boots/jackboots/toeless

-
 /datum/gear/shoes/toelessknee
 	display_name = "toe-less jackboots, knee-length"
 	path = /obj/item/clothing/shoes/boots/jackboots/toeless/knee

 /datum/gear/shoes/toelessthigh
 	display_name = "toe-less jackboots, thigh-length"
-	path = /obj/item/clothing/shoes/boots/jackboots/toeless/thigh
+	path = /obj/item/clothing/shoes/boots/jackboots/toeless/thigh
+
+/datum/gear/eyes/aerogelgoggles
+	display_name = "airtight orange goggles (Teshari)"
+	path = /obj/item/clothing/glasses/aerogelgoggles
+	whitelisted = SPECIES_TESHARI
+	sort_category = "Xenowear"
--- a/code/modules/client/preference_setup/loadout/loadout_xeno_vr.dm
+++ b/code/modules/client/preference_setup/loadout/loadout_xeno_vr.dm
@@ -96,3 +96,385 @@
 	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