From: Alekshhh <44923899+Alekshhh@users.noreply.github.com> Date: Mon, 22 Jan 2024 14:59:32 +0000 (+0200) Subject: Hud Eyepatches (#24132) X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=80b0a24ee8ee27dbaf32e882a63bc15d1b255a09;p=space-station-14.git Hud Eyepatches (#24132) * dsdt * op * text reduce * ey * we fix --- diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/bardrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/bardrobe.yml index bd43b174ee..cbc71f85af 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/bardrobe.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/bardrobe.yml @@ -4,6 +4,7 @@ ClothingHeadHatBowlerHat: 2 ClothingHeadHatTophat: 2 ClothingEyesHudBeer: 2 + ClothingEyesEyepatchHudBeer: 1 ClothingHeadsetService: 2 ClothingOuterApronBar: 2 ClothingOuterWinterBar: 2 diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/medidrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/medidrobe.yml index 841f05a630..6dc1996479 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/medidrobe.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/medidrobe.yml @@ -6,6 +6,7 @@ ClothingBackpackSatchelMedical: 4 ClothingUniformJumpsuitMedicalDoctor: 4 ClothingUniformJumpskirtMedicalDoctor: 4 + ClothingEyesEyepatchHudMedical: 1 ClothingHeadNurseHat: 4 ClothingOuterCoatLab: 4 ClothingShoesColorWhite: 4 diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/sec.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/sec.yml index 227d8767e8..695f7e98af 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/sec.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/sec.yml @@ -11,6 +11,7 @@ FlashlightSeclite: 5 ClothingEyesGlassesSunglasses: 2 ClothingEyesHudSecurity: 2 + ClothingEyesEyepatchHudSecurity: 1 ClothingBeltSecurityWebbing: 5 Zipties: 12 RiotShield: 2 diff --git a/Resources/Prototypes/Entities/Clothing/Eyes/hud.yml b/Resources/Prototypes/Entities/Clothing/Eyes/hud.yml index 5771d9f024..89010ca30e 100644 --- a/Resources/Prototypes/Entities/Clothing/Eyes/hud.yml +++ b/Resources/Prototypes/Entities/Clothing/Eyes/hud.yml @@ -9,7 +9,7 @@ - type: Clothing sprite: Clothing/Eyes/Hud/diag.rsi - type: ShowHealthBars - damageContainers: + damageContainers: - Inorganic - Silicon @@ -24,10 +24,10 @@ - type: Clothing sprite: Clothing/Eyes/Hud/med.rsi - type: ShowHealthBars - damageContainers: + damageContainers: - Biological - type: ShowHealthIcons - damageContainers: + damageContainers: - Biological - type: Tag tags: @@ -111,10 +111,10 @@ - type: Clothing sprite: Clothing/Eyes/Hud/medonion.rsi - type: ShowHealthBars - damageContainers: + damageContainers: - Biological - type: ShowHealthIcons - damageContainers: + damageContainers: - Biological - type: ShowHungerIcons @@ -129,10 +129,10 @@ - type: Clothing sprite: Clothing/Eyes/Hud/medonionbeer.rsi - type: ShowHealthBars - damageContainers: + damageContainers: - Biological - type: ShowHealthIcons - damageContainers: + damageContainers: - Biological - type: ShowHungerIcons - type: ShowThirstIcons @@ -152,7 +152,7 @@ node: medsecHud - type: ShowSecurityIcons - type: ShowHealthBars - damageContainers: + damageContainers: - Biological - type: entity @@ -167,11 +167,11 @@ sprite: Clothing/Eyes/Hud/medsecengi.rsi - type: ShowSecurityIcons - type: ShowHealthBars - damageContainers: + damageContainers: - Biological - Inorganic - type: ShowHealthIcons - damageContainers: + damageContainers: - Biological - type: ShowSyndicateIcons @@ -187,11 +187,11 @@ sprite: Clothing/Eyes/Hud/omni.rsi - type: ShowSecurityIcons - type: ShowHealthBars - damageContainers: + damageContainers: - Biological - Inorganic - type: ShowHealthIcons - damageContainers: + damageContainers: - Biological - type: ShowHungerIcons - type: ShowThirstIcons @@ -216,3 +216,36 @@ 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 index 0000000000..5ea6a09494 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 index 0000000000..f0d842ddbc 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 index 0000000000..2f7d9c2de7 --- /dev/null +++ b/Resources/Textures/Clothing/Eyes/Hud/beerpatch.rsi/meta.json @@ -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 index 0000000000..5bb3dde71f 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 index 0000000000..fcb3dbb412 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 index 0000000000..2f7d9c2de7 --- /dev/null +++ b/Resources/Textures/Clothing/Eyes/Hud/medpatch.rsi/meta.json @@ -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 index 0000000000..ed5af49e30 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 index 0000000000..8a1fc5bc55 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 index 0000000000..2f7d9c2de7 --- /dev/null +++ b/Resources/Textures/Clothing/Eyes/Hud/secpatch.rsi/meta.json @@ -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/Misc/eyepatch.rsi/equipped-EYES.png b/Resources/Textures/Clothing/Eyes/Misc/eyepatch.rsi/equipped-EYES.png index 7534d4eb56..f3ecc702de 100644 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