Add prescription glasses to loadouts + diagnostic hud (#4871)

* everything buh * a bunch of loadout changes * .rsi * changes request + prisonguard startinggear
2026-09-29 23:57:29 +00:00 · 2025-12-04 20:14:00 -06:00
parent f6e855f4a3
commit c12e669b14
29 changed files with 181 additions and 7 deletions
@@ -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
@@ -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
@@ -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
@@ -186,3 +186,8 @@
  id: MedicalEyePatchHud
  equipment:
    eyes: ClothingEyesEyepatchHudMedical
+
+- type: loadout
+  id: PrescriptionMedHud
+  equipment:
+    eyes: ClothingEyesPrescriptionMedHud
@@ -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
@@ -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
@@ -38,6 +38,7 @@
  - SecurityGloves # DeltaV - Security can start with gloves
  - SecurityShoes
  - SecurityBelt
+  - SecurityEyewear # DeltaV - Security eyewear with prescription options
  - SurvivalSecurity
  - Trinkets
  - GroupSpeciesBreathToolSecurity
@@ -28,7 +28,7 @@
 - type: startingGear
  id: PrisonGuardGear
  equipment:
-    eyes: ClothingEyesGlassesSecurity
+    #eyes: ClothingEyesGlassesSecurity # DeltaV - loadouts
    id: PrisonGuardPDA
    ears: ClothingHeadsetPrisonGuard # begin DeltaV
  storage:
@@ -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
@@ -47,7 +47,7 @@
 - type: startingGear
  id: HoSGear
  equipment:
-    eyes: ClothingEyesGlassesSecurity
+    #eyes: ClothingEyesGlassesSecurity # DeltaV - loadouts
    id: HoSPDA
    gloves: ClothingHandsGlovesCombat
    ears: ClothingHeadsetAltSecurity
@@ -25,7 +25,7 @@
 - type: startingGear
  id: SecurityOfficerGear
  equipment:
-    eyes: ClothingEyesGlassesSecurity
+    #eyes: ClothingEyesGlassesSecurity # DeltaV - loadouts
    ears: ClothingHeadsetSecurity
    #pocket1: WeaponPistolMk58Nonlethal # DeltaV - loadouts
  storage:
@@ -34,7 +34,7 @@
 - type: startingGear
  id: WardenGear
  equipment:
-    eyes: ClothingEyesGlassesSecurity
+    #eyes: ClothingEyesGlassesSecurity # DeltaV - loadouts
    id: WardenPDA
    ears: ClothingHeadsetSecurity
    #pocket1: WeaponPistolMk58Nonlethal # DeltaV - loadouts
@@ -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
@@ -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
@@ -47,3 +47,14 @@
  id: StasecWinterCoatCorpsman
  equipment:
    outerClothing: ClothingOuterCoatStasecCorpsman
+
+# Eyewear
+- type: loadout
+  id: CorpsmanGlasses
+  equipment:
+    eyes: ClothingEyesGlassesCorpsman
+
+- type: loadout
+  id: PrescriptionCorpsmanGlasses
+  equipment:
+    eyes: ClothingEyesPrescriptionCorpsmanGlasses
@@ -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
@@ -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
@@ -38,6 +38,7 @@
  - BrigMedicBack
  - SecurityShoes
  - BrigMedicOuterClothing
+  - CorpsmanEyewear
  - MedicalGloves
  - SurvivalSecurity
  - Trinkets
@@ -120,7 +121,7 @@
  - RoboticistGloves
  - RoboticistShoes
  - RoboticistPDA
-  - Glasses
+  - RoboticistGlasses
  - Survival
  - Trinkets
  - GroupSpeciesBreathTool
@@ -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
@@ -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
@@ -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
@@ -669,6 +669,9 @@
 - type: Tag
  id: HudSecurity

+- type: Tag
+  id: HudDiagnostic
+
 - type: Tag
  id: GuideEmbeded

@@ -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
+        }
+    ]
+}