diff --git a/Resources/Locale/ru-RU/_wega/recipes/recipes.ftl b/Resources/Locale/ru-RU/_wega/recipes/recipes.ftl index 449f1c9fbe..9593916587 100644 --- a/Resources/Locale/ru-RU/_wega/recipes/recipes.ftl +++ b/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 = охранный-мед визор diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/clothing/eyes/glasses.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/clothing/eyes/glasses.ftl new file mode 100644 index 0000000000..cf7a6268e9 --- /dev/null +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/clothing/eyes/glasses.ftl @@ -0,0 +1,4 @@ +ent-ClothingEyesGlassesMedSecSunglasses = мед-охранные очки + .desc = Пара солнцезащитных очков с мед-охранным интерфейсом. +ent-ClothingEyesGlassesMedSunglasses = медицинские очки + .desc = Пара солнцезащитных очков с мед-охранным интерфейсом. \ No newline at end of file diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml index 6eb87f9619..5e67f42663 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml +++ b/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 diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/security.yml b/Resources/Prototypes/Catalog/Fills/Lockers/security.yml index 75fb202504..d7bb5e166e 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/security.yml +++ b/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 diff --git a/Resources/Prototypes/Entities/Clothing/Eyes/hud.yml b/Resources/Prototypes/Entities/Clothing/Eyes/hud.yml index 185a05e5c6..34ca14fed3 100644 --- a/Resources/Prototypes/Entities/Clothing/Eyes/hud.yml +++ b/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] diff --git a/Resources/Prototypes/_Wega/Entities/Clothing/Eyes/glasses.yml b/Resources/Prototypes/_Wega/Entities/Clothing/Eyes/glasses.yml new file mode 100644 index 0000000000..5b0f78414e --- /dev/null +++ b/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 diff --git a/Resources/Prototypes/_Wega/Recipes/Construction/Graphs/clothing/MedGlasses.yml b/Resources/Prototypes/_Wega/Recipes/Construction/Graphs/clothing/MedGlasses.yml new file mode 100644 index 0000000000..f0ad4b073c --- /dev/null +++ b/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 diff --git a/Resources/Prototypes/_Wega/Recipes/Construction/Graphs/clothing/MedSecGlasses.yml b/Resources/Prototypes/_Wega/Recipes/Construction/Graphs/clothing/MedSecGlasses.yml new file mode 100644 index 0000000000..509604acb0 --- /dev/null +++ b/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 diff --git a/Resources/Prototypes/_Wega/Recipes/Construction/clothing.yml b/Resources/Prototypes/_Wega/Recipes/Construction/clothing.yml new file mode 100644 index 0000000000..4e3be7dd56 --- /dev/null +++ b/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 \ No newline at end of file diff --git a/Resources/Prototypes/_Wega/tags.yml b/Resources/Prototypes/_Wega/tags.yml index 5137c57795..f9db14a894 100644 --- a/Resources/Prototypes/_Wega/tags.yml +++ b/Resources/Prototypes/_Wega/tags.yml @@ -280,3 +280,6 @@ - type: Tag id: CardTarot + +- type: Tag + id: HudMedSec diff --git a/Resources/Textures/_Wega/Clothing/Eyes/Glasses/medglasses.rsi/equipped-EYES.png b/Resources/Textures/_Wega/Clothing/Eyes/Glasses/medglasses.rsi/equipped-EYES.png new file mode 100644 index 0000000000..9cabdf3bfe Binary files /dev/null and b/Resources/Textures/_Wega/Clothing/Eyes/Glasses/medglasses.rsi/equipped-EYES.png differ diff --git a/Resources/Textures/_Wega/Clothing/Eyes/Glasses/medglasses.rsi/icon.png b/Resources/Textures/_Wega/Clothing/Eyes/Glasses/medglasses.rsi/icon.png new file mode 100644 index 0000000000..e0ad93f9ca Binary files /dev/null and b/Resources/Textures/_Wega/Clothing/Eyes/Glasses/medglasses.rsi/icon.png differ diff --git a/Resources/Textures/_Wega/Clothing/Eyes/Glasses/medglasses.rsi/inhand-left.png b/Resources/Textures/_Wega/Clothing/Eyes/Glasses/medglasses.rsi/inhand-left.png new file mode 100644 index 0000000000..6282538570 Binary files /dev/null and b/Resources/Textures/_Wega/Clothing/Eyes/Glasses/medglasses.rsi/inhand-left.png differ diff --git a/Resources/Textures/_Wega/Clothing/Eyes/Glasses/medglasses.rsi/inhand-right.png b/Resources/Textures/_Wega/Clothing/Eyes/Glasses/medglasses.rsi/inhand-right.png new file mode 100644 index 0000000000..609d7c4e7f Binary files /dev/null and b/Resources/Textures/_Wega/Clothing/Eyes/Glasses/medglasses.rsi/inhand-right.png differ diff --git a/Resources/Textures/_Wega/Clothing/Eyes/Glasses/medglasses.rsi/meta.json b/Resources/Textures/_Wega/Clothing/Eyes/Glasses/medglasses.rsi/meta.json new file mode 100644 index 0000000000..582c0e3932 --- /dev/null +++ b/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 + } + ] +} diff --git a/Resources/Textures/_Wega/Clothing/Eyes/Glasses/medsecglasses.rsi/equipped-EYES.png b/Resources/Textures/_Wega/Clothing/Eyes/Glasses/medsecglasses.rsi/equipped-EYES.png new file mode 100644 index 0000000000..328dd2c867 Binary files /dev/null and b/Resources/Textures/_Wega/Clothing/Eyes/Glasses/medsecglasses.rsi/equipped-EYES.png differ diff --git a/Resources/Textures/_Wega/Clothing/Eyes/Glasses/medsecglasses.rsi/icon.png b/Resources/Textures/_Wega/Clothing/Eyes/Glasses/medsecglasses.rsi/icon.png new file mode 100644 index 0000000000..cc19bc4507 Binary files /dev/null and b/Resources/Textures/_Wega/Clothing/Eyes/Glasses/medsecglasses.rsi/icon.png differ diff --git a/Resources/Textures/_Wega/Clothing/Eyes/Glasses/medsecglasses.rsi/inhand-left.png b/Resources/Textures/_Wega/Clothing/Eyes/Glasses/medsecglasses.rsi/inhand-left.png new file mode 100644 index 0000000000..290c94bec6 Binary files /dev/null and b/Resources/Textures/_Wega/Clothing/Eyes/Glasses/medsecglasses.rsi/inhand-left.png differ diff --git a/Resources/Textures/_Wega/Clothing/Eyes/Glasses/medsecglasses.rsi/inhand-right.png b/Resources/Textures/_Wega/Clothing/Eyes/Glasses/medsecglasses.rsi/inhand-right.png new file mode 100644 index 0000000000..662c899023 Binary files /dev/null and b/Resources/Textures/_Wega/Clothing/Eyes/Glasses/medsecglasses.rsi/inhand-right.png differ diff --git a/Resources/Textures/_Wega/Clothing/Eyes/Glasses/medsecglasses.rsi/meta.json b/Resources/Textures/_Wega/Clothing/Eyes/Glasses/medsecglasses.rsi/meta.json new file mode 100644 index 0000000000..582c0e3932 --- /dev/null +++ b/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 + } + ] +}