From 40ca72ded37509007de21c51ffef4bc66b0a4468 Mon Sep 17 00:00:00 2001 From: RipZoro1 Date: Thu, 31 Oct 2024 09:13:48 +1200 Subject: [PATCH] =?UTF-8?q?=D0=92=D0=B5=D1=89=D0=B8=20=D0=A6=D0=9A=20?= =?UTF-8?q?=D0=B8=20=D1=81=D1=83=D0=BF=D0=B5=D1=80=D1=81=D0=B8=D0=BD=D1=82?= =?UTF-8?q?=D0=B5=D0=B7=D0=B0=D1=82=D0=BE=D1=80=20=D0=B2=20=D0=BB=D0=BE?= =?UTF-8?q?=D0=B4=D0=B0=D1=83=D1=82=D0=B5=20=D0=BC=D1=83=D0=B7=D1=8B=D0=BA?= =?UTF-8?q?=D0=B0=D0=BD=D1=82=D0=B0.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Entities/Clothing/Back/satchels.ftl | 3 ++ .../Entities/Clothing/OuterClothing/coats.ftl | 5 +++- .../ADT/Entities/Clothing/Back/satchel.yml | 10 +++++++ .../Entities/Clothing/OuterClothing/coats.yml | 27 ++++++++++++++++++ .../VendingMachines/Inventories/centdrobe.yml | 2 ++ .../Loadouts/Jobs/Civilian/musician.yml | 9 ++++++ .../centcom_satchel.rsi/equipped-BACKPACK.png | Bin 0 -> 611 bytes .../Satchels/centcom_satchel.rsi/icon.png | Bin 0 -> 515 bytes .../centcom_satchel.rsi/inhand-left.png | Bin 0 -> 496 bytes .../centcom_satchel.rsi/inhand-right.png | Bin 0 -> 445 bytes .../Satchels/centcom_satchel.rsi/meta.json | 26 +++++++++++++++++ .../equipped-OUTERCLOTHING.png | Bin 0 -> 816 bytes .../Coats/centcom_coat.rsi/icon.png | Bin 0 -> 360 bytes .../Coats/centcom_coat.rsi/inhand-left.png | Bin 0 -> 383 bytes .../Coats/centcom_coat.rsi/inhand-right.png | Bin 0 -> 387 bytes .../Coats/centcom_coat.rsi/meta.json | 26 +++++++++++++++++ 16 files changed, 107 insertions(+), 1 deletion(-) create mode 100644 Resources/Textures/Clothing/Back/Satchels/centcom_satchel.rsi/equipped-BACKPACK.png create mode 100644 Resources/Textures/Clothing/Back/Satchels/centcom_satchel.rsi/icon.png create mode 100644 Resources/Textures/Clothing/Back/Satchels/centcom_satchel.rsi/inhand-left.png create mode 100644 Resources/Textures/Clothing/Back/Satchels/centcom_satchel.rsi/inhand-right.png create mode 100644 Resources/Textures/Clothing/Back/Satchels/centcom_satchel.rsi/meta.json create mode 100644 Resources/Textures/Clothing/OuterClothing/Coats/centcom_coat.rsi/equipped-OUTERCLOTHING.png create mode 100644 Resources/Textures/Clothing/OuterClothing/Coats/centcom_coat.rsi/icon.png create mode 100644 Resources/Textures/Clothing/OuterClothing/Coats/centcom_coat.rsi/inhand-left.png create mode 100644 Resources/Textures/Clothing/OuterClothing/Coats/centcom_coat.rsi/inhand-right.png create mode 100644 Resources/Textures/Clothing/OuterClothing/Coats/centcom_coat.rsi/meta.json diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Back/satchels.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Back/satchels.ftl index b2f21d3f2e7..e8294651af5 100644 --- a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Back/satchels.ftl +++ b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Back/satchels.ftl @@ -1,2 +1,5 @@ ent-ADTClothingBackpackSatchelBlueshield = сумка офицера синего щита .desc = Крайне вместительная черно-синяя сумка с яркими белыми эмблемами щита, предназначенная для хранения охранного и медицинского арсенала Офицеров Синего Щита. + +ent-ADTClothingCentComBackpack = сумка центком + .desc Зелёная сумка. Пахнет свежестью. diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/OuterClothing/coats.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/OuterClothing/coats.ftl index f1f7212c2b0..dbba684d97b 100644 --- a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/OuterClothing/coats.ftl +++ b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/OuterClothing/coats.ftl @@ -2,7 +2,7 @@ ent-ADTClothingOuterCoatLabPathologist = халат патологоанатом .desc = { ent-ClothingOuterCoatLab.desc } ent-ADTClothingOuterApronPathologist = фартук патологоанатома .desc = Фартук для работы с трупами. -ent-ADTClothingKadet = шинель для Кадетов СБ +ent-ADTClothingKadet = шинель для кадетов сб .desc = шинель, сшитая для новобранцев службы безопасности. Она очень похожа на шинели младших чинов РИА ent-ADTClothingOuterGraySweatshirtTop = серая толстовка-топка @@ -24,3 +24,6 @@ ent-ADTClothingOuterCoatInvestigator = бушлат следователя Сл ent-ClothingOuterAtmosianBomberJacket = куртка-бомбер атмосианина .desc = Плотная, поношенная куртка-бомбер атмосианина. + +ent-ADTClothingOuterCoatCentCom = пальто центком + .desc = Зеленое пальто с золотыми вставками. На спине выгравирована золотая буква N. Такое пальто носят только важные персоны... diff --git a/Resources/Prototypes/ADT/Entities/Clothing/Back/satchel.yml b/Resources/Prototypes/ADT/Entities/Clothing/Back/satchel.yml index 91803f42f20..ac911eb96c1 100644 --- a/Resources/Prototypes/ADT/Entities/Clothing/Back/satchel.yml +++ b/Resources/Prototypes/ADT/Entities/Clothing/Back/satchel.yml @@ -14,3 +14,13 @@ components: - type: Sprite sprite: ADT/Clothing/Back/pathologist_satchel.rsi + +# Сумка ЦентКом +- type: entity + parent: ClothingBackpackSatchel + id: ADTClothingCentComSatchel + name: centcom satchel + description: Green satchel. He smells fresh + components: + - type: Sprite + sprite: ADT/Clothing/Back/centcom_satchel.rsi diff --git a/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/coats.yml b/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/coats.yml index 6bfbc649fbe..98eb531b82b 100644 --- a/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/coats.yml +++ b/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/coats.yml @@ -141,3 +141,30 @@ sprite: ADT/Clothing/OuterClothing/Coats/atmosian.rsi - type: Clothing sprite: ADT/Clothing/OuterClothing/Coats/atmosian.rsi + +#Пальто ЦентКом +- type: entity + parent: ClothingOuterBase + id: ADTClothingOuterCoatCentCom + name: centcom coat + description: A green coat with gold inserts. The golden letter N is emblazoned on the back. Only the big shots wear this coat... + components: + - type: Storage + grid: + - 0,0,3,1 + maxItemSize: Normal + - type: Sprite + sprite: ADT/Clothing/OuterClothing/Coats/centcom_coat.rsi + - type: Clothing + sprite: ADT/Clothing/OuterClothing/Coats/centcom_coat.rsi + - type: StorageFill + contents: + - id: RubberStampCentcom + - id: PenCentcom + - type: Armor + modifiers: + coefficients: + Blunt: 0.7 + Slash: 0.7 + Piercing: 0.6 + Heat: 0.7 diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/centdrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/centdrobe.yml index 68665ae7fcc..e8a863eefa8 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/centdrobe.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/centdrobe.yml @@ -18,3 +18,5 @@ ClothingOuterCoatExpensive: 1 ClothingNeckScarfStripedCentcom: 3 ClothingNeckCloakCentcom: 3 + ADTClothingOuterCoatCentCom: 3 #ADT-Tweak + ADTClothingCentComSatchel: 3 #ADT-Tweak diff --git a/Resources/Prototypes/Loadouts/Jobs/Civilian/musician.yml b/Resources/Prototypes/Loadouts/Jobs/Civilian/musician.yml index 2d3e6bd0fed..1ba54288313 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Civilian/musician.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Civilian/musician.yml @@ -14,3 +14,12 @@ id: MusicianWintercoat equipment: outerClothing: ClothingOuterWinterMusician + +- type: loadoutEffectGroup + id: SuperSynthesizerInstrument + effects: + - !type:JobRequirementLoadoutEffect + requirement: + !type:RoleTimeRequirement + role: Musician + time: 72000 #20 hrs diff --git a/Resources/Textures/Clothing/Back/Satchels/centcom_satchel.rsi/equipped-BACKPACK.png b/Resources/Textures/Clothing/Back/Satchels/centcom_satchel.rsi/equipped-BACKPACK.png new file mode 100644 index 0000000000000000000000000000000000000000..d6772087902460d4441b895ff25c7802159ed1bf GIT binary patch literal 611 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O`0F1o(uwE?v2eL5gAfnZqyMzGCoUXE0}IKfRdIoKZeig3+9TS&E6(oP|k> zk-?0GO^QXf(v2ZPjX{EeNrIU%LXFXk_2Bta4BqSv`V9T+m%n=Vdg=A;40;R_iQ=6b z7qNJ8npbHsc#DYSnlb1yFljTJ_JuL%Ffw_G0xkdfxa%&E(kKb?3;s_WVA!`xPXefi zv%n*=n1O-s2naJy)#j51dep(w#W5tp{q2O?VTTn2TwM=Zv+Z&9y&`b=)Bk!66Jg^6 zGcN4igA{Hje{8SXHDBKAz6Q>N7#VcgLPxZ7eKJU;mYy*O_3n{QfQJgG*Z8 z{17_fmHPF!WQeJBTH~ed0@p7@2{N_*k3BZGlwFWpYo+44g{iI_ccfFeLrVDtIdi@- z)Uj~%MHVQy2C&Ri(qKA&pIc5Y+e7&`*SvZ0PRyzq391j?uHKq|!+|4YCQ zt&CeACUxxcz1x|v@P5%E5pJoh%PgT@YA+JbvT~R0P4j0K`m*=G>ElVfVm}W1rrSNR zP7Qjj{6VzJn5X&X0r7(+)-|Ue2wEQ(Gdg)ga!-(gMT^o8cBX85#%o52-Zr|AcLD>L N!PC{xWt~$(699wi^E?0m literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Back/Satchels/centcom_satchel.rsi/icon.png b/Resources/Textures/Clothing/Back/Satchels/centcom_satchel.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..0034b8730a35acfac67e73bf88f70d95661ca22b GIT binary patch literal 515 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCijQ0(?STd3_mNs-;zvxEKr=7<|~B`aMf`H7>rrbmrQXPJN!vecp5L&42ju z!RfOXm#*CA(&s(%{;ay~J&L)SO1WB!d78XF3=H1v4EhWVx(p0@462D-d;V^Bsgh>& z=3vle1X?1LbovjFQYZ=X3;vHEFvP@2zXhu0EbxddW?X?_wfUrh9%1lwaSXBW zzdGq<(IEq#mRgO6S==nbN>Q)A*L#Pxd%oCm`TiS~a~{7d*POMuQvYR@LqO$6Zh=J_ zPs4s)cUdJ+)OWB`)#1v@jx685S!>U-I^0d$UAW}h-P^z0OXfH1y~*|DaNurZhr=h| zt`k}HJmnfskMm5|=OUB0Nl(xh7L-}qVX^yuL&01w6B^DDRZGjnVDMl?gXnMHmDp#|XZO$qAEe$ewmv^p_(0ziZqK bTkkPSMJD}GVA$~&7(fi3u6{1-oD!M<;~3Xs literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Back/Satchels/centcom_satchel.rsi/inhand-left.png b/Resources/Textures/Clothing/Back/Satchels/centcom_satchel.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..84341566f1d6c5e9e93d4c5b8c317f000fc804c0 GIT binary patch literal 496 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O`1U2Ka=yGKe!U_=+=x$}_kNGT3o2C@?UDDX_~4HiN%d4#aR1`?QSbAa zgtr!6v6r}PcAwn1p5^()JQ1H`n-lZZW~S>c&zP`_MdqOO^L1wh&y{_4@2L^0JsBdQ z6f|v1(}e9|O&@fVc?F*A-MS#%p{Zc@^Vw7M&lpW}I4Bpgps9r`WI}+W|Anjn?kuff zh~_Ql*`HhHFt=^B{bS|{vH{P91eWMI++;M-V`SuZC}Ze-Gm}?j!5apt=?x9{6Cyul zyL&J)zMH<($oj##XZQd4$3=*id_R4uiy^gHy|nCwOqn%1tKuKVRnLOeTP@e{0z-_! M)78&qol`;+0Q_RP`2YX_ literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Back/Satchels/centcom_satchel.rsi/inhand-right.png b/Resources/Textures/Clothing/Back/Satchels/centcom_satchel.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..a6f88692dd0e61f100b130e7f33e5ecfc2f0af2e GIT binary patch literal 445 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O`0}1^9%xGKe!UgvvA6aWMFbC+uiqmSAR3XJClBSEK+1 zKY6-1hD5l(ofa#8NP(kGG;8g(>Hq(qXFED4=T**Jzt|5|W{wXm^UNO{YBy?Nj9@ch zc)g!tc0%UFd{u_EfyumYsux<$O`kn{W9Ni$1xN~M zxG5F}t$gx)LclNf)()#`)3-H~^|#jXK3x-(_OPaG^{ojL`k&hW;QcElaEN((7yBKz T92Os-?-@K@{an^LB{Ts5meHhT literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Back/Satchels/centcom_satchel.rsi/meta.json b/Resources/Textures/Clothing/Back/Satchels/centcom_satchel.rsi/meta.json new file mode 100644 index 00000000000..c166df646be --- /dev/null +++ b/Resources/Textures/Clothing/Back/Satchels/centcom_satchel.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/2e24b7af2221928e4b844a29408e821b60a5fe29", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-BACKPACK", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/centcom_coat.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Coats/centcom_coat.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 0000000000000000000000000000000000000000..1e3c211dd24fe65c65da9bce7651aa81e6ac322c GIT binary patch literal 816 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O_~K2Ka=yGFUP&m;g;+U{GaX@L^X>5o1tfV6b2~wua&VLk3P$R(3O%|4$ia zb~3P;vG5slFsLwa$+9w9Fsz-)Agw1bv4KHGPmo2CsVawIK`+oyh7Wt$K~9n`3Gxg6 zj}tJcn{b-~m2nn$L>4nJ@ErtU#vK#0-!d>TIeNM{hD5l(o%XP3sRBAvddN8vDA=RgVA7FEQ_+z1C1h`iN|bWOq81Z zJ~QmycV;?ALFFWlPi_?#UPy*>FmcHI%j4FOsn6^e(NLItah2|-h8HSLcZGih+++N< zVA~0aicFZ-~IFd-^mL;y1gNFCgY5)^-E?htqtY<(V};N zH6gY^pZ!Dj#rJV9U1!|dYpBg|?X&v6uVKen_T83lVs$yb_27L57tw=E8|KMgu@YI& z?x=f>?LcT#RQsb#3waNSoLW-cuw% zSqO5qPg&(3&-!2$NJ7Yd@kY)EX_GUgT`eDpHKfaCwLCMd65)Sy*^c?z&w9t$uuz64 zmTA)QGIhQiUHaz&WEH;q! fN6$Xngvfi0Q3g4$mBKndf)b>stDnm{r-UW|lC@KB literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/centcom_coat.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Coats/centcom_coat.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..041fa555671e461918b62caf6b8cd1a4af2cf572 GIT binary patch literal 360 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCijS1AIbU8BBoMfoui_ANK!G8D@4e{C~)>b|%Bb28OB}pdyCG#yj#rin}Dp zFZe$kFnIYhegX<}7I;J!GcfQS0b$0e+I-SL!JVEijv*HQPbWO&Yc}9$vAhsj`JesX z!H%UDQ}$1fU9|K=;Zo86i|kog0zwlqv!oj(88^4i*eH?Bx#H`#DBIPXD#15d8yq-3 z^s_s-I=*J;nHY0~bpz+L?FKEePt`ZPm3t~sb3c#ITDIuej7b;ce!e`w|1Ih7)Nk9B zon-9!Cajit)!=1yM!H36K@cDJMTRi07wIJp=MS5Asjv1~!N`8w-bzdOm2=<3r-oVc oUp4&ZJQ`V;$tw4Sx#738@IS>O?*0IApeGnSUHx3vIVCg!0I;Ehy#N3J literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/centcom_coat.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Coats/centcom_coat.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..0e80eddfcb14f55feeaaf029da6665cdfa77d119 GIT binary patch literal 383 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O`031o(uw@+)#On=mmbGBB7hF!-=D@G|^=2$W+eQ@d&pq&P}~{DS{O0K>iJ zy^%mM&H|6fVg?4jBOuH;Rhv&5D0s)y#W5tp{q0moz7_)x*R8s5|K{7I{wj62As}q5 zwx?B>B|c01U+x_hR?UQ<2~5xIS#R6Pr@nPuc|$_RaivY{(!{MXYZhE_OAZib+Y*r3 zlfW0Q)%vVRqEF1LS9FV;jqlpIOj`o7<_LdLeesB8b!$*E>s%}U^G`(<0Gav|)oPf2 z?QIa#>J{aQny&FYoV)dzC*wD98^-#*dz!MB7O)rsEmZ^BeNX+zvps+Iv$2}}N@i03 z)^zb)1k44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O`1k1^9%xGAJ@Im@qK-uru&7Fe(BOpuK)2U1)mL4Lvi zVSr)N8J+V$QO*L7$YKTtz9S&aI8~cZ8Ypc=7QgJvURR&rRC?wNd4f5Hd$&o>;ImZ)rh zoXGoH-BbVK&UpQchyDwGSkGYpWFJ#OYv=|?t{{e>2}~b!9QQnKRjptAxK*;hY)|3R z!?O84j$0o0K4m%BXTD6~*2iN!i#HTDc^u?CeSHz{Y8!8XcNH5r-fh%O_{a2Wdq@7m Tc^Pwoeq``;^>bP0l+XkKQ6ZCq literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/centcom_coat.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Coats/centcom_coat.rsi/meta.json new file mode 100644 index 00000000000..e482264df5f --- /dev/null +++ b/Resources/Textures/Clothing/OuterClothing/Coats/centcom_coat.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +}