diff --git a/code/modules/client/preference_setup/loadout/loadout_eyes.dm b/code/modules/client/preference_setup/loadout/loadout_eyes.dm index 50617425f1..bd8413b3dd 100644 --- a/code/modules/client/preference_setup/loadout/loadout_eyes.dm +++ b/code/modules/client/preference_setup/loadout/loadout_eyes.dm @@ -68,42 +68,41 @@ path = /obj/item/clothing/glasses/science /datum/gear/eyes/security - display_name = "Security HUD" + display_name = "Security HUD selector" + description = "Select from a range of Security HUD eyepieces that can display the ID status and security records of people in line of sight." path = /obj/item/clothing/glasses/hud/security allowed_roles = list("Security Officer","Head of Security","Warden", "Detective","Blueshield Guard","Security Pilot") //YW ADDITIONS -/datum/gear/eyes/security/prescriptionsec - display_name = "Security HUD, prescription" - path = /obj/item/clothing/glasses/hud/security/prescription - -/datum/gear/eyes/security/sunglasshud - display_name = "Security HUD, sunglasses" - path = /obj/item/clothing/glasses/sunglasses/sechud - -/datum/gear/eyes/security/aviator - display_name = "Security HUD Aviators" - path = /obj/item/clothing/glasses/sunglasses/sechud/aviator - -/datum/gear/eyes/security/aviator/prescription - display_name = "Security HUD Aviators, prescription" - path = /obj/item/clothing/glasses/sunglasses/sechud/aviator/prescription +/datum/gear/eyes/security/New() + ..() + var/list/selector_uniforms = list( + "standard security HUD"=/obj/item/clothing/glasses/hud/security, + "prescription security HUD"=/obj/item/clothing/glasses/hud/security/prescription, + "security HUD sunglasses"=/obj/item/clothing/glasses/sunglasses/sechud, + "security HUD aviators"=/obj/item/clothing/glasses/sunglasses/sechud/aviator, + "security HUD aviators (prescription)"=/obj/item/clothing/glasses/sunglasses/sechud/aviator/prescription, + "security HUD eyepatch, mark I"=/obj/item/clothing/glasses/hud/security/eyepatch, + "security HUD eyepatch, mark II"=/obj/item/clothing/glasses/hud/security/eyepatch2, + "tactical security visor"=/obj/item/clothing/glasses/sunglasses/sechud/tactical_sec_vis + ) + gear_tweaks += new/datum/gear_tweak/path(sortAssoc(selector_uniforms)) /datum/gear/eyes/medical - display_name = "Medical HUD" + display_name = "Medical HUD selector" + description = "Select from a range of Medical HUD eyepieces that can display the health status of people in line of sight." path = /obj/item/clothing/glasses/hud/health - allowed_roles = list("Medical Doctor","Chief Medical Officer","Chemist","Paramedic","Geneticist", "Psychiatrist", "Search and Rescue") + allowed_roles = list("Medical Doctor","Chief Medical Officer","Chemist","Paramedic","Geneticist", "Psychiatrist") -/datum/gear/eyes/medical/prescriptionmed - display_name = "Medical HUD, prescription" - path = /obj/item/clothing/glasses/hud/health/prescription - -/datum/gear/eyes/medical/aviator - display_name = "Medical HUD Aviators" - path = /obj/item/clothing/glasses/hud/health/aviator - -/datum/gear/eyes/medical/aviator/prescription - display_name = "Medical HUD Aviators, prescription" - path = /obj/item/clothing/glasses/hud/health/aviator/prescription +/datum/gear/eyes/medical/New() + ..() + var/list/selector_uniforms = list( + "standard medical HUD"=/obj/item/clothing/glasses/hud/health, + "prescription medical HUD"=/obj/item/clothing/glasses/hud/health/prescription, + "medical HUD aviators"=/obj/item/clothing/glasses/hud/health/aviator, + "medical HUD aviators (prescription)"=/obj/item/clothing/glasses/hud/health/aviator/prescription, + "medical HUD eyepatch"=/obj/item/clothing/glasses/hud/health/eyepatch + ) + gear_tweaks += new/datum/gear_tweak/path(sortAssoc(selector_uniforms)) /datum/gear/eyes/janitor display_name = "Contaminant HUD" @@ -115,31 +114,27 @@ path = /obj/item/clothing/glasses/hud/janitor/prescription /datum/gear/eyes/meson - display_name = "Optical Meson Scanners" + display_name = "Optical Meson Scanners selection" + description = "Select from a range of meson-projection eyewear. Note: not all of these items are atmospherically sealed." path = /obj/item/clothing/glasses/meson - allowed_roles = list("Engineer","Chief Engineer","Atmospheric Technician", "Scientist", "Research Director", "Shaft Miner") + allowed_roles = list("Engineer","Chief Engineer","Atmospheric Technician", "Scientist", "Research Director") -/datum/gear/eyes/meson/prescription - display_name = "Optical Meson Scanners, prescription" - path = /obj/item/clothing/glasses/meson/prescription +/datum/gear/eyes/meson/New() + ..() + var/list/selector_uniforms = list( + "standard meson goggles"=/obj/item/clothing/glasses/meson, + "prescription meson goggles"=/obj/item/clothing/glasses/meson/prescription, + "meson retinal projector"=/obj/item/clothing/glasses/omnihud/eng/meson, + "meson aviator glasses"=/obj/item/clothing/glasses/meson/aviator, + "meson aviator glasses (prescription)"=/obj/item/clothing/glasses/meson/aviator/prescription + ) + gear_tweaks += new/datum/gear_tweak/path(sortAssoc(selector_uniforms)) /datum/gear/eyes/material display_name = "Optical Material Scanners" path = /obj/item/clothing/glasses/material allowed_roles = list("Shaft Miner","Quartermaster") -/datum/gear/eyes/material/prescription - display_name = "Prescription Optical Material Scanners" - path = /obj/item/clothing/glasses/material/prescription - -/datum/gear/eyes/meson/aviator - display_name = "Optical Meson Aviators" - path = /obj/item/clothing/glasses/meson/aviator - -/datum/gear/eyes/meson/aviator/prescription - display_name = "Optical Meson Aviators, prescription" - path = /obj/item/clothing/glasses/meson/aviator/prescription - /datum/gear/eyes/glasses/fakesun display_name = "Sunglasses, stylish" path = /obj/item/clothing/glasses/fakesunglasses @@ -149,21 +144,20 @@ path = /obj/item/clothing/glasses/fakesunglasses/aviator /datum/gear/eyes/sun - display_name = "sunglasses (Security/Command)" + display_name = "functional sunglasses selector" + description = "Select from a range of polarized sunglasses that can block flashes whilst still looking classy." path = /obj/item/clothing/glasses/sunglasses allowed_roles = list("Security Officer","Head of Security","Warden","Site Manager","Head of Personnel","Quartermaster","Internal Affairs Agent","Detective", "Blueshield Guard","Security Pilot") //YW ADDITIONS -/datum/gear/eyes/sun/shades - display_name = "sunglasses, fat (Security/Command)" - path = /obj/item/clothing/glasses/sunglasses/big - -/datum/gear/eyes/sun/aviators - display_name = "sunglasses, aviators (Security/Command)" - path = /obj/item/clothing/glasses/sunglasses/aviator - -/datum/gear/eyes/sun/prescriptionsun - display_name = "sunglasses, presciption (Security/Command)" - path = /obj/item/clothing/glasses/sunglasses/prescription +/datum/gear/eyes/sun/New() + ..() + var/list/selector_uniforms = list( + "sunglasses"=/obj/item/clothing/glasses/sunglasses, + "extra large sunglasses"=/obj/item/clothing/glasses/sunglasses/big, + "aviators"=/obj/item/clothing/glasses/sunglasses/aviator, + "prescription sunglasses"=/obj/item/clothing/glasses/sunglasses/prescription + ) + gear_tweaks += new/datum/gear_tweak/path(sortAssoc(selector_uniforms)) /datum/gear/eyes/circuitry display_name = "goggles, circuitry (empty)" diff --git a/code/modules/client/preference_setup/loadout/loadout_eyes_vr.dm b/code/modules/client/preference_setup/loadout/loadout_eyes_vr.dm index 6af708be96..2073b1fe9f 100644 --- a/code/modules/client/preference_setup/loadout/loadout_eyes_vr.dm +++ b/code/modules/client/preference_setup/loadout/loadout_eyes_vr.dm @@ -1,10 +1,6 @@ /datum/gear/eyes/medical allowed_roles = list("Medical Doctor","Chief Medical Officer","Chemist","Paramedic","Geneticist", "Psychiatrist","Field Medic") //CHOMP keep explo -/datum/gear/eyes/meson - display_name = "Optical Meson Scanners (Eng, Sci, Explo)" - allowed_roles = list("Engineer","Chief Engineer","Atmospheric Technician", "Scientist", "Research Director", "Explorer", "Pathfinder") //CHOMP keep explo - /datum/gear/eyes/arglasses display_name = "AR glasses" path = /obj/item/clothing/glasses/omnihud @@ -54,26 +50,6 @@ display_name = "science goggles (no overlay)" path = /obj/item/clothing/glasses/fluff/science_proper -/datum/gear/eyes/meson/retinal - display_name = "retinal projector, meson" - path = /obj/item/clothing/glasses/omnihud/eng/meson - -/datum/gear/eyes/security/secpatch - display_name = "Security HUDpatch" - path = /obj/item/clothing/glasses/hud/security/eyepatch - -/datum/gear/eyes/security/secpatch2 - display_name = "Security HUDpatch MKII" - path = /obj/item/clothing/glasses/hud/security/eyepatch2 - -/datum/gear/eyes/security/tac_sec_visor - display_name = "Tactical AR visor" - path = /obj/item/clothing/glasses/sunglasses/sechud/tactical_sec_vis - -/datum/gear/eyes/medical/medpatch - display_name = "Health HUDpatch" - path = /obj/item/clothing/glasses/hud/health/eyepatch - /datum/gear/eyes/bigshot display_name = "Big Shot's Glasses" path = /obj/item/clothing/glasses/sunglasses/bigshot diff --git a/code/modules/client/preference_setup/loadout/loadout_head.dm b/code/modules/client/preference_setup/loadout/loadout_head.dm index 8e04fc6dcc..13c0d8ad49 100644 --- a/code/modules/client/preference_setup/loadout/loadout_head.dm +++ b/code/modules/client/preference_setup/loadout/loadout_head.dm @@ -420,7 +420,6 @@ ..() gear_tweaks += gear_tweak_free_color_choice - /datum/gear/head/bows display_name = "hair bow selection, colorable" path = /obj/item/clothing/head/bow @@ -434,3 +433,19 @@ "sweet bow"=/obj/item/clothing/head/bow/sweet ) gear_tweaks += list(new/datum/gear_tweak/path(bows), gear_tweak_free_color_choice) + +/datum/gear/head/pilot + display_name = "pilot helmets selection" + description = "Your choice of four hard-wearing head-protecting helmets for pilots." + path = /obj/item/clothing/head/pilot_vr + allowed_roles = list("Pilot", "Talon Pilot") + +/datum/gear/head/pilot/New() + ..() + var/list/selector_uniforms = list( + "pilot helmet, standard"=/obj/item/clothing/head/pilot_vr, + "pilot helmet, alt"=/obj/item/clothing/head/pilot_vr/alt, + "pilot helmet, ITV Talon"=/obj/item/clothing/head/pilot_vr/talon, + "pilot helmet, major bill's transport"=/obj/item/clothing/head/pilot_vr/mbill + ) + gear_tweaks += new/datum/gear_tweak/path(sortAssoc(selector_uniforms)) diff --git a/code/modules/client/preference_setup/loadout/loadout_suit.dm b/code/modules/client/preference_setup/loadout/loadout_suit.dm index d116582713..b03d6bb659 100644 --- a/code/modules/client/preference_setup/loadout/loadout_suit.dm +++ b/code/modules/client/preference_setup/loadout/loadout_suit.dm @@ -800,3 +800,7 @@ /datum/gear/suit/wornshirt display_name = "worn shirt" path = /obj/item/clothing/suit/wornshirt + +/datum/gear/suit/bomber_pilot + display_name = "bomber jacket, pilot" + path = /obj/item/clothing/suit/storage/toggle/bomber/pilot diff --git a/code/modules/client/preference_setup/loadout/loadout_uni_selector.dm b/code/modules/client/preference_setup/loadout/loadout_uni_selector.dm index e9f0054d34..5f4e103442 100644 --- a/code/modules/client/preference_setup/loadout/loadout_uni_selector.dm +++ b/code/modules/client/preference_setup/loadout/loadout_uni_selector.dm @@ -22,8 +22,8 @@ /datum/gear/uniform/site_manager_selector display_name = "Command - Site Manager's Uniforms" - description = "Select from a range of outfits available to all Site Managers." - allowed_roles = list("Site Manager") + description = "Select from a range of outfits available to all Site Managers, and Talon Captains." + allowed_roles = list("Site Manager","Talon Captain") show_roles = FALSE path = /obj/item/clothing/under/rank/neo_captain sort_category = "Uniforms" @@ -84,8 +84,8 @@ /datum/gear/uniform/pilot_uniform_selector display_name = "Civilian - Pilot's Uniforms" - description = "Select from a range of outfits available to all Pilots." - allowed_roles = list("Pilot") + description = "Select from a range of outfits available to all Pilots (including those on the Talon)." + allowed_roles = list("Pilot","Talon Pilot") show_roles = FALSE path = /obj/item/clothing/under/rank/neo_pilot sort_category = "Uniforms" @@ -94,6 +94,8 @@ /datum/gear/uniform/pilot_uniform_selector/New() ..() var/list/selector_uniforms = list( + "standard pilot's uniform"=/obj/item/clothing/under/rank/pilot1/no_webbing, + "navy pilot's uniform"=/obj/item/clothing/under/rank/pilot2, "TG&C jumpsuit"=/obj/item/clothing/under/rank/neo_pilot, "TG&C jumpskirt"=/obj/item/clothing/under/rank/neo_pilot_skirt, "Major Bill's flightsuit"=/obj/item/clothing/under/mbill_flight, @@ -188,7 +190,7 @@ /datum/gear/uniform/security_selector display_name = "Security - Basic Uniforms" description = "Select from a range of outfits available to all Security personnel." - allowed_roles = list("Head of Security", "Warden", "Detective", "Security Officer") + allowed_roles = list("Head of Security", "Warden", "Detective", "Security Officer","Talon Guard") show_roles = FALSE path = /obj/item/clothing/under/rank/security/corp sort_category = "Uniforms" @@ -374,7 +376,7 @@ /datum/gear/uniform/cargo_miner_selector display_name = "Cargo - Miner's Uniforms" description = "Select from a range of outfits available to all Mining personnel." - allowed_roles = list("Shaft Miner","Quartermaster") + allowed_roles = list("Shaft Miner","Quartermaster","Talon Miner") show_roles = FALSE path = /obj/item/clothing/under/rank/neo_miner sort_category = "Uniforms" @@ -418,7 +420,7 @@ /datum/gear/uniform/engineer_selector display_name = "Engineering - Basic Uniforms" description = "Select from a range of outfits available to all Engineering personnel." - allowed_roles = list("Chief Engineer","Engineer","Atmospheric Technician") + allowed_roles = list("Chief Engineer","Engineer","Atmospheric Technician","Talon Engineer") show_roles = FALSE path = /obj/item/clothing/under/rank/neo_engi sort_category = "Uniforms" @@ -466,7 +468,7 @@ /datum/gear/uniform/medical_selector display_name = "Medical - Basic Uniforms" description = "Select from a range of outfits available to all Medical personnel." - allowed_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Psychiatrist","Paramedic") + allowed_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Psychiatrist","Paramedic","Talon Doctor") show_roles = FALSE path = /obj/item/clothing/under/rank/neo_med sort_category = "Uniforms" @@ -519,7 +521,7 @@ /datum/gear/uniform/paramedic_selector display_name = "Medical - Paramedic's Uniforms" description = "Select from a range of outfits available to all Paramedics." - allowed_roles = list("Medical Doctor","Chief Medical Officer","Paramedic") + allowed_roles = list("Medical Doctor","Chief Medical Officer","Paramedic","Talon Doctor") show_roles = FALSE path = /obj/item/clothing/under/rank/paramedunidark sort_category = "Uniforms" diff --git a/maps/southern_cross/loadout/loadout_suit.dm b/maps/southern_cross/loadout/loadout_suit.dm index 1cfa67846c..e69de29bb2 100644 --- a/maps/southern_cross/loadout/loadout_suit.dm +++ b/maps/southern_cross/loadout/loadout_suit.dm @@ -1,3 +0,0 @@ -/datum/gear/suit/bomber_pilot - display_name = "bomber jacket, pilot" - path = /obj/item/clothing/suit/storage/toggle/bomber/pilot diff --git a/maps/southern_cross/loadout/loadout_uniform.dm b/maps/southern_cross/loadout/loadout_uniform.dm index 01280fd642..e69de29bb2 100644 --- a/maps/southern_cross/loadout/loadout_uniform.dm +++ b/maps/southern_cross/loadout/loadout_uniform.dm @@ -1,5 +0,0 @@ -// Uniform slot -/datum/gear/uniform/pilot - display_name = "uniform, pilot (Pilot)" - path = /obj/item/clothing/under/rank/pilot2 - allowed_roles = list("Pilot") diff --git a/maps/southern_cross/loadout/loadout_vr.dm b/maps/southern_cross/loadout/loadout_vr.dm index 45b886e8b4..e69de29bb2 100644 --- a/maps/southern_cross/loadout/loadout_vr.dm +++ b/maps/southern_cross/loadout/loadout_vr.dm @@ -1,19 +0,0 @@ -/datum/gear/head/pilot/standard - display_name = "helmet, standard pilot (Pilot)" - path = /obj/item/clothing/head/pilot_vr - allowed_roles = list("Pilot") - -/datum/gear/head/pilot/colored - display_name = "helmet, colored pilot (Pilot)" - path = /obj/item/clothing/head/pilot_vr/alt - allowed_roles = list("Pilot") - -/datum/gear/head/pilot/talon - display_name = "helmet, talon pilot (Pilot)" - path = /obj/item/clothing/head/pilot_vr/talon - allowed_roles = list("Pilot") - -/datum/gear/head/pilot/mbill - display_name = "helmet, major bill's (Pilot)" - path = /obj/item/clothing/head/pilot_vr/mbill - allowed_roles = list("Pilot") \ No newline at end of file diff --git a/vorestation.dme b/vorestation.dme index 1276218ce6..5fcd744132 100644 --- a/vorestation.dme +++ b/vorestation.dme @@ -4666,9 +4666,6 @@ #include "maps\southern_cross\items\clothing\sc_accessory.dm" #include "maps\southern_cross\items\clothing\sc_suit.dm" #include "maps\southern_cross\items\clothing\sc_under.dm" -#include "maps\southern_cross\loadout\loadout_suit.dm" -#include "maps\southern_cross\loadout\loadout_uniform.dm" -#include "maps\southern_cross\loadout\loadout_vr.dm" #include "maps\southern_cross\structures\closets\engineering.dm" #include "maps\southern_cross\structures\closets\medical.dm" #include "maps\southern_cross\structures\closets\misc.dm"