]> git.smokeofanarchy.ru Git - space-station-14.git/commitdiff
Hud Standardization (#25208)
authorHanz <41141796+Hanzdegloker@users.noreply.github.com>
Wed, 21 Feb 2024 06:22:30 +0000 (01:22 -0500)
committerGitHub <noreply@github.com>
Wed, 21 Feb 2024 06:22:30 +0000 (23:22 -0700)
* Standardization of the Eyepatches

what it says on the tin

* added the pun...

yea

Resources/Prototypes/Catalog/VendingMachines/Inventories/bardrobe.yml
Resources/Prototypes/Catalog/VendingMachines/Inventories/medical.yml
Resources/Prototypes/Catalog/VendingMachines/Inventories/medidrobe.yml
Resources/Prototypes/Catalog/VendingMachines/Inventories/robotics.yml
Resources/Prototypes/Catalog/VendingMachines/Inventories/sec.yml
Resources/Prototypes/Entities/Clothing/Eyes/hud.yml
Resources/Textures/Clothing/Eyes/Hud/diagpatch.rsi/equipped-EYES.png [new file with mode: 0644]
Resources/Textures/Clothing/Eyes/Hud/diagpatch.rsi/icon.png [new file with mode: 0644]
Resources/Textures/Clothing/Eyes/Hud/diagpatch.rsi/meta.json [new file with mode: 0644]

index cbc71f85afe5080fdc607d9127fce5d2a0b4dd94..5e4b0561762dd0ee420f14213af07b0c7962a4b0 100644 (file)
@@ -4,7 +4,7 @@
     ClothingHeadHatBowlerHat: 2
     ClothingHeadHatTophat: 2
     ClothingEyesHudBeer: 2
-    ClothingEyesEyepatchHudBeer: 1
+    ClothingEyesEyepatchHudBeer: 2
     ClothingHeadsetService: 2
     ClothingOuterApronBar: 2
     ClothingOuterWinterBar: 2
index 43e7cf7c941bfb362bf2649749a89e7af3fd5099..466749120bd93ed85107eb116dba3d2db0445bb0 100644 (file)
@@ -7,3 +7,6 @@
     Bloodpack: 5
     EpinephrineChemistryBottle: 3
     Syringe: 5
+    ClothingEyesHudMedical: 2
+    ClothingEyesEyepatchHudMedical: 2
+
index a511b08d6537d878ed219fc5dddcf68eaec12ef9..54e8d3d9fb7dfb460571c4baa08e039d37a5f659 100644 (file)
@@ -6,7 +6,6 @@
     ClothingBackpackSatchelMedical: 4\r
     ClothingUniformJumpsuitMedicalDoctor: 4\r
     ClothingUniformJumpskirtMedicalDoctor: 4\r
-    ClothingEyesEyepatchHudMedical: 1\r
     ClothingHeadHatBeretMedic: 4\r
     ClothingHeadNurseHat: 4\r
     ClothingOuterCoatLab: 4\r
index 077aa2dca4ccca9b3ab8a4e1e8d26cd1c7b082ad..c53efb3e729cae66791b6d6f3a1c3255ee32546b 100644 (file)
@@ -5,6 +5,7 @@
     SciFlash: 4
     ProximitySensor: 3
     ClothingEyesHudDiagnostic: 2
+    ClothingEyesEyepatchHudDiag: 2
     RemoteSignaller: 3
     Igniter: 3 # its more ordnance but yeah
     HandheldHealthAnalyzer: 3
index b1152f42ab9d301bcf9570bad05c83edc548059c..0aa814196af11324c780901c68e474b11ea8be8e 100644 (file)
@@ -12,7 +12,7 @@
     FlashlightSeclite: 5
     ClothingEyesGlassesSunglasses: 2
     ClothingEyesHudSecurity: 2
-    ClothingEyesEyepatchHudSecurity: 1
+    ClothingEyesEyepatchHudSecurity: 2
     ClothingBeltSecurityWebbing: 5
     Zipties: 12
     RiotShield: 2
index aa1aea4df7ade56fba59099dc0d3c60b7b26643d..fabb7bc642962767fda9f311018bdafa17a2e8d4 100644 (file)
@@ -17,7 +17,7 @@
   parent: ClothingEyesBase
   id: ClothingEyesHudMedical
   name: medical hud
-  description: A heads-up display that scans the humanoids in view and provides accurate data about their health status.
+  description: A heads-up display that scans the humanoids in view and provides accurate data about their health status. 
   components:
   - type: Sprite
     sprite: Clothing/Eyes/Hud/med.rsi
     sprite: Clothing/Eyes/Hud/beerpatch.rsi
   - type: Clothing
     sprite: Clothing/Eyes/Hud/beerpatch.rsi
+
+- type: entity
+  parent: ClothingEyesBase
+  id: ClothingEyesEyepatchHudDiag
+  name: diagnostic hud eyepatch
+  description: A heads-up display capable of analyzing the integrity and status of robotics and exosuits. Made out of see-borg-ium.
+  components:
+  - type: Sprite
+    sprite: Clothing/Eyes/Hud/diagpatch.rsi
+  - type: Clothing
+    sprite: Clothing/Eyes/Hud/diagpatch.rsi
+  - type: ShowHealthBars
+    damageContainers:
+    - Inorganic
+    - Silicon
diff --git a/Resources/Textures/Clothing/Eyes/Hud/diagpatch.rsi/equipped-EYES.png b/Resources/Textures/Clothing/Eyes/Hud/diagpatch.rsi/equipped-EYES.png
new file mode 100644 (file)
index 0000000..91a6b3a
Binary files /dev/null and b/Resources/Textures/Clothing/Eyes/Hud/diagpatch.rsi/equipped-EYES.png differ
diff --git a/Resources/Textures/Clothing/Eyes/Hud/diagpatch.rsi/icon.png b/Resources/Textures/Clothing/Eyes/Hud/diagpatch.rsi/icon.png
new file mode 100644 (file)
index 0000000..ca0aac2
Binary files /dev/null and b/Resources/Textures/Clothing/Eyes/Hud/diagpatch.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/Eyes/Hud/diagpatch.rsi/meta.json b/Resources/Textures/Clothing/Eyes/Hud/diagpatch.rsi/meta.json
new file mode 100644 (file)
index 0000000..bb228e7
--- /dev/null
@@ -0,0 +1,18 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/5a73e8f825ff279e82949b9329783a9e3070e2da , edited by Alekshhh and Hanzdegloker",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "equipped-EYES",
+      "directions": 4
+    }
+  ]
+}