Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -592,4 +592,84 @@
"TG&C jumpsuit"=/obj/item/clothing/under/rank/neo_robo,
"TG&C jumpskirt"=/obj/item/clothing/under/rank/neo_robo_skirt
)
gear_tweaks += new/datum/gear_tweak/path(sortAssoc(selector_uniforms))
gear_tweaks += new/datum/gear_tweak/path(sortAssoc(selector_uniforms))
// New Talon Uniforms
/datum/gear/uniform/talon
display_name = "Talon's Uniforms"
description = "Select from a range of outfits available to all Talon crew's."
allowed_roles = list("Talon Captain","Talon Doctor","Talon Engineer","Talon Pilot","Talon Guard","Talon Miner")
path = /obj/item/clothing/under/rank/talon/basic/refreshed
sort_category = "Uniforms"
cost = 1

/datum/gear/uniform/talon/New()
..()
var/list/selector_uniforms = list(
"Refreshed Talon crew Uniform"=/obj/item/clothing/under/rank/talon/basic/refreshed,
"Old Talon crew Uniform"=/obj/item/clothing/under/rank/talon/basic,
)
gear_tweaks += new/datum/gear_tweak/path(sortAssoc(selector_uniforms))

/datum/gear/uniform/talon_captain
display_name = "Talon - Captain's Uniforms"
description = "Select from a range of outfits available to all Talon Captain's."
allowed_roles = list("Talon Captain")
path = /obj/item/clothing/under/rank/talon/command/refreshed
sort_category = "Uniforms"
cost = 1

/datum/gear/uniform/talon_captain/New()
..()
var/list/selector_uniforms = list(
"Refreshed Talon Command Uniform"=/obj/item/clothing/under/rank/talon/command/refreshed,
"Old Talon Command Uniform"=/obj/item/clothing/under/rank/talon/command,
)
gear_tweaks += new/datum/gear_tweak/path(sortAssoc(selector_uniforms))

/datum/gear/uniform/talon_pilot
display_name = "Talon - Pilot's Uniforms"
description = "Select from a range of outfits available to all Talon Pilot's."
allowed_roles = list("Talon Pilot")
path = /obj/item/clothing/under/rank/talon/pilot/refreshed
sort_category = "Uniforms"
cost = 1

/datum/gear/uniform/talon_pilot/New()
..()
var/list/selector_uniforms = list(
"Refreshed Talon Pilot Uniform"=/obj/item/clothing/under/rank/talon/pilot/refreshed,
"Old Talon Pilot Uniform"=/obj/item/clothing/under/rank/talon/pilot,
)
gear_tweaks += new/datum/gear_tweak/path(sortAssoc(selector_uniforms))

/datum/gear/uniform/talon_security
display_name = "Talon - Guard's Uniforms"
description = "Select from a range of outfits available to all Talon Guard's."
allowed_roles = list("Talon Guard")
path = /obj/item/clothing/under/rank/talon/security/refreshed
sort_category = "Uniforms"
cost = 1

/datum/gear/uniform/talon_security/New()
..()
var/list/selector_uniforms = list(
"Refreshed Talon Guard Uniform"=/obj/item/clothing/under/rank/talon/security/refreshed,
"Old Talon Security Uniform"=/obj/item/clothing/under/rank/talon/security,
)
gear_tweaks += new/datum/gear_tweak/path(sortAssoc(selector_uniforms))

/datum/gear/uniform/talon_medical
display_name = "Talon - Doctor's Uniforms"
description = "Select from a range of outfits available to all Talon Doctor's."
allowed_roles = list("Talon Doctor")
path = /obj/item/clothing/under/rank/talon/proper/refreshed
sort_category = "Uniforms"
cost = 1

/datum/gear/uniform/talon_medical/New()
..()
var/list/selector_uniforms = list(
"Refreshed Talon Doctor Uniform"=/obj/item/clothing/under/rank/talon/proper/refreshed,
"Old Talon Doctor Uniform"=/obj/item/clothing/under/rank/talon/proper,
)
gear_tweaks += new/datum/gear_tweak/path(sortAssoc(selector_uniforms))
31 changes: 0 additions & 31 deletions code/modules/client/preference_setup/loadout/loadout_uniform_rs.dm
Original file line number Diff line number Diff line change
@@ -1,34 +1,3 @@
// New Talon Uniforms
/datum/gear/uniform/refreshedtalonbasic
display_name = "Refreshed Talon Jumpsuit"
description = "An expertly manufacted jumpsuit worn often by ITV Talon operators. This variant of the suit has been given more thought, as it's made for manueverability in mind."
path = /obj/item/clothing/under/rank/talon/basic/refreshed
allowed_roles = list("Talon Captain","Talon Doctor","Talon Engineer","Talon Pilot","Talon Guard","Talon Miner")

/datum/gear/uniform/refreshedtalonmedical
display_name = "Refreshed Talon Medical Jumpsuit"
description = "An expertly manufacted jumpsuit worn often by ITV Talon operators. This variant of the suit has been given more thought, as it's made for manueverability in mind."
path = /obj/item/clothing/under/rank/talon/proper/refreshed
allowed_roles = list("Talon Doctor")

/datum/gear/uniform/refreshedtalonsecurity
display_name = "Refreshed Talon Security Jumpsuit"
description = "An expertly manufacted jumpsuit worn often by ITV Talon operators. This variant of the suit has been given more thought, as it's made for manueverability in mind."
path = /obj/item/clothing/under/rank/talon/security/refreshed
allowed_roles = list("Talon Guard")

/datum/gear/uniform/refreshedtalonpilot
display_name = "Refreshed Talon Pilot Uniform"
description = "An expertly manufacted uniform worn often by ITV Talon operators. This variant of the suit has been given more thought, as it's made with formaility in mind."
path = /obj/item/clothing/under/rank/talon/pilot/refreshed
allowed_roles = list("Talon Pilot")

/datum/gear/uniform/refreshedtaloncaptain
display_name = "Refreshed Talon Command Uniform"
description = "An expertly manufacted uniform worn often by ITV Talon operators. This variant of the suit has been given more thought, as it's made with formaility in mind."
path = /obj/item/clothing/under/rank/talon/command/refreshed
allowed_roles = list("Talon Captain")

/datum/gear/uniform/hfjumpskirt
display_name = "HYPER jumpskirt"
path = /obj/item/clothing/under/hyperfiber/skirt
Expand Down
24 changes: 15 additions & 9 deletions maps/tether/tether_jobs.dm
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,9 @@

l_ear = /obj/item/device/radio/headset/talon
glasses = /obj/item/clothing/glasses/sunglasses
uniform = /obj/item/clothing/under/rank/talon/command
head = /obj/item/clothing/head/caphat/talon/refreshed
uniform = /obj/item/clothing/under/rank/talon/command/refreshed
suit = /obj/item/clothing/suit/talon/capcoat
shoes = /obj/item/clothing/shoes/laceup // RS Edit
backpack = /obj/item/weapon/storage/backpack/talon
satchel_one = /obj/item/weapon/storage/backpack/satchel/talon
Expand All @@ -199,9 +201,9 @@

l_ear = /obj/item/device/radio/headset/talon
shoes = /obj/item/clothing/shoes/black
head = /obj/item/clothing/head/pilot_vr/talon
uniform = /obj/item/clothing/under/rank/talon/pilot
suit = /obj/item/clothing/suit/storage/toggle/bomber/pilot
head = /obj/item/clothing/head/caphat/talon/refreshed
uniform = /obj/item/clothing/under/rank/talon/pilot/refreshed
suit = /obj/item/clothing/suit/storage/talonbomberjacket
gloves = /obj/item/clothing/gloves/fingerless
glasses = /obj/item/clothing/glasses/fakesunglasses/aviator
uniform_accessories = list(/obj/item/clothing/accessory/storage/webbing/pilot1 = 1)
Expand All @@ -222,8 +224,9 @@
backpack = /obj/item/weapon/storage/backpack/medic
satchel_one = /obj/item/weapon/storage/backpack/satchel/med
messenger_bag = /obj/item/weapon/storage/backpack/messenger/med
uniform = /obj/item/clothing/under/rank/talon/proper
suit = /obj/item/clothing/suit/storage/toggle/labcoat
head = /obj/item/clothing/head/soft/talon/refreshed
uniform = /obj/item/clothing/under/rank/talon/proper/refreshed
suit = /obj/item/clothing/suit/storage/toggle/labcoat/talon
l_hand = /obj/item/weapon/storage/firstaid/regular
r_pocket = /obj/item/device/flashlight/pen
backpack = /obj/item/weapon/storage/backpack/talon
Expand All @@ -245,7 +248,8 @@
backpack = /obj/item/weapon/storage/backpack/security
satchel_one = /obj/item/weapon/storage/backpack/satchel/sec
messenger_bag = /obj/item/weapon/storage/backpack/messenger/sec
uniform = /obj/item/clothing/under/rank/talon/security
head = /obj/item/clothing/head/beret/talon/command/refreshed
uniform = /obj/item/clothing/under/rank/talon/security/refreshed
l_pocket = /obj/item/device/flash
backpack = /obj/item/weapon/storage/backpack/talon
satchel_one = /obj/item/weapon/storage/backpack/satchel/talon
Expand All @@ -267,7 +271,8 @@
backpack = /obj/item/weapon/storage/backpack/industrial
satchel_one = /obj/item/weapon/storage/backpack/satchel/eng
messenger_bag = /obj/item/weapon/storage/backpack/messenger/engi
uniform = /obj/item/clothing/under/rank/talon/basic
head = /obj/item/clothing/head/soft/talon/refreshed
uniform = /obj/item/clothing/under/rank/talon/basic/refreshed
belt = /obj/item/weapon/storage/belt/utility/atmostech
backpack = /obj/item/weapon/storage/backpack/talon
satchel_one = /obj/item/weapon/storage/backpack/satchel/talon
Expand All @@ -286,7 +291,8 @@
shoes = /obj/item/clothing/shoes/boots/workboots
r_pocket = /obj/item/weapon/storage/bag/ore
l_pocket = /obj/item/weapon/tool/crowbar
uniform = /obj/item/clothing/under/rank/talon/basic
head = /obj/item/clothing/head/soft/talon/refreshed
uniform = /obj/item/clothing/under/rank/talon/basic/refreshed
backpack = /obj/item/weapon/storage/backpack/talon
satchel_one = /obj/item/weapon/storage/backpack/satchel/talon
messenger_bag = /obj/item/weapon/storage/backpack/messenger/talon