diff --git a/Resources/Locale/en-US/_DV/preferences/loadout-groups.ftl b/Resources/Locale/en-US/_DV/preferences/loadout-groups.ftl index 19f0b748b8e..c7caa6b4356 100644 --- a/Resources/Locale/en-US/_DV/preferences/loadout-groups.ftl +++ b/Resources/Locale/en-US/_DV/preferences/loadout-groups.ftl @@ -101,6 +101,7 @@ loadout-group-mantis-gloves = Mantis gloves loadout-group-roboticist-head = Roboticist head loadout-group-roboticist-jumpsuit = Roboticist jumpsuit loadout-group-roboticist-gloves = Roboticist gloves +loadout-group-roboticist-glasses = Roboticist glasses loadout-group-roboticist-shoes = Roboticist shoes loadout-group-roboticist-outerclothing = Roboticist outer clothing loadout-group-roboticist-id = Roboticist PDA @@ -120,12 +121,14 @@ loadout-group-head-of-security-shoes = Head of Security shoes loadout-group-security-cadet-head = Security Cadet head loadout-group-security-neck = Security neck loadout-group-security-gloves = Security gloves +loadout-group-security-eyewear = Security eyewear loadout-group-brig-medic-head = Corpsman head loadout-group-brig-medic-jumpsuit = Corpsman jumpsuit loadout-group-brig-medic-back = Corpsman backpack loadout-group-brig-medic-neck = Corpsman neck loadout-group-brig-medic-outerclothing = Corpsman outer clothing +loadout-group-corpsman-eyewear = Corpsman eyewear loadout-group-prison-guard-head = Prison Guard head loadout-group-prison-guard-jumpsuit = Prison Guard jumpsuit diff --git a/Resources/Locale/en-US/_DV/recipes/tags.ftl b/Resources/Locale/en-US/_DV/recipes/tags.ftl index 66092852537..655aac054f6 100644 --- a/Resources/Locale/en-US/_DV/recipes/tags.ftl +++ b/Resources/Locale/en-US/_DV/recipes/tags.ftl @@ -16,6 +16,7 @@ construction-graph-tag-corpsman-glasses = corpsman glasses construction-graph-tag-glasses = glasses construction-graph-tag-medhud = medical hud construction-graph-tag-sechud = security hud +construction-graph-tag-diaghud = diagnostic hud construction-graph-tag-magboots = magboots # Nuke diff --git a/Resources/Prototypes/Entities/Clothing/Eyes/hud.yml b/Resources/Prototypes/Entities/Clothing/Eyes/hud.yml index 21526c9ec36..a98787bd8a5 100644 --- a/Resources/Prototypes/Entities/Clothing/Eyes/hud.yml +++ b/Resources/Prototypes/Entities/Clothing/Eyes/hud.yml @@ -47,6 +47,9 @@ - type: StationAiOverlay cosmetic: true # don't give roboticists reach hacks # End DeltaV Additions + - type: Tag + tags: + - HudDiagnostic - type: ShowHealthBars damageContainers: - Inorganic diff --git a/Resources/Prototypes/Loadouts/Jobs/Medical/medical_doctor.yml b/Resources/Prototypes/Loadouts/Jobs/Medical/medical_doctor.yml index 9fe878260ce..0832c57ef89 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Medical/medical_doctor.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Medical/medical_doctor.yml @@ -186,3 +186,8 @@ id: MedicalEyePatchHud equipment: eyes: ClothingEyesEyepatchHudMedical + +- type: loadout + id: PrescriptionMedHud + equipment: + eyes: ClothingEyesPrescriptionMedHud diff --git a/Resources/Prototypes/Loadouts/loadout_groups.yml b/Resources/Prototypes/Loadouts/loadout_groups.yml index d343e588912..bbea108c36b 100644 --- a/Resources/Prototypes/Loadouts/loadout_groups.yml +++ b/Resources/Prototypes/Loadouts/loadout_groups.yml @@ -1367,6 +1367,14 @@ - SecurityPDA - SeniorOfficerPDA +- type: loadoutGroup + id: SecurityEyewear + name: loadout-group-security-eyewear + minLimit: 0 + loadouts: + - SecurityGlasses + - PrescriptionSecurityGlasses + - type: loadoutGroup id: DetectiveHead name: loadout-group-detective-head @@ -1617,6 +1625,7 @@ loadouts: - MedicalHud - MedicalEyePatchHud + - PrescriptionMedHud # DeltaV - Glasses - GlassesJamjar - GlassesJensen diff --git a/Resources/Prototypes/Loadouts/role_loadouts.yml b/Resources/Prototypes/Loadouts/role_loadouts.yml index 2ff0bded6b4..d75fa2c08d4 100644 --- a/Resources/Prototypes/Loadouts/role_loadouts.yml +++ b/Resources/Prototypes/Loadouts/role_loadouts.yml @@ -382,6 +382,7 @@ - SecurityBelt - HeadofSecurityOuterClothingDeltaV # DeltaV - Switched to DeltaV version, was HeadofSecurityOuterClothing - HeadofSecurityShoes # DeltaV - winter boots + - SecurityEyewear # DeltaV - Security eyewear with prescription options - SurvivalSecurity - Trinkets - SecurityStar @@ -400,6 +401,7 @@ - WardenOuterClothingDeltaV # DeltaV - Switched to DeltaV version, was WardenOuterClothing - SecurityGloves # DeltaV - Security can start with gloves - SecurityShoes + - SecurityEyewear # DeltaV - Security eyewear with prescription options - SurvivalSecurity - Trinkets - SecurityStar @@ -419,6 +421,7 @@ - SecurityShoes - SecurityPDA - SecurityBelt + - SecurityEyewear # DeltaV - Security eyewear with prescription options - SurvivalSecurity - Trinkets - SecurityStar @@ -435,6 +438,7 @@ - SecurityBackpack - DetectiveOuterClothingDeltaV # DeltaV - Replaced with DeltaV version, was DetectiveOuterClothing - SecurityShoes + - SecurityEyewear # DeltaV - Security eyewear with prescription options - SurvivalSecurity - Trinkets - SecurityStar diff --git a/Resources/Prototypes/Nyanotrasen/Loadouts/role_loadouts.yml b/Resources/Prototypes/Nyanotrasen/Loadouts/role_loadouts.yml index e87d146f5a0..f7345c8e09c 100644 --- a/Resources/Prototypes/Nyanotrasen/Loadouts/role_loadouts.yml +++ b/Resources/Prototypes/Nyanotrasen/Loadouts/role_loadouts.yml @@ -38,6 +38,7 @@ - SecurityGloves # DeltaV - Security can start with gloves - SecurityShoes - SecurityBelt + - SecurityEyewear # DeltaV - Security eyewear with prescription options - SurvivalSecurity - Trinkets - GroupSpeciesBreathToolSecurity diff --git a/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Security/prisonguard.yml b/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Security/prisonguard.yml index b0e16514325..5685d5144e4 100644 --- a/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Security/prisonguard.yml +++ b/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Security/prisonguard.yml @@ -28,7 +28,7 @@ - type: startingGear id: PrisonGuardGear equipment: - eyes: ClothingEyesGlassesSecurity + #eyes: ClothingEyesGlassesSecurity # DeltaV - loadouts id: PrisonGuardPDA ears: ClothingHeadsetPrisonGuard # begin DeltaV storage: diff --git a/Resources/Prototypes/Roles/Jobs/Security/detective.yml b/Resources/Prototypes/Roles/Jobs/Security/detective.yml index 57392b58924..062b77cc750 100644 --- a/Resources/Prototypes/Roles/Jobs/Security/detective.yml +++ b/Resources/Prototypes/Roles/Jobs/Security/detective.yml @@ -26,7 +26,7 @@ - type: startingGear id: DetectiveGear equipment: - eyes: ClothingEyesGlassesSecurity + #eyes: ClothingEyesGlassesSecurity # DeltaV - loadouts id: DetectivePDA gloves: ClothingHandsGlovesForensic # DeltaV - roundstart detective forensic gloves ears: ClothingHeadsetSecurity diff --git a/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml b/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml index 114a27462c1..19531cf4f9b 100644 --- a/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml +++ b/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml @@ -47,7 +47,7 @@ - type: startingGear id: HoSGear equipment: - eyes: ClothingEyesGlassesSecurity + #eyes: ClothingEyesGlassesSecurity # DeltaV - loadouts id: HoSPDA gloves: ClothingHandsGlovesCombat ears: ClothingHeadsetAltSecurity diff --git a/Resources/Prototypes/Roles/Jobs/Security/security_officer.yml b/Resources/Prototypes/Roles/Jobs/Security/security_officer.yml index c64cd565c7a..58ed7d2ca0c 100644 --- a/Resources/Prototypes/Roles/Jobs/Security/security_officer.yml +++ b/Resources/Prototypes/Roles/Jobs/Security/security_officer.yml @@ -25,7 +25,7 @@ - type: startingGear id: SecurityOfficerGear equipment: - eyes: ClothingEyesGlassesSecurity + #eyes: ClothingEyesGlassesSecurity # DeltaV - loadouts ears: ClothingHeadsetSecurity #pocket1: WeaponPistolMk58Nonlethal # DeltaV - loadouts storage: diff --git a/Resources/Prototypes/Roles/Jobs/Security/warden.yml b/Resources/Prototypes/Roles/Jobs/Security/warden.yml index 1ff4ce9a4f6..2193d982f4c 100644 --- a/Resources/Prototypes/Roles/Jobs/Security/warden.yml +++ b/Resources/Prototypes/Roles/Jobs/Security/warden.yml @@ -34,7 +34,7 @@ - type: startingGear id: WardenGear equipment: - eyes: ClothingEyesGlassesSecurity + #eyes: ClothingEyesGlassesSecurity # DeltaV - loadouts id: WardenPDA ears: ClothingHeadsetSecurity #pocket1: WeaponPistolMk58Nonlethal # DeltaV - loadouts diff --git a/Resources/Prototypes/_DV/Entities/Clothing/Eyes/hud.yml b/Resources/Prototypes/_DV/Entities/Clothing/Eyes/hud.yml index ef051d4e943..8462d0ebdde 100644 --- a/Resources/Prototypes/_DV/Entities/Clothing/Eyes/hud.yml +++ b/Resources/Prototypes/_DV/Entities/Clothing/Eyes/hud.yml @@ -58,3 +58,22 @@ - type: Clothing sprite: Clothing/Eyes/Hud/syndagent.rsi - type: ShowSyndicateIcons + +- type: entity + parent: ClothingEyesHudDiagnostic + id: ClothingEyesPrescriptionDiagHud + name: prescription diagnostic hud + description: A poorly done and rushed mix between half of a pair of prescription glasses and a diagnostic HUD allowing you analyze the integrity and status of robotics and exosuits. + components: + - type: Sprite + sprite: _DV/Clothing/Eyes/Hud/prescdiaghud.rsi + - type: Clothing + sprite: _DV/Clothing/Eyes/Hud/prescdiaghud.rsi + - type: Construction + graph: PrescriptionDiagHud + node: prescdiaghud + - type: VisionCorrection + correctionPower: 1.75 # The hud part decreases efficiency + - type: Tag + tags: + - HudDiagnostic diff --git a/Resources/Prototypes/_DV/Loadouts/Jobs/Science/roboticist.yml b/Resources/Prototypes/_DV/Loadouts/Jobs/Science/roboticist.yml index 768382a80ca..00361ccdd7b 100644 --- a/Resources/Prototypes/_DV/Loadouts/Jobs/Science/roboticist.yml +++ b/Resources/Prototypes/_DV/Loadouts/Jobs/Science/roboticist.yml @@ -37,3 +37,19 @@ id: RoboticistPDA equipment: id: RoboticistPDA + +# Glasses +- type: loadout + id: ClothingEyesHudDiagnostic + equipment: + eyes: ClothingEyesHudDiagnostic + +- type: loadout + id: ClothingEyesPrescriptionDiagHud + equipment: + eyes: ClothingEyesPrescriptionDiagHud + +- type: loadout + id: ClothingEyesEyepatchHudDiag + equipment: + eyes: ClothingEyesEyepatchHudDiag diff --git a/Resources/Prototypes/_DV/Loadouts/Jobs/Security/brigmedic.yml b/Resources/Prototypes/_DV/Loadouts/Jobs/Security/brigmedic.yml index 42c7f2c89aa..ceb42d187f9 100644 --- a/Resources/Prototypes/_DV/Loadouts/Jobs/Security/brigmedic.yml +++ b/Resources/Prototypes/_DV/Loadouts/Jobs/Security/brigmedic.yml @@ -47,3 +47,14 @@ id: StasecWinterCoatCorpsman equipment: outerClothing: ClothingOuterCoatStasecCorpsman + +# Eyewear +- type: loadout + id: CorpsmanGlasses + equipment: + eyes: ClothingEyesGlassesCorpsman + +- type: loadout + id: PrescriptionCorpsmanGlasses + equipment: + eyes: ClothingEyesPrescriptionCorpsmanGlasses diff --git a/Resources/Prototypes/_DV/Loadouts/Jobs/Security/security_eyewear.yml b/Resources/Prototypes/_DV/Loadouts/Jobs/Security/security_eyewear.yml new file mode 100644 index 00000000000..ac23640027f --- /dev/null +++ b/Resources/Prototypes/_DV/Loadouts/Jobs/Security/security_eyewear.yml @@ -0,0 +1,13 @@ +# Security Eyewear + +# Security Glasses +- type: loadout + id: SecurityGlasses + equipment: + eyes: ClothingEyesGlassesSecurity + +# Prescription Security Glasses +- type: loadout + id: PrescriptionSecurityGlasses + equipment: + eyes: ClothingEyesPrescriptionSecurityGlasses diff --git a/Resources/Prototypes/_DV/Loadouts/loadout_groups.yml b/Resources/Prototypes/_DV/Loadouts/loadout_groups.yml index 3108f51d295..886d49678d5 100644 --- a/Resources/Prototypes/_DV/Loadouts/loadout_groups.yml +++ b/Resources/Prototypes/_DV/Loadouts/loadout_groups.yml @@ -287,6 +287,14 @@ - PlateCarrier - DuraVest +- type: loadoutGroup + id: CorpsmanEyewear + name: loadout-group-corpsman-eyewear + minLimit: 0 + loadouts: + - CorpsmanGlasses + - PrescriptionCorpsmanGlasses + - type: loadoutGroup id: BrigMedicBack name: loadout-group-brig-medic-back @@ -770,6 +778,15 @@ - WhiteShoes - ScienceWinterBoots +- type: loadoutGroup + id: RoboticistGlasses + name: loadout-group-roboticist-glasses + minLimit: 0 + loadouts: + - ClothingEyesHudDiagnostic + - ClothingEyesPrescriptionDiagHud + - ClothingEyesEyepatchHudDiag + # Command ## Captain - type: loadoutGroup diff --git a/Resources/Prototypes/_DV/Loadouts/role_loadouts.yml b/Resources/Prototypes/_DV/Loadouts/role_loadouts.yml index 8d180ff2fdb..1ef7cfb0427 100644 --- a/Resources/Prototypes/_DV/Loadouts/role_loadouts.yml +++ b/Resources/Prototypes/_DV/Loadouts/role_loadouts.yml @@ -38,6 +38,7 @@ - BrigMedicBack - SecurityShoes - BrigMedicOuterClothing + - CorpsmanEyewear - MedicalGloves - SurvivalSecurity - Trinkets @@ -120,7 +121,7 @@ - RoboticistGloves - RoboticistShoes - RoboticistPDA - - Glasses + - RoboticistGlasses - Survival - Trinkets - GroupSpeciesBreathTool diff --git a/Resources/Prototypes/_DV/Recipes/Construction/Graphs/clothing/prescription_huds.yml b/Resources/Prototypes/_DV/Recipes/Construction/Graphs/clothing/prescription_huds.yml index 00a51e13326..62a170d5cd1 100644 --- a/Resources/Prototypes/_DV/Recipes/Construction/Graphs/clothing/prescription_huds.yml +++ b/Resources/Prototypes/_DV/Recipes/Construction/Graphs/clothing/prescription_huds.yml @@ -49,3 +49,29 @@ doAfter: 5 - node: prescsechud entity: ClothingEyesPrescriptionHudSecurity + +- type: constructionGraph + id: PrescriptionDiagHud + start: start + graph: + - node: start + edges: + - to: prescdiaghud + steps: + - tag: HudDiagnostic + name: construction-graph-tag-diaghud + icon: + sprite: Clothing/Eyes/Hud/diag.rsi + state: icon + doAfter: 5 + - component: VisionCorrection + name: construction-graph-tag-glasses + icon: + sprite: Clothing/Eyes/Glasses/glasses.rsi + state: icon + doAfter: 5 + - material: Cable + amount: 5 + doAfter: 5 + - node: prescdiaghud + entity: ClothingEyesPrescriptionDiagHud diff --git a/Resources/Prototypes/_DV/Recipes/Construction/clothing.yml b/Resources/Prototypes/_DV/Recipes/Construction/clothing.yml index a1f00039c20..a893a16da89 100644 --- a/Resources/Prototypes/_DV/Recipes/Construction/clothing.yml +++ b/Resources/Prototypes/_DV/Recipes/Construction/clothing.yml @@ -14,6 +14,14 @@ category: construction-category-clothing objectType: Item +- type: construction + id: ClothingEyesPrescriptionDiagHud + graph: PrescriptionDiagHud + startNode: start + targetNode: prescdiaghud + category: construction-category-clothing + objectType: Item + - type: construction id: ClothingEyesGlassesCorpsman graph: GlassesCorpsHUD diff --git a/Resources/Prototypes/_DV/Roles/Jobs/Security/brigmedic.yml b/Resources/Prototypes/_DV/Roles/Jobs/Security/brigmedic.yml index fe361993f48..1981d59845b 100644 --- a/Resources/Prototypes/_DV/Roles/Jobs/Security/brigmedic.yml +++ b/Resources/Prototypes/_DV/Roles/Jobs/Security/brigmedic.yml @@ -30,7 +30,7 @@ - type: startingGear id: CorpsmanGear # see Prototypes/Roles/Jobs/Fun/misc_startinggear.yml for "BrigmedicGear" equipment: - eyes: ClothingEyesHudMedical + #eyes: ClothingEyesHudMedical # DeltaV - loadouts id: CorpsmanPDA ears: ClothingHeadsetBrigmedic belt: ClothingBeltCorpsmanWebbingFilled diff --git a/Resources/Prototypes/tags.yml b/Resources/Prototypes/tags.yml index b6eaad9bfc0..7c2d49e3b9f 100644 --- a/Resources/Prototypes/tags.yml +++ b/Resources/Prototypes/tags.yml @@ -669,6 +669,9 @@ - type: Tag id: HudSecurity +- type: Tag + id: HudDiagnostic + - type: Tag id: GuideEmbeded diff --git a/Resources/Textures/_DV/Clothing/Eyes/Hud/prescdiaghud.rsi/equipped-EYES-arachnid.png b/Resources/Textures/_DV/Clothing/Eyes/Hud/prescdiaghud.rsi/equipped-EYES-arachnid.png new file mode 100644 index 00000000000..edbffbb5f6e Binary files /dev/null and b/Resources/Textures/_DV/Clothing/Eyes/Hud/prescdiaghud.rsi/equipped-EYES-arachnid.png differ diff --git a/Resources/Textures/_DV/Clothing/Eyes/Hud/prescdiaghud.rsi/equipped-EYES-moth.png b/Resources/Textures/_DV/Clothing/Eyes/Hud/prescdiaghud.rsi/equipped-EYES-moth.png new file mode 100644 index 00000000000..b62bcb8eb14 Binary files /dev/null and b/Resources/Textures/_DV/Clothing/Eyes/Hud/prescdiaghud.rsi/equipped-EYES-moth.png differ diff --git a/Resources/Textures/_DV/Clothing/Eyes/Hud/prescdiaghud.rsi/equipped-EYES.png b/Resources/Textures/_DV/Clothing/Eyes/Hud/prescdiaghud.rsi/equipped-EYES.png new file mode 100644 index 00000000000..8ed0262acac Binary files /dev/null and b/Resources/Textures/_DV/Clothing/Eyes/Hud/prescdiaghud.rsi/equipped-EYES.png differ diff --git a/Resources/Textures/_DV/Clothing/Eyes/Hud/prescdiaghud.rsi/icon.png b/Resources/Textures/_DV/Clothing/Eyes/Hud/prescdiaghud.rsi/icon.png new file mode 100644 index 00000000000..57254ca0250 Binary files /dev/null and b/Resources/Textures/_DV/Clothing/Eyes/Hud/prescdiaghud.rsi/icon.png differ diff --git a/Resources/Textures/_DV/Clothing/Eyes/Hud/prescdiaghud.rsi/inhand-left.png b/Resources/Textures/_DV/Clothing/Eyes/Hud/prescdiaghud.rsi/inhand-left.png new file mode 100644 index 00000000000..440dadcd057 Binary files /dev/null and b/Resources/Textures/_DV/Clothing/Eyes/Hud/prescdiaghud.rsi/inhand-left.png differ diff --git a/Resources/Textures/_DV/Clothing/Eyes/Hud/prescdiaghud.rsi/inhand-right.png b/Resources/Textures/_DV/Clothing/Eyes/Hud/prescdiaghud.rsi/inhand-right.png new file mode 100644 index 00000000000..a66d87b9118 Binary files /dev/null and b/Resources/Textures/_DV/Clothing/Eyes/Hud/prescdiaghud.rsi/inhand-right.png differ diff --git a/Resources/Textures/_DV/Clothing/Eyes/Hud/prescdiaghud.rsi/meta.json b/Resources/Textures/_DV/Clothing/Eyes/Hud/prescdiaghud.rsi/meta.json new file mode 100644 index 00000000000..e20bd6e0d61 --- /dev/null +++ b/Resources/Textures/_DV/Clothing/Eyes/Hud/prescdiaghud.rsi/meta.json @@ -0,0 +1,34 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Diagnostic hud Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/5a73e8f825ff279e82949b9329783a9e3070e2da and prescription glasses from commit https://github.com/tgstation/tgstation/commit/5a73e8f825ff279e82949b9329783a9e3070e2da modified by Adrian16199, arachnid and moth versions by HTMLSystem", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-EYES", + "directions": 4 + }, + { + "name": "equipped-EYES-arachnid", + "directions": 4 + }, + { + "name": "equipped-EYES-moth", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +}