From cb590c69baad67905c534412b59b858e33bc7525 Mon Sep 17 00:00:00 2001 From: Bolper <169089627+Bolper@users.noreply.github.com> Date: Mon, 2 Dec 2024 17:50:06 +0300 Subject: [PATCH 1/8] =?UTF-8?q?=D0=96=D0=B8=D0=B3=D0=B0=20DV?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Entities/Objects/Tools/lighters.ftl | 3 +- .../ADT/Entities/Objects/Tools/lighters.yml | 11 ++++++++ .../VendingMachines/Inventories/cigs.yml | 1 + .../Tools/Lighters/dvzippo.rsi/closed.png | Bin 0 -> 307 bytes .../Lighters/dvzippo.rsi/lighter_flame.png | Bin 0 -> 525 bytes .../Tools/Lighters/dvzippo.rsi/meta.json | 26 ++++++++++++++++++ .../Tools/Lighters/dvzippo.rsi/open.png | Bin 0 -> 408 bytes 7 files changed, 40 insertions(+), 1 deletion(-) create mode 100644 Resources/Textures/ADT/Objects/Tools/Lighters/dvzippo.rsi/closed.png create mode 100644 Resources/Textures/ADT/Objects/Tools/Lighters/dvzippo.rsi/lighter_flame.png create mode 100644 Resources/Textures/ADT/Objects/Tools/Lighters/dvzippo.rsi/meta.json create mode 100644 Resources/Textures/ADT/Objects/Tools/Lighters/dvzippo.rsi/open.png diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Tools/lighters.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Tools/lighters.ftl index 4d5c9546ad1..42252da70fa 100644 --- a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Tools/lighters.ftl +++ b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Tools/lighters.ftl @@ -2,4 +2,5 @@ ent-ADTZippo = Зажигалка Zippo .desc = Необычная стальная зажигалка Zippo. Зажигайте со вкусом. ent-ADTZippoExec = Зажигалка We-Ya Gold .desc = Замечательная зажигалка Zippo, выполненная в фирменных черно-золотых тонах. - +ent-ADTZippoDV = Зажигалка DV Titanium + .desc = Надёжная металлическая зажигалка зиппо с титановым покрытием, рассчитан на долгий срок службы. Является продуктом коллаборации Dar-Vaxed и We-Ya Gold. diff --git a/Resources/Prototypes/ADT/Entities/Objects/Tools/lighters.yml b/Resources/Prototypes/ADT/Entities/Objects/Tools/lighters.yml index db9da334815..23216cc3545 100644 --- a/Resources/Prototypes/ADT/Entities/Objects/Tools/lighters.yml +++ b/Resources/Prototypes/ADT/Entities/Objects/Tools/lighters.yml @@ -32,3 +32,14 @@ sprite: ADT/Objects/Tools/Lighters/execzippo.rsi - type: StaticPrice price: 300 + +- type: entity + name: DV Titanium zippo lighter + description: Reliable metal zippo lighter with titanium coating, designed for a long service life. It is a product of the Dar-Vaxed and We-Ya Gold collaboration. + parent: ADTZippo + id: ADTZippoDV + components: + - type: Sprite + sprite: ADT/Objects/Tools/Lighters/dvzippo.rsi + - type: StaticPrice + price: 300 diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/cigs.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/cigs.yml index c29f698e590..5a4c5377172 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/cigs.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/cigs.yml @@ -31,6 +31,7 @@ # ADT Tweak Start ADTZippo: 2 ADTZippoExec: 1 + ADTZippoDV: 1 # FlippoLighter: 2 # ADT Tweak End emaggedInventory: diff --git a/Resources/Textures/ADT/Objects/Tools/Lighters/dvzippo.rsi/closed.png b/Resources/Textures/ADT/Objects/Tools/Lighters/dvzippo.rsi/closed.png new file mode 100644 index 0000000000000000000000000000000000000000..3cfe7d3f4d5f519844d096283a522e7f1dc9708a GIT binary patch literal 307 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}Z#`WcLn7Rh zQzQ}&SRD9f++&qs!s6x(B--LQIyyT3%wO@bUGYB~H*=4hp6~rVmClovdj#=piU|&$ zoalNYyRE}?QGwJ=#_Q|j(-n>irdTF4J+p0l;k<{(`>kDbri6f~XzGHM%s+no_~-5E zX?Ue;Pr{0tBgZf3edqK!%pfiXYh3Ob6Mw<&;$T_O?Y1b literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Objects/Tools/Lighters/dvzippo.rsi/lighter_flame.png b/Resources/Textures/ADT/Objects/Tools/Lighters/dvzippo.rsi/lighter_flame.png new file mode 100644 index 0000000000000000000000000000000000000000..d9af7c61ccd190da025747746dd89b443f25d557 GIT binary patch literal 525 zcmeAS@N?(olHy`uVBq!ia0vp^4nUm1!3HGP9xZtRq!^2X+?^QKos)S9WFPl*aSW-5 zdpl>LAFCseYx@7@2Bt=*i37bDl9dL7A0z87*Q-+npg zxpnS&+udpE`I(ddPdoWNpW#5mNzM-(K6(uLj@OkpRR4_1KhGDFzJj-e_desE`kHOe zXLDb-4C8oS?!S8b_R0_YzfAwTEqed#LruK@K3-h7dcUN@^8cT|-TLO|r^=S|SAYFF zQ-(FS(pDQwPskN~ZNso(((0gg#?VPy-Ze6Y6@|VsSl~73nytYBuXSFsY$2YPcCoWX zoD5xgxIxP^>iYo(?VVbs5&^27ujM2XRKu6@F|Sg|yvxkI=E2xyTVCy)rJhPiIbCCdV6Qk0H%v(wLl~)|_uXl9%`JZv#gMZg& z$uoXs<+N;A!Fc8Q4Bh~KxvTOFfhz8{?96VydRciq9ZHt3EF}!GiUNz19YjtBo?(h?nnr@7F{W>W86}kn)q4&rXDbU89ZJ6T-G@yGywo7fYnU^ literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Objects/Tools/Lighters/dvzippo.rsi/meta.json b/Resources/Textures/ADT/Objects/Tools/Lighters/dvzippo.rsi/meta.json new file mode 100644 index 00000000000..f6b6443d01d --- /dev/null +++ b/Resources/Textures/ADT/Objects/Tools/Lighters/dvzippo.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by discord:prazat911 для Время Приключений MRP", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "closed" + }, + { + "name": "open" + }, + { + "name": "lighter_flame", + "delays": [ + [ + 0.2, + 0.1 + ] + ] + } + ] +} diff --git a/Resources/Textures/ADT/Objects/Tools/Lighters/dvzippo.rsi/open.png b/Resources/Textures/ADT/Objects/Tools/Lighters/dvzippo.rsi/open.png new file mode 100644 index 0000000000000000000000000000000000000000..0179a4f8fe6d1f3fdc23b2291691109f4b61a9fb GIT binary patch literal 408 zcmV;J0cZY+P)Px$Qb|NXR9Hu2WEfz;IKcKZj5=U61O|Tyh=_>%N6sm4-n^lzqwyLBvRqSB6D6k} zK75$|4tV|gHQW(5Zrq@s1Niv({!2+oF?{>>4eo$Pj~>gf!6`p zLSP1?E;uwEK70ta9OMX48sXyN0`ot8`b1J1As7NM3t({ovIu11uV25wmcv2-Bu|bb z2)Y&&)G*6oj=5MX!Vs}Wlwn24YcLH1*RNj(JB*Z2Am{+(QV5nNYDHc!R6gQkXqWp0 zr$OqP-$*b#d-iN#8~}3AdXK*hjw?P7i~|NV1dtQx$c=&lO#`4P0Obgp=K_#Lpsbk2 z{g+|ZS7rtnjht0UDFZ Date: Mon, 2 Dec 2024 18:09:45 +0300 Subject: [PATCH 2/8] =?UTF-8?q?=D0=BF=D0=BE=D1=81=D1=82=D0=B5=D1=80=D1=8B?= =?UTF-8?q?=20DV?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Structures/Wallmount/Signs/posters.ftl | 8 ++++++++ .../Structures/Wallmount/Signs/posters.yml | 18 ++++++++++++++++++ .../Markers/Spawners/Random/posters.yml | 2 ++ .../Wallmounts/posters.rsi/meta.json | 6 ++++++ .../posters.rsi/poster_unclepraz_legit.png | Bin 0 -> 1111 bytes .../posters.rsi/poster_whatdv_legit.png | Bin 0 -> 602 bytes 6 files changed, 34 insertions(+) create mode 100644 Resources/Textures/ADT/Structures/Wallmounts/posters.rsi/poster_unclepraz_legit.png create mode 100644 Resources/Textures/ADT/Structures/Wallmounts/posters.rsi/poster_whatdv_legit.png diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Structures/Wallmount/Signs/posters.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Structures/Wallmount/Signs/posters.ftl index fad99ec523d..605fd7a5677 100644 --- a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Structures/Wallmount/Signs/posters.ftl +++ b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Structures/Wallmount/Signs/posters.ftl @@ -243,3 +243,11 @@ ent-ADTPosterContrabandUmaRabbit = Ума - кролик ent-ADTPosterContrabandUmaOnBeach = Пляжный сезон! .desc = Плакат призывающий экипаж опробывать исскуственные пляжи на станции (пляж не доступен на некоторых станциях). .suffix = { "Спонсорское, Ума" } + +ent-ADTPosterWhatDVLegit = Что такое Dar-Vaxed? + .desc = Dar-Vaxed - это многопрофильный холдинговая компания, специализирующийся на производстве гражданской и военной продукции. Ассортимент компании включает: спецодежды, скафандры, костюмы и униформы, а так-же швейные машины и швейные инструменты. + .suffix = ДВ + +ent-ADTPosterUnclePrazLegit = ТЫ нам нужен! + .desc = Рекламный плакат, стилизованный под военную пропаганду, описывает все преимущества работы в холдинговой компании Dar-Vaxed. В нем упоминаются нелепые вещи, такие как: "льготы для многодетных работников, страхование жизни, защита прав работника". Создано при поддержке проекта по обмену специалистами корпорации NanoTrasen. + .suffix = ДВ diff --git a/Resources/Prototypes/ADT/Entities/Structures/Wallmount/Signs/posters.yml b/Resources/Prototypes/ADT/Entities/Structures/Wallmount/Signs/posters.yml index 8d6623bd350..99d6476d8e9 100644 --- a/Resources/Prototypes/ADT/Entities/Structures/Wallmount/Signs/posters.yml +++ b/Resources/Prototypes/ADT/Entities/Structures/Wallmount/Signs/posters.yml @@ -841,3 +841,21 @@ components: - type: Sprite state: poster_umaonbeach_contraband #Спрайт от Празата + +- type: entity + parent: ADTPosterBase + id: ADTPosterWhatDVLegit + name: What is Dar-Vaxed? + suffix: DV + components: + - type: Sprite + state: poster_whatdv_legit #Спрайт от Празата + +- type: entity + parent: ADTPosterBase + id: ADTPosterUnclePrazLegit + name: We need you! + suffix: DV + components: + - type: Sprite + state: poster_unclepraz_legit #Спрайт от Празата diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/posters.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/posters.yml index 131c13d73cb..aafaa5cb7bd 100644 --- a/Resources/Prototypes/Entities/Markers/Spawners/Random/posters.yml +++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/posters.yml @@ -112,6 +112,8 @@ - ADTPosterContrabandUmaAndAzalia - ADTPosterContrabandUmaRabbit - ADTPosterContrabandUmaOnBeach + - ADTPosterWhatDVLegit + - ADTPosterUnclePrazLegit #ADT tweak ^^^ chance: 1 diff --git a/Resources/Textures/ADT/Structures/Wallmounts/posters.rsi/meta.json b/Resources/Textures/ADT/Structures/Wallmounts/posters.rsi/meta.json index 55eab6a72b2..f276dc8b4da 100644 --- a/Resources/Textures/ADT/Structures/Wallmounts/posters.rsi/meta.json +++ b/Resources/Textures/ADT/Structures/Wallmounts/posters.rsi/meta.json @@ -57,6 +57,12 @@ }, { "name": "poster_umaonbeach_contraband" + }, + { + "name": "poster_whatdv_legit" + }, + { + "name": "poster_unclepraz_legit" } ] } diff --git a/Resources/Textures/ADT/Structures/Wallmounts/posters.rsi/poster_unclepraz_legit.png b/Resources/Textures/ADT/Structures/Wallmounts/posters.rsi/poster_unclepraz_legit.png new file mode 100644 index 0000000000000000000000000000000000000000..649ee16c054f7c52a781b9e495e38c39656870b0 GIT binary patch literal 1111 zcmV-d1gQIoP)Px(5lKWrR9HvNmwQZ9M-;|Cf}ntQVOgLBHO54u#?(JtNw+k`L`ZR26p2Vct3;Ho zXr-FIpe;?H1s`dxFBBA`2pZ8K+6A*!3=)xsM@$Iu(WcVUtfg_0Km~aSH0Nw)y}Lld zT_AXp&7C`UX1?F~X71csCroiTO|d>+Pk^s8vWLi-#fuiOK|cNgvWKlq)m z-=(LHnCys^1dz7mq-@dAI%G9%lLv7A(&eEj=g-lzq8>9U)wt4s6l+~}jtR(TQyVnF zA-JY*LQuLFYBSnVIKBu z;EmO}OVDaEIR9Le-s2l5ClLWAjpYozaoSMYsT(? z0I>Ib;U_QQ?(S|Cy;@d*ipqK%KJW$C2?+as4gt(7iL#Cp5bOb|IEfjfr(2&tyx)a; zfAk~cm>*2lUBlMOpV6iA9k2%=>qYivvzbNC=tGf^d(%d+yJY?_h;aju0=YmCJ-vPK zQF$X=8-a5L1vcg9|8-)*06Nk>u*poDqQa>{C3cn6L#b3kp->=07l@RiIxaUiH{)=$ z8e2C$L-`?#Ln0JeM)^}<4?u$vgnRU3xe07A10@mop=0uSA0fTfvcZhO1B0c#>wq9UdjADtc= zAHcGcFW~Cx%3JR*eJzIY3`O zvNn5eCt5t_FhE=5V-&l1b6sl78+`pI_Bb!VxR^+8KOq3*0A(fCL4wN*F2_ZB@}eUl zTAbggTCu%xklRvS&1Pq|pTglaK%HqFh-sjEnqv~V5d0ozE*k)NLLVVl+ zQV1#wH^_2&@9E1(4y^BQgFb$yjWClq;s71V@{^K9f4)kc5Q4M@#6g5Imu4;PoS2s* z|4e8PU=KlSVKmEa$N|U(pksN>!GreWSe=kQ7%gjQ8_n+B@{Z+G{>Nm*)F-L(_55!* dNy&~l?Ej;lRzC!dmg4{b002ovPDHLkV1nC*0?hyb literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Structures/Wallmounts/posters.rsi/poster_whatdv_legit.png b/Resources/Textures/ADT/Structures/Wallmounts/posters.rsi/poster_whatdv_legit.png new file mode 100644 index 0000000000000000000000000000000000000000..9a3f1b4c9952d7ac2248cab2d8afd131a436d5f8 GIT binary patch literal 602 zcmV-g0;TPx%6iGxuR9Hu2WEfz;IKcKZj5+{o2$U2y{Rc&jp@j)NhSZd$iH@yXcb~%5o%qK*HG=S7(7gaNWLSyFC9?~6HPI(N3SbUM2@7OcuxT4S3KIOhz$cYdn zj+{`@9YL`J1~d_}|9M8K{R}@@q{uG^Kn~dE&jNRZgf=gjZPfN2E(VkL+V}@7hR&y& z13(s>s}jWP0A$C46oT|n`LzV+T4H8g$fbr*JhIAfC8kqTo357jF zpBcrjjEjH4d}Q@t0S-CxTSN>$9>EQS*#>e52++*|6qiKggaD{nPD!iy@2_8QcmMqU ok@QyafcFb14t5d@80{MZ0Mt?LFq@?<6951J07*qoM6N<$g6YrsdH?_b literal 0 HcmV?d00001 From b87e74f912e61e0f318c0572b9f2f573be5b4a2a Mon Sep 17 00:00:00 2001 From: Bolper <169089627+Bolper@users.noreply.github.com> Date: Mon, 2 Dec 2024 18:45:52 +0300 Subject: [PATCH 3/8] =?UTF-8?q?=D0=94=D0=BE=D0=B4=D0=B5=D0=BB=D0=B0=D1=82?= =?UTF-8?q?=D1=8C=20=D0=BF=D0=B0=D0=BF=D0=BA=D1=83=20=D0=BF=D1=80=D0=B0?= =?UTF-8?q?=D0=B7=D0=B0=20=D0=BA=D0=B0=D0=BA=20=D0=BF=D0=BE=D1=8F=D0=B2?= =?UTF-8?q?=D0=B8=D1=82=D1=81=D1=8F=20=D1=85=D1=83=D0=B9=D0=BD=D1=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Entities/Objects/Misc/paper.ftl | 3 +++ .../ADT/Entities/Objects/Misc/paper.yml | 23 ++++++++++++++++++ .../Misc/bureaucracy.rsi/folder-base.png | Bin 0 -> 98 bytes .../Misc/bureaucracy.rsi/folder-centcom.png | Bin 0 -> 357 bytes .../Misc/bureaucracy.rsi/folder-colormap.png | Bin 0 -> 233 bytes .../bureaucracy.rsi/folder-overlay-paper.png | Bin 0 -> 113 bytes .../Objects/Misc/bureaucracy.rsi/meta.json | 23 ++++++++++++++++++ 7 files changed, 49 insertions(+) create mode 100644 Resources/Textures/ADT/Objects/Misc/bureaucracy.rsi/folder-base.png create mode 100644 Resources/Textures/ADT/Objects/Misc/bureaucracy.rsi/folder-centcom.png create mode 100644 Resources/Textures/ADT/Objects/Misc/bureaucracy.rsi/folder-colormap.png create mode 100644 Resources/Textures/ADT/Objects/Misc/bureaucracy.rsi/folder-overlay-paper.png create mode 100644 Resources/Textures/ADT/Objects/Misc/bureaucracy.rsi/meta.json diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Misc/paper.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Misc/paper.ftl index 3a621a78f2a..71839171a24 100644 --- a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Misc/paper.ftl +++ b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Misc/paper.ftl @@ -1 +1,4 @@ ent-TapeRecorderTranscript = транскрипция записи + +ent-ADTBoxFolderDV = чёрно-оранжевая папка + .desc = Папка выполненый под стиль Dar-Vaxed. diff --git a/Resources/Prototypes/ADT/Entities/Objects/Misc/paper.yml b/Resources/Prototypes/ADT/Entities/Objects/Misc/paper.yml index 3c86e22aef5..163f102b0d2 100644 --- a/Resources/Prototypes/ADT/Entities/Objects/Misc/paper.yml +++ b/Resources/Prototypes/ADT/Entities/Objects/Misc/paper.yml @@ -3,3 +3,26 @@ id: TapeRecorderTranscript name: record transcript # TODO: could have a unique sprite in the future + +- type: entity + id: ADTBoxFolderBase + parent: BoxFolderBase + name: folder + description: A folder filled with top secret paperwork. + components: + - type: Sprite + sprite: ADT/Objects/Misc/bureaucracy.rsi + layers: + - state: folder-colormap + - state: folder-base + +- type: entity + id: ADTBoxFolderDV + name: DV folder + parent: ADTBoxFolderBase + suffix: DV + components: + - type: Sprite + layers: + - state: folder-centcom + - state: folder-base diff --git a/Resources/Textures/ADT/Objects/Misc/bureaucracy.rsi/folder-base.png b/Resources/Textures/ADT/Objects/Misc/bureaucracy.rsi/folder-base.png new file mode 100644 index 0000000000000000000000000000000000000000..5fbb47268fc20367d8ba35969dae8e1dda8bf9cf GIT binary patch literal 98 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzO-~ockch)?FDNoG81OJ{{Pf>F w*f!dD@(*VNW`_Asg|@ymo^)g?14B4>?>rVJ{`tncfSMRQUHx3vIVCg!0F{&*i2wiq literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Objects/Misc/bureaucracy.rsi/folder-centcom.png b/Resources/Textures/ADT/Objects/Misc/bureaucracy.rsi/folder-centcom.png new file mode 100644 index 0000000000000000000000000000000000000000..cc9a33153f6eb60b2f09f86b82994c4c4da7acef GIT binary patch literal 357 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?3oArNM~bhqvg0|TSD zr;B4q1ZQ%B1nXi&11TmTaX|5aN6%mOb1VPo-_iE(32Li*-p<44R^DMGo}v)QrMo-! z-{{{Tm`QFZ*>w)3M;OXk;vd$@?2>_$) Bi^l)} literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Objects/Misc/bureaucracy.rsi/folder-colormap.png b/Resources/Textures/ADT/Objects/Misc/bureaucracy.rsi/folder-colormap.png new file mode 100644 index 0000000000000000000000000000000000000000..ce23165866a1557152c72fdcfded37fa8c63bfcf GIT binary patch literal 233 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJ4W2HJArXh)PC3YXSb@itw?spt z#W6uZqQ#OypY`3!par%8s)0f$-?wdec>2B>!(oFnM?0n}xGcFQ<)OLoJD*ce=I!FO zqIgTe~DWM4f>yaXG literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Objects/Misc/bureaucracy.rsi/meta.json b/Resources/Textures/ADT/Objects/Misc/bureaucracy.rsi/meta.json new file mode 100644 index 00000000000..ed2611382c5 --- /dev/null +++ b/Resources/Textures/ADT/Objects/Misc/bureaucracy.rsi/meta.json @@ -0,0 +1,23 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "drawn by discord: prazat911", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "folder-base" + }, + { + "name": "folder-colormap" + }, + { + "name": "folder-overlay-paper" + }, + { + "name": "folder-centcom" + } + ] +} From 33d5ba7916d361a147701b0197c1fde4a29dc287 Mon Sep 17 00:00:00 2001 From: Bolper <169089627+Bolper@users.noreply.github.com> Date: Mon, 2 Dec 2024 19:34:20 +0300 Subject: [PATCH 4/8] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=D0=B0=20=D0=BE=D1=87=D0=B5=D1=80=D0=B5=D0=B4=D0=BD=D0=B0?= =?UTF-8?q?=D1=8F=20=D1=85=D1=83=D0=B9=D0=BD=D1=8F=20=D0=9F=D1=80=D0=B0?= =?UTF-8?q?=D0=B7=D0=B0=D1=82=D0=B0:=20=D0=BA=D0=BB=D0=B8=D0=B1=D0=BE?= =?UTF-8?q?=D0=B0=D1=80=D0=B4=20=D0=B8=20=D0=BF=D0=BE=D1=84=D0=B8=D0=BA?= =?UTF-8?q?=D1=88=D0=B5=D0=BD=D0=B0=20=D0=BF=D0=B0=D0=BF=D0=BA=D0=B0=20?= =?UTF-8?q?=D0=BF=D1=80=D0=B0=D0=B7=D0=B0=D1=82=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Entities/Objects/Misc/paper.ftl | 5 +++ .../ADT/Entities/Objects/Misc/paper.yml | 24 +++++++++++- .../Misc/bureaucracy.rsi/folder-centcom.png | Bin 357 -> 0 bytes .../Misc/bureaucracy.rsi/folder-dv.png | Bin 0 -> 294 bytes .../Objects/Misc/bureaucracy.rsi/meta.json | 2 +- .../Misc/dv-clipboard.rsi/clipboard.png | Bin 0 -> 254 bytes .../Misc/dv-clipboard.rsi/clipboard_over.png | Bin 0 -> 198 bytes .../Misc/dv-clipboard.rsi/clipboard_paper.png | Bin 0 -> 187 bytes .../Misc/dv-clipboard.rsi/clipboard_pen.png | Bin 0 -> 201 bytes .../Misc/dv-clipboard.rsi/equipped-BELT.png | Bin 0 -> 372 bytes .../Misc/dv-clipboard.rsi/inhand-left.png | Bin 0 -> 648 bytes .../Misc/dv-clipboard.rsi/inhand-right.png | Bin 0 -> 644 bytes .../Objects/Misc/dv-clipboard.rsi/meta.json | 35 ++++++++++++++++++ 13 files changed, 64 insertions(+), 2 deletions(-) delete mode 100644 Resources/Textures/ADT/Objects/Misc/bureaucracy.rsi/folder-centcom.png create mode 100644 Resources/Textures/ADT/Objects/Misc/bureaucracy.rsi/folder-dv.png create mode 100644 Resources/Textures/ADT/Objects/Misc/dv-clipboard.rsi/clipboard.png create mode 100644 Resources/Textures/ADT/Objects/Misc/dv-clipboard.rsi/clipboard_over.png create mode 100644 Resources/Textures/ADT/Objects/Misc/dv-clipboard.rsi/clipboard_paper.png create mode 100644 Resources/Textures/ADT/Objects/Misc/dv-clipboard.rsi/clipboard_pen.png create mode 100644 Resources/Textures/ADT/Objects/Misc/dv-clipboard.rsi/equipped-BELT.png create mode 100644 Resources/Textures/ADT/Objects/Misc/dv-clipboard.rsi/inhand-left.png create mode 100644 Resources/Textures/ADT/Objects/Misc/dv-clipboard.rsi/inhand-right.png create mode 100644 Resources/Textures/ADT/Objects/Misc/dv-clipboard.rsi/meta.json diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Misc/paper.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Misc/paper.ftl index 71839171a24..946f6358637 100644 --- a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Misc/paper.ftl +++ b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Misc/paper.ftl @@ -2,3 +2,8 @@ ent-TapeRecorderTranscript = транскрипция записи ent-ADTBoxFolderDV = чёрно-оранжевая папка .desc = Папка выполненый под стиль Dar-Vaxed. + .suffix = ДВ + +ent-ADTBoxFolderClipboardDV = планшет Dar-Vaxed + .desc = Стильный планшет, обитый чёрной кожей. Сотрудники Dar-Vaxed часто носят, но редко используют. + .suffix = ДВ diff --git a/Resources/Prototypes/ADT/Entities/Objects/Misc/paper.yml b/Resources/Prototypes/ADT/Entities/Objects/Misc/paper.yml index 163f102b0d2..60b04140506 100644 --- a/Resources/Prototypes/ADT/Entities/Objects/Misc/paper.yml +++ b/Resources/Prototypes/ADT/Entities/Objects/Misc/paper.yml @@ -24,5 +24,27 @@ components: - type: Sprite layers: - - state: folder-centcom + - state: folder-dv - state: folder-base + +- type: entity + id: ADTBoxFolderClipboardDV + parent: BoxFolderClipboard + name: DV`s clipboard + suffix: DV + components: + - type: Sprite + sprite: ADT/Objects/Misc/dv-clipboard.rsi + layers: + - state: clipboard + - state: clipboard_paper + map: ["clipboard_paper"] + visible: false + - state: clipboard_pen + map: ["clipboard_pen"] + visible: false + - state: clipboard_over + - type: Item + sprite: ADT/Objects/Misc/dv-clipboard.rsi + - type: Clothing + sprite: ADT/Objects/Misc/dv-clipboard.rsi diff --git a/Resources/Textures/ADT/Objects/Misc/bureaucracy.rsi/folder-centcom.png b/Resources/Textures/ADT/Objects/Misc/bureaucracy.rsi/folder-centcom.png deleted file mode 100644 index cc9a33153f6eb60b2f09f86b82994c4c4da7acef..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 357 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?3oArNM~bhqvg0|TSD zr;B4q1ZQ%B1nXi&11TmTaX|5aN6%mOb1VPo-_iE(32Li*-p<44R^DMGo}v)QrMo-! z-{{{Tm`QFZ*>w)3M;OXk;vd$@?2>_$) Bi^l)} diff --git a/Resources/Textures/ADT/Objects/Misc/bureaucracy.rsi/folder-dv.png b/Resources/Textures/ADT/Objects/Misc/bureaucracy.rsi/folder-dv.png new file mode 100644 index 0000000000000000000000000000000000000000..ba1b6e4f0df5b624f5bbb60b644978cb1e70c1fd GIT binary patch literal 294 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}$2?seLn7Rh zQzQ}&SRD9f++&qs!s6zfkkQgGXVb0vh{}t4Kf4xw+9~1nu~FyS*URp0+t@L}$4B^!Tox80a5q`~JPR{ir0=i%w+=S$T6`{6g`ri-T1HAaQgJAeL=jI*ot zv1V`3ImmWoX^O;)XAEB~#Kc7Z`-ijhWN?IhzISvMca*($^Ig*gods7I7b`kk7EoBK zx1cJJM=K+N&m-mMA%p+?{9b_#dTw7&bxhMuU!=7-kiDnvKn4fTYXJs^Ad^dqOUl+K j0)51n8sVAd>&u`8WOD#92wV!D45B<;{an^LB{Ts5)Z1)! literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Objects/Misc/bureaucracy.rsi/meta.json b/Resources/Textures/ADT/Objects/Misc/bureaucracy.rsi/meta.json index ed2611382c5..eedb537a3b1 100644 --- a/Resources/Textures/ADT/Objects/Misc/bureaucracy.rsi/meta.json +++ b/Resources/Textures/ADT/Objects/Misc/bureaucracy.rsi/meta.json @@ -17,7 +17,7 @@ "name": "folder-overlay-paper" }, { - "name": "folder-centcom" + "name": "folder-dv" } ] } diff --git a/Resources/Textures/ADT/Objects/Misc/dv-clipboard.rsi/clipboard.png b/Resources/Textures/ADT/Objects/Misc/dv-clipboard.rsi/clipboard.png new file mode 100644 index 0000000000000000000000000000000000000000..05c34a9d047f24919959f5f2bee1aa1c5f665581 GIT binary patch literal 254 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}J3L(+Ln7Rh zQzQ}&SRD9f++&qs!qVo(!O`9IpZ)1H&sX*bXR5tdv*wZx_pAE-OVyEID1^aC<_SZd zU0vJPbMXhuSl>N$OH3|4aNS>C(oNPtifOSTf^gU>knsG$pY?0j9o=Bf86>;=++(2P z)qU^p?K$@0^YQYgtG14;3Wpu}9z1-iywdU0)6eR!EE%44#5k&LNLSzg|9HchV`5B4 re#kB9Um>s{^?B+QMxgNz6d4#cYJODA>yEDn4#?y*WRVbS1foOkl{|7M{=&pefz&nB!DO!@fp^!9^%23JB=Z_8{lId*hv zgYGqBQ?}=iyqBMEdg`}M2}6bN?f;I=r-ysT3+|@x%L~CgZixBxfwGW*uEJqSk<4N zK10$(M|*#|nTNjtKprZTvnn=eqF?ZhCpfKlqlcE%KOedC5H{b#;JKhXT1@-X|w k&nuHv8F()^>}VAC>a0>+^myxLpaU2@UHx3vIVCg!0JXP6)Bpeg literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Objects/Misc/dv-clipboard.rsi/clipboard_pen.png b/Resources/Textures/ADT/Objects/Misc/dv-clipboard.rsi/clipboard_pen.png new file mode 100644 index 0000000000000000000000000000000000000000..524b557af49b1afd2d5bb7bc56937dc62fc7e214 GIT binary patch literal 201 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}&7LlfArbD$ zDG~_>EDn4#?y*WRVQGuwm?07UKRh6eIenh#>SxWi0z%V%$h+9@sP2Av=H_CR$}W|o z2B#Cn7N;jpaK5%?7Qc|%t(ZlkO+Kua3@(p9sd~&?rr7X?qlQm$X@RmPi-+Nih^>qH hBzPMy3Sbb741LP-ik6C>KLee^;OXk;vd$@?2>@0;L6QIf literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Objects/Misc/dv-clipboard.rsi/equipped-BELT.png b/Resources/Textures/ADT/Objects/Misc/dv-clipboard.rsi/equipped-BELT.png new file mode 100644 index 0000000000000000000000000000000000000000..dc5cbf0ec4363b3d6abc729cf1558df50201ac01 GIT binary patch literal 372 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%z^*mi1Ln`9l z&NAdW9uU>$5m8Hwh=OG;tqro*)RMA?*DO$_F@D)DLhx;WC)#v-@n8rlzW8{JKf= z_=5vB&wk4&Bi{Sw^~{=k`b->|2XeJH*`0k_xc;%Ef!6B0@To-^xBeG?%ANft;^{nZ z=X>T?-%L1oA&SYtvvTcX#yIotbFRz*L2<7$8m^yRRD6+P%9QI?QV&WuzlbqmP<^_! zkFDaaj+HnsKIO%18TZ`{I2}IQF)>D*E|X_G`jb&M#I+L p%Px%LPB6xC7h*9tVIAL2dzV0gpStE#Pqg_$@%z0`YiCAWgYkhD_59I&B9#FgRo;z7wgz zYSCX`UtgYWYinbG5$c8fOcfR`40D~!{{poEne4GhB^Sv}wJnGQxM4u0ToxnYuK zL?W>Ur)P(b+~#7^awr48TL&_tQ!!C0-Y8$Bk{W=?V^EvBCvbgLaAaf-$MNRx_F*Dw z)H_bjBNSFf#qeYhwl^LjQ>iNDru2|%Z@Xmx(uIRr%|3xZ5L!Y2PH@P8((7A*Ra&}y zCpB2=A5Hg(Mgkg*Xc+;G2a^oQjYH5%!Pn=9`B%#hLDhC?m**Tov|W-@iGvMLajBD^ iVFEh2x+=MOo`8Sv*3v;kAPhAC0000V6yXcaSW-5 zdpm2Rw^N|VvG>^~O4=#>%?l8RcgR+nqh%C#LbO0$eswEPn8np2d`!L#V1<)XD$ z7b>pYsHm-^^)=Ax%OjhLqy>fRDjv+eSGe=^-sd&n%l8$_-ZPwXyuR)D`}Hgh76%@) zEMc|DW2j_V$_ixoIYb?J%r>E(ajjU#@yTKq&wf}eEj@Qu&pCF<`uYR=emHJfbS=O3 z>er_~IZOY=Gkjp*6-uXrT%MEk{DwpuDBI2h%@lFHi`1I27G5q zUu4eb?xw@XcOlo@gn?sDwCt8U_n4R*CNtb(jEQP^!uw%sdBnsQE3D$pu3njVKko4D z@>QRHHnOdVoUv^C;pSL9(TleN#2FYCXk5I#?9%%CSFiRm$gGXX)nM?Q-h9xJ@xTI) zB|=9TmsCiyh_f4L2(5G}WYCObJ9w0lr^`hvP{yHax?@2hL$lIEFA??$k5UC?JgRK~$^YOqfs!}6@ajK7RWqR%>B UKYLsXn5-B)UHx3vIVCg!0JJp`*Z=?k literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Objects/Misc/dv-clipboard.rsi/meta.json b/Resources/Textures/ADT/Objects/Misc/dv-clipboard.rsi/meta.json new file mode 100644 index 00000000000..6cb81a227ad --- /dev/null +++ b/Resources/Textures/ADT/Objects/Misc/dv-clipboard.rsi/meta.json @@ -0,0 +1,35 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Do over of clipboard.rsi sprites done by joshepvodka", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "clipboard" + }, + { + "name": "clipboard_over" + }, + { + "name": "clipboard_paper" + }, + { + "name": "clipboard_pen" + }, + { + "name": "equipped-BELT", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} From 2a44c769eabdedfa610379f3544c6b266017f9d0 Mon Sep 17 00:00:00 2001 From: Bolper <169089627+Bolper@users.noreply.github.com> Date: Mon, 2 Dec 2024 20:19:05 +0300 Subject: [PATCH 5/8] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=D0=B8=D0=B5=20=D1=80=D1=83=D1=87=D0=B5=D0=BA=20DV?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../prototypes/Entities/Objects/Misc/pen.ftl | 5 +++ .../ADT/Entities/Objects/Misc/pen.yml | 25 +++++++++++ .../Objects/Misc/pens.rsi/ADTpen_capdv.png | Bin 0 -> 338 bytes .../ADT/Objects/Misc/pens.rsi/ADTpen_dv.png | Bin 0 -> 333 bytes .../ADT/Objects/Misc/pens.rsi/meta.json | 40 ++++++++++-------- 5 files changed, 53 insertions(+), 17 deletions(-) create mode 100644 Resources/Textures/ADT/Objects/Misc/pens.rsi/ADTpen_capdv.png create mode 100644 Resources/Textures/ADT/Objects/Misc/pens.rsi/ADTpen_dv.png diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Misc/pen.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Misc/pen.ftl index 33e9b22a9a2..66a4017b62b 100644 --- a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Misc/pen.ftl +++ b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Misc/pen.ftl @@ -8,3 +8,8 @@ ent-ADTPenRD = перьевая ручка научного руководите .desc = Элегантная перьевая ручка для научного руководителя станции. ent-ADTPenHos = перьевая ручка главы службы безопасности .desc = Элегантная перьевая ручка для главы службы безопасности станции. + +ent-ADTPenCapDV = перьевая ручка Dar-Vaxed + .desc = Особая ручка для важных лиц компании Dar-Vaxed. +ent-ADTPenDV = ручка Dar-Vaxed + .desc = Эксклюзивная ручка стелезованный под чёрно-оранжевый стиль Dar-Vaxed. diff --git a/Resources/Prototypes/ADT/Entities/Objects/Misc/pen.yml b/Resources/Prototypes/ADT/Entities/Objects/Misc/pen.yml index d75a3cbddd1..8f35b72fffe 100644 --- a/Resources/Prototypes/ADT/Entities/Objects/Misc/pen.yml +++ b/Resources/Prototypes/ADT/Entities/Objects/Misc/pen.yml @@ -65,3 +65,28 @@ components: - type: Sprite state: ADTpen_hos + +- type: entity + name: DV`s pen + parent: ADTPenEmbeddable + id: ADTPenDV + suffix: DV + components: + - type: Sprite + state: ADTpen_dv + - type: DamageOtherOnHit + damage: + types: + Piercing: 0 + +- type: entity + name: Cap DV`s pen + parent: [BaseAdvancedPen] + id: ADTPenCapDV + suffix: DV + components: + - type: Sprite + sprite: ADT/Objects/Misc/pens.rsi + state: ADTpen_capdv + - type: Item + sprite: ADT/Objects/Misc/pens.rsi diff --git a/Resources/Textures/ADT/Objects/Misc/pens.rsi/ADTpen_capdv.png b/Resources/Textures/ADT/Objects/Misc/pens.rsi/ADTpen_capdv.png new file mode 100644 index 0000000000000000000000000000000000000000..76694aee83f5856c21a0e8d735939eb0923e4924 GIT binary patch literal 338 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^TEDn4#?y*WRVR3T?5^ZrD60>LgumALf^YCeL|CNs_Ch-VPpYSg~H}%|y4;O>k zvMif2*ys38{+GY?g=}*}g8;Lstm7o+o^;#Pl;;or@E5y$SY6BW{QbYQ7nT2}W)xr0 zwx49u|`kW3XfrVOp@mz5K{cV|7oX$tp*8MERfSv#5Hb;+e`4D#K7LaYFI2WkLU9e*2pMUbq8q)sYPA!ELhNYht i^GWbFUKEhvWn^fYUZwao(EDn4#?y*WRVR3T?5*~bvg`6+{>&M%uM#`^a>Q`yLVQKOI^@|sVHkF@R8l(CY zZZRsHW@TxSShMzwq?}#VsemJelNEoRU|;k#ScWP6@{<42x>d&+ijM5`ifa=Ow>Q4C z@XnfA8|!{$8>Yac95C$H4k9NV@U=f&_NUq>uHC z6(s?a)I5q9P6#TTuAWz)>f$f_#HuNUT|r$f%c4n%y+Ou#rLsmD!zN|Bnu_BF=Ue73 znd2zRen4iT_K70`FSQ+lzAc%>oRG;p#p8L+)AS!7UP=b02`}xK#(O=Gy{GL!1_zL6 cXlG!M=O|S?x?*PqFnkz1UHx3vIVCg!05w8?kpKVy literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Objects/Misc/pens.rsi/meta.json b/Resources/Textures/ADT/Objects/Misc/pens.rsi/meta.json index 07593c92db3..207b0a8383b 100644 --- a/Resources/Textures/ADT/Objects/Misc/pens.rsi/meta.json +++ b/Resources/Textures/ADT/Objects/Misc/pens.rsi/meta.json @@ -6,21 +6,27 @@ "x": 32, "y": 32 }, - "states": [ - { - "name": "ADTpen_CE" - }, - { - "name": "ADTpen_cmo" - }, - { - "name": "ADTpen_hos" - }, - { - "name": "ADTpen_QM" - }, - { - "name": "ADTpen_RD" - } - ] + "states": [ + { + "name": "ADTpen_CE" + }, + { + "name": "ADTpen_cmo" + }, + { + "name": "ADTpen_hos" + }, + { + "name": "ADTpen_QM" + }, + { + "name": "ADTpen_RD" + }, + { + "name": "ADTpen_capdv" + }, + { + "name": "ADTpen_dv" + } + ] } From af134db2d51fdf1e40a01201ca1f2a7b9aa34da1 Mon Sep 17 00:00:00 2001 From: Bolper <169089627+Bolper@users.noreply.github.com> Date: Mon, 2 Dec 2024 20:41:10 +0300 Subject: [PATCH 6/8] =?UTF-8?q?=D0=93=D0=BE=D0=B2=D0=BD=D0=BE=20=D1=84?= =?UTF-8?q?=D0=BB=D0=B0=D1=88=D0=BA=D0=B0=20DV?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Objects/Consumable/Drinks/drinks_flasks.ftl | 4 ++++ .../Objects/Consumable/Drinks/drinks_flasks.yml | 9 +++++++++ .../Consumable/Drinks/flask_dv.rsi/icon.png | Bin 0 -> 449 bytes .../Consumable/Drinks/flask_dv.rsi/meta.json | 14 ++++++++++++++ 4 files changed, 27 insertions(+) create mode 100644 Resources/Textures/ADT/Objects/Consumable/Drinks/flask_dv.rsi/icon.png create mode 100644 Resources/Textures/ADT/Objects/Consumable/Drinks/flask_dv.rsi/meta.json diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Consumable/Drinks/drinks_flasks.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Consumable/Drinks/drinks_flasks.ftl index 6ac4441527e..98579b70347 100644 --- a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Consumable/Drinks/drinks_flasks.ftl +++ b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Consumable/Drinks/drinks_flasks.ftl @@ -1,2 +1,6 @@ ent-ADTDrinkFlaskArmy = Армейская Фляга .desc = Довольно качественная фляга. + +ent-ADTDrinkFlaskDV = фляга Dar-Vaxed + .desc = Фляжка премиум-класса, выполненый из титана с выгравированным на ней символом DV. + .suffix = ДВ diff --git a/Resources/Prototypes/ADT/Entities/Objects/Consumable/Drinks/drinks_flasks.yml b/Resources/Prototypes/ADT/Entities/Objects/Consumable/Drinks/drinks_flasks.yml index fa444b278c2..6075d3de80f 100644 --- a/Resources/Prototypes/ADT/Entities/Objects/Consumable/Drinks/drinks_flasks.yml +++ b/Resources/Prototypes/ADT/Entities/Objects/Consumable/Drinks/drinks_flasks.yml @@ -7,3 +7,12 @@ - type: Drink - type: Sprite sprite: ADT/Objects/Consumable/Drinks/armyflask.rsi + +- type: entity + parent: FlaskBase + id: ADTDrinkFlaskDV + name: DV`s Flask + components: + - type: Drink + - type: Sprite + sprite: ADT/Objects/Consumable/Drinks/flask_dv.rsi diff --git a/Resources/Textures/ADT/Objects/Consumable/Drinks/flask_dv.rsi/icon.png b/Resources/Textures/ADT/Objects/Consumable/Drinks/flask_dv.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..e015a3058c27b877199321ed41a4ba8bcdced129 GIT binary patch literal 449 zcmV;y0Y3hTP)Px$dr3q=R9Hu2WEfz;IKcKZj5=U61V%$(Gz5lr2nY)b{s)z$Z{NQs+an}t)X_2i z|Mu-`hUd>8F~Tf|73CmDaP#p0=i}uE%M)9~6Ri+rproYSe{DSjhO3t@FuZ*6m_c4v zmf_Rq&kXNBd|=?@=3@X^{^|2ahOb{f5^XNg3SkZq78YfYkd}r!0wgXjAq(~}NbdfF zJG67aQX7H)?H`oEmL;T@Fznc}oZ-dOr(g$xXi)S-GrVQ!dH$7Xj}fg9WGTo28d}^8 z@y8_Kp#bwa$nqZLPYmbp{-(VHZe07y;O5KB@aQfFI5Z@*c^O_@{mcLor;7u8HZz0c zd!f|}1`zv91s8)!$2a4x?!~0P-!!5sC^b@T>aFxlCmMpGFV7}d Date: Mon, 2 Dec 2024 21:41:03 +0300 Subject: [PATCH 7/8] =?UTF-8?q?=D0=BF=D0=B5=D1=87=D0=B0=D1=82=D1=8C=20?= =?UTF-8?q?=D0=B4=D0=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ru-RU/ADT/paper/stamp-component.ftl | 1 + .../Entities/Objects/Misc/rubber_stamp.ftl | 4 + .../Entities/Objects/Misc/rubber_stamp.yml | 14 + .../ADT/Objects/Misc/stamps.rsi/meta.json | 5 +- .../ADT/Objects/Misc/stamps.rsi/stamp-dv.png | Bin 0 -> 359 bytes .../Objects/Misc/bureaucracy.rsi/meta.json | 469 +++++++++--------- .../Misc/bureaucracy.rsi/paper_stamp-dv.png | Bin 0 -> 206 bytes 7 files changed, 259 insertions(+), 234 deletions(-) create mode 100644 Resources/Textures/ADT/Objects/Misc/stamps.rsi/stamp-dv.png create mode 100644 Resources/Textures/Objects/Misc/bureaucracy.rsi/paper_stamp-dv.png diff --git a/Resources/Locale/ru-RU/ADT/paper/stamp-component.ftl b/Resources/Locale/ru-RU/ADT/paper/stamp-component.ftl index db79a559ea1..8937b65b7c1 100644 --- a/Resources/Locale/ru-RU/ADT/paper/stamp-component.ftl +++ b/Resources/Locale/ru-RU/ADT/paper/stamp-component.ftl @@ -1,2 +1,3 @@ stamp-component-stamped-name-magistrat = Магистрат stamp-component-stamped-name-remake = ПЕРЕДЕЛАТЬ +stamp-component-stamped-name-dv = Dar-Vaxed diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Misc/rubber_stamp.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Misc/rubber_stamp.ftl index 296177a4115..0f71d1f1fd6 100644 --- a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Misc/rubber_stamp.ftl +++ b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Misc/rubber_stamp.ftl @@ -3,3 +3,7 @@ ent-RubberStampMagisrat = Печать магистрата .desc = Выглядит угрожающее. От нее веет неоспоримой мощью и величием. ent-ADTRubberStampRemake = печать ПЕРЕДЕЛАТЬ .desc = Увидеть её после того, как долго подготавливал документ - настоящее мучениею + +ent-RubberStampDV = штамп Dar-Vaxed + .desc = Штамп для представителей компании Dar-Vaxed. + .suffix = ДВ, DO NOT MAP diff --git a/Resources/Prototypes/ADT/Entities/Objects/Misc/rubber_stamp.yml b/Resources/Prototypes/ADT/Entities/Objects/Misc/rubber_stamp.yml index 49a4f8d514d..395916bfcf4 100644 --- a/Resources/Prototypes/ADT/Entities/Objects/Misc/rubber_stamp.yml +++ b/Resources/Prototypes/ADT/Entities/Objects/Misc/rubber_stamp.yml @@ -23,3 +23,17 @@ stampState: "paper_stamp-deny" - type: Sprite state: stamp-deny + +- type: entity + name: DV's rubber stamp + parent: RubberStampBase + id: RubberStampDV + suffix: DV + components: + - type: Stamp + stampedName: stamp-component-stamped-name-dv + stampedColor: "#ffa500" + stampState: "paper_stamp-dv" + - type: Sprite + sprite: ADT/Objects/Misc/stamps.rsi + state: stamp-dv diff --git a/Resources/Textures/ADT/Objects/Misc/stamps.rsi/meta.json b/Resources/Textures/ADT/Objects/Misc/stamps.rsi/meta.json index f0ca450081a..99c215c7c95 100644 --- a/Resources/Textures/ADT/Objects/Misc/stamps.rsi/meta.json +++ b/Resources/Textures/ADT/Objects/Misc/stamps.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Created by discord:KING_DICE#4881", + "copyright": "Created by discord:KING_DICE#4881, prazat911", "size": { "x": 32, "y": 32 @@ -9,6 +9,9 @@ "states": [ { "name": "stamp-magistrat" + }, + { + "name": "stamp-dv" } ] } diff --git a/Resources/Textures/ADT/Objects/Misc/stamps.rsi/stamp-dv.png b/Resources/Textures/ADT/Objects/Misc/stamps.rsi/stamp-dv.png new file mode 100644 index 0000000000000000000000000000000000000000..d099abc4824ee7dc27ef05230c910c6d37cc89ea GIT binary patch literal 359 zcmV-t0hs=YP)Px$AxT6*R9Hu2WEfz;IKcKZj5=U61V%%EtPm)X`}RElO0sz*YXDhpsLaZs zp~a2jh8x$uGMvBrn}JkEkmZ0#UjeM;*YeFDXzzffHUj@0LM5;|;K1q^4ADnEkmMcL2=W*c^aM4qvt*DHqV94>9V1(GVC70RTTopdp`?xo7|Y002ovPDHLk FV1ky^k`n*` literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json b/Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json index 5a9f70ce240..4a51f9db7cb 100644 --- a/Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json +++ b/Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json @@ -1,241 +1,244 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/e1142f20f5e4661cb6845cfcf2dd69f864d67432. paper_stamp-syndicate by Veritius. paper_receipt, paper_receipt_horizontal by eoineoineoin. paper_stamp-greytide by ubaser. paper_stamp-psychologist by clinux. syndicate_card by Aserovich", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/e1142f20f5e4661cb6845cfcf2dd69f864d67432. paper_stamp-syndicate by Veritius. paper_receipt, paper_receipt_horizontal by eoineoineoin. paper_stamp-greytide by ubaser. paper_stamp-psychologist by clinux. syndicate_card by Aserovich, discord: prazat911", "size": { "x": 32, "y": 32 }, - "states": [ - { - "name": "envelope_closed" - }, - { - "name": "envelope_open" - }, - { - "name": "envelope_open_overlay" - }, - { - "name": "envelope_torn" - }, - { - "name": "envelope_torn_overlay" - }, - { - "name": "folder-base" - }, - { - "name": "folder-colormap" - }, - { - "name": "folder-white" - }, - { - "name": "folder-centcom" - }, - { - "name": "folder-overlay-paper" - }, - { - "name": "folder-sec-doc" - }, - { - "name": "folder-stamp-inverse" - }, - { - "name": "label_cart" - }, - { - "name": "labeler0" - }, - { - "name": "labeler1" - }, - { - "name": "labeler_e" - }, - { - "name": "nano_paper" - }, - { - "name": "nano_paper_words", - "delays": [ - [ - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1 - ] - ] - }, - { - "name": "newspaper" - }, - { - "name": "np_dispenser" - }, - { - "name": "np_dispenser_empty" - }, - { - "name": "pamphlet" - }, - { - "name": "paper" - }, - { - "name": "paper_bin0" - }, - { - "name": "paper_bin1" - }, - { - "name": "paper_plane" - }, - { - "name": "paper_talisman" - }, - { - "name": "paper_talisman_armor" - }, - { - "name": "paper_talisman_blind" - }, - { - "name": "paper_talisman_communicate" - }, - { - "name": "paper_talisman_conceal" - }, - { - "name": "paper_talisman_deafen" - }, - { - "name": "paper_talisman_emp" - }, - { - "name": "paper_talisman_newtome" - }, - { - "name": "paper_talisman_revealrunes" - }, - { - "name": "paper_talisman_runestun" - }, - { - "name": "paper_talisman_supply" - }, - { - "name": "paper_talisman_travel" - }, - { - "name": "paper_talisman_travel_unused" - }, - { - "name": "paper_words" - }, - { - "name": "paper_words-blood" - }, - { - "name": "paper_receipt" - }, - { - "name": "paper_receipt_words" - }, - { - "name": "paper_receipt_horizontal" - }, - { - "name": "paper_receipt_horizontal_words" - }, - { - "name": "paper_dotmatrix" - }, - { - "name": "paper_dotmatrix_words" - }, - { - "name": "scrap" - }, - { - "name": "scrap_bloodied" - }, - { - "name": "paper_stamp-cap" - }, - { - "name": "paper_stamp-ce" - }, - { - "name": "paper_stamp-centcom" - }, - { - "name": "paper_stamp-chaplain" - }, - { - "name": "paper_stamp-lawyer" - }, - { - "name": "paper_stamp-clown" - }, - { - "name": "paper_stamp-cmo" - }, - { - "name": "paper_stamp-deny" - }, - { - "name": "paper_stamp-detective" - }, - { - "name": "paper_stamp-hop" - }, - { - "name": "paper_stamp-hos" - }, - { - "name": "paper_stamp-ok" - }, - { - "name": "paper_stamp-mime" - }, - { - "name": "paper_stamp-qm" - }, - { - "name": "paper_stamp-rd" - }, - { - "name": "paper_stamp-syndicate" - }, - { - "name": "paper_stamp-trader" - }, - { - "name": "paper_stamp-warden" - }, - { - "name": "paper_stamp-generic" - }, - { - "name": "paper_stamp-greytide" - }, - { - "name": "paper_stamp-approve" - }, - { - "name": "syndicate_card" - }, - { - "name": "paper_stamp-psychologist" - } - ] + "states": [ + { + "name": "envelope_closed" + }, + { + "name": "envelope_open" + }, + { + "name": "envelope_open_overlay" + }, + { + "name": "envelope_torn" + }, + { + "name": "envelope_torn_overlay" + }, + { + "name": "folder-base" + }, + { + "name": "folder-colormap" + }, + { + "name": "folder-white" + }, + { + "name": "folder-centcom" + }, + { + "name": "folder-overlay-paper" + }, + { + "name": "folder-sec-doc" + }, + { + "name": "folder-stamp-inverse" + }, + { + "name": "label_cart" + }, + { + "name": "labeler0" + }, + { + "name": "labeler1" + }, + { + "name": "labeler_e" + }, + { + "name": "nano_paper" + }, + { + "name": "nano_paper_words", + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] + }, + { + "name": "newspaper" + }, + { + "name": "np_dispenser" + }, + { + "name": "np_dispenser_empty" + }, + { + "name": "pamphlet" + }, + { + "name": "paper" + }, + { + "name": "paper_bin0" + }, + { + "name": "paper_bin1" + }, + { + "name": "paper_plane" + }, + { + "name": "paper_talisman" + }, + { + "name": "paper_talisman_armor" + }, + { + "name": "paper_talisman_blind" + }, + { + "name": "paper_talisman_communicate" + }, + { + "name": "paper_talisman_conceal" + }, + { + "name": "paper_talisman_deafen" + }, + { + "name": "paper_talisman_emp" + }, + { + "name": "paper_talisman_newtome" + }, + { + "name": "paper_talisman_revealrunes" + }, + { + "name": "paper_talisman_runestun" + }, + { + "name": "paper_talisman_supply" + }, + { + "name": "paper_talisman_travel" + }, + { + "name": "paper_talisman_travel_unused" + }, + { + "name": "paper_words" + }, + { + "name": "paper_words-blood" + }, + { + "name": "paper_receipt" + }, + { + "name": "paper_receipt_words" + }, + { + "name": "paper_receipt_horizontal" + }, + { + "name": "paper_receipt_horizontal_words" + }, + { + "name": "paper_dotmatrix" + }, + { + "name": "paper_dotmatrix_words" + }, + { + "name": "scrap" + }, + { + "name": "scrap_bloodied" + }, + { + "name": "paper_stamp-cap" + }, + { + "name": "paper_stamp-ce" + }, + { + "name": "paper_stamp-centcom" + }, + { + "name": "paper_stamp-chaplain" + }, + { + "name": "paper_stamp-lawyer" + }, + { + "name": "paper_stamp-clown" + }, + { + "name": "paper_stamp-cmo" + }, + { + "name": "paper_stamp-deny" + }, + { + "name": "paper_stamp-detective" + }, + { + "name": "paper_stamp-hop" + }, + { + "name": "paper_stamp-hos" + }, + { + "name": "paper_stamp-ok" + }, + { + "name": "paper_stamp-mime" + }, + { + "name": "paper_stamp-qm" + }, + { + "name": "paper_stamp-rd" + }, + { + "name": "paper_stamp-syndicate" + }, + { + "name": "paper_stamp-trader" + }, + { + "name": "paper_stamp-warden" + }, + { + "name": "paper_stamp-generic" + }, + { + "name": "paper_stamp-greytide" + }, + { + "name": "paper_stamp-approve" + }, + { + "name": "syndicate_card" + }, + { + "name": "paper_stamp-psychologist" + }, + { + "name": "paper_stamp-dv" + } + ] } diff --git a/Resources/Textures/Objects/Misc/bureaucracy.rsi/paper_stamp-dv.png b/Resources/Textures/Objects/Misc/bureaucracy.rsi/paper_stamp-dv.png new file mode 100644 index 0000000000000000000000000000000000000000..e753c330246675b952e7924be451d02a4379359c GIT binary patch literal 206 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}9iA?ZArbD$ zDG~_>EDn4#?y*WRVR3UtA~Mb8PdxNpA%=nauN@{ICA;t#G#X08X}- zf24a9_O+Pl&+yG+ZcpJ=;GXAq<;VX=uhKW1cYMRVI^JM{v`~sA!!z#)4;T5L4%;kK pvQ Date: Tue, 3 Dec 2024 18:16:00 +0300 Subject: [PATCH 8/8] =?UTF-8?q?=D0=9F=D1=80=D0=B0=D0=B2=D0=BA=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Entities/Objects/Misc/rubber_stamp.ftl | 2 +- .../ADT/Entities/Objects/Misc/rubber_stamp.yml | 2 +- .../Prototypes/Catalog/Cargo/cargo_vending.yml | 2 +- .../ADT/Objects/Misc/dv-clipboard.rsi/meta.json | 2 +- .../Textures/ADT/Objects/Misc/pens.rsi/meta.json | 14 +++++++------- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Misc/rubber_stamp.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Misc/rubber_stamp.ftl index 0f71d1f1fd6..32b150fb61e 100644 --- a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Misc/rubber_stamp.ftl +++ b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Misc/rubber_stamp.ftl @@ -4,6 +4,6 @@ ent-RubberStampMagisrat = Печать магистрата ent-ADTRubberStampRemake = печать ПЕРЕДЕЛАТЬ .desc = Увидеть её после того, как долго подготавливал документ - настоящее мучениею -ent-RubberStampDV = штамп Dar-Vaxed +ent-ADTRubberStampDV = штамп Dar-Vaxed .desc = Штамп для представителей компании Dar-Vaxed. .suffix = ДВ, DO NOT MAP diff --git a/Resources/Prototypes/ADT/Entities/Objects/Misc/rubber_stamp.yml b/Resources/Prototypes/ADT/Entities/Objects/Misc/rubber_stamp.yml index 395916bfcf4..f3a994f5f7d 100644 --- a/Resources/Prototypes/ADT/Entities/Objects/Misc/rubber_stamp.yml +++ b/Resources/Prototypes/ADT/Entities/Objects/Misc/rubber_stamp.yml @@ -27,7 +27,7 @@ - type: entity name: DV's rubber stamp parent: RubberStampBase - id: RubberStampDV + id: ADTRubberStampDV suffix: DV components: - type: Stamp diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml b/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml index cf42699ba72..a7ea6c6c784 100644 --- a/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml +++ b/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml @@ -184,7 +184,7 @@ sprite: Objects/Specific/Service/vending_machine_restock.rsi state: base product: CrateVendingMachineRestockSmokesFilled - cost: 9460 # ADT TWEAK + cost: 11000 # ADT TWEAK category: cargoproduct-category-name-service group: market diff --git a/Resources/Textures/ADT/Objects/Misc/dv-clipboard.rsi/meta.json b/Resources/Textures/ADT/Objects/Misc/dv-clipboard.rsi/meta.json index 6cb81a227ad..8fd6cb4dd35 100644 --- a/Resources/Textures/ADT/Objects/Misc/dv-clipboard.rsi/meta.json +++ b/Resources/Textures/ADT/Objects/Misc/dv-clipboard.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Do over of clipboard.rsi sprites done by joshepvodka", + "copyright": "Created by discord: prazat911", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/ADT/Objects/Misc/pens.rsi/meta.json b/Resources/Textures/ADT/Objects/Misc/pens.rsi/meta.json index 207b0a8383b..7a6b2c71ef7 100644 --- a/Resources/Textures/ADT/Objects/Misc/pens.rsi/meta.json +++ b/Resources/Textures/ADT/Objects/Misc/pens.rsi/meta.json @@ -1,11 +1,11 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "ADTpen_CE, ADTpen_cmo, ADTpen_hos, ADTpen_QM, ADTpen_RD is drawn by mascotvalera (Discord)", - "size": { - "x": 32, - "y": 32 - }, + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "ADTpen_CE, ADTpen_cmo, ADTpen_hos, ADTpen_QM, ADTpen_RD is drawn by mascotvalera (Discord); ADTpen_dv was drawn by discord: prazat911", + "size": { + "x": 32, + "y": 32 + }, "states": [ { "name": "ADTpen_CE"