Merge pull request #299 from MartynDew/glasses

Мед и СБ-Мед очки

Resources/Locale/ru-RU/_wega/recipes/recipes.ftl

@@ -1,2 +1,3 @@
 recipes-resecret-door-name = укреплённая потайная дверь 
 recipes-resecret-door-desc = Потайная дверь, замаскированная под укреплённую стену. Прекрасное решение, чтобы спрятать ваши тёмные делишки.
+construction-graph-tag-medsec-hud = охранный-мед визор

Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/clothing/eyes/glasses.ftl

@@ -0,0 +1,4 @@
+ent-ClothingEyesGlassesMedSecSunglasses = мед-охранные очки
+    .desc = Пара солнцезащитных очков с мед-охранным интерфейсом.
+ent-ClothingEyesGlassesMedSunglasses = медицинские очки
+    .desc = Пара солнцезащитных очков с мед-охранным интерфейсом.

Resources/Prototypes/Catalog/Fills/Lockers/heads.yml

@@ -220,7 +220,7 @@
     - id: SurgerykitFilledPro # Corvax-Wega-Surgery-Edit
     - id: ClothingHandsGlovesLatexSurgeon # Corvax-Wega-Surgery
     - id: ClothingBackpackDuffelSurgeryFilled
-    - id: ClothingEyesHudMedical
+    - id: ClothingEyesGlassesMedSunglasses
     - id: ClothingHandsGlovesNitrile
     - id: ClothingHeadsetAltMedical
     - id: ClothingMaskSterile

Resources/Prototypes/Catalog/Fills/Lockers/security.yml

@@ -113,7 +113,7 @@
   id: FillLockerBrigmedic
   table: !type:AllSelector
     children:
-    - id: ClothingEyesGlassesSecurity
+    - id: ClothingEyesGlassesMedSecSunglasses
     # - id: WeaponTaser # Corvax-Wega-Edit
     - id: WeaponDisabler
     - id: TrackingImplanter
@@ -127,6 +127,7 @@
     - id: ClothingUniformJumpskirtOfLife
       prob: 0.1
     - id: MedkitFilled
+    - id: MedkitCombatFilled
     #Corvax Delete start
     #- !type:GroupSelector
     #  prob: 0.7

Resources/Prototypes/Entities/Clothing/Eyes/hud.yml

@@ -176,6 +176,10 @@
   - type: Construction
     graph: HudMedSec
     node: medsecHud
+  - type: Tag
+    tags:
+    - WhitelistChameleon
+    - HudMedSec
 
 - type: entity
   parent: [ClothingEyesBase, ShowSecurityIcons, ShowMedicalIcons]

Resources/Prototypes/_Wega/Entities/Clothing/Eyes/glasses.yml

@@ -0,0 +1,39 @@
+- type: entity
+  parent: ClothingEyesHudMedical
+  id: ClothingEyesGlassesMedSunglasses
+  name: med sun glasses
+  description: A pair of black sunglasses with medical HUD.
+  components:
+  - type: FlashImmunity
+  - type: EyeProtection
+    protectionTime: 5
+  - type: Sprite
+    sprite: _Wega/Clothing/Eyes/Glasses/medglasses.rsi
+  - type: Clothing
+    sprite: _Wega/Clothing/Eyes/Glasses/medglasses.rsi
+  - type: Tag
+    tags:
+    - WhitelistChameleon
+  - type: Construction
+    graph: GlassesMed
+    node: medGlasses  
+  
+- type: entity
+  parent: ClothingEyesHudMedSec
+  id: ClothingEyesGlassesMedSecSunglasses
+  name: med-sec sun glasses
+  description: A pair of black sunglasses with security and medical HUD.
+  components:
+  - type: FlashImmunity
+  - type: EyeProtection
+    protectionTime: 5
+  - type: Sprite
+    sprite: _Wega/Clothing/Eyes/Glasses/medsecglasses.rsi
+  - type: Clothing
+    sprite: _Wega/Clothing/Eyes/Glasses/medsecglasses.rsi
+  - type: Tag
+    tags:
+    - WhitelistChameleon
+  - type: Construction
+    graph: GlassesMedSec
+    node: medsecGlasses

Resources/Prototypes/_Wega/Recipes/Construction/Graphs/clothing/MedGlasses.yml

@@ -0,0 +1,25 @@
+- type: constructionGraph
+  id: GlassesMed
+  start: start
+  graph:
+    - node: start
+      edges:
+        - to: medGlasses
+          steps:
+            - tag: HudMedical
+              name: construction-graph-tag-medical-hud
+              icon:
+                sprite: Clothing/Eyes/Hud/med.rsi
+                state: icon
+              doAfter: 5
+            - tag: Sunglasses
+              name: construction-graph-tag-sun-glasses
+              icon:
+                sprite: Clothing/Eyes/Glasses/sunglasses.rsi
+                state: icon
+              doAfter: 5
+            - material: Cable
+              amount: 5
+              doAfter: 5
+    - node: medGlasses
+      entity: ClothingEyesGlassesMedSunglasses

Resources/Prototypes/_Wega/Recipes/Construction/Graphs/clothing/MedSecGlasses.yml

@@ -0,0 +1,25 @@
+- type: constructionGraph
+  id: GlassesMedSec
+  start: start
+  graph:
+    - node: start
+      edges:
+        - to: medsecGlasses
+          steps:
+            - tag: HudMedSec
+              name: construction-graph-tag-medsec-hud
+              icon:
+                sprite: Clothing/Eyes/Hud/medsec.rsi
+                state: icon
+              doAfter: 5
+            - tag: Sunglasses
+              name: construction-graph-tag-sun-glasses
+              icon:
+                sprite: Clothing/Eyes/Glasses/sunglasses.rsi
+                state: icon
+              doAfter: 5
+            - material: Cable
+              amount: 5
+              doAfter: 5
+    - node: medsecGlasses
+      entity: ClothingEyesGlassesMedSecSunglasses

Resources/Prototypes/_Wega/Recipes/Construction/clothing.yml

@@ -0,0 +1,15 @@
+- type: construction
+  id: GlassesMedSec
+  graph: GlassesMedSec
+  startNode: start
+  targetNode: medsecGlasses
+  category: construction-category-clothing
+  objectType: Item
+  
+- type: construction
+  id: GlassesMedical
+  graph: GlassesMed
+  startNode: start
+  targetNode: medGlasses
+  category: construction-category-clothing
+  objectType: Item

Resources/Prototypes/_Wega/tags.yml

@@ -280,3 +280,6 @@
 
 - type: Tag
   id: CardTarot
+  
+- type: Tag
+  id: HudMedSec

Resources/Textures/_Wega/Clothing/Eyes/Glasses/medglasses.rsi/meta.json

@@ -0,0 +1,26 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "resprite from security glasses by Creatorbot01",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "equipped-EYES",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}

Resources/Textures/_Wega/Clothing/Eyes/Glasses/medsecglasses.rsi/meta.json

@@ -0,0 +1,26 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "resprite from security glasses by Creatorbot01",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "equipped-EYES",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}