]> git.smokeofanarchy.ru Git - space-station-14.git/commitdiff
Hud Eyepatches (#24132)
authorAlekshhh <44923899+Alekshhh@users.noreply.github.com>
Mon, 22 Jan 2024 14:59:32 +0000 (16:59 +0200)
committerGitHub <noreply@github.com>
Mon, 22 Jan 2024 14:59:32 +0000 (17:59 +0300)
* dsdt

* op

* text reduce

* ey

* we fix

14 files changed:
Resources/Prototypes/Catalog/VendingMachines/Inventories/bardrobe.yml
Resources/Prototypes/Catalog/VendingMachines/Inventories/medidrobe.yml
Resources/Prototypes/Catalog/VendingMachines/Inventories/sec.yml
Resources/Prototypes/Entities/Clothing/Eyes/hud.yml
Resources/Textures/Clothing/Eyes/Hud/beerpatch.rsi/equipped-EYES.png [new file with mode: 0644]
Resources/Textures/Clothing/Eyes/Hud/beerpatch.rsi/icon.png [new file with mode: 0644]
Resources/Textures/Clothing/Eyes/Hud/beerpatch.rsi/meta.json [new file with mode: 0644]
Resources/Textures/Clothing/Eyes/Hud/medpatch.rsi/equipped-EYES.png [new file with mode: 0644]
Resources/Textures/Clothing/Eyes/Hud/medpatch.rsi/icon.png [new file with mode: 0644]
Resources/Textures/Clothing/Eyes/Hud/medpatch.rsi/meta.json [new file with mode: 0644]
Resources/Textures/Clothing/Eyes/Hud/secpatch.rsi/equipped-EYES.png [new file with mode: 0644]
Resources/Textures/Clothing/Eyes/Hud/secpatch.rsi/icon.png [new file with mode: 0644]
Resources/Textures/Clothing/Eyes/Hud/secpatch.rsi/meta.json [new file with mode: 0644]
Resources/Textures/Clothing/Eyes/Misc/eyepatch.rsi/equipped-EYES.png

index bd43b174ee2b2f772e984b92132e1da9334d1efc..cbc71f85afe5080fdc607d9127fce5d2a0b4dd94 100644 (file)
@@ -4,6 +4,7 @@
     ClothingHeadHatBowlerHat: 2
     ClothingHeadHatTophat: 2
     ClothingEyesHudBeer: 2
+    ClothingEyesEyepatchHudBeer: 1
     ClothingHeadsetService: 2
     ClothingOuterApronBar: 2
     ClothingOuterWinterBar: 2
index 841f05a6301c31f9425bb02da0321f60901cdff8..6dc19964794987b5c1e5e661877dff7c3733851f 100644 (file)
@@ -6,6 +6,7 @@
     ClothingBackpackSatchelMedical: 4\r
     ClothingUniformJumpsuitMedicalDoctor: 4\r
     ClothingUniformJumpskirtMedicalDoctor: 4\r
+    ClothingEyesEyepatchHudMedical: 1\r
     ClothingHeadNurseHat: 4\r
     ClothingOuterCoatLab: 4\r
     ClothingShoesColorWhite: 4\r
index 227d8767e83cc7505777b0b8069d2cca9bd187c1..695f7e98afc7cdcf1e0574499aa8aedffe18719d 100644 (file)
@@ -11,6 +11,7 @@
     FlashlightSeclite: 5
     ClothingEyesGlassesSunglasses: 2
     ClothingEyesHudSecurity: 2
+    ClothingEyesEyepatchHudSecurity: 1
     ClothingBeltSecurityWebbing: 5
     Zipties: 12
     RiotShield: 2
index 5771d9f0244f566a50c67c3e75b9645d80893876..89010ca30e06f1db7977018eeea2f6f4f3ba0888 100644 (file)
@@ -9,7 +9,7 @@
   - type: Clothing
     sprite: Clothing/Eyes/Hud/diag.rsi
   - type: ShowHealthBars
-    damageContainers: 
+    damageContainers:
     - Inorganic
     - Silicon
 
   - type: Clothing
     sprite: Clothing/Eyes/Hud/med.rsi
   - type: ShowHealthBars
-    damageContainers: 
+    damageContainers:
     - Biological
   - type: ShowHealthIcons
-    damageContainers: 
+    damageContainers:
     - Biological
   - type: Tag
     tags:
   - type: Clothing
     sprite: Clothing/Eyes/Hud/medonion.rsi
   - type: ShowHealthBars
-    damageContainers: 
+    damageContainers:
     - Biological
   - type: ShowHealthIcons
-    damageContainers: 
+    damageContainers:
     - Biological
   - type: ShowHungerIcons
 
   - type: Clothing
     sprite: Clothing/Eyes/Hud/medonionbeer.rsi
   - type: ShowHealthBars
-    damageContainers: 
+    damageContainers:
     - Biological
   - type: ShowHealthIcons
-    damageContainers: 
+    damageContainers:
     - Biological
   - type: ShowHungerIcons
   - type: ShowThirstIcons
     node: medsecHud
   - type: ShowSecurityIcons
   - type: ShowHealthBars
-    damageContainers: 
+    damageContainers:
     - Biological
 
 - type: entity
     sprite: Clothing/Eyes/Hud/medsecengi.rsi
   - type: ShowSecurityIcons
   - type: ShowHealthBars
-    damageContainers: 
+    damageContainers:
     - Biological
     - Inorganic
   - type: ShowHealthIcons
-    damageContainers: 
+    damageContainers:
     - Biological
   - type: ShowSyndicateIcons
 
     sprite: Clothing/Eyes/Hud/omni.rsi
   - type: ShowSecurityIcons
   - type: ShowHealthBars
-    damageContainers: 
+    damageContainers:
     - Biological
     - Inorganic
   - type: ShowHealthIcons
-    damageContainers: 
+    damageContainers:
     - Biological
   - type: ShowHungerIcons
   - type: ShowThirstIcons
   suffix: Syndicate
   components:
   - type: ShowSecurityIcons
+
+- type: entity
+  parent: ClothingEyesHudMedical
+  id: ClothingEyesEyepatchHudMedical
+  name: medical hud eyepatch
+  description: A heads-up display that scans the humanoids in view and provides accurate data about their health status. For true patriots.
+  components:
+  - type: Sprite
+    sprite: Clothing/Eyes/Hud/medpatch.rsi
+  - type: Clothing
+    sprite: Clothing/Eyes/Hud/medpatch.rsi
+
+- type: entity
+  parent: ClothingEyesHudSecurity
+  id: ClothingEyesEyepatchHudSecurity
+  name: security hud eyepatch
+  description: A heads-up display that scans the humanoids in view and provides accurate data about their ID status and security records. For true patriots.
+  components:
+  - type: Sprite
+    sprite: Clothing/Eyes/Hud/secpatch.rsi
+  - type: Clothing
+    sprite: Clothing/Eyes/Hud/secpatch.rsi
+
+- type: entity
+  parent: ClothingEyesHudBeer
+  id: ClothingEyesEyepatchHudBeer
+  name: beer hud eyepatch
+  description: A pair of sunHud outfitted with apparatus to scan reagents, as well as providing an innate understanding of liquid viscosity while in motion. For true patriots.
+  components:
+  - type: Sprite
+    sprite: Clothing/Eyes/Hud/beerpatch.rsi
+  - type: Clothing
+    sprite: Clothing/Eyes/Hud/beerpatch.rsi
diff --git a/Resources/Textures/Clothing/Eyes/Hud/beerpatch.rsi/equipped-EYES.png b/Resources/Textures/Clothing/Eyes/Hud/beerpatch.rsi/equipped-EYES.png
new file mode 100644 (file)
index 0000000..5ea6a09
Binary files /dev/null and b/Resources/Textures/Clothing/Eyes/Hud/beerpatch.rsi/equipped-EYES.png differ
diff --git a/Resources/Textures/Clothing/Eyes/Hud/beerpatch.rsi/icon.png b/Resources/Textures/Clothing/Eyes/Hud/beerpatch.rsi/icon.png
new file mode 100644 (file)
index 0000000..f0d842d
Binary files /dev/null and b/Resources/Textures/Clothing/Eyes/Hud/beerpatch.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/Eyes/Hud/beerpatch.rsi/meta.json b/Resources/Textures/Clothing/Eyes/Hud/beerpatch.rsi/meta.json
new file mode 100644 (file)
index 0000000..2f7d9c2
--- /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",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "equipped-EYES",
+      "directions": 4
+    }
+  ]
+}
diff --git a/Resources/Textures/Clothing/Eyes/Hud/medpatch.rsi/equipped-EYES.png b/Resources/Textures/Clothing/Eyes/Hud/medpatch.rsi/equipped-EYES.png
new file mode 100644 (file)
index 0000000..5bb3dde
Binary files /dev/null and b/Resources/Textures/Clothing/Eyes/Hud/medpatch.rsi/equipped-EYES.png differ
diff --git a/Resources/Textures/Clothing/Eyes/Hud/medpatch.rsi/icon.png b/Resources/Textures/Clothing/Eyes/Hud/medpatch.rsi/icon.png
new file mode 100644 (file)
index 0000000..fcb3dbb
Binary files /dev/null and b/Resources/Textures/Clothing/Eyes/Hud/medpatch.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/Eyes/Hud/medpatch.rsi/meta.json b/Resources/Textures/Clothing/Eyes/Hud/medpatch.rsi/meta.json
new file mode 100644 (file)
index 0000000..2f7d9c2
--- /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",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "equipped-EYES",
+      "directions": 4
+    }
+  ]
+}
diff --git a/Resources/Textures/Clothing/Eyes/Hud/secpatch.rsi/equipped-EYES.png b/Resources/Textures/Clothing/Eyes/Hud/secpatch.rsi/equipped-EYES.png
new file mode 100644 (file)
index 0000000..ed5af49
Binary files /dev/null and b/Resources/Textures/Clothing/Eyes/Hud/secpatch.rsi/equipped-EYES.png differ
diff --git a/Resources/Textures/Clothing/Eyes/Hud/secpatch.rsi/icon.png b/Resources/Textures/Clothing/Eyes/Hud/secpatch.rsi/icon.png
new file mode 100644 (file)
index 0000000..8a1fc5b
Binary files /dev/null and b/Resources/Textures/Clothing/Eyes/Hud/secpatch.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/Eyes/Hud/secpatch.rsi/meta.json b/Resources/Textures/Clothing/Eyes/Hud/secpatch.rsi/meta.json
new file mode 100644 (file)
index 0000000..2f7d9c2
--- /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",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "equipped-EYES",
+      "directions": 4
+    }
+  ]
+}
index 7534d4eb56b66178c27f66855eef7cb480b05098..f3ecc702de31ed3ad7630f0404580a043227db96 100644 (file)
Binary files a/Resources/Textures/Clothing/Eyes/Misc/eyepatch.rsi/equipped-EYES.png and b/Resources/Textures/Clothing/Eyes/Misc/eyepatch.rsi/equipped-EYES.png differ