From 7027b8be50360054c1cb5b81fdb3d3ecc964b5a7 Mon Sep 17 00:00:00 2001 From: Eugeny Date: Tue, 14 Nov 2023 02:13:01 +0400 Subject: [PATCH] =?UTF-8?q?=D0=A4=D0=B8=D0=BA=D1=81=D1=8B=20=D0=BA=D0=BE?= =?UTF-8?q?=D0=BD=D1=82=D0=B5=D0=BD=D1=82=D0=B0=20=D0=BA=D0=BE=20=D0=B4?= =?UTF-8?q?=D0=BD=D1=8E=20=D1=80=D0=BE=D0=B6=D0=B4=D0=B5=D0=BD=D0=B8=D1=8F?= =?UTF-8?q?=20=D0=BF=D1=80=D0=BE=D0=B5=D0=BA=D1=82=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Resources/Changelog/ChangelogADT.yml | 8 ++++++++ .../structures/wallmounts/signs/posters.ftl | 5 ++++- .../Structures/Wallmount/Signs/posters.yml | 9 +++++++++ .../Prototypes/Catalog/Fills/Boxes/general.yml | 4 ++-- .../Markers/Spawners/Random/posters.yml | 1 + .../Structures/Machines/cloning_machine.yml | 4 ++-- .../Structures/Machines/medical_scanner.yml | 4 ++-- .../Head/Hats/bluebirthdaycap.rsi/icon.png | Bin 426 -> 311 bytes .../Head/Hats/graybirthdaycap.rsi/icon.png | Bin 390 -> 291 bytes .../Head/Hats/ntbirthdaycap.rsi/icon.png | Bin 503 -> 366 bytes .../Head/Hats/pinkbirthdaycap.rsi/icon.png | Bin 418 -> 298 bytes .../Head/Hats/syndiebirthdaycap.rsi/icon.png | Bin 482 -> 399 bytes .../Structures/Wallmounts/posters.rsi/meta.json | 3 +++ .../poster_adtlustardeco_contraband.png | Bin 0 -> 1328 bytes 14 files changed, 31 insertions(+), 7 deletions(-) create mode 100644 Resources/Textures/Structures/Wallmounts/posters.rsi/poster_adtlustardeco_contraband.png diff --git a/Resources/Changelog/ChangelogADT.yml b/Resources/Changelog/ChangelogADT.yml index 94be1d183c9..eb6055dff87 100644 --- a/Resources/Changelog/ChangelogADT.yml +++ b/Resources/Changelog/ChangelogADT.yml @@ -568,3 +568,11 @@ Entries: - {message: Разблокировка Новакидов, type: Fix} id: 55607 #костыль отображения в Обновлениях time: '2023-11-14T07:40:00.0000000+00:00' + +- author: Петр Игнатьевич + changes: + - {message: Фикс вместимости коробки из под И.Р.П., type: Fix} + - {message: Фикс размеров капсулы клонирования и медицинского сканера - теперь они должны пролезать через двери., type: Fix} + - {message: Фикс спрайтов некоторых вещей ко Дню Рождения Сервера., type: Fix} + id: 55606 #костыль отображения в Обновлениях + time: '2023-11-14T01:20:00.0000000+00:00' diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/wallmounts/signs/posters.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/wallmounts/signs/posters.ftl index 52e8ba115c5..c610d330bc6 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/wallmounts/signs/posters.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/wallmounts/signs/posters.ftl @@ -292,6 +292,9 @@ ent-ADTPosterPassTheBanana = "Передайте банан ниже!" ent-ADTPosterLegitEfficiency = диаграмма трудовой эффективности .desc = Центральное командование приводит статистику, где зарплаты сотрудников превышают более 2х процентов от общей прибыли с денег, которые приносит их труд и заявляет, что это самые неутешительные результаты за последние 120 лет. -ent-ADTPosterDontSitDown = ""Не садись!" +ent-ADTPosterDontSitDown = "Не садись!" .desc = Голографический плакат с изображением показывающим насколько могут быть опасны мензурки. .suffix = { "День рождения сервера" } + +ent-ADTPosterContrabandLustArDeco = таяранское ар-деко + .desc = На плакате изображена таяранка в привлекательной позе и наряде в стиле ар-деко. diff --git a/Resources/Prototypes/ADT/Entities/Structures/Wallmount/Signs/posters.yml b/Resources/Prototypes/ADT/Entities/Structures/Wallmount/Signs/posters.yml index 92b930ccb9b..7d554afc973 100644 --- a/Resources/Prototypes/ADT/Entities/Structures/Wallmount/Signs/posters.yml +++ b/Resources/Prototypes/ADT/Entities/Structures/Wallmount/Signs/posters.yml @@ -76,6 +76,15 @@ - type: Sprite state: poster_adtlustuma_contraband #Спрайт от Празата +- type: entity + parent: PosterBase + id: ADTPosterContrabandLustArDeco + name: Tayaran ArDeco + description: "A poster with tayaran women of attractive appearance and in ar deco suit." + components: + - type: Sprite + state: poster_adtlustardeco_contraband #Спрайт от Празата + #картины - type: entity diff --git a/Resources/Prototypes/Catalog/Fills/Boxes/general.yml b/Resources/Prototypes/Catalog/Fills/Boxes/general.yml index c006d14300c..573e4f1be23 100644 --- a/Resources/Prototypes/Catalog/Fills/Boxes/general.yml +++ b/Resources/Prototypes/Catalog/Fills/Boxes/general.yml @@ -175,8 +175,8 @@ description: A box of decades old military surplus rations. It is surprisingly not rotten. components: - type: Storage - maxItemSize: Large - maxTotalWeight: 100 + maxItemSize: Normal + maxTotalWeight: 10 - type: StorageFill contents: - id: DrinkMREFlask # Size 8 diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/posters.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/posters.yml index af6109257fc..cf6829d64a9 100644 --- a/Resources/Prototypes/Entities/Markers/Spawners/Random/posters.yml +++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/posters.yml @@ -96,6 +96,7 @@ - ADTPosterContrabandFearThem # Спрайт от Иллюми - ADTPosterContrabandSilence # Спрайт от Иллюми - ADTPosterContrabandLustUma + - ADTPosterContrabandLustArDeco chance: 1 - type: entity diff --git a/Resources/Prototypes/Entities/Structures/Machines/cloning_machine.yml b/Resources/Prototypes/Entities/Structures/Machines/cloning_machine.yml index 0cc9f71e55a..1054ca2b634 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/cloning_machine.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/cloning_machine.yml @@ -1,4 +1,4 @@ -- type: entity +- type: entity id: CloningPod parent: BaseMachinePowered name: cloning pod @@ -25,7 +25,7 @@ fix1: shape: !type:PhysShapeAabb - bounds: "-0.25,-0.5,0.25,0.5" + bounds: "-0.2,-0.4,0.2,0.4" density: 190 mask: - MachineMask diff --git a/Resources/Prototypes/Entities/Structures/Machines/medical_scanner.yml b/Resources/Prototypes/Entities/Structures/Machines/medical_scanner.yml index c8d233f04cc..0928775a647 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/medical_scanner.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/medical_scanner.yml @@ -1,4 +1,4 @@ -- type: entity +- type: entity id: MedicalScanner parent: BaseMachinePowered name: medical scanner @@ -44,7 +44,7 @@ fix1: shape: !type:PhysShapeAabb - bounds: "-0.25,-0.5,0.25,0.5" + bounds: "-0.2,-0.4,0.2,0.4" density: 190 mask: - MachineMask diff --git a/Resources/Textures/ADT/Clothing/Head/Hats/bluebirthdaycap.rsi/icon.png b/Resources/Textures/ADT/Clothing/Head/Hats/bluebirthdaycap.rsi/icon.png index 2a16ce8f9123031f04b5b320842ec1cf276232ca..6ea9703ef4f7a4ad5cede5067bbc368ff1943a72 100644 GIT binary patch delta 229 zcmVyG7tno5Cnmf!{u5$?^oXN?Pl$gFbha{lM*}P7kUZRa!TIbVM)nlN{i-!5s`}7+qV8Vn6e;ucH53%O^W-RiT z`zzI~of>lQ42}*D;GMzA^{pxiwScjp5|G^In9Uce6m~TN5`XrV%dczi4Bizp#0hk{ z&mm1g-GSVF4MYM;?!7bOE~pa7-G6Mit>?4(f<22Zpv!$1d3uMNf;a)r*$*9)N&we= z4sI7j2}qmI=|WLJsrh~2c7dJ1SpU69K#Vayou9Stm(D-IJA>z&3&a?EQy3ILM6lLk zvtF?Xe`2#_Ad)t;OZ>zLmlMw+X!SAEJ diff --git a/Resources/Textures/ADT/Clothing/Head/Hats/graybirthdaycap.rsi/icon.png b/Resources/Textures/ADT/Clothing/Head/Hats/graybirthdaycap.rsi/icon.png index e6892e55aaec5219a86cc354c8f9a7f35566bee1..0205b008c557e91cc03383c3918454bd189e0456 100644 GIT binary patch delta 209 zcmV;?051QA1ET_vIDY`UNklq|{AWG(ZG3;D{eTgKdNy zYGcH$ZUiWbq9}?YB*xez^B-xr_g*BiEzrY_F_1`z8ZgF4#`gvK_Gflm*lysB?Y9JG z+jn+a5ZwR()LKRJEP?aoU%_o*S>UdEi3F_*2LeH`bI+taLzsc|6LWZ)&c-Z zDUWYM2*3BQ2@nyr)>@ai+P;Sq(Neq10;9xCfE&&h7$ruy;Q-?ZM`jY-a0LJk0ZdgO LC*!uelVAZRq5xdX delta 308 zcmV-40n7fQ0)_*SIDY{iNkl{R2A|#CG!&qM6!Gi~X9rHX(&G*e+*8iUr(- zA_38T3T7@!;k!gYMBBFS=e-~;%n2O1Phm}=xC5#C8khv++1bRjDs*ZebRyP!_su5-V~nYn80`w*gm_r7XStrGF8b!M5ZX!0HY!1O)|wY1e#UOE7gMswYYSKsQ_aN5l!R idEf3;0KXtK<`HUucMy%S7wZW{R+ax9V2xRm(E%o@u7QgH delta 422 zcmV;X0a^a;0`~)uIe(8yL_t(oh3!@`PQx%1eWArnxk86ZWN5l~=K#F{bHx>sIZRB5 zrPt^I+8GHZk`6&);0j1cc;GXnZk*JO{gX-&f+tl?E9d#W=NHGoKYE7O|g2M-#)r*{Oy7Isv_RVAw^##rj_RHSI#hhghbB4S!MeM1&0y;?*B2p;)FQ zgRuJFXpA-~bm~Clm)9}~Apl4w2Ri|i`wEyTwC;fJz6)3aOzx9O`S{BqWOt!e0?K_d z@c^*`&8mBl7>%8|oCTQNdyfRjdGWo&evD%Z>;&p-uTOp;;#2}m?r%RV_c(Tel|bZI zOLq*a6E0n_3V+butI{=zpjk2I>w5QcvZUagK;#4QwkTb^JKl=Q&AnBCf*yH2epR}I-Oxd}lK_>%-Lsjn zsdP5?0P|34eHE*5c?P+dI&rg4vSOK9pD)+RTM5|X;TvUuZ%M#;v5=NFCOu-%?EnA( diff --git a/Resources/Textures/ADT/Clothing/Head/Hats/pinkbirthdaycap.rsi/icon.png b/Resources/Textures/ADT/Clothing/Head/Hats/pinkbirthdaycap.rsi/icon.png index 8267a703324bc59cfebfb05587908919e598e957..a6a5b8e4d27941088f19112913c4b7959692d48f 100644 GIT binary patch delta 216 zcmV;}04M*V1F8a$IDY`bNklw844b~Lw z2@KfYB=B$hiX{c#4FJHtyV_L(?d4ygO`%)hE_#ndx4^M1pG`-*{Z0I5{U`xuhUDB; zD>;LiyK1Rd002rUMMS{ccDa2WPDEXQtB#O}h?ybtJY+baOrTPe_(nV2EKntWK2r`4 S0N@Sg!cFQ83{{kqd;um!5MeX` delta 337 zcmV-X0j~b40-^(uIDY{;NklcgdCr`l$cJR~oFVyz4Ed&f zNP*1KUUV$L4zU9Veu$*fp@nZUB$0PKodE$07A*Md_&lAsq}~;gACKQ{54XNtR+b*7 zqL!RJ(VO3HSDwgy?Dr-o%mQ8olYn;mr?pU3u(58 zpiI6b3t0iV)Z}y11Hva+jFF`c0X&h{ jbzSuA8wimg##r=FEfVpojhNSa^~FRTjm@z zE~p)l?pOOqZ3!L5*>hhof4wsI1=mEXSqORsm-~0D_CS-i>Ka}VNcQ95yC&bf-Ku6` z7I{s?+!uT{W;kNK+({&JMR++-b~$kOGz{JcPdS>j1&%L4k^G6u+KB_>&c{ypMBx1l zx9gv^E8UALWipoo0Cq{@RnL2sNq6H#RCYOnKw4~N-xRlD>z5gKx}fNLQd;t0Vv PlyA8Ta5+(ele_^Y%KMOg delta 401 zcmV;C0dD?}1L6aaIe&UdL_t(oh3!@`PQx%1eLq57(zQ}&TZ|oY1%`;JN8l3l06jps zOt&&{1%`|$sn{x56NU~oLviZ_H~x+zRfs+*aunJBzxV!=72t{sgF+6gw>xz#bo&xi zt5 zXoa+H_VdXCn}ALIb48NQfGtI|rQ! zP8OU5O!Yc+U4JCfS^=XK9`gc#I}2ellnuqX=3g>V*WUql)%^-cmBrsZw>b?Dk8IK%KD0c diff --git a/Resources/Textures/Structures/Wallmounts/posters.rsi/meta.json b/Resources/Textures/Structures/Wallmounts/posters.rsi/meta.json index 3837f5449fc..b38852c6aca 100644 --- a/Resources/Textures/Structures/Wallmounts/posters.rsi/meta.json +++ b/Resources/Textures/Structures/Wallmounts/posters.rsi/meta.json @@ -417,6 +417,9 @@ { "name": "poster_adtlustuma_contraband" }, + { + "name": "poster_adtlustardeco_contraband" + }, { "name": "poster52_contraband", "directions": 1, diff --git a/Resources/Textures/Structures/Wallmounts/posters.rsi/poster_adtlustardeco_contraband.png b/Resources/Textures/Structures/Wallmounts/posters.rsi/poster_adtlustardeco_contraband.png new file mode 100644 index 0000000000000000000000000000000000000000..74b94f92778f24d874d8a9d4c57cdf10c4af2996 GIT binary patch literal 1328 zcmV-01<(44P)Px(&`Cr=R9HvNmupNER}{zpGqVrG6{O3;w$RWZr9uROswxn7M@}X@ceLyWHkkXeA5KXDDY-*IUVRyR)7Rx?nra5=n zSr&;OW=-r(HZ$k$-FtrLf6lqH!{Hte?jHNc9RYssY?lczEj=@g)6)0*ZF97M=BKX@ z&OMf2IHRvS0@&?#IjuN1Vv#H@T`-wU>H&IR&p^h(UIip*pINNKn)6=JH9dbGqBBa6 z@=EP(cEkYJ>vph>gCl4ML8b%Jx*#0gx4i#3)Tf{*2ff=fk@4=;kODgwF#CG_E~He} z;LPK*LJCyYuyr)I=BIxF4Ud+?4e9`>2#dCqqj_l*O51NK0L_Kb%>H9{7Uu82qRdaV z-!|Lumdy<4c?_JrtiA?PS7u|MaR}Luq%udV+eT2G> z*@3FTc<@nLSlfEk1I$~Q1!=+?h?449<^oqq1~?9&M&;zdm8b8+*YSEST8}nGkb+ms zAbC7&oCxEMV$gv1I3%m0KXqOHWOCGX>j?L zh=tJtgXlKfQQ}HqcC~&8dOHt~NeVwVG#XfbhyY;K)-uSV4<(L7{N<6+D>#uM8u5Uh zV|I7aFw2B)NWiwzQXFb-hQ}7`)bs!S4Mi z+SCKRUJsAQgNlLz=8pixl#mD#1bln&w7MD~fcZ}?1SiNi>4H-KGc5EXim#aZSs8j7Chsqq6tk|YEHTxnxU3j7l?zIgM5x)e|wK6Bs&X!IdR z`YwSLp36m10-`8F5CnD~7Z=A0(vvF&&H_rogoLi+zp7WD{K!k-bs+@|m-K970-&hr zLrTzx0BE@LJW3mi9vO{WK2oOub-~g%3czVY0Ha?yVK$rbNx2qlKO9z4@a5(N))iEQ zF;5%8O-dm7B%In(dcDx;bg){jtOgto2mF3N z?pvS8;AC0Gr|XZX2UuRcGEj7OfNjEsyZ#Ys*H!uXt-&2?0@sjC4> z0Rc>PPMhz@9mjEt8Lh{%@%$beKHF<%r{c?LHq>^_W{^`M>en5POaTJWYPBq?U5h5L zd|4XH_r>-T>_|?^*^NgFH?X?s_|bxz3sFohpU=lsP^|#9;r-qZn1k+PFJkq3Hy}wo zW*cG!bvpuflO`=H8v+Vl zINzxrV5)=Qeei9E?CEb!G&lXtiELGW%V%TF0000