From feb4f160aed5a87584ff06db4917c2c12d7fad38 Mon Sep 17 00:00:00 2001 From: MartynDew Date: Sat, 17 Jan 2026 21:01:15 +0300 Subject: [PATCH] da --- .../Locale/ru-RU/_wega/recipes/recipes.ftl | 1 + .../_wega/entities/clothing/eyes/glasses.ftl | 4 ++ .../Catalog/Fills/Lockers/heads.yml | 2 +- .../Catalog/Fills/Lockers/security.yml | 3 +- .../Prototypes/Entities/Clothing/Eyes/hud.yml | 4 ++ .../_Wega/Entities/Clothing/Eyes/glasses.yml | 39 ++++++++++++++++++ .../Graphs/clothing/MedGlasses.yml | 25 +++++++++++ .../Graphs/clothing/MedSecGlasses.yml | 25 +++++++++++ .../_Wega/Recipes/Construction/clothing.yml | 15 +++++++ Resources/Prototypes/_Wega/tags.yml | 3 ++ .../Glasses/medglasses.rsi/equipped-EYES.png | Bin 0 -> 397 bytes .../Eyes/Glasses/medglasses.rsi/icon.png | Bin 0 -> 290 bytes .../Glasses/medglasses.rsi/inhand-left.png | Bin 0 -> 443 bytes .../Glasses/medglasses.rsi/inhand-right.png | Bin 0 -> 428 bytes .../Eyes/Glasses/medglasses.rsi/meta.json | 26 ++++++++++++ .../medsecglasses.rsi/equipped-EYES.png | Bin 0 -> 406 bytes .../Eyes/Glasses/medsecglasses.rsi/icon.png | Bin 0 -> 307 bytes .../Glasses/medsecglasses.rsi/inhand-left.png | Bin 0 -> 447 bytes .../medsecglasses.rsi/inhand-right.png | Bin 0 -> 428 bytes .../Eyes/Glasses/medsecglasses.rsi/meta.json | 26 ++++++++++++ 20 files changed, 171 insertions(+), 2 deletions(-) create mode 100644 Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/clothing/eyes/glasses.ftl create mode 100644 Resources/Prototypes/_Wega/Entities/Clothing/Eyes/glasses.yml create mode 100644 Resources/Prototypes/_Wega/Recipes/Construction/Graphs/clothing/MedGlasses.yml create mode 100644 Resources/Prototypes/_Wega/Recipes/Construction/Graphs/clothing/MedSecGlasses.yml create mode 100644 Resources/Prototypes/_Wega/Recipes/Construction/clothing.yml create mode 100644 Resources/Textures/_Wega/Clothing/Eyes/Glasses/medglasses.rsi/equipped-EYES.png create mode 100644 Resources/Textures/_Wega/Clothing/Eyes/Glasses/medglasses.rsi/icon.png create mode 100644 Resources/Textures/_Wega/Clothing/Eyes/Glasses/medglasses.rsi/inhand-left.png create mode 100644 Resources/Textures/_Wega/Clothing/Eyes/Glasses/medglasses.rsi/inhand-right.png create mode 100644 Resources/Textures/_Wega/Clothing/Eyes/Glasses/medglasses.rsi/meta.json create mode 100644 Resources/Textures/_Wega/Clothing/Eyes/Glasses/medsecglasses.rsi/equipped-EYES.png create mode 100644 Resources/Textures/_Wega/Clothing/Eyes/Glasses/medsecglasses.rsi/icon.png create mode 100644 Resources/Textures/_Wega/Clothing/Eyes/Glasses/medsecglasses.rsi/inhand-left.png create mode 100644 Resources/Textures/_Wega/Clothing/Eyes/Glasses/medsecglasses.rsi/inhand-right.png create mode 100644 Resources/Textures/_Wega/Clothing/Eyes/Glasses/medsecglasses.rsi/meta.json 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 0000000000000000000000000000000000000000..9cabdf3bfecccf6c7b8251b7799982d4f9461e81 GIT binary patch literal 397 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEU<~neaSW-5dppaK>yUwni?VIw zX^#cf2b(+QIemzlcj%Gt9r3Qns-~c`ivnCVB|m=tDH-l+J@bG1yxlr659hl+{B6zV zz{KU>P~RBC;KcEK-}~~9C8ZB{WG*`&d;M+k`O~%g*S(Iuy=`^*-Ry)V2~zSn65AFVvux?&{98#-#I| zBh!T^YhHLXOjWyR>%lNhD$2D*f||0Z(gL#7&go0y8>fIQCNw}0k6p~f|&Nn{zY}8%x(MjK3#eZd^ z@%PEqa~V&huD#sJ^5Ttao|cfp^sRpCLJKyF?_BB85Od9Hu1CYUxF^e$7>gobmnbn> lRZpDV#e%M3`6JE>2C*qtj+)&E76F5q!PC{xWt~$(696|$s^I_t literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..e0ad93f9cadcee446c35cbcc695fbb3aaf2e9fd5 GIT binary patch literal 290 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJm!2+;ArbD$DG~_>EDn4#?y*WR zVR3VY5gcs|6DC}!f5P?p?(Xse+ZRO&r6)ce2`Q} z-BI(?=!Q_q&c9zPdCt$bZ$B-ZZ0W)4$R6Qt-xB@r;bHc+hixBz$wVgxV(ffK+81TFx+0vG{|K;Q&0 z0)Y$Q_$%=FWAfK6HBIB(tUS+6^ZrHjvT}O1)5C0$!!Xchy{2k^APZx;SWs2h>^x;r znD5hx+K(fZZ_i|(lO%BtmtEN0k+CqkuA{#1BYPPRgmZkFrY4SKYTNc^b>8gYDX6&+ z=Elu!#I?A)0k~F()c*h=MP5r@7@(ySQgy%pDe_wK!T>Fukg5X)NRii)7Y1nQgj5|c zK#IJUyf8pZC#33t0aE0(?-F@ lFn~kL$5p51D4@=7^kNntZnJ_gbGjbN_z+FRc;N zFY~{m@4LSN1B=Bw2Dbx+3?BrJa3rwElrtzluwba*PGB)$>a%VTERbRNyWK(Ncy8S; z!M9=Gf{H7*eynq@oR^*bCU%CJ=kGOITIcw^_@jgFH!Dbl-Z6>QTCyxNL)Nv#KF)LI z#u%L!^HTTLmi=2WD}44LgPhv?%NJ>Eku|+ra=-Fa&nBIf>$2Zp_P>5>{;@W(+n4T$ z$kx_&dY5^9cCJof*uMDEt44;*&cfHMjCcCHRyU$pi}{i* zn|gGXYz(n!e_^_3+HwPP!QT!A+TI7%T()zp&`5OuQ&V?LDxW0~gLCos!)W2IXPdFX5T$uC1&F(uPDh_(tbNy5t()EjiCo=3@Q))GlVeZ}& uzOGD9HeGw^!c_82$y}5ZL&IYA2YiiptsIT^*%<@Fo59o7&t;ucLK6VxjIQDU literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..cc19bc4507c9c020d98c3260db1587248895e1e0 GIT binary patch literal 307 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJU!E?GArbD$DG~_>EDn4#?y*WR zVR3VY5gcs|6DC}!f5P?p?(Xse+ZRO&r6)ce2`Q< zdOE?|p=guVTb`n4fjqPK{xfjVIg?WH?~i57Jc-keSsd05f{z#`Je9YrNvQbq!|+bd z>lf`B)0$Nr_>Qm@wDKgfw`dqi%=yD?F8qWcf@4o~)pW=GhZyy~e|;T3K_=qf;lq#r z_sLoZEaIN6+~LK1;6d7hXV2Jv%h~caJV{_kv+VKjQRc8>NRiOlnE08o$VtVNQOJk+ qh?OQq?v#`{{^1kp8x;`cuoK#;JE;J31S2=0-h7V2zV|4z5*BljDY6^ zFan+nVD~FfJ-?XOr!nPuZr!Xb%gopBiIT(K>e*HgYm2Pwnx>NpZQnmB+bn4mhP2)7 z*m)N7x%oLBsrdM&#oLP7=Qxh7!(|sXbYxl>Wm!^HRY7|h4uorbk|ZXIA}WgFZgt-6 z;4Y}45QfGLZA4$(zX9kgMCyM4kRq=oFAUJq38^|@fE0Nxd0~K-PDs@O1Ek1n$qNIt zbV8~Q7$8MnOI{eDr4v$hzyK-oTJpjGEuE060|rQu*OC_oXz7Gh9WX$Oyq3H$KuagM zb=cZPcvu6vy9nuecG*i{?jk%afLmkIG&N1r{Am}#2>{*k;p`YV34rrH0RRpy7h_?7 pi(Td12?lUzxflxrTyU$ht9omf zfYPLnTX-Q z)6DACFQMrW&kewRF&*I_T6Rpqjpe!WHRzN}5FmJCy z!|lM#uMQ1cj_ml_L_os@Q$xY;Y*MrS%w*{N&UWLU%-{BE=J#nC!XMUuXWPR2;@6rD zrS?1