From 9f288cd3fa670a9bab6a5c6bef5771a2810c85ab Mon Sep 17 00:00:00 2001 From: Filo Date: Mon, 6 Jan 2025 21:51:10 +0500 Subject: [PATCH 1/5] =?UTF-8?q?=D0=97=D0=B0=D0=BA=D0=B0=D0=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Entities/Clothing/Eyes/glasses.ftl | 4 ++ .../Entities/Clothing/Eyes/huds.ftl | 3 ++ .../Entities/Clothing/Head/helmets.ftl | 6 ++- .../Entities/Clothing/Uniforms/jumpsuits.ftl | 10 ++++ .../ADT/Entities/Clothing/Eyes/glasses.yml | 20 +++++++ .../ADT/Entities/Clothing/Eyes/hud.yml | 18 ++++++- .../ADT/Entities/Clothing/Head/helmets.yml | 18 +++++++ .../Entities/Clothing/Uniforms/Jumpsuits.yml | 51 ++++++++++++++++++ .../Glasses/mgd_pnvhud.rsi/equipped-EYES.png | Bin 0 -> 464 bytes .../Eyes/Glasses/mgd_pnvhud.rsi/icon.png | Bin 0 -> 359 bytes .../Eyes/Glasses/mgd_pnvhud.rsi/meta.json | 19 +++++++ .../Eyes/HUD/mgd_hud.rsi/equipped-EYES.png | Bin 0 -> 437 bytes .../Clothing/Eyes/HUD/mgd_hud.rsi/icon.png | Bin 0 -> 203 bytes .../Clothing/Eyes/HUD/mgd_hud.rsi/meta.json | 19 +++++++ .../mgd_helmet.rsi/equipped-HELMET.png | Bin 0 -> 618 bytes .../Head/Helmets/mgd_helmet.rsi/icon.png | Bin 0 -> 286 bytes .../Head/Helmets/mgd_helmet.rsi/meta.json | 19 +++++++ .../mgd_agent.rsi/equipped-INNERCLOTHING.png | Bin 0 -> 1677 bytes .../Uniforms/Jumpsuit/mgd_agent.rsi/icon.png | Bin 0 -> 545 bytes .../Uniforms/Jumpsuit/mgd_agent.rsi/meta.json | 19 +++++++ .../mgd_guard.rsi/equipped-INNERCLOTHING.png | Bin 0 -> 1933 bytes .../Uniforms/Jumpsuit/mgd_guard.rsi/icon.png | Bin 0 -> 555 bytes .../Uniforms/Jumpsuit/mgd_guard.rsi/meta.json | 19 +++++++ .../equipped-INNERCLOTHING.png | Bin 0 -> 1009 bytes .../Jumpsuit/mgd_participant.rsi/icon.png | Bin 0 -> 467 bytes .../Jumpsuit/mgd_participant.rsi/meta.json | 19 +++++++ 26 files changed, 241 insertions(+), 3 deletions(-) create mode 100644 Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Eyes/huds.ftl create mode 100644 Resources/Textures/ADT/Clothing/Eyes/Glasses/mgd_pnvhud.rsi/equipped-EYES.png create mode 100644 Resources/Textures/ADT/Clothing/Eyes/Glasses/mgd_pnvhud.rsi/icon.png create mode 100644 Resources/Textures/ADT/Clothing/Eyes/Glasses/mgd_pnvhud.rsi/meta.json create mode 100644 Resources/Textures/ADT/Clothing/Eyes/HUD/mgd_hud.rsi/equipped-EYES.png create mode 100644 Resources/Textures/ADT/Clothing/Eyes/HUD/mgd_hud.rsi/icon.png create mode 100644 Resources/Textures/ADT/Clothing/Eyes/HUD/mgd_hud.rsi/meta.json create mode 100644 Resources/Textures/ADT/Clothing/Head/Helmets/mgd_helmet.rsi/equipped-HELMET.png create mode 100644 Resources/Textures/ADT/Clothing/Head/Helmets/mgd_helmet.rsi/icon.png create mode 100644 Resources/Textures/ADT/Clothing/Head/Helmets/mgd_helmet.rsi/meta.json create mode 100644 Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/mgd_agent.rsi/equipped-INNERCLOTHING.png create mode 100644 Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/mgd_agent.rsi/icon.png create mode 100644 Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/mgd_agent.rsi/meta.json create mode 100644 Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/mgd_guard.rsi/equipped-INNERCLOTHING.png create mode 100644 Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/mgd_guard.rsi/icon.png create mode 100644 Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/mgd_guard.rsi/meta.json create mode 100644 Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/mgd_participant.rsi/equipped-INNERCLOTHING.png create mode 100644 Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/mgd_participant.rsi/icon.png create mode 100644 Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/mgd_participant.rsi/meta.json diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Eyes/glasses.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Eyes/glasses.ftl index dcee8da40cb..7bf27aabe2c 100644 --- a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Eyes/glasses.ftl +++ b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Eyes/glasses.ftl @@ -24,3 +24,7 @@ ent-ADTServantOfEvilGlasses = сварочные очки прислужника ent-ClothingEyesNightVision = прибор ночного видения .desc = Прибор, позволяющий лучше видеть в темноте или при плохой освещенности. Обратной стороной является возможность стать ослепленным при воздействии яркой вспышки света. + +ent-ClothingEyesNightVisionMGD = ПНВ компании MG&D + .desc = Стандартный прибор ночного видения, используемый сотрудниками компании MG&D + .suffix = { "MG&D" } diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Eyes/huds.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Eyes/huds.ftl new file mode 100644 index 00000000000..44e9415611b --- /dev/null +++ b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Eyes/huds.ftl @@ -0,0 +1,3 @@ +ent-ADTClothingEyesHudMGD = визор компании MG&D + .desc = Визор, предназначенный для сотрудников Службы Безопасности компании "MG&D". + .suffix = { "MG&D" } diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Head/helmets.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Head/helmets.ftl index 7792e228d00..74a80885a3f 100644 --- a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Head/helmets.ftl +++ b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Head/helmets.ftl @@ -8,4 +8,8 @@ ent-ADTClothingHeadHelmetTSF = шлем армии ТСФ ent-ADTClothingHeadUSSPjuggernautHelmetArmored = бронешлем "ТШ-6" .desc = Тяжелый защитный с Шестого уровнем защиты "Вулкан" предназначен для использования в комплекте боевого снаряжения с целью круговой защиты головы человека шестого класса от пуль стрелкового оружия. Прошел реальные боевые испытания в "Лямбде-14" и "Шерхане" и до сих пор остается на вооружении органов КГБ СССП и армейского спецназа. - .suffix = { "" } \ No newline at end of file + .suffix = { "" } + +ent-ADTClothingHeadHelmetMGDGuard = шлем "ТКШ - Б29" + .desc = Крепкий шлем, обеспечивающий умеренную защиту головы от разных типов повреждений. + .suffix = { "MG&D" } diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Uniforms/jumpsuits.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Uniforms/jumpsuits.ftl index 88b1cecc26f..918e6f4af64 100644 --- a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Uniforms/jumpsuits.ftl +++ b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Uniforms/jumpsuits.ftl @@ -376,3 +376,13 @@ ent-ADTClothingUniformSwimsuitWinth = купальник ведьмочки ent-ADTClothingUniformJumpsuitCamisoleQM = укороченный камзол квартирмейстера .desc = Камзол, который одновременно хорош как для работы так и для отдыха. + +ent-ADTClothingUniformJumpsuitMGDAgent = деловой костюм компании MG&D + .desc = Состоит из очень мягкой ткани. На себе имеет также имеет белую шубу с черным воротником. + .suffix = { "MG&D" } +ent-ADTClothingUniformJumpsuitMGDParticipant = костюм участника голодных игр + .desc = Состоит из белых и черных тканей. Костюм облегается на тело что дает свободу для передвижений. + .suffix = { "MG&D" } +ent-ADTClothingUniformJumpsuitMGDGuard = бронированный костюм компании MG&D + .desc = Состоит из прочного бронежилета "Тактика" а также защиты для коленей и локтей, состоящих из кевлара. + .suffix = { "MG&D" } diff --git a/Resources/Prototypes/ADT/Entities/Clothing/Eyes/glasses.yml b/Resources/Prototypes/ADT/Entities/Clothing/Eyes/glasses.yml index a5ada0f40ae..d90359f0fe9 100644 --- a/Resources/Prototypes/ADT/Entities/Clothing/Eyes/glasses.yml +++ b/Resources/Prototypes/ADT/Entities/Clothing/Eyes/glasses.yml @@ -123,3 +123,23 @@ icon: True: { state: icon } False: { state: icon } + +- type: entity + parent: [ClothingEyesBase] + id: ClothingEyesNightVisionMGD + name: night vision + description: jungar poka + components: + - type: Sprite + sprite: ADT/Clothing/Eyes/Glasses/mgd_pnvhud.rsi + - type: Clothing + sprite: ADT/Clothing/Eyes/Glasses/mgd_pnvhud.rsi + - type: NightVisionItem # RMC Night vision + - type: ItemToggle # RMC Night vision + - type: Appearance + - type: GenericVisualizer + visuals: + enum.NightVisionItemVisuals.Active: + icon: + True: { state: icon } + False: { state: icon } diff --git a/Resources/Prototypes/ADT/Entities/Clothing/Eyes/hud.yml b/Resources/Prototypes/ADT/Entities/Clothing/Eyes/hud.yml index 0c39f701efc..bb8470c551a 100644 --- a/Resources/Prototypes/ADT/Entities/Clothing/Eyes/hud.yml +++ b/Resources/Prototypes/ADT/Entities/Clothing/Eyes/hud.yml @@ -5,8 +5,22 @@ description: Im tired components: - type: Sprite - sprite: ADT/Clothing/Eyes/HUD/phantom_hud.rsi + sprite: ADT/Clothing/Eyes/Hud/phantom_hud.rsi - type: Clothing - sprite: ADT/Clothing/Eyes/HUD/phantom_hud.rsi + sprite: ADT/Clothing/Eyes/Hud/phantom_hud.rsi - type: ShowHauntedIcons +- type: entity + parent: ClothingEyesBase + id: ADTClothingEyesHudMGD + name: mgd hud + description: owl attacking + components: + - type: Sprite + sprite: ADT/Clothing/Eyes/Hud/mgd_hud.rsi + - type: Clothing + sprite: ADT/Clothing/Eyes/Hud/mgd_hud.rsi + - type: ShowJobIcons + - type: ShowCriminalRecordIcons + - type: FlashImmunity + diff --git a/Resources/Prototypes/ADT/Entities/Clothing/Head/helmets.yml b/Resources/Prototypes/ADT/Entities/Clothing/Head/helmets.yml index 153cc3a73cc..b95abea81a2 100644 --- a/Resources/Prototypes/ADT/Entities/Clothing/Head/helmets.yml +++ b/Resources/Prototypes/ADT/Entities/Clothing/Head/helmets.yml @@ -56,3 +56,21 @@ - type: ExplosionResistance damageCoefficient: 0.70 - type: GroupExamine + +- type: entity + parent: ClothingHeadBase + id: ADTClothingHeadHelmetMGDGuard + name: MG&D guard helmet + description: MG&D guard helmet + components: + - type: Sprite + sprite: ADT/Clothing/Head/Helmets/mgd_helmet.rsi + - type: Clothing + sprite: ADT/Clothing/Head/Helmets/mgd_helmet.rsi + - type: Armor + modifiers: + coefficients: + Blunt: 0.9 + Slash: 0.9 + Piercing: 0.9 + Heat: 0.9 diff --git a/Resources/Prototypes/ADT/Entities/Clothing/Uniforms/Jumpsuits.yml b/Resources/Prototypes/ADT/Entities/Clothing/Uniforms/Jumpsuits.yml index a25d150167d..1b0d6bc8a9d 100644 --- a/Resources/Prototypes/ADT/Entities/Clothing/Uniforms/Jumpsuits.yml +++ b/Resources/Prototypes/ADT/Entities/Clothing/Uniforms/Jumpsuits.yml @@ -1230,6 +1230,8 @@ - type: Clothing sprite: ADT/Clothing/Uniforms/Jumpsuit/winth_swimsuit.rsi +# конец swimsuit + - type: entity parent: ClothingUniformBase id: ADTClothingUniformJumpsuitCamisoleQM @@ -1240,3 +1242,52 @@ sprite: ADT/Clothing/Uniforms/Jumpsuit/qm_camisole.rsi - type: Clothing sprite: ADT/Clothing/Uniforms/Jumpsuit/qm_camisole.rsi + +- type: entity + parent: ClothingUniformBase + id: ADTClothingUniformJumpsuitMGDAgent + name: MG&D agent + description: MG&D agent + components: + - type: Sprite + sprite: ADT/Clothing/Uniforms/Jumpsuit/mgd_agent.rsi + - type: Clothing + sprite: ADT/Clothing/Uniforms/Jumpsuit/mgd_agent.rsi + +- type: entity + parent: ClothingUniformBase + id: ADTClothingUniformJumpsuitMGDParticipant + name: MG&D participant + description: MG&D participant + components: + - type: Sprite + sprite: ADT/Clothing/Uniforms/Jumpsuit/mgd_participant.rsi + - type: Clothing + sprite: ADT/Clothing/Uniforms/Jumpsuit/mgd_participant.rsi + - type: Armor + modifiers: + coefficients: + Blunt: 0.95 + Slash: 0.9 + Piercing: 0.9 + Heat: 0.95 + +- type: entity + parent: ClothingUniformBase + id: ADTClothingUniformJumpsuitMGDGuard + name: MG&D guard + description: MG&D guard + components: + - type: Sprite + sprite: ADT/Clothing/Uniforms/Jumpsuit/mgd_guard.rsi + - type: Clothing + sprite: ADT/Clothing/Uniforms/Jumpsuit/mgd_guard.rsi + - type: Armor + modifiers: + coefficients: + Blunt: 0.7 + Slash: 0.7 + Piercing: 0.6 + Heat: 0.7 + - type: ExplosionResistance + damageCoefficient: 0.75 diff --git a/Resources/Textures/ADT/Clothing/Eyes/Glasses/mgd_pnvhud.rsi/equipped-EYES.png b/Resources/Textures/ADT/Clothing/Eyes/Glasses/mgd_pnvhud.rsi/equipped-EYES.png new file mode 100644 index 0000000000000000000000000000000000000000..318bb33f84c605b58df135d14ec17c1d5a98ccfa GIT binary patch literal 464 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEV663YaSW+oe0$5btJy*1z{iti zPF#Yg1vYGoxpPP_+#vkM;m_D>`-9QNv~{jR6m+#x9Rqu%RR;x?``X6 z=FJQGBj9i#bipdEx4X=b>=XDIAH#ielaIOY;*^r!hr8G3M&B1WCAC0<>u;^a3yZ$x zPmEqY4m`c9+*FM5lg;(R1{#vO+wShoVpVX@lX3rAw|CY0zi}sz*XL}1^|mN*liVYZ zd!ZRR9(|j1!sT^~uiueY{^uNQ$=IYIFY9`-Tbtc>PMRLG z@R#74^;@2vnE9&qzW?JyrHD2gV0qYJ_K+uP=iZkj(+aAaE&o PGKlhY^>bP0l+XkKwIsL4 literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Clothing/Eyes/Glasses/mgd_pnvhud.rsi/icon.png b/Resources/Textures/ADT/Clothing/Eyes/Glasses/mgd_pnvhud.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..f6733aafeaa5c965748d95d22ee68bcc56bd2c48 GIT binary patch literal 359 zcmV-t0hs=YP)Px$AxT6*R9J=WldW#UFcgKqO>;mcm!ypwurP#5;sbDL*NY*ERd5VJW5WQ-FsB0J|jNezD-; zcqEFV;l6EKUe;?~uUDSVXJC97y%IYnV7^-r2m}Iwz#Gc*Z$&7nm2&_9002ovPDHLk FV1iR2o3Q`@ literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Clothing/Eyes/Glasses/mgd_pnvhud.rsi/meta.json b/Resources/Textures/ADT/Clothing/Eyes/Glasses/mgd_pnvhud.rsi/meta.json new file mode 100644 index 00000000000..38ce2a18dd2 --- /dev/null +++ b/Resources/Textures/ADT/Clothing/Eyes/Glasses/mgd_pnvhud.rsi/meta.json @@ -0,0 +1,19 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by discord:peacemakerrus", + "size": { + "x": 32, + "y": 32 + }, + "states": + [ + { + "name": "equipped-EYES", + "directions": 4 + }, + { + "name": "icon" + } + ] +} diff --git a/Resources/Textures/ADT/Clothing/Eyes/HUD/mgd_hud.rsi/equipped-EYES.png b/Resources/Textures/ADT/Clothing/Eyes/HUD/mgd_hud.rsi/equipped-EYES.png new file mode 100644 index 0000000000000000000000000000000000000000..0bdfa1e8841c697fa3337e3c2d0dd3485c2c33c4 GIT binary patch literal 437 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%z^F3W0Ln`LH zy|ppxP=Ls>kNYpNZ_v{^tCnErGIphvGW1<$Qs_(G zeEY4}cYBXdH&@))BXfKsW5uiQ%NdyMC3qJVaDBMwW5&4PZeH}-`t;95i!c7zmtn@(v1o(PUz^tlj%pn$jB*K_k$2@gbMWe`pW<(P zws~9`_tHyVZ_e5??21YV@PEC}W~S#UJAc0WaPm|LZRL!@H)> zpYku|)3kflGX2jP*7M&@+?G3+{XYL0Z;^A1b}{8IEcjMm)tW1LBggLZY<>^14}T9V z*~}zanQs@VJkzt_V9xgF2L)*lBGlQ>Z96XB?fOpozwi3%-o|ULzjiWWm?bVC2m=$d aKeFcXX4~tiCC>xK1B0ilpUXO@geCyPA;eh# literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Clothing/Eyes/HUD/mgd_hud.rsi/icon.png b/Resources/Textures/ADT/Clothing/Eyes/HUD/mgd_hud.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..c06681e26170b8599fdd6641c2a87ef0699212e9 GIT binary patch literal 203 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}t)4E9ArY-_ zFCFAOY{1j{aQ{+ki`E!lvkZspJQp?^^_^shbBwOw`+DJC_d!kDJ?~W}2=FTk2u|cX z{i)-k_4>u)S_f7#KKsenu-iR5_lJGW({~Tw2?j8o+Gd;FzRCHd!;J*>I3 z+|ZZdN>$9O<7EfeAz-XQ~#R^O{r zB|H6i`308fg`7H7{DkqBP3_ckvJ*~ul+`Wat7JSf=huRJC%DXBSY?W=NA$xk3_tI_R)1yI zgtN)9^PZ*$Bw)>ZuTXyYL&I!9~Y~*}5Cj}ebOKZM<&Ft}GmR(CN-}SZLdL{f} z=iPPA2jkQxyJqC9_?yLWe|hlU=~rf4KQv?guE%`R%4^eQjH|!sU2FZd^<(~7|I1tI zZswUu8_z%gTGcf$=Eo}b-B~G-VGDPCtf_tXW5Vr=M`AcuU)8cYH{sz0Y0e1@_|P9? zrojKtmG$*IJ!cDADNEkGq%K|2Fz>bUv1TiCjzn`=)!FynmR-#;d(FzUrAF?7FSlcA zgjv7L-t|*bJFORWz3eVt%Wrw&Wy!0#O;c`0Ab|qip6oDDf{+R7wSm>+& z#Bj+*8P*M`Q-a*!~4ToigylP+inuOrFGper<9#BRof@se9w}=@pXOo z3x~_gML)fm-EH^vb60vm6X)N!PoI=t#XOB>tW+^rQp>)Q(c+i*eU{9lcOzzPs}|m{ zPXF#~x!K3^^g3o-Xm@MT)l*~?Qow~8e=B@oF8A59WYf$qKERa1mm1-j=IhI#1!Qvo UF$i1=o(!TqUHx3vIVCg!0N9!fF#rGn literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Clothing/Head/Helmets/mgd_helmet.rsi/icon.png b/Resources/Textures/ADT/Clothing/Head/Helmets/mgd_helmet.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..c90cee7e56cf70ae6104a5231129ab2780c4c259 GIT binary patch literal 286 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 literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/mgd_guard.rsi/meta.json b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/mgd_guard.rsi/meta.json new file mode 100644 index 00000000000..9113eecd383 --- /dev/null +++ b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/mgd_guard.rsi/meta.json @@ -0,0 +1,19 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by discord:peacemakerrus", + "size": { + "x": 32, + "y": 32 + }, + "states": + [ + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "icon" + } + ] +} diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/mgd_participant.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/mgd_participant.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 0000000000000000000000000000000000000000..6a429f9c39c1ff2d6853e361065b524e6ed09cb9 GIT binary patch literal 1009 zcmVPx&t4TybRCt{2nz2jcP#nj<9)~y-8j`_1;y;ijTO6ER99lP_lXN@j;&_8N_6Biq zkXw4-R^5t&WH3%HLMMk1L1>2?BJaVQvb-C5@0sSJ_9e#3`92V6lP2G9e|h=6M}9v* zqtR$I8jVKtIayHoaih`VloBvTadUGe&vo53UaQqnuNyc&|D|-zqWUK%M{<9=y^Esy zUy6!18ZGX+E^jni{N&^aj8RZZ&}g){ih-i~mSxGUjQ&gkaNRXN9zTFFinFs*Se69< zczk>W09clVv$In$Mll{gz;)N&GzfY6hGEF9jQ*>`B?tm;+cp5eFbn{|;^HDUHnzan zZ`5kbxVY#eNfH16Ap`($e}50p^GZJsdHOG*sz3815XZ5+xIm16w0IoHvtCk(JpC+1 z^j{2sh<+T$pp;4zNs@pu3ez;f7)6pKQe6DbwrvDKQ0h^5PCt*L`mc@vaZ%6n7TWDy zY2y0&61CbguCFhpc)Ps|&+`_9iMQZ6{WN9tUkw1IRDQ12>S(uj0RTyoOg;NzD#|;r z4A1FjDXRbVrGwcdQm;>vP_wxW-yg{R&E~e8hx5)W%5(a86xE+O3I4C>0L}o0E7_S-Q9r@0^c9VrD&B>a!!QgGLJ&m}2q7>G1HImHA$_F)h;?{&&LxD% z^>~#q_N159kK?$IzES|X-2?eq%+2ZPCVjjLs?gUtVBQAi&5H}6Ec^REX4+R3Rp=`P zATP;Oo%lYIzDA?bXfzs)Mx)VuZuz~SM~N}D6H9@4sL zDr=AcCUtsB3B(2fwr#_4oWIB2%14IKa2yAsY@YU{+MA&KN{lfoH*psP*>ZUmWHmaS zoheVMD7_Kd+xv#q)m5yltl;+cR^9<%au-a~R5qZBX_`~-|83hww|fA`aS%lj!Z5_v z*450{EA>*e+1#G`K93QQ^`J_j07Ov)U{aA421LU|)rh7H;HfH|_N0n(0KzcLt-Vj$ z)|LvHP-AJTMNU8|MHq(FO6Rqlxb7NfjPc=c$ji3G%<5q{9CF4O&&&9#9zK0xLuPzA60_Y0y+!2Y8;h5Cj3=+xyOek5QFj zjLJXW?H;_#O^}IbG#YWn*t;aZJP(X9J{pZmC19Nc=51i!eEI+=B|*V^_5@Vzp-=!m fO7_=iG^P0iZ=$#|LaFX+00000NkvXXu0mjfXY=9J literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/mgd_participant.rsi/icon.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/mgd_participant.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..f1650b8e82fc00f6e56474c03614285e2a2cf34f GIT binary patch literal 467 zcmV;^0WAKBP)Px$jY&j7R9J=Wm9cKyFc5}67lkGRGDN`L^%C6V!DE3AdH|0Z`wrPVW%O7eTb-eR zks;7fdCC)bBap!(4IaRW3pNk%h&bAI6W?5b)~k3rJ>k8u z+ufp+0^oc;1E7>*x4XrA;dFXJ>s7XhkCzPkzK?ZX1F%>u04RzA5l2;3h&YzZB_Ra5 zZjW;g0AoySn&x6UvQuEKP0j~~8yIlTVXe(|nJ1uWnwc>MrBo6TLcn{Wsw%t}LI^3i zQVL@XIj7GOFkr1kM3RWZ;eq-56Nke?3O=llAzOfm0C08n6@U-|_xC>tA-tF$>~eW^ zALzP0MNtq!V7>m#yZ3?jViGV)!1Me&=QtjZIOpiPeQL#H8TDZLzK>;Drdl7U>pGQT zZv78jY{k#HzW(-N+;u-^>-CpWpU*#|^(y}P+5By8Vq#(dwW$n128O002ov JPDHLkV1jT^*0KNq literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/mgd_participant.rsi/meta.json b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/mgd_participant.rsi/meta.json new file mode 100644 index 00000000000..9113eecd383 --- /dev/null +++ b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/mgd_participant.rsi/meta.json @@ -0,0 +1,19 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by discord:peacemakerrus", + "size": { + "x": 32, + "y": 32 + }, + "states": + [ + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "icon" + } + ] +} From 0ffe6c9ac21e6b970f8dc31db4b44e683690bce0 Mon Sep 17 00:00:00 2001 From: Filo <98309485+Filokini@users.noreply.github.com> Date: Mon, 6 Jan 2025 22:35:27 +0500 Subject: [PATCH 2/5] Update hud.yml --- Resources/Prototypes/ADT/Entities/Clothing/Eyes/hud.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Resources/Prototypes/ADT/Entities/Clothing/Eyes/hud.yml b/Resources/Prototypes/ADT/Entities/Clothing/Eyes/hud.yml index bb8470c551a..3a225bc10ae 100644 --- a/Resources/Prototypes/ADT/Entities/Clothing/Eyes/hud.yml +++ b/Resources/Prototypes/ADT/Entities/Clothing/Eyes/hud.yml @@ -5,9 +5,9 @@ description: Im tired components: - type: Sprite - sprite: ADT/Clothing/Eyes/Hud/phantom_hud.rsi + sprite: ADT/Clothing/Eyes/HUD/phantom_hud.rsi - type: Clothing - sprite: ADT/Clothing/Eyes/Hud/phantom_hud.rsi + sprite: ADT/Clothing/Eyes/HUD/phantom_hud.rsi - type: ShowHauntedIcons - type: entity @@ -17,9 +17,9 @@ description: owl attacking components: - type: Sprite - sprite: ADT/Clothing/Eyes/Hud/mgd_hud.rsi + sprite: ADT/Clothing/Eyes/HUD/mgd_hud.rsi - type: Clothing - sprite: ADT/Clothing/Eyes/Hud/mgd_hud.rsi + sprite: ADT/Clothing/Eyes/HUD/mgd_hud.rsi - type: ShowJobIcons - type: ShowCriminalRecordIcons - type: FlashImmunity From db587e8f781d37ff91e2a66f5c83397c00518aec Mon Sep 17 00:00:00 2001 From: Filo Date: Tue, 7 Jan 2025 00:38:48 +0500 Subject: [PATCH 3/5] review --- .../ru-RU/ADT/prototypes/Entities/Clothing/Eyes/glasses.ftl | 2 +- Resources/Prototypes/ADT/Entities/Clothing/Eyes/glasses.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Eyes/glasses.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Eyes/glasses.ftl index 7bf27aabe2c..1295dae6a73 100644 --- a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Eyes/glasses.ftl +++ b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Eyes/glasses.ftl @@ -25,6 +25,6 @@ ent-ADTServantOfEvilGlasses = сварочные очки прислужника ent-ClothingEyesNightVision = прибор ночного видения .desc = Прибор, позволяющий лучше видеть в темноте или при плохой освещенности. Обратной стороной является возможность стать ослепленным при воздействии яркой вспышки света. -ent-ClothingEyesNightVisionMGD = ПНВ компании MG&D +ent-ADTClothingEyesNightVisionMGD = ПНВ компании MG&D .desc = Стандартный прибор ночного видения, используемый сотрудниками компании MG&D .suffix = { "MG&D" } diff --git a/Resources/Prototypes/ADT/Entities/Clothing/Eyes/glasses.yml b/Resources/Prototypes/ADT/Entities/Clothing/Eyes/glasses.yml index d90359f0fe9..18173b49ed7 100644 --- a/Resources/Prototypes/ADT/Entities/Clothing/Eyes/glasses.yml +++ b/Resources/Prototypes/ADT/Entities/Clothing/Eyes/glasses.yml @@ -126,7 +126,7 @@ - type: entity parent: [ClothingEyesBase] - id: ClothingEyesNightVisionMGD + id: ADTClothingEyesNightVisionMGD name: night vision description: jungar poka components: From 1f0a34c02456f8b97602003c821cd6da7fdffd40 Mon Sep 17 00:00:00 2001 From: Filo Date: Tue, 7 Jan 2025 00:54:13 +0500 Subject: [PATCH 4/5] banner --- .../Entities/Structures/Decorations/banners.ftl | 3 +++ .../Entities/Structures/Decorations/banners.yml | 11 +++++++++++ .../Decoration/banners64x64.rsi/meta.json | 15 +++++++++++++++ .../Decoration/banners64x64.rsi/mgdflag.png | Bin 0 -> 817 bytes 4 files changed, 29 insertions(+) create mode 100644 Resources/Textures/ADT/Structures/Decoration/banners64x64.rsi/meta.json create mode 100644 Resources/Textures/ADT/Structures/Decoration/banners64x64.rsi/mgdflag.png diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Structures/Decorations/banners.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Structures/Decorations/banners.ftl index cbf642708b9..0b75e63779a 100644 --- a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Structures/Decorations/banners.ftl +++ b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Structures/Decorations/banners.ftl @@ -1,3 +1,6 @@ ent-ADTBannerTSF = знамя ТСФ .desc = Это знамя с логотипом ТСФ. .suffix = { "ТСФ" } +ent-ADTBannerMGD = знамя MG&D + .desc = Флаг корпорации MG&D - Marshall Gohnson & Dark + .suffix = { "MG&D" } diff --git a/Resources/Prototypes/ADT/Entities/Structures/Decorations/banners.yml b/Resources/Prototypes/ADT/Entities/Structures/Decorations/banners.yml index 5d38e55921b..c1701a316da 100644 --- a/Resources/Prototypes/ADT/Entities/Structures/Decorations/banners.yml +++ b/Resources/Prototypes/ADT/Entities/Structures/Decorations/banners.yml @@ -7,3 +7,14 @@ - type: Sprite sprite: ADT/Structures/Decoration/banners.rsi state: humanflag + +- type: entity + id: ADTBannerMGD + parent: BannerBase + name: MG&D banner + description: MG&D banner. + components: + - type: Sprite + sprite: ADT/Structures/Decoration/banners64x64.rsi + state: mgdflag + scale: 0.75, 0.75 diff --git a/Resources/Textures/ADT/Structures/Decoration/banners64x64.rsi/meta.json b/Resources/Textures/ADT/Structures/Decoration/banners64x64.rsi/meta.json new file mode 100644 index 00000000000..065cce002a3 --- /dev/null +++ b/Resources/Textures/ADT/Structures/Decoration/banners64x64.rsi/meta.json @@ -0,0 +1,15 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "ADT team", + + "size": { + "x": 64, + "y": 64 + }, + "states": [ + { + "name": "mgdflag" + } + ] +} diff --git a/Resources/Textures/ADT/Structures/Decoration/banners64x64.rsi/mgdflag.png b/Resources/Textures/ADT/Structures/Decoration/banners64x64.rsi/mgdflag.png new file mode 100644 index 0000000000000000000000000000000000000000..f72a8aaebca0d3a7cb253ad24e9777010e6596a7 GIT binary patch literal 817 zcmV-11J3-3P);)7(fOrkh;BmZx2k-z2USJ;=1ETC(f-gc|+^NBTsA+3P zovxlFJ2eodr@FeQ{;#WgIw4VHmk}@mM!*Od0V7}pjDQiSC4q;Ks(<|ab<&*w_0Mnh zc)cgQCi3I>ro!O4@lrTXSvcMRC@Ky?OK_puxRV1ZE1uq=0sz4hh$;d22uIA1Xw>y? z0KVhOcRC%lu%Fasx?`fWjm z;zS9YGr&9aO80=gXes@>-EO8^N_%nul#H{-!>0k5&*y2_yzU_oD@{(koeolJ*dCw+ z@}_APi$&r$8jT|QB<8I=Ik_cp(+f&CRaOG)^*U;|+hT}ZEH4eoc{-g+=F+y>mw@*{ zLO`E64B>#Y-EN~^ua~&PhOtx%eDfnaJujC_xJ1L@Fm10^D{8C69<&4~?QuaoJ(CzN zj+X#HU>w~KhXa39Z3hM5);z?~XN_M3gRd~}qxN__c1>!}wci7RW&mF%H_fT;`CfpM zD9QvrpH{mv0Q@wEHpD_a7j>;HxUWy!O2CKSJ!5CHSu~kUk|Ed(rSZrHWQXLVX$z78 zB#?gi=ZlWNu)6{zu>j%vYCi`7pdDn$`BY9*PJro2kXAfzCHbmL8(z^k&68jd0E59G zVS?QrfQm%Hhu^tB2lk}_G#ZW5@py~~f(w9)E89Mcr{OA#7i~Yi2qCx# vkT#5>cUhkiFak!v2p9n)U<8c7|3=^+5$f`WN?;Sf00000NkvXXu0mjfXbyAg literal 0 HcmV?d00001 From c6d0c9f66be44481030ce18633a3ea24fbe0cdc0 Mon Sep 17 00:00:00 2001 From: Filo Date: Tue, 7 Jan 2025 01:16:13 +0500 Subject: [PATCH 5/5] ebalyakazino --- .../Entities/Structures/Decorations/banners.yml | 2 +- .../meta.json | 4 ++-- .../Decoration/banners48x48.rsi/mgdflag.png | Bin 0 -> 651 bytes .../Decoration/banners64x64.rsi/mgdflag.png | Bin 817 -> 0 bytes 4 files changed, 3 insertions(+), 3 deletions(-) rename Resources/Textures/ADT/Structures/Decoration/{banners64x64.rsi => banners48x48.rsi}/meta.json (84%) create mode 100644 Resources/Textures/ADT/Structures/Decoration/banners48x48.rsi/mgdflag.png delete mode 100644 Resources/Textures/ADT/Structures/Decoration/banners64x64.rsi/mgdflag.png diff --git a/Resources/Prototypes/ADT/Entities/Structures/Decorations/banners.yml b/Resources/Prototypes/ADT/Entities/Structures/Decorations/banners.yml index c1701a316da..c4d4f845565 100644 --- a/Resources/Prototypes/ADT/Entities/Structures/Decorations/banners.yml +++ b/Resources/Prototypes/ADT/Entities/Structures/Decorations/banners.yml @@ -15,6 +15,6 @@ description: MG&D banner. components: - type: Sprite - sprite: ADT/Structures/Decoration/banners64x64.rsi + sprite: ADT/Structures/Decoration/banners48x48.rsi state: mgdflag scale: 0.75, 0.75 diff --git a/Resources/Textures/ADT/Structures/Decoration/banners64x64.rsi/meta.json b/Resources/Textures/ADT/Structures/Decoration/banners48x48.rsi/meta.json similarity index 84% rename from Resources/Textures/ADT/Structures/Decoration/banners64x64.rsi/meta.json rename to Resources/Textures/ADT/Structures/Decoration/banners48x48.rsi/meta.json index 065cce002a3..73f683db573 100644 --- a/Resources/Textures/ADT/Structures/Decoration/banners64x64.rsi/meta.json +++ b/Resources/Textures/ADT/Structures/Decoration/banners48x48.rsi/meta.json @@ -4,8 +4,8 @@ "copyright": "ADT team", "size": { - "x": 64, - "y": 64 + "x": 48, + "y": 48 }, "states": [ { diff --git a/Resources/Textures/ADT/Structures/Decoration/banners48x48.rsi/mgdflag.png b/Resources/Textures/ADT/Structures/Decoration/banners48x48.rsi/mgdflag.png new file mode 100644 index 0000000000000000000000000000000000000000..26edbd906851a53af84b10e9da462c328eacd34e GIT binary patch literal 651 zcmV;60(AX}P)Px%MM*?KRA_Dm?ryWN5R&Ijvd;Xto(f|Vk0}suJ+i~{ve2FRK?e&GFrL~hw zPO#V`erZ?8!2Vb=YPf) zpp?3~CWP?nE2TtPmd;&?^3PQulxP)5lB8~%Gp?(0uM#>oWm!T>3HAQzJ#NV9cbQBk zcW=_@gc#7Vq3zS@*e1t+D;~IyVKA?`r zBNmHA?yj)*e9`hno{Vj+ZJqFztEF7*g%@50B(QB z`0+&cKE!hgGEi032uGh-3mdHh)aR-r;%uU}(LTKq4g2q79qlv2Hn#r{%L lU<^1Wy*u;)7(fOrkh;BmZx2k-z2USJ;=1ETC(f-gc|+^NBTsA+3P zovxlFJ2eodr@FeQ{;#WgIw4VHmk}@mM!*Od0V7}pjDQiSC4q;Ks(<|ab<&*w_0Mnh zc)cgQCi3I>ro!O4@lrTXSvcMRC@Ky?OK_puxRV1ZE1uq=0sz4hh$;d22uIA1Xw>y? z0KVhOcRC%lu%Fasx?`fWjm z;zS9YGr&9aO80=gXes@>-EO8^N_%nul#H{-!>0k5&*y2_yzU_oD@{(koeolJ*dCw+ z@}_APi$&r$8jT|QB<8I=Ik_cp(+f&CRaOG)^*U;|+hT}ZEH4eoc{-g+=F+y>mw@*{ zLO`E64B>#Y-EN~^ua~&PhOtx%eDfnaJujC_xJ1L@Fm10^D{8C69<&4~?QuaoJ(CzN zj+X#HU>w~KhXa39Z3hM5);z?~XN_M3gRd~}qxN__c1>!}wci7RW&mF%H_fT;`CfpM zD9QvrpH{mv0Q@wEHpD_a7j>;HxUWy!O2CKSJ!5CHSu~kUk|Ed(rSZrHWQXLVX$z78 zB#?gi=ZlWNu)6{zu>j%vYCi`7pdDn$`BY9*PJro2kXAfzCHbmL8(z^k&68jd0E59G zVS?QrfQm%Hhu^tB2lk}_G#ZW5@py~~f(w9)E89Mcr{OA#7i~Yi2qCx# vkT#5>cUhkiFak!v2p9n)U<8c7|3=^+5$f`WN?;Sf00000NkvXXu0mjfXbyAg