From ad6f7193567d4e96cf3a46eef1cde1e62ec50ac3 Mon Sep 17 00:00:00 2001 From: TAZIKLIK <73418250+Evgencheg@users.noreply.github.com> Date: Thu, 5 Sep 2024 20:23:32 +0300 Subject: [PATCH 1/6] =?UTF-8?q?=D1=84=D0=B8=D0=BA=D1=81=D0=B5=D1=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Guidebook/NewPlayer/Controls/Controls.xml | 76 ++++++++----------- 1 file changed, 31 insertions(+), 45 deletions(-) diff --git a/Resources/ServerInfo/Guidebook/NewPlayer/Controls/Controls.xml b/Resources/ServerInfo/Guidebook/NewPlayer/Controls/Controls.xml index 071969c22b..2787c95c30 100644 --- a/Resources/ServerInfo/Guidebook/NewPlayer/Controls/Controls.xml +++ b/Resources/ServerInfo/Guidebook/NewPlayer/Controls/Controls.xml @@ -1,62 +1,48 @@  -# Управление + # Управление -Вы можете в любой момент изменить привязки клавиш здесь: - + Здесь вы можете изменить сочетания клавиш в любое время: + -## Перемещение -Вы можете перемещаться по игровому миру с помощью [color=yellow][bold][keybind="MoveUp"][keybind="MoveLeft"][keybind="MoveDown"][keybind="MoveRight"][/bold][/color]. -Если удерживать [color=yellow][bold][keybind="Walk"][/bold][/color], вы будете ходить шагом, что не даст вам поскользнуться и упасть. + ## Базовое управление + Мы будем вежливо предполагать, что вы уже знаете, как работает WASD. + Помимо этого, в SS14 есть несколько основных взаимодействий, упорядоченных по важности: -Вы можете включить ходьбу на [color=cyan]переключение[/color] в меню управления. + - [color=#a4885c][keybind="Use"/][/color] чтобы подобрать предметы и использовать объекты как кнопки или компьютеры, и [color=#a4885c][keybind="ActivateItemInWorld"/][/color] использовать предметы. Вы так же можете нажать [color=#a4885c]alt[/color] делая это, чтобы вызвать альтернативные взаимодействия для некоторых объектов. + - Вы также можете быстро использовать предметы, которые держите в руках, нажав [color=#a4885c][keybind="ActivateItemInHand"/][/color] и [color=#a4885c][keybind="AltActivateItemInHand"/][/color] соответственно. + - [color=#a4885c][keybind="UIRightClick"/][/color] чтобы открыть контекст меню. Затем вы можете либо щелкнуть левой кнопкой мыши по записи, как в обычном режиме, либо щелкнуть правой кнопкой мыши еще раз, чтобы открыть меню глаголов, которое предоставляет вам более сложные способы взаимодействия с объектом. + - Вы можете нажать [color=#a4885c][keybind="ExamineEntity"/][/color] на объекты чтобы осмотреть их, чтобы узнать их название и детализацию (хотя часто и с чувством юмора) описание. -[color=cyan]Перетаскивание[/color] объектов осуществляется с помощью [color=yellow][bold][keybind="TryPullObject"][/bold][/color]. -Во время перетаскивания вы можете перетащить объект к курсору мыши с помощью [color=yellow][bold][keybind="MovePulledObject"][/bold][/color]. -Нажав [color=yellow][bold][keybind="ReleasePulledObject"][/bold][/color], вы отпустите объект, который вы в данный момент перетаскиваете. + Вы можете быстро опробовать эти элементы управления с помощью обезьянки, изображенной ниже (заметка: нажатие на нее работает только в игре, а не в лобби), и в любом месте этого руководства, если вам будет показан объект, [color=#a4885c][keybind="ExamineEntity"/] осмотр будет работать всегда[/color]: -Вы можете оказаться в ситуации с [color=#EB2D3A][bold]низкой гравитацией[/bold][/color]. -Это приведёт к тому, что ваш персонаж будет дрейфовать при движении. -Находясь вне станции, вы не сможете контролировать своё направление. -[bold]Бросание предметов[/bold] или [bold]распыление огнетушителя[/bold] помогут вам двигаться, находясь в таком состоянии. -## Взаимодействие -Общие взаимодействия осуществляются с помощью [color=yellow][bold][keybind="Use"][/bold][/color]. -Они [bold]контекстно-зависимые[/bold] и зависят от предмета в вашей активной руке. -Вы также можете использовать [color=yellow][bold][keybind="AltActivateItemInWorld"][/bold][/color] для выполнения [bold]альтернативных взаимодействий[/bold]. + -Для выполнения [color=cyan]базовых взаимодействий[/color] используйте [color=yellow][bold][keybind="ActivateItemInWorld"][/bold][/color]. -Это похоже на [bold]взаимодействие, когда в руках ничего нет[/bold]. -Нажатие [color=yellow][bold][keybind="ActivateItemInHand"][/bold][/color] приводит к тому же эффекту с текущим удерживаемым предметом. -Это наиболее часто используется для выполнения основных действий, когда вы держите что-то в руках, например, для открытия двери, когда у вас заняты руки. + ## Инвентарь + Чтобы перемещать предметы в вашем инвентаре и между контейнерами, вы можете щелкнуть по предмету (или его названию), чтобы переместить его в свою активную руку, а затем щелкнуть по месту, куда вы хотите его переместить (либо в ячейку на вашем HUD, либо в контейнер). -Наведение курсора на объект и нажатие [color=yellow][bold][keybind="UIRightClick"/][/bold][/color] вызывает [color=cyan]контекстное меню[/color]. -Это позволяет не только сортировать большие кучи предметов, но и выполнять [bold]дополнительные действия[/bold]. + Предметы, находящиеся у вас в руках, активны только по одному за раз, чтобы переключиться между теми, которые вы используете в данный момент, вы можете нажать [color=#a4885c][keybind="SwapHands"/][/color] на вашей клавиатуре чтобы сменить активную руку. -[color=cyan]Изучение[/color] предметов осуществляется с помощью [color=yellow][bold][keybind="ExamineEntity"][/bold][/color], которая вызывает окно с названием объекта, небольшим описанием и другими важными деталями. -[italic]Изучение окружающих предметов поможет вам узнать, что они делают и какими свойствами обладают[/italic]. + Открывать контейнеры в вашем инвентаре также просто: наведите курсор на нужный предмет и активируйте его с помощью [color=#a4885c][keybind="ActivateItemInWorld"/][/color] или нажмите на значок сумки в правом нижнем углу слота, в котором она находится. -## Руки -Используя [color=yellow][bold][keybind="Use"][/bold][/color] на предметах в мире, вы подберёте их в вашу активную руку. -Вы можете менять активную руку, используя [color=yellow][bold][keybind="SwapHands"][/bold][/color]. + Когда вы открываете контейнер, появляется окно, в котором отображается содержимое контейнера и количество свободного места для хранения вещей. + Все предметы имеют определенный размер, некоторые из них слишком велики, чтобы поместиться в большинстве или во всех контейнерах. -Вы можете [color=cyan]положить[/color] предмет, который держите в руках, используя [color=yellow][bold][keybind="Drop"][/bold][/color] или [color=cyan]бросить его[/color] к вашему курсору с помощью [color=yellow][bold][keybind="ThrowItemInHand"][/bold][/color]. + Чтобы бросить предмет вы можете нажать [color=#a4885c][keybind="Drop"/][/color], и отбросить их с большей силой (так же известное как бросок), вы можете нажать [color=#a4885c][keybind="ThrowItemInHand"/][/color]. -## Инвентарь -Вы можете [color=cyan]открыть[/color] свой инвентарь, используя [color=yellow][bold][keybind="OpenInventoryMenu"][/bold][/color]. -Каждый слот в вашем HUD может быть заполнен соответствующим [bold]предметом[/bold] или [bold]одеждой[/bold]. + Немного более продвинутым способом управления вашим инвентарем является использование [color=#a4885c]Shift + B[/color]. Если ваша активная рука в данный момент пуста, эта горячая клавиша вытащит последний предмет, который был положен в вашу сумку. Если у вас в руке есть какой-либо предмет, эта же горячая клавиша положит его в вашу сумку. + Горячая клавиша [color=#a4885c]Shift + E[/color] работает точно так же, но использует ваш ремень в качестве хранилища. + ## Действия + Слева на вашем графическом дисплее есть панель, показывающая различные действия, которые вы можете предпринять. + Вы можете навести курсор на каждое из них, чтобы увидеть название и описание действия, которые расскажут вам, что это такое и как оно работает. + Вы можете щелкнуть по действию, чтобы вызвать его, или нажать цифровую клавишу в любой момент, чтобы вызвать действие, не нажимая на него. -Два слота на нижней панели соответствуют вашим [bold]сумке и поясу[/bold]. -Вы можете открыть их, нажав [color=yellow][bold][keybind="ActivateItemInWorld"][/bold][/color] по ним или кликнув на иконку в [bold]правом нижнем углу[/bold]. + Чтобы изменить порядок ваших действий, просто перетащите их в другие ячейки, щелкните правой кнопкой мыши, чтобы удалить их, и нажмите на значок шестеренки в верхней части панели, чтобы открыть меню для (повторного) их добавления. + Всего у вас есть 10 страниц с действиями, между которыми вы можете переключаться нажатием кнопки [color=#a4885c]shift-(number)[/color]. + Кроме того, вы можете нажать на значок блокировки, чтобы предотвратить изменение панели действий. -Нажатие [color=yellow][bold][keybind="MoveStoredItem"][/bold][/color] позволит [color=cyan]достать предмет из сумки[/color]. -Удерживая её, вы сможете [color=cyan]перетащить[/color] предмет в другое место. -При перетаскивании нажатие [color=yellow][bold][keybind="RotateStoredItem"][/bold][/color] приведёт к [color=cyan]вращению[/color] предмета. - -Вы по-прежнему можете выполнять все обычные действия с предметами в сумке, включая [color=cyan]осмотр[/color] и открытие [color=cyan]контекстного меню[/color]. - -## Камера -Камеру можно [color=cyan]масштабировать[/color] с помощью [color=yellow][bold][keybind="ZoomIn"][/bold][/color] и [color=yellow][bold][keybind="ZoomOut"][/bold][/color] и сбрасывать с помощью [color=yellow][bold][keybind="ResetZoom"][/bold][/color]. -Аналогично, вы можете [color=cyan]вращать[/color] её влево и вправо с помощью [color=yellow][bold][keybind="CameraRotateLeft"][/bold][/color] и [color=yellow][bold][keybind="CameraRotateRight"][/bold][/color]. -Вы можете выровнять её в соответствии с поворотом грида с помощью [color=yellow][bold][keybind="CameraReset"][/bold][/color]. + ## Передвижение + Есть несколько факторов, которые могут повлиять на ваши движения, в первую очередь это касается скольжения (для этого вам нужно ходить с [color=#a4885c]shift[/color] чтобы избежать, обычно.) и отсутствие гравитации. + Скольжение просто оглушает вас на некоторое время, но никакая гравитация не может быть смертельной, если вы сойдете с дистанции и отойдете более чем на 1,5 м от ближайшей стены или твердой конструкции, так как вы потеряете хватку и больше не сможете двигаться, не кинув что-нибудь. From 0f6b00ff4657f349e4301c0e4cdf651b29e084db Mon Sep 17 00:00:00 2001 From: MegaDaimond <158335048+MegaDaimond@users.noreply.github.com> Date: Fri, 6 Sep 2024 14:35:27 +0700 Subject: [PATCH 2/6] =?UTF-8?q?=D0=A4=D0=B8=D0=BA=D1=81=D1=8B=20=D1=87.3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Entities/Clothing/Mask/mask.yml | 7 ++++++- .../upgcloth.rsi/equipped-INNERCLOTHING.png | Bin 988 -> 1298 bytes .../Uniforms/NPZ/upgcloth.rsi/icon.png | Bin 481 -> 422 bytes .../Summer/Bikinis/stripper.rsi/base.png | Bin 240 -> 0 bytes .../stripper.rsi/equipped-INNERCLOTHING.png | Bin 506 -> 0 bytes .../Summer/Bikinis/stripper.rsi/icon.png | Bin 249 -> 0 bytes .../Summer/Bikinis/stripper.rsi/visor.png | Bin 166 -> 0 bytes .../swimming_trunks.rsi/base.png | Bin 240 -> 0 bytes .../equipped-INNERCLOTHING.png | Bin 506 -> 0 bytes .../swimming_trunks.rsi/icon.png | Bin 249 -> 0 bytes .../swimming_trunks.rsi/visor.png | Bin 166 -> 0 bytes 11 files changed, 6 insertions(+), 1 deletion(-) delete mode 100644 Resources/Textures/_LostParadise/Clothing/Uniforms/Summer/Bikinis/stripper.rsi/base.png delete mode 100644 Resources/Textures/_LostParadise/Clothing/Uniforms/Summer/Bikinis/stripper.rsi/equipped-INNERCLOTHING.png delete mode 100644 Resources/Textures/_LostParadise/Clothing/Uniforms/Summer/Bikinis/stripper.rsi/icon.png delete mode 100644 Resources/Textures/_LostParadise/Clothing/Uniforms/Summer/Bikinis/stripper.rsi/visor.png delete mode 100644 Resources/Textures/_LostParadise/Clothing/Uniforms/Summer/Swimming-trunks/swimming_trunks.rsi/base.png delete mode 100644 Resources/Textures/_LostParadise/Clothing/Uniforms/Summer/Swimming-trunks/swimming_trunks.rsi/equipped-INNERCLOTHING.png delete mode 100644 Resources/Textures/_LostParadise/Clothing/Uniforms/Summer/Swimming-trunks/swimming_trunks.rsi/icon.png delete mode 100644 Resources/Textures/_LostParadise/Clothing/Uniforms/Summer/Swimming-trunks/swimming_trunks.rsi/visor.png diff --git a/Resources/Prototypes/_LostParadise/Entities/Clothing/Mask/mask.yml b/Resources/Prototypes/_LostParadise/Entities/Clothing/Mask/mask.yml index d3a6b834b8..35f0808dfe 100644 --- a/Resources/Prototypes/_LostParadise/Entities/Clothing/Mask/mask.yml +++ b/Resources/Prototypes/_LostParadise/Entities/Clothing/Mask/mask.yml @@ -357,4 +357,9 @@ Blunt: 0.95 Slash: 0.95 Piercing: 0.95 - Heat: 0.95 \ No newline at end of file + Heat: 0.95 + - type: Tag + tags: + - HidesHair + - WhitelistChameleon + - HidesNose \ No newline at end of file diff --git a/Resources/Textures/_LostParadise/Clothing/Uniforms/NPZ/upgcloth.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_LostParadise/Clothing/Uniforms/NPZ/upgcloth.rsi/equipped-INNERCLOTHING.png index f8271d04ba2533894ca384e48c0d81c23de364ee..e8fa270393614f67490da6c93f65a25de74dec78 100644 GIT binary patch delta 1278 zcmV|zX+^mm z$5{f|MGla=NNh^uB90~h2iOwVyKv!1_8$NeE>h5gl+d28h!n>Kpri>%=^|`X*aC@Q zBo|wft>%jJ8!gLvnOSzh3Hy=IYG;3Z-@JMAgM9;pgoK2IgnxvDtSE}xMaI}v+1Xi@ z0l@KbUU4f63es}INncUiP5NC{yjgGH&5Ou;# z2M`CjBedEb*Lzy+4i0ihqOY97+I8#^6qLT}AV{sBOsxX|n)L>n^#-=Kv%HLi9|j=+ z;MX3a!1JIquYRdiVXt5R?W*q@0nK^?$<#Uya!2^^@qe8H09)JH31NcDKYVyP$w`*U6iTHmz`P^%vw=Y?M8^qiv9 zq@MNTJ?9rS<@`eIe&IpzS4C(kOv}mV&$BF%h@;hNAR67kXmrDmx}HU^*T>hd4bOv~ z+qywf6o0I(#hIqXpsEo7;Q9bynqwHo5Q9NqakBj}gd<>c^93`_F}mGrM57x>B;wGt z7!rv%qR|a>yVo$yF*Y|}__q?X=>veOMvzFvC-f7EICl!&rzpzI$^#M(P}K;YJ^PCr z(ChVK7(?`WeQp3<4+2$v>1;9O^X2lkAhyW4^4|r8RZv)L0_>)Awl}4IhNM{DW^el{$uAd zcz<$$ro|@u;5-H_8z~1E#*ojqBISM~sxR|FMrt7xG_w{$BKNsH=Y-TZ!FloX6PaHK zIl#&AMMXu>EHnZ{ndMxk>t3Vlr@&(Gh~jA$ zAVJE(B~$At7RrJAXK;Gw?#@2)`8}>pHhDp6i;Oi{>6Ef67Rs=^h_GfdINeU&0E8oxC{!?$mjPaZ19S-1E}?jh4MlwJd3UEEPslH zGOE@06Df01!f9~X1}qyX2Q=#qTwUHGpWnmD=^>i+hUd}O4_fUGXxkhOg0h=3q^H4F zyTdE}RK@_SO|qU~nHl(n@u zi$*sbGr-o(2|+^}CG1dgRK^aeE_Xl)O3Kn&kBdx?S@!{0j|)wXlA!gtDE!oxb^zt! z?A>6Vy+N|rwa6YXxk+gUP>88>tJ@Nl_=LA;=D^Z8CW30wn%an5Pj|ejVW10oI)S oqNYD9gF#_>;M1&07*qoM6N<$f*uEX_W%F@ delta 966 zcmbQlb%%X|N`sf3szwsRyM`PH&F}>4B{oO5hcO-X(i=}MX3z#J}v=%?h0k8 zMGD4xCWWm_9s-qcloa^617(bXYzD6eO?e>2lJ4m1$iT3%pZiZDE0E8Y|H*Yfq~iF)5S5QV$Rzr!)y^pk$b`qxA@eHCo3>&^S)%7H+Np^jd;nHKMaB0BFh4q z%r;&)cTQy5w5A&>j;l}e3-~C`VM%__HKpq6spubvb|-GWX>M#C|K-zz*1u}aCpsSKIPmJ2igaYy=AZ}_9~`hDG6n{<<3bHDz+UHbo0O7F+( zU-$7<%1+|2lx%lcqv3Hd{^#NejWWmUPyF%l5MU52l5=@*LtOKRzbw=2+49Hwtj)!} z&S!7e@0aCgv(H)R@o0a<*T={G-$z|qw{G2)U&c57{acW_tKmevHRr$WX_Axg-roDT zl_RQWugK}dv(d-u{~l|ad0&U&bi$UZf4sg`r9W6-zs~1M5Nx};f`9*Y*$L;e*3$p7P_4kJhvFyC@@ZtB2;CV+)>N{r2 z7)bq`{j&88yS%o7Ah+UrgIxx0B^q?5L;Tsd=*Sw{Z* z+1I}c+q3uxDntk0m|Xn!`N8!XO@5mfFK)hceqUN21LyDM+5FrOjNg1+y;WnWVd%2c z@m6#5Hp*-0+C`sz(y(^!cio+r&(Ghh(-(aAtJdK%iEYQueD$=O`Qzea@tq1!g>JOg z$#LAA_Svr~Jbm4qh)vV%FD)@pN{Oy}l-^j(zJc|Et_r8uU4_qIXQsl0Tq@ICi&#|AV+BL8ppyby6aM63F0KoL;9(6Or~^f8cVT z|;2d-0V|2v%sE^M7=HCW?X(uIJ=Q0ie@v z;_=}L0H`S9&mbcB{*baPquF#$w>Nh*o6e8gzCWa5#lAzS0;}Z)^@au4bL5Eu0Iuht z-mtJ*ZdAhYDW0A)`u>nzf-@B%FZ0)5tsjGR1yK;@V-$qw+C9`8Rw;4uO5}bHtO|@L zBO!x!?OrLdM1T6DAjEhwV*d&3E094u?dH*S=~qdvB;da|xd5eB+-ljh-@jwGdqcH) ziAv=HhxTF-2!P*;l>``uNwwNFO!Eo=5XalnJWba~l2}QAQYVze@fHA(rt6=4UPAdb qGz>F0k|Y*~b{?2n0gXnZ`2a)^&mv?JpM?Mb002ovP6b4+LSTa4%($cg delta 455 zcmV;&0XY7q1K|UZB!35VNliru=mirH0ybSG5G4Qr02g#cSaefwW^{L9a%BKVOhiyl zM<8}(av(DOV1ZP1_K>z@;j|==^1poj5 z24YJ`L;(K){{a7>y{D4^00BHnL_t(|oMZU^|3AY(;sLdM)PDh^4j6U7&~!jo*S!BA zj4YM!`Y$6RPnIJ{vi$Yy*I>(GjsWptmV@Y! zkVKLlL6QStmckqX!!XN1G))|U?0a+?W-&5NiX)g9NB}2JUd1c_^XGR`i~|D}VifJ) zyAMu-u%ojRgMX%$5{ktqPC(Q=c)-c<{{1uJT|jJ5!Qva1@U{1+QM8Lt2{e9CzyWx_yHsF-e({!4bTD%xC2NkwVWJ6{=-T`7!8Yi5Dm(P zq?Uw4~I@j&7($pJu;17HAF9*|=p1|T)a xkc(gtAC~n<&3+`;1+>DW4j6U7r~?Mv0RZu~OXyPpSlj>r002ovPDHLkV1gk-w*LSC diff --git a/Resources/Textures/_LostParadise/Clothing/Uniforms/Summer/Bikinis/stripper.rsi/base.png b/Resources/Textures/_LostParadise/Clothing/Uniforms/Summer/Bikinis/stripper.rsi/base.png deleted file mode 100644 index 076dda39e2d7a92f7ccd8b464b0563eeaff3d7d3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 240 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}t2|vCLn2z= zPCm%%tjN)pd3o-P1H5+*a?UsudglP=j*Sy-O{8v3pU$z~SHDJ`bz=NK4gnTNfj={6 zZ=cZ7cJF#rZ28WvjtqrI(LFO`mF@`7*mCWfijC5{aMmYt!kq;zBR&^1&R1CEc_fwb zGE-Wdq2SGR^%2s`rnqT7HCf;K=0hp>ni*;f_RiIJJ#zR*_50iQiN6>8`+bI|>TPC@ o7{iB8|8<^c$^k88V6b7Fe91N2;hES~psN`?UHx3vIVCg!0QX*CMgRZ+ diff --git a/Resources/Textures/_LostParadise/Clothing/Uniforms/Summer/Bikinis/stripper.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_LostParadise/Clothing/Uniforms/Summer/Bikinis/stripper.rsi/equipped-INNERCLOTHING.png deleted file mode 100644 index 3fef984aca4d6b67e049f83578a96d65fb61523a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 506 zcmVPx$v`IukRA_Fc3iBAkI-K3zS}feO8fr4__gt$PG~Lfn+x6niEuAAoU(- zSd>Cl)nhZ1pYYo>spIjB?WCQ7N~KcyVdS#`=48vHK@OkYM+N4S0FVli7J#TL?&*!* zaFuE}3=csjHAXS$1gy%3cRnocm0Dzg_zMd1bUeiCiSm>FWYQyLjX2J-FQa_V4c0f6c}ZPwSIX%r(da5 z{s+cuW-bcQF&lq5{{YDun2Wl1g;#dT7W22@JE#IxpbAuhjDWW?P#z&8;4e-bhRuzIT%l(W@UQB}d5fsR{kSpaKpJ}9teUt!qrD6>~!pPmoe z7EI+SK_=ZWniaCFz|5edc$2fe^q{jhJBH&d--lfrC=h@kR(-=}C@5_dJO!ipigYo1 w_k{xR;2FQLSAoEwo+1^rW^t-gsZ@RqFG+TS!9!ObE&u=k07*qoM6N<$f*p|CY5)KL diff --git a/Resources/Textures/_LostParadise/Clothing/Uniforms/Summer/Bikinis/stripper.rsi/icon.png b/Resources/Textures/_LostParadise/Clothing/Uniforms/Summer/Bikinis/stripper.rsi/icon.png deleted file mode 100644 index 623d85a9e1576daac89f1d52498b915aa2b4c11b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 249 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE0wix1Z>k4UjKx9jP7LeL$-D$|Hha1_hIn+o zon**&$biRnzToo}Q&#SEC|@>jQF7j8?I$WT4;ilFo4TVTk}GuuuLlp$Pw%ADb@%(2 zLPP&6So(=8WQxptew1O3&Zot)i&VC%8!+}3{uh{Fy2qt4=Uf5QVGi%C{vtsp2oz^cFtJ3Ycm2Ief);*__X|ltVYa5Li1HYMf9Lq0c{C)4=KfZ(s xOD2>Q{E1~alQK88im<4n`gQu&X%Q~loCIBLBVmAN) diff --git a/Resources/Textures/_LostParadise/Clothing/Uniforms/Summer/Bikinis/stripper.rsi/visor.png b/Resources/Textures/_LostParadise/Clothing/Uniforms/Summer/Bikinis/stripper.rsi/visor.png deleted file mode 100644 index 681abfadf813948f8568664ab4d2514468285e6d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 166 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}37#&FArY;~ z2@Bn&34didq7{r`zSm#xxKneAw1QTzLReM-TvZ}b1Z;8POaFk#V; zLrd@S@bIjQIC6qrh5i1Ut+xYf=19Hq+^>N!$c<5#fq`FB`RUV(@hJb6Mw< G&;$SppgSS} diff --git a/Resources/Textures/_LostParadise/Clothing/Uniforms/Summer/Swimming-trunks/swimming_trunks.rsi/base.png b/Resources/Textures/_LostParadise/Clothing/Uniforms/Summer/Swimming-trunks/swimming_trunks.rsi/base.png deleted file mode 100644 index 076dda39e2d7a92f7ccd8b464b0563eeaff3d7d3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 240 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}t2|vCLn2z= zPCm%%tjN)pd3o-P1H5+*a?UsudglP=j*Sy-O{8v3pU$z~SHDJ`bz=NK4gnTNfj={6 zZ=cZ7cJF#rZ28WvjtqrI(LFO`mF@`7*mCWfijC5{aMmYt!kq;zBR&^1&R1CEc_fwb zGE-Wdq2SGR^%2s`rnqT7HCf;K=0hp>ni*;f_RiIJJ#zR*_50iQiN6>8`+bI|>TPC@ o7{iB8|8<^c$^k88V6b7Fe91N2;hES~psN`?UHx3vIVCg!0QX*CMgRZ+ diff --git a/Resources/Textures/_LostParadise/Clothing/Uniforms/Summer/Swimming-trunks/swimming_trunks.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_LostParadise/Clothing/Uniforms/Summer/Swimming-trunks/swimming_trunks.rsi/equipped-INNERCLOTHING.png deleted file mode 100644 index 3fef984aca4d6b67e049f83578a96d65fb61523a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 506 zcmVPx$v`IukRA_Fc3iBAkI-K3zS}feO8fr4__gt$PG~Lfn+x6niEuAAoU(- zSd>Cl)nhZ1pYYo>spIjB?WCQ7N~KcyVdS#`=48vHK@OkYM+N4S0FVli7J#TL?&*!* zaFuE}3=csjHAXS$1gy%3cRnocm0Dzg_zMd1bUeiCiSm>FWYQyLjX2J-FQa_V4c0f6c}ZPwSIX%r(da5 z{s+cuW-bcQF&lq5{{YDun2Wl1g;#dT7W22@JE#IxpbAuhjDWW?P#z&8;4e-bhRuzIT%l(W@UQB}d5fsR{kSpaKpJ}9teUt!qrD6>~!pPmoe z7EI+SK_=ZWniaCFz|5edc$2fe^q{jhJBH&d--lfrC=h@kR(-=}C@5_dJO!ipigYo1 w_k{xR;2FQLSAoEwo+1^rW^t-gsZ@RqFG+TS!9!ObE&u=k07*qoM6N<$f*p|CY5)KL diff --git a/Resources/Textures/_LostParadise/Clothing/Uniforms/Summer/Swimming-trunks/swimming_trunks.rsi/icon.png b/Resources/Textures/_LostParadise/Clothing/Uniforms/Summer/Swimming-trunks/swimming_trunks.rsi/icon.png deleted file mode 100644 index 623d85a9e1576daac89f1d52498b915aa2b4c11b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 249 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE0wix1Z>k4UjKx9jP7LeL$-D$|Hha1_hIn+o zon**&$biRnzToo}Q&#SEC|@>jQF7j8?I$WT4;ilFo4TVTk}GuuuLlp$Pw%ADb@%(2 zLPP&6So(=8WQxptew1O3&Zot)i&VC%8!+}3{uh{Fy2qt4=Uf5QVGi%C{vtsp2oz^cFtJ3Ycm2Ief);*__X|ltVYa5Li1HYMf9Lq0c{C)4=KfZ(s xOD2>Q{E1~alQK88im<4n`gQu&X%Q~loCIBLBVmAN) diff --git a/Resources/Textures/_LostParadise/Clothing/Uniforms/Summer/Swimming-trunks/swimming_trunks.rsi/visor.png b/Resources/Textures/_LostParadise/Clothing/Uniforms/Summer/Swimming-trunks/swimming_trunks.rsi/visor.png deleted file mode 100644 index 681abfadf813948f8568664ab4d2514468285e6d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 166 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}37#&FArY;~ z2@Bn&34didq7{r`zSm#xxKneAw1QTzLReM-TvZ}b1Z;8POaFk#V; zLrd@S@bIjQIC6qrh5i1Ut+xYf=19Hq+^>N!$c<5#fq`FB`RUV(@hJb6Mw< G&;$SppgSS} From 8131821002058dcf8a2381eff5f8d0f8f9dcd366 Mon Sep 17 00:00:00 2001 From: MegaDaimond <158335048+MegaDaimond@users.noreply.github.com> Date: Fri, 6 Sep 2024 17:39:19 +0700 Subject: [PATCH 3/6] =?UTF-8?q?=D0=A4=D0=B8=D0=BA=D1=81=20=D0=BC=D0=B5?= =?UTF-8?q?=D1=82=D1=8B=20=D0=B8=20=D0=B8=D0=B7=D0=BC=D0=B5=D0=BD=D0=B5?= =?UTF-8?q?=D0=BD=D0=B8=D1=8F=20=D0=BA=D0=B0=D1=82=D0=B0=D0=BB=D0=BE=D0=B3?= =?UTF-8?q?=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Catalog/Fills/Crates/security.yml | 3 + .../Catalog/Fills/Lockers/medical.yml | 10 +- .../Catalog/Fills/Lockers/security.yml | 19 ++++ .../Catalog/Fills/Lockers/suit_storage.yml | 2 +- .../Inventories/atmosdrobe.yml | 13 +++ .../VendingMachines/Inventories/chemdrobe.yml | 3 +- .../Inventories/clothesmate.yml | 50 +++++++++ .../VendingMachines/Inventories/engidrobe.yml | 14 +++ .../VendingMachines/Inventories/medidrobe.yml | 15 ++- .../VendingMachines/Inventories/salvage.yml | 5 + .../VendingMachines/Inventories/scidrobe.yml | 21 ++++ .../VendingMachines/Inventories/sec.yml | 1 + .../VendingMachines/Inventories/secdrobe.yml | 27 ++++- .../VendingMachines/Inventories/virodrobe.yml | 19 ++++ .../Inventories/winterdrobe.yml | 11 +- .../Structures/cryostorage.rsi/meta.json | 36 +++++-- .../Clothing/Head/Hats/alex.rsi/meta.json | 4 +- .../Clothing/Head/Hats/jake.rsi/meta.json | 4 +- .../Clothing/Head/Hats/rasmus.rsi/meta.json | 4 +- .../Clothing/Head/Hats/richter.rsi/meta.json | 4 +- .../Clothing/Head/Hats/tony.rsi/meta.json | 4 +- .../Decals/bricktile-s.rsi/meta.json | 2 +- .../Decals/departament-sign.rsi/meta.json | 2 +- .../Decals/ind-letters-mini.rsi/meta.json | 2 +- .../Decals/ind-letters.rsi/meta.json | 2 +- .../Decals/ind-numbers-mini.rsi/meta.json | 2 +- .../Decals/ind-numbers.rsi/meta.json | 2 +- .../Decals/lpsignwtext.rsi/meta.json | 2 +- .../_LostParadise/Decals/markup.rsi/meta.json | 2 +- .../Decals/minitile-s.rsi/meta.json | 2 +- .../Decals/secsign.rsi/meta.json | 2 +- .../Decals/starcircle.rsi/meta.json | 2 +- .../Decals/wheelchair.rsi/meta.json | 2 +- .../Interface/Misc/status_ai.rsi/meta.json | 2 +- .../Objects/Fun/daki.rsi/meta.json | 1 + .../Misc/specialdelivery.rsi/meta.json | 4 +- .../Weapons/Melee/telebaton.rsi/meta.json | 4 +- .../Weapons/Melee/telebatonSpac.rsi/meta.json | 4 +- .../Machines/book_printer.rsi/cartridge.png | Bin 619 -> 0 bytes .../Machines/book_printer.rsi/full.png | Bin 234 -> 0 bytes .../Machines/book_printer.rsi/high.png | Bin 202 -> 0 bytes .../Machines/book_printer.rsi/icon.png | Bin 619 -> 0 bytes .../Machines/book_printer.rsi/inhand-left.png | Bin 259 -> 0 bytes .../book_printer.rsi/inhand-right.png | Bin 259 -> 0 bytes .../Machines/book_printer.rsi/low.png | Bin 201 -> 0 bytes .../Machines/book_printer.rsi/medium.png | Bin 201 -> 0 bytes .../Machines/book_printer.rsi/meta.json | 100 ------------------ .../Machines/book_printer.rsi/none.png | Bin 216 -> 0 bytes .../Machines/book_printer.rsi/slotted.png | Bin 326 -> 0 bytes .../Machines/book_printer.rsi/working.png | Bin 886 -> 0 bytes 50 files changed, 261 insertions(+), 147 deletions(-) delete mode 100644 Resources/Textures/_LostParadise/Structures/Machines/book_printer.rsi/cartridge.png delete mode 100644 Resources/Textures/_LostParadise/Structures/Machines/book_printer.rsi/full.png delete mode 100644 Resources/Textures/_LostParadise/Structures/Machines/book_printer.rsi/high.png delete mode 100644 Resources/Textures/_LostParadise/Structures/Machines/book_printer.rsi/icon.png delete mode 100644 Resources/Textures/_LostParadise/Structures/Machines/book_printer.rsi/inhand-left.png delete mode 100644 Resources/Textures/_LostParadise/Structures/Machines/book_printer.rsi/inhand-right.png delete mode 100644 Resources/Textures/_LostParadise/Structures/Machines/book_printer.rsi/low.png delete mode 100644 Resources/Textures/_LostParadise/Structures/Machines/book_printer.rsi/medium.png delete mode 100644 Resources/Textures/_LostParadise/Structures/Machines/book_printer.rsi/meta.json delete mode 100644 Resources/Textures/_LostParadise/Structures/Machines/book_printer.rsi/none.png delete mode 100644 Resources/Textures/_LostParadise/Structures/Machines/book_printer.rsi/slotted.png delete mode 100644 Resources/Textures/_LostParadise/Structures/Machines/book_printer.rsi/working.png diff --git a/Resources/Prototypes/Catalog/Fills/Crates/security.yml b/Resources/Prototypes/Catalog/Fills/Crates/security.yml index 592c153508..01267e06cd 100644 --- a/Resources/Prototypes/Catalog/Fills/Crates/security.yml +++ b/Resources/Prototypes/Catalog/Fills/Crates/security.yml @@ -8,6 +8,9 @@ contents: - id: ClothingOuterArmorPlateCarrier # DeltaV - ClothingOuterArmorBulletproof replaced in favour of plate carrier amount: 3 +#LPP + - id: LPPClothingOuterHardsuitReflectivepatrolsec + prob: 0.3 - type: entity id: CrateSecurityHelmet diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/medical.yml b/Resources/Prototypes/Catalog/Fills/Lockers/medical.yml index f217791683..9e28863b62 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/medical.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/medical.yml @@ -109,7 +109,7 @@ prob: 0.3 - id: ClothingMaskSterile - id: LunchboxMedicalFilledRandom # Delta-V Lunchboxes! - prob: 0.3 + prob: 0.3 - type: entity parent: LockerWallMedical @@ -145,7 +145,7 @@ orGroup: Surgshrubs - id: ClothingMaskSterile - id: LunchboxMedicalFilledRandom # Delta-V Lunchboxes! - prob: 0.3 + prob: 0.3 - type: entity id: LockerChemistryFilled @@ -187,7 +187,7 @@ - id: MedkitFilled prob: 0.3 - id: LunchboxMedicalFilledRandom # Delta-V Lunchboxes! - prob: 0.3 + prob: 0.3 - type: entity id: LockerParamedicFilledHardsuit #Delta V - Paramedic locker with suit @@ -196,7 +196,7 @@ components: - type: StorageFill contents: - - id: ClothingOuterHardsuitVoidParamed + - id: LPPHardsuitAssaultParamedic #LPP - id: ClothingOuterCoatParamedicWB - id: ClothingHeadHatParamedicsoft - id: ClothingOuterWinterPara @@ -211,4 +211,4 @@ - id: MedkitFilled prob: 0.3 - id: LunchboxMedicalFilledRandom # Delta-V Lunchboxes! - prob: 0.3 + prob: 0.3 diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/security.yml b/Resources/Prototypes/Catalog/Fills/Lockers/security.yml index e2d7ad1483..8931db3869 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/security.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/security.yml @@ -26,6 +26,11 @@ - id: BoxEncryptionKeyPrisoner #Delta-V - id: LunchboxSecurityFilledRandom # Delta-v Lunchboxes! prob: 0.3 +#LPP + - id: LPPWeaponPistolPF20 + - id: LPPMagazinePistolPF20lethal + - id: LPPMagazinePistolPF20Rubber + prob: 0.5 #Кибербуллинг метаюзеров :D - type: entity id: LockerWardenFilled @@ -54,6 +59,11 @@ - id: BoxEncryptionKeyPrisoner #Delta-V - id: LunchboxSecurityFilledRandom # Delta-v Lunchboxes! prob: 0.3 +#LPP + - id: LPPWeaponPistolPF20 + - id: LPPMagazinePistolPF20lethal + - id: LPPMagazinePistolPF20Rubber + prob: 0.5 #Кибербуллинг метаюзеров :D - type: entity id: LockerSecurityFilled @@ -99,6 +109,13 @@ prob: 0.6 - id: LunchboxSecurityFilledRandom # Delta-v Lunchboxes! prob: 0.3 +#LPP + - id: ClothingOuterHardsuitSanta + prob: 0.01 + - id: ClothingOuterHardsuitClown + prob: 0.01 + - id: ClothingMaskClown + prob: 0.1 - type: entity id: LockerBrigmedicFilled @@ -197,6 +214,8 @@ - id: BoxEvidenceMarkers - id: LunchboxSecurityFilledRandom # Delta-v Lunchboxes! prob: 0.3 +#LPP + - id: LPPClothingOuterDetectiveHardsuit - type: entity id: ClosetBombFilled diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/suit_storage.yml b/Resources/Prototypes/Catalog/Fills/Lockers/suit_storage.yml index 734bd485a2..c22577f748 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/suit_storage.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/suit_storage.yml @@ -257,7 +257,7 @@ contents: - id: NitrogenTankFilled - id: OxygenTankFilled - - id: ClothingOuterHardsuitVoidParamed + - id: LPPHardsuitAssaultParamedic #Изменение от LPP - id: ClothingMaskBreathMedical - type: AccessReader access: [ [ "Paramedic" ] ] diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/atmosdrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/atmosdrobe.yml index f2cc7e8a54..dfabbc8cf7 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/atmosdrobe.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/atmosdrobe.yml @@ -14,3 +14,16 @@ ClothingOuterWinterAtmos: 2 ClothingNeckScarfStripedLightBlue: 3 ClothingShoesBootsWinterAtmos: 2 #Delta V: Add departmental winter boots +#LPP + LPPAtmosBlackSkirt: 3 + LPPAtmostechjean: 3 + LPPGorkaAtmos: 3 + LPPGorkaWithReflectorsAtmos: 3 + LPPQmcAtmos: 3 + LPPQmsyndAtmos: 3 + LPPSkirtleneckAtmos: 3 + LPPSkirtleneckQMAtmos: 3 + LPPSupplyChiefAtmos: 3 + LPPSupplyChiefSkirtAtmos: 3 + LPPTurtleneckQmAtmos: 3 + LPPUtilAtmos: 3 \ No newline at end of file diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/chemdrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/chemdrobe.yml index 433210dce7..524d963557 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/chemdrobe.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/chemdrobe.yml @@ -20,4 +20,5 @@ ClothingOuterApronChemist: 2 # Realistic PPE apron for chemistry ClothingEyesGlassesChemist: 2 # Safety glasses ClothingHandsGlovesChemist: 2 # Heavy duty chemistry gloves - # End of modified code \ No newline at end of file + # End of modified code + LPPChemistHudGlasses: 2 #LPP-Edit's \ No newline at end of file diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml index 6c99f925ee..a6e9e02f44 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml @@ -21,7 +21,57 @@ ClothingHandsGlovesColorBlack: 4 ClothingEyesGlassesCheapSunglasses: 2 ClothingClothWrap: 4 +#LPP + LPPWaistbag01: 3 + LPPWaistbag02: 3 + LPPWaistbag03: 3 + LPPWaistbag04: 3 + LPPWaistbag05: 3 + LPPWaistbag06: 3 + LPPWaistbag07: 3 + LPPWaistbag08: 3 + LPPWaistbag09: 3 + LPPWaistbag10: 3 + LPPUnathiWraps: 3 + LPPDeckerJumpsuit: 3 + LPPDraculass: 3 + LPPDrfreeze: 3 + LPPKilt: 3 + LPPMaid: 3 + LPPSchoolgirl: 3 + LPPSchoolgirlgreen: 3 + LPPSchoolgirlorange: 3 + LPPSchoolgirlred: 3 + LPPSwagOutfit: 3 + LPPSwagShoes: 3 + LPPGlowShoes: 3 + LPPIceboots: 3 + LPPRainBow: 3 + LPPBlackFlannelJumpsuit: 2 + LPPGreenFlannelJumpsuit: 2 + LPPOrangeFlannelJumpsuit: 2 + LPPClothingNeckNeckerchiefGreen: 5 + LPPClothingNeckNeckerchiefPurple: 5 + LPPClothingNeckNeckerchiefRed: 5 + LPPClothingHeadHatCapRed: 4 + LPPClothingHeadHatCapBlack: 4 + LPPClothingHeadHatCapGreen: 4 + LPPClothingHeadHatCapBlue: 4 + LPPClothingUniformGreenTracksuit: 4 + LPPClothingUniformBlackTracksuit: 4 + LPPClothingUniformBlueTracksuit: 4 + LPPClothingUniformRedTracksuit: 4 contrabandInventory: ClothingMaskNeckGaiter: 2 ClothingUniformJumpsuitTacticool: 1 ClothingUniformJumpskirtTacticool: 1 + ClothingEyesGlassesSunglasses: 2 + ClothingHandsGlovesColorBlack: 4 + ClothingHandsGlovesColorGray: 4 + ClothingHandsGlovesColorBrown: 2 + ClothingHandsGlovesColorWhite: 2 + ClothingHandsGlovesColorRed: 2 + ClothingHandsGlovesColorBlue: 2 + ClothingHandsGlovesColorGreen: 2 + ClothingHandsGlovesColorOrange: 2 + ClothingHandsGlovesColorPurple: 2 \ No newline at end of file diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/engidrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/engidrobe.yml index 5d732def49..82d7eb19c3 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/engidrobe.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/engidrobe.yml @@ -16,3 +16,17 @@ ClothingOuterWinterEngi: 2 ClothingNeckScarfStripedOrange: 3 ClothingShoesBootsWinterEngi: 2 +#LPP + LPPEngiBlackSkirt: 3 + LPPEngiTechjean: 3 + LPPGorkaEngi: 3 + LPPGorkaWithReflectorsEngi: 3 + LPPQmcEngi: 3 + LPPQmsyndEngi: 3 + LPPSkirtleneckEngi: 3 + LPPSkirtleneckQMEngi: 3 + LPPSupplyChiefEngi: 3 + LPPSupplyChiefSkirtEngi: 3 + LPPTurtleneckQmEngi: 3 + LPPUtilEngi: 3 + LPPClothingOuterCoatEngie: 3 diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/medidrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/medidrobe.yml index f4fb03e6c7..294a7b2c98 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/medidrobe.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/medidrobe.yml @@ -18,10 +18,23 @@ UniformScrubsColorGreen: 4 UniformScrubsColorBlue: 4 UniformScrubsColorPurple: 4 - ClothingHeadHatSurgcapGreen: 4 + ClothingHeadHatSurgcapGreen: 4 ClothingHeadHatSurgcapBlue: 4 ClothingHeadHatSurgcapPurple: 4 ClothingShoesBootsWinterMed: 2 +#LPP + LPPMedicBlackSkirt: 4 + LPPMedictechjean: 4 + LPPGorkaMedic: 4 + LPPGorkaMedicVarg: 4 + LPPQmcMedic: 4 + LPPQmsyndMedic: 4 + LPPSkirtleneckMedic: 4 + LPPSkirtleneckQMMedic: 4 + LPPSupplyChiefMedic: 4 + LPPSupplyChiefSkirtMedic: 4 + LPPTurtleneckQmMedic: 4 + LPPUtilMedic: 4 contrabandInventory: #DeltaV UniformScrubsColorCybersun: 1 #DeltaV ClothingHeadHatSurgcapCybersun: 1 #DeltaV diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/salvage.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/salvage.yml index b5665df37b..609c41107c 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/salvage.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/salvage.yml @@ -13,3 +13,8 @@ SeismicCharge: 2 FultonBeacon: 1 Fulton: 2 +#LPP + WeaponCrusherDagger: 2 + ContrabandInventory: + LPPWeaponSyndieGlaive: 1 + ClothingBackpackDuffelSyndicate: 1 \ No newline at end of file diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/scidrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/scidrobe.yml index c4608af34e..924c3f734e 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/scidrobe.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/scidrobe.yml @@ -16,3 +16,24 @@ ClothingNeckScarfStripedPurple: 3 ClothingHeadTinfoil: 2 # Nyanotrasen - Tinfoil hats for Epistemics ClothingShoesBootsWinterSci: 2 +#LPP + LPPRndBlackSkirt: 3 + LPPRndtechjean: 3 + LPPGorkaRnd: 3 + LPPGorkaRndVarg: 3 + LPPQmcRnd: 3 + LPPQmsyndRnd: 3 + LPPSkirtleneckRnd: 3 + LPPSkirtleneckQMRnd: 3 + LPPSupplyChiefRnd: 3 + LPPSupplyChiefSkirtRnd: 3 + LPPTurtleneckQmRnd: 3 + LPPUtilRnd: 3 + ClothingOuterCoatRnd: 3 + ClothingShoesColorWhite: 3 + ClothingNeckTieSci: 3 + ClothingHeadsetScience: 3 + ClothingMaskGas: 3 + ClothingOuterWinterSci: 2 + ClothingNeckScarfStripedPurple: 3 + ClothingShoesBootsWinterSci: 2 \ No newline at end of file diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/sec.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/sec.yml index 01b58ae40f..e3148f2572 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/sec.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/sec.yml @@ -30,3 +30,4 @@ FoodDonutHomer: 12 FoodBoxDonut: 2 #box evidence + LPPTelebaton: 3 #LPP \ No newline at end of file diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/secdrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/secdrobe.yml index cb0c10c129..d36098022d 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/secdrobe.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/secdrobe.yml @@ -26,4 +26,29 @@ ClothingShoesBootsCombat: 1 ClothingShoesBootsWinterSec: 2 ClothingShoesBootsCowboyBlack: 1 - ClothingHeadHatCowboyBlack: 1 \ No newline at end of file + ClothingHeadHatCowboyBlack: 1 +##LPP + LPPSecBlackSkirt: 3 + LPPSectechjean: 3 + LPPGorkaSec: 3 + LPPGorkaSecVarg: 3 + LPPQmcSec: 3 + LPPQmsyndSec: 3 + LPPSkirtleneckSec: 3 + LPPSkirtleneckQMSec: 3 + LPPSupplyChiefSec: 3 + LPPSupplyChiefSkirtSec: 3 + LPPTurtleneckQmSec: 3 + LPPUtilSec: 3 + LPPTacticoolSec: 3 + ClothingEyesHudSecurity: 2 + ClothingMaskNeckGaiter: 2 + LPPClothingMaskBandageBlack: 2 + LPPClothingMaskBandageRed: 1 + LPPClothingHeadHatRedBandana: 1 + LPPClothingMaskBandageSkull: 1 + ClothingHeadBandBlack: 2 + ClothingHeadBandSkull: 1 + LPPClothingHeadSecHat: 2 + ContrabandInventory: + ClothingMaskClownSecurity: 1 \ No newline at end of file diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/virodrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/virodrobe.yml index a5965ad4de..630e4beb10 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/virodrobe.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/virodrobe.yml @@ -11,3 +11,22 @@ ClothingBackpackSatchelVirology: 2 ClothingBackpackDuffelVirology: 2 ClothingShoesBootsWinterViro: 2 #Delta V: Add departmental winter boots +#LPP + LPPGorkaVirology: 2 + LPPGorkaVirologyVarg: 2 + LPPQmcVirology: 2 + LPPQmcSyndVirology: 2 + LPPSkirtleneck: 2 + LPPSkirtleneck2: 2 + LPPSkirtleneckQM: 2 + LPPSkirtleneckQM2: 2 + LPPSupplyChief: 2 + LPPSupplyChief2: 2 + LPPSupplyChiefSkirt: 2 + LPPSupplyChiefSkirt2: 2 + LPPTurtleneckQM: 2 + LPPTurtleneckQM2: 2 + LPPUtilVirology: 2 + LPPVirologyBlackSkirt: 2 + LPPVirologyTechjean: 2 + LPPMedicBlackSkirt2: 2 \ No newline at end of file diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/winterdrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/winterdrobe.yml index 0f8c73dac3..09ad00f016 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/winterdrobe.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/winterdrobe.yml @@ -18,7 +18,16 @@ ClothingOuterCoatBomber: 3 ClothingHeadHatSantahat: 2 ClothingHeadHatXmasCrown: 2 - +#LPP + LPPClothingHeadHatBlackBeanie: 2 + LPPClothingHeadHatBlueBeanie: 2 + LPPClothingHeadHatGreenBeanie: 2 + LPPClothingHeadHatRedBeanie: 2 + LPPClothingOuterCoatBomber1: 3 + LPPClothingOuterCoatBomber2: 3 + LPPClothingOuterCoatBomber3: 3 + LPPClothingOuterCoatBomber4: 3 + LPPClothingOuterCoatBomber5: 3 emaggedInventory: ClothingNeckScarfStripedSyndieGreen: 3 ClothingNeckScarfStripedSyndieRed: 3 diff --git a/Resources/Textures/Structures/cryostorage.rsi/meta.json b/Resources/Textures/Structures/cryostorage.rsi/meta.json index ed9f72a60e..d361b5f161 100644 --- a/Resources/Textures/Structures/cryostorage.rsi/meta.json +++ b/Resources/Textures/Structures/cryostorage.rsi/meta.json @@ -15,11 +15,31 @@ "name": "sleeper_1", "directions": 4, "delays": [ - [1.5, 0.05, 0.05, 0.05, 0.05, 0.05, 0.05, 0.05, 0.05, 0.05, 0.05, 0.05], - [1.5, 0.05, 0.05, 0.05, 0.05, 0.05, 0.05, 0.05, 0.05, 0.05, 0.05, 0.05], - [1.5, 0.05, 0.05, 0.05, 0.05, 0.05, 0.05, 0.05, 0.05, 0.05, 0.05, 0.05, 0.05, 0.05, 0.05, 0.05, 0.05, 0.05], - [1.5, 0.05, 0.05, 0.05, 0.05, 0.05, 0.05, 0.05, 0.05, 0.05, 0.05, 0.05, 0.05, 0.05, 0.05, 0.05, 0.05, 0.05] - ] - } - ] -} + [ + 0.2, + 0.2, + 0.2, + 0.2 + ], + [ + 0.2, + 0.2, + 0.2, + 0.2 + ], + [ + 0.2, + 0.2, + 0.2, + 0.2 + ], + [ + 0.2, + 0.2, + 0.2, + 0.2 + ] + ] + } + ] + } \ No newline at end of file diff --git a/Resources/Textures/_LostParadise/Clothing/Head/Hats/alex.rsi/meta.json b/Resources/Textures/_LostParadise/Clothing/Head/Hats/alex.rsi/meta.json index a4d090165b..69b8f9a187 100644 --- a/Resources/Textures/_LostParadise/Clothing/Head/Hats/alex.rsi/meta.json +++ b/Resources/Textures/_LostParadise/Clothing/Head/Hats/alex.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, - "license": "EULA/CLA with a hosting restriction, full text: https://raw.githubusercontent.com/SerbiaStrong-220/space-station-14/master/CLA.txt", - "copyright": "Made by Qwerlink(discord dago#7393) for SS220", + "license": "CC-BY-SA-3.0", + "copyright": "Made by Qwerlink(discord dago#7393) for SS220 https://raw.githubusercontent.com/SerbiaStrong-220/space-station-14/master/CLA.txt", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/_LostParadise/Clothing/Head/Hats/jake.rsi/meta.json b/Resources/Textures/_LostParadise/Clothing/Head/Hats/jake.rsi/meta.json index a4d090165b..69b8f9a187 100644 --- a/Resources/Textures/_LostParadise/Clothing/Head/Hats/jake.rsi/meta.json +++ b/Resources/Textures/_LostParadise/Clothing/Head/Hats/jake.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, - "license": "EULA/CLA with a hosting restriction, full text: https://raw.githubusercontent.com/SerbiaStrong-220/space-station-14/master/CLA.txt", - "copyright": "Made by Qwerlink(discord dago#7393) for SS220", + "license": "CC-BY-SA-3.0", + "copyright": "Made by Qwerlink(discord dago#7393) for SS220 https://raw.githubusercontent.com/SerbiaStrong-220/space-station-14/master/CLA.txt", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/_LostParadise/Clothing/Head/Hats/rasmus.rsi/meta.json b/Resources/Textures/_LostParadise/Clothing/Head/Hats/rasmus.rsi/meta.json index a4d090165b..69b8f9a187 100644 --- a/Resources/Textures/_LostParadise/Clothing/Head/Hats/rasmus.rsi/meta.json +++ b/Resources/Textures/_LostParadise/Clothing/Head/Hats/rasmus.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, - "license": "EULA/CLA with a hosting restriction, full text: https://raw.githubusercontent.com/SerbiaStrong-220/space-station-14/master/CLA.txt", - "copyright": "Made by Qwerlink(discord dago#7393) for SS220", + "license": "CC-BY-SA-3.0", + "copyright": "Made by Qwerlink(discord dago#7393) for SS220 https://raw.githubusercontent.com/SerbiaStrong-220/space-station-14/master/CLA.txt", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/_LostParadise/Clothing/Head/Hats/richter.rsi/meta.json b/Resources/Textures/_LostParadise/Clothing/Head/Hats/richter.rsi/meta.json index a4d090165b..69b8f9a187 100644 --- a/Resources/Textures/_LostParadise/Clothing/Head/Hats/richter.rsi/meta.json +++ b/Resources/Textures/_LostParadise/Clothing/Head/Hats/richter.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, - "license": "EULA/CLA with a hosting restriction, full text: https://raw.githubusercontent.com/SerbiaStrong-220/space-station-14/master/CLA.txt", - "copyright": "Made by Qwerlink(discord dago#7393) for SS220", + "license": "CC-BY-SA-3.0", + "copyright": "Made by Qwerlink(discord dago#7393) for SS220 https://raw.githubusercontent.com/SerbiaStrong-220/space-station-14/master/CLA.txt", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/_LostParadise/Clothing/Head/Hats/tony.rsi/meta.json b/Resources/Textures/_LostParadise/Clothing/Head/Hats/tony.rsi/meta.json index a4d090165b..69b8f9a187 100644 --- a/Resources/Textures/_LostParadise/Clothing/Head/Hats/tony.rsi/meta.json +++ b/Resources/Textures/_LostParadise/Clothing/Head/Hats/tony.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, - "license": "EULA/CLA with a hosting restriction, full text: https://raw.githubusercontent.com/SerbiaStrong-220/space-station-14/master/CLA.txt", - "copyright": "Made by Qwerlink(discord dago#7393) for SS220", + "license": "CC-BY-SA-3.0", + "copyright": "Made by Qwerlink(discord dago#7393) for SS220 https://raw.githubusercontent.com/SerbiaStrong-220/space-station-14/master/CLA.txt", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/_LostParadise/Decals/bricktile-s.rsi/meta.json b/Resources/Textures/_LostParadise/Decals/bricktile-s.rsi/meta.json index 2658bbe3b3..166cddf8e3 100644 --- a/Resources/Textures/_LostParadise/Decals/bricktile-s.rsi/meta.json +++ b/Resources/Textures/_LostParadise/Decals/bricktile-s.rsi/meta.json @@ -1,6 +1,6 @@ { "version": 1, - "license": "CC0-1.0", + "license": "CC-BY-SA-3.0", "copyright": "Made by github user @Morb0. Modified v2 by ko4erga (discord)", "size": { "x": 32, diff --git a/Resources/Textures/_LostParadise/Decals/departament-sign.rsi/meta.json b/Resources/Textures/_LostParadise/Decals/departament-sign.rsi/meta.json index 91ca171029..fb92ddd8a2 100644 --- a/Resources/Textures/_LostParadise/Decals/departament-sign.rsi/meta.json +++ b/Resources/Textures/_LostParadise/Decals/departament-sign.rsi/meta.json @@ -1,6 +1,6 @@ { "version": 2, - "license": "AGPL 3.0", + "license": "CC-BY-SA-3.0", "copyright": "Draw by Hqlle (Github)", "size": { "x": 32, diff --git a/Resources/Textures/_LostParadise/Decals/ind-letters-mini.rsi/meta.json b/Resources/Textures/_LostParadise/Decals/ind-letters-mini.rsi/meta.json index 53b566fef1..2229d1d4a5 100644 --- a/Resources/Textures/_LostParadise/Decals/ind-letters-mini.rsi/meta.json +++ b/Resources/Textures/_LostParadise/Decals/ind-letters-mini.rsi/meta.json @@ -1,6 +1,6 @@ { "version": 2, - "license": "AGPL 3.0", + "license": "CC-BY-SA-3.0", "copyright": "Draw by Hqlle (Github)", "size": { "x": 32, diff --git a/Resources/Textures/_LostParadise/Decals/ind-letters.rsi/meta.json b/Resources/Textures/_LostParadise/Decals/ind-letters.rsi/meta.json index 7472f22442..3da6695fd2 100644 --- a/Resources/Textures/_LostParadise/Decals/ind-letters.rsi/meta.json +++ b/Resources/Textures/_LostParadise/Decals/ind-letters.rsi/meta.json @@ -1,6 +1,6 @@ { "version": 2, - "license": "AGPL 3.0", + "license": "CC-BY-SA-3.0", "copyright": "Draw by Hqlle (Github)", "size": { "x": 32, diff --git a/Resources/Textures/_LostParadise/Decals/ind-numbers-mini.rsi/meta.json b/Resources/Textures/_LostParadise/Decals/ind-numbers-mini.rsi/meta.json index a398d3a506..410d63e12f 100644 --- a/Resources/Textures/_LostParadise/Decals/ind-numbers-mini.rsi/meta.json +++ b/Resources/Textures/_LostParadise/Decals/ind-numbers-mini.rsi/meta.json @@ -1,6 +1,6 @@ { "version": 2, - "license": "AGPL 3.0", + "license": "CC-BY-SA-3.0", "copyright": "Draw by Hqlle (Github)", "size": { "x": 32, diff --git a/Resources/Textures/_LostParadise/Decals/ind-numbers.rsi/meta.json b/Resources/Textures/_LostParadise/Decals/ind-numbers.rsi/meta.json index a398d3a506..410d63e12f 100644 --- a/Resources/Textures/_LostParadise/Decals/ind-numbers.rsi/meta.json +++ b/Resources/Textures/_LostParadise/Decals/ind-numbers.rsi/meta.json @@ -1,6 +1,6 @@ { "version": 2, - "license": "AGPL 3.0", + "license": "CC-BY-SA-3.0", "copyright": "Draw by Hqlle (Github)", "size": { "x": 32, diff --git a/Resources/Textures/_LostParadise/Decals/lpsignwtext.rsi/meta.json b/Resources/Textures/_LostParadise/Decals/lpsignwtext.rsi/meta.json index df86372cb8..2d4fd74fa6 100644 --- a/Resources/Textures/_LostParadise/Decals/lpsignwtext.rsi/meta.json +++ b/Resources/Textures/_LostParadise/Decals/lpsignwtext.rsi/meta.json @@ -1,6 +1,6 @@ { "version": 2, - "license": "AGPL 3.0", + "license": "CC-BY-SA-3.0", "copyright": "Draw by Hqlle (Github)", "size": { "x": 32, diff --git a/Resources/Textures/_LostParadise/Decals/markup.rsi/meta.json b/Resources/Textures/_LostParadise/Decals/markup.rsi/meta.json index e19ff7cfcf..42f1934fdb 100644 --- a/Resources/Textures/_LostParadise/Decals/markup.rsi/meta.json +++ b/Resources/Textures/_LostParadise/Decals/markup.rsi/meta.json @@ -1,6 +1,6 @@ { "version": 2, - "license": "AGPL 3.0", + "license": "CC-BY-SA-3.0", "copyright": "Draw by Hqlle (Github)", "size": { "x": 32, diff --git a/Resources/Textures/_LostParadise/Decals/minitile-s.rsi/meta.json b/Resources/Textures/_LostParadise/Decals/minitile-s.rsi/meta.json index 50fc352e23..18cd972a15 100644 --- a/Resources/Textures/_LostParadise/Decals/minitile-s.rsi/meta.json +++ b/Resources/Textures/_LostParadise/Decals/minitile-s.rsi/meta.json @@ -1,6 +1,6 @@ { "version": 1, - "license": "CC0-1.0", + "license": "CC-BY-SA-3.0", "copyright": "Made by github user Skilets", "size": { "x": 32, diff --git a/Resources/Textures/_LostParadise/Decals/secsign.rsi/meta.json b/Resources/Textures/_LostParadise/Decals/secsign.rsi/meta.json index dcccb470e3..a18ae275f7 100644 --- a/Resources/Textures/_LostParadise/Decals/secsign.rsi/meta.json +++ b/Resources/Textures/_LostParadise/Decals/secsign.rsi/meta.json @@ -1,6 +1,6 @@ { "version": 2, - "license": "AGPL 3.0", + "license": "CC-BY-SA-3.0", "copyright": "Draw by Hqlle (Github)", "size": { "x": 32, diff --git a/Resources/Textures/_LostParadise/Decals/starcircle.rsi/meta.json b/Resources/Textures/_LostParadise/Decals/starcircle.rsi/meta.json index 63fc41ae4c..c5f380b99a 100644 --- a/Resources/Textures/_LostParadise/Decals/starcircle.rsi/meta.json +++ b/Resources/Textures/_LostParadise/Decals/starcircle.rsi/meta.json @@ -1,6 +1,6 @@ { "version": 2, - "license": "AGPL 3.0", + "license": "CC-BY-SA-3.0", "copyright": "Draw by Hqlle (Github)", "size": { "x": 32, diff --git a/Resources/Textures/_LostParadise/Decals/wheelchair.rsi/meta.json b/Resources/Textures/_LostParadise/Decals/wheelchair.rsi/meta.json index 331e12ade9..6fc2b02f07 100644 --- a/Resources/Textures/_LostParadise/Decals/wheelchair.rsi/meta.json +++ b/Resources/Textures/_LostParadise/Decals/wheelchair.rsi/meta.json @@ -1,6 +1,6 @@ { "version": 2, - "license": "CC-BY-NC-SA-4.0", + "license": "CC-BY-SA-3.0", "copyright": "Draw by Skilets: https://github.com/Skilets", "size": { "x": 32, diff --git a/Resources/Textures/_LostParadise/Interface/Misc/status_ai.rsi/meta.json b/Resources/Textures/_LostParadise/Interface/Misc/status_ai.rsi/meta.json index 070bdbf3e7..26162afd93 100644 --- a/Resources/Textures/_LostParadise/Interface/Misc/status_ai.rsi/meta.json +++ b/Resources/Textures/_LostParadise/Interface/Misc/status_ai.rsi/meta.json @@ -1,6 +1,6 @@ { "version": 1, - "license": "CC-BY-SA 3.0", + "license": "CC-BY-SA-3.0", "copyright": "Made by Lost Paradise", "size": { "x": 8, diff --git a/Resources/Textures/_LostParadise/Objects/Fun/daki.rsi/meta.json b/Resources/Textures/_LostParadise/Objects/Fun/daki.rsi/meta.json index 925163054c..1dbd262fee 100644 --- a/Resources/Textures/_LostParadise/Objects/Fun/daki.rsi/meta.json +++ b/Resources/Textures/_LostParadise/Objects/Fun/daki.rsi/meta.json @@ -1,5 +1,6 @@ { "version": 1, + "license": "CC-BY-SA-3.0", "copyright": "Taken from BlueMoon github https://github.com/BlueMoon-Labs/SERP-BlueMoon-Station-13", "size": { "x": 32, diff --git a/Resources/Textures/_LostParadise/Objects/Misc/specialdelivery.rsi/meta.json b/Resources/Textures/_LostParadise/Objects/Misc/specialdelivery.rsi/meta.json index d5bcc17c0a..9e64816e71 100644 --- a/Resources/Textures/_LostParadise/Objects/Misc/specialdelivery.rsi/meta.json +++ b/Resources/Textures/_LostParadise/Objects/Misc/specialdelivery.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, - "license": "EULA/CLA with a hosting restriction, full text: https://raw.githubusercontent.com/SerbiaStrong-220/space-station-14/master/CLA.txt", - "copyright": "Made by Qwerlink(discord dago#7393) for SS220", + "license": "CC-BY-SA-3.0", + "copyright": "Made by Qwerlink(discord dago#7393) for SS220 https://raw.githubusercontent.com/SerbiaStrong-220/space-station-14/master/CLA.txt", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/_LostParadise/Objects/Weapons/Melee/telebaton.rsi/meta.json b/Resources/Textures/_LostParadise/Objects/Weapons/Melee/telebaton.rsi/meta.json index b44223a9e8..fdb6fcd2d6 100644 --- a/Resources/Textures/_LostParadise/Objects/Weapons/Melee/telebaton.rsi/meta.json +++ b/Resources/Textures/_LostParadise/Objects/Weapons/Melee/telebaton.rsi/meta.json @@ -1,6 +1,6 @@ { - "version": 1.3, - "license": "CC-BY-3.0", + "version": 1, + "license": "CC-BY-SA-3.0", "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/555fa0ed9f380509156d94131bd8a3f1c1fee1cf", "size": { "x": 32, diff --git a/Resources/Textures/_LostParadise/Objects/Weapons/Melee/telebatonSpac.rsi/meta.json b/Resources/Textures/_LostParadise/Objects/Weapons/Melee/telebatonSpac.rsi/meta.json index b44223a9e8..fdb6fcd2d6 100644 --- a/Resources/Textures/_LostParadise/Objects/Weapons/Melee/telebatonSpac.rsi/meta.json +++ b/Resources/Textures/_LostParadise/Objects/Weapons/Melee/telebatonSpac.rsi/meta.json @@ -1,6 +1,6 @@ { - "version": 1.3, - "license": "CC-BY-3.0", + "version": 1, + "license": "CC-BY-SA-3.0", "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/555fa0ed9f380509156d94131bd8a3f1c1fee1cf", "size": { "x": 32, diff --git a/Resources/Textures/_LostParadise/Structures/Machines/book_printer.rsi/cartridge.png b/Resources/Textures/_LostParadise/Structures/Machines/book_printer.rsi/cartridge.png deleted file mode 100644 index bf32beff2ee224d910a333cab59cbc406336f9de..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 619 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCil~2Ka=yCZ-n0Cgw)QXS(}DheV{!oV$GD)Oof}?#}LkNg2iYMYS~zJzoBi z^OvkIENdt#ZRqNo+1@jK-s07>7px49NKDTu)6zAZI%{cL=hVJQ^V++o&6vAv+N{Oq z*7jvJ9UVP0jLob|Dw-SGCRo}z7nC=q<&-C;7qu`mx3jSL2gepxG$myg$0X&%Cg-+W zoAudQPIk1;$}88=GmeXkjg5`AclJriDve3X4G4`73QI`JD2j;7jEKu{^$G_1pxepr zJCL$33Gxg6PZ40~Q>zgN8pT=Q5n0T@z;_sg8IR|$NC67I@pN$vvG9M}mzdvVAmX~U zD_2sfI4CuE&8aJXf+BYd4F3H;|0%J%$$Ojr?=2Ox_AL26Z_l=Ae-Fh@__H-&^s-qQN;MAhy0?ad46Z+q9RV2XZ$jM_yZewf5DFwDa#a7S{+C?9b_zu~>eB=$(a-bm3RJuR)*R|ZJ`|~dw|G%>Nf86GebK;M8 z3EVyZq3GOx>mBL&w!i)FHw1Z2-s}3E8K{SWp}_SSbC%hn|IZiymYnyK;WHxxLrjd9 YboD#C@6*iVIYCN1UHx3vIVCg!00q-jF8}}l diff --git a/Resources/Textures/_LostParadise/Structures/Machines/book_printer.rsi/high.png b/Resources/Textures/_LostParadise/Structures/Machines/book_printer.rsi/high.png deleted file mode 100644 index 375fdfd8ba7be28f2887f54956d7ffc1b6318ae3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 202 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sEXgD|57Yp@DXFy7O}F{C2y?X8WR4Gui47c%l6%bk0q)%Qrt zZ-uV_Uyfz~#7PmdKI;Vst07=(EhX4Qo diff --git a/Resources/Textures/_LostParadise/Structures/Machines/book_printer.rsi/icon.png b/Resources/Textures/_LostParadise/Structures/Machines/book_printer.rsi/icon.png deleted file mode 100644 index 7401ef855465a2fc7bf7b2807997879982fc87f3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 619 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCijo0(?ST6Ov0^J>#!le{kZ|^(oU=M?`14dqp2Te&zmy7mCUT=2qS=?qQd% z+~(s`mXy@8vh|mc(3F?gw{r|JF?W}jH&RhH6_rpqbmZcJL+AGHKcl8$?&BM4;~e7W zAMfJgVsCG+rl!VFC78Ev|F(FyQ>Xk^d+=E~1_CY5InJ&Mq%=x`{DS`z2N?FP(vtw{ z;VkfoEM{QfI{?CrS=Tx_fgbhnba4!^@b8_>Tij&8)8?GH+3ehUU&o0ne_#6lpMUz2 z#^%QDwtJPX+dc8ER=@NA!F;9z&J)cSFg%wLY1Qp*w4U-H@k44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O`212l#}z8kzeGwX^|JtR+Ey!T*7P;rBMaV4whJfk$L9 z0|Vb75M~tB@M-`G=6Jd|hD5l(y=KVApvd78DDtlU*;JP9sW+P>xXnLnCq3FMvhgg3 zzy~1mW4x3!@1X>@V!ThLFohYfj5jH*7lJavm=iJ?Pc(E^>bP0l+XkKwdPci diff --git a/Resources/Textures/_LostParadise/Structures/Machines/book_printer.rsi/inhand-right.png b/Resources/Textures/_LostParadise/Structures/Machines/book_printer.rsi/inhand-right.png deleted file mode 100644 index bfa6b35c3d35aa986de97b7f271f4acd5428a688..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 259 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O`212l#}z8kwCN{*?kL){-E<;Qv6t@Ov9yFi?QAz$3Dl zfr0N32s4Umcr^e8b39!fLn7SYUOUUx;K1P)SX%Qx-OsfvYr#hO6+hmcYL!WQJ|T_= zXb}U$d$Wctp+Y`xg-Mq^)_!gHX#PRDVd~?;oTnDd%b6JtKv1=OfaS!CX|Y=FR#EG3 oPyBBa@GITr=+|0?I))W~>fQFfuiet`0qte*boFyt=akR{0I^wBjQ{`u diff --git a/Resources/Textures/_LostParadise/Structures/Machines/book_printer.rsi/low.png b/Resources/Textures/_LostParadise/Structures/Machines/book_printer.rsi/low.png deleted file mode 100644 index 1d56e83adcc78ae1ae2dd42860c1f44fdb25c2aa..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 201 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sEXgD|57Yp@DXFwWD(F{C2y?X82H4F)`{7c$HXr2X}tUEJCo z*A?(#RpT$YDf68l@=ss^s{LRceEMAAshh`cWY_-ryiEW1^J#Naqu)N zOSpwOns?6ogCB!s{xD7gs%5B4KarE;J;(CcF8lwLm#6NU&t;ucLK6Vzc0c_9 diff --git a/Resources/Textures/_LostParadise/Structures/Machines/book_printer.rsi/meta.json b/Resources/Textures/_LostParadise/Structures/Machines/book_printer.rsi/meta.json deleted file mode 100644 index e79a8183d5..0000000000 --- a/Resources/Textures/_LostParadise/Structures/Machines/book_printer.rsi/meta.json +++ /dev/null @@ -1,100 +0,0 @@ -{ - "version": 1, - "license": "See repo license.", - "copyright": "By temporaldarkness for Enterprise server exclusive use.", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "icon" - }, - { - "name": "working", - "delays": [ - [ - 0.2, - 0.15, - 0.2, - 0.15 - ] - ] - }, - { - "name": "slotted", - "delays": [ - [ - 0.25, - 0.25, - 0.25, - 0.25 - ] - ] - }, - { - "name": "none", - "delays": [ - [ - 0.25, - 0.25, - 0.25, - 0.25 - ] - ] - }, - { - "name": "low", - "delays": [ - [ - 0.25, - 0.25, - 0.25, - 0.25 - ] - ] - }, - { - "name": "medium", - "delays": [ - [ - 0.25, - 0.25, - 0.25, - 0.25 - ] - ] - }, - { - "name": "high", - "delays": [ - [ - 0.25, - 0.25, - 0.25, - 0.25 - ] - ] - }, - { - "name": "full", - "delays": [ - [ - 0.25, - 0.25, - 0.25, - 0.25 - ] - ] - }, - { - "name": "cartridge" - }, - { - "name": "inhand-left" - }, - { - "name": "inhand-right" - } - ] -} diff --git a/Resources/Textures/_LostParadise/Structures/Machines/book_printer.rsi/none.png b/Resources/Textures/_LostParadise/Structures/Machines/book_printer.rsi/none.png deleted file mode 100644 index 1b62925312578b51c5eeb2d0e73a30023b84e176..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 216 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sEXgD|57Yp@DXFxS(?F{C2y?X8WR2NXnD9VUy)9K7~-d*L*e zCQgoRffuYNq$}?6lCB3TW!P4HC1=T$b-Q?%PI))ezW0rNwpmio{aJ}+_P0-4+LwPg zd(rJ%`F)T|Ac*My*)Xg3=Ks%|f8U(<6C@DBVLth)+^|L?k44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O`1E2l#}zx_d>NTY0Ofs94$hTUuJ$Ifj^+yC)=GZ9Th%FO;D=-z<=%ZF1f~4?5lXKLTVcy3tFtQ18HDsOK4y`z`)$l zc%Nm5{GB`h#rwZC7j2f`A;k44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O`0F2l#}zCM1`-dd6S9{@}!^>rE+~U~=0xhg&T0v6QdC3JFXRD?E z{nvl&gQc+XSBAtI|HD4!u#8F#1DCc%v_axdF3$N3 z^?Pr>UH5&G!DOaI`xx^0+7F-Ie(3dM(?I@?pDZ=|ZRPs6dt8W97jn2F-tfI{zk5@e z`Ba9aeGECRjdGGFBO_z4FTecqo!)y!!}$%zPR&pW@Oi};IKN@l#D$z&)f`IsJASe7 ze5$c4Een~};OID?;n+f^;-^pJOJ>eBp4YH~zhQ6w?QibY`I%LpKV<34Pz<0(6TRLW~ zS|#xL*h`tyDrz;C6|FdSH%#6t^(1!sr;kg{EO~A0b$GFfO%~&iEp}`NSYF(9+AHX} zAm#m)-^GgaY~)|u+qtPS`MKv@{$qQCm5l`_Sjnfb*1Vf5HM5f;H}PwYz}Ix$7u88h zX-EFi7hvl?k2GKQl5;|Lk~5{J_(i5Ak#O tPt! From 5e09bab4a7385b7e2935e643fc6fe0848673003e Mon Sep 17 00:00:00 2001 From: Flybik Date: Fri, 6 Sep 2024 15:06:16 +0300 Subject: [PATCH 4/6] =?UTF-8?q?=D0=A4=D0=B8=D0=BA=D1=81=20=D0=B2=D1=80?= =?UTF-8?q?=D0=B5=D0=BC=D0=B5=D0=BD=D0=B8=20=D1=80=D0=BE=D0=BB=D0=B5=D0=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Prototypes/Nyanotrasen/Roles/Jobs/Cargo/mail_carrier.yml | 3 +++ Resources/Prototypes/Roles/Jobs/Cargo/cargo_technician.yml | 2 +- Resources/Prototypes/Roles/Jobs/Civilian/botanist.yml | 3 +++ Resources/Prototypes/Roles/Jobs/Civilian/clown.yml | 2 +- Resources/Prototypes/Roles/Jobs/Civilian/janitor.yml | 3 +++ Resources/Prototypes/Roles/Jobs/Civilian/service_worker.yml | 2 +- .../Prototypes/Roles/Jobs/Engineering/technical_assistant.yml | 2 +- Resources/Prototypes/Roles/Jobs/Medical/medical_intern.yml | 2 +- Resources/Prototypes/Roles/Jobs/Science/research_assistant.yml | 2 +- 9 files changed, 15 insertions(+), 6 deletions(-) diff --git a/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Cargo/mail_carrier.yml b/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Cargo/mail_carrier.yml index 58613660b2..a89186f043 100644 --- a/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Cargo/mail_carrier.yml +++ b/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Cargo/mail_carrier.yml @@ -4,6 +4,9 @@ description: job-description-mail-carrier startingGear: CourierGear playTimeTracker: JobMailCarrier + requirements: + - !type:CharacterOverallTimeRequirement + min: 3600 # LostParadise - 1 hour icon: "JobIconMailCarrier" supervisors: job-supervisors-qm access: diff --git a/Resources/Prototypes/Roles/Jobs/Cargo/cargo_technician.yml b/Resources/Prototypes/Roles/Jobs/Cargo/cargo_technician.yml index 5eb8c61f03..816478055c 100644 --- a/Resources/Prototypes/Roles/Jobs/Cargo/cargo_technician.yml +++ b/Resources/Prototypes/Roles/Jobs/Cargo/cargo_technician.yml @@ -6,7 +6,7 @@ antagAdvantage: 2 # DeltaV - Reduced TC: External Access requirements: - !type:CharacterOverallTimeRequirement - min: 7200 + min: 1800 # LostParadise - 30 min startingGear: CargoTechGear icon: "JobIconCargoTechnician" supervisors: job-supervisors-qm diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/botanist.yml b/Resources/Prototypes/Roles/Jobs/Civilian/botanist.yml index fd6e9442c6..693b2d3272 100644 --- a/Resources/Prototypes/Roles/Jobs/Civilian/botanist.yml +++ b/Resources/Prototypes/Roles/Jobs/Civilian/botanist.yml @@ -3,6 +3,9 @@ name: job-name-botanist description: job-description-botanist playTimeTracker: JobBotanist + requirements: + - !type:CharacterOverallTimeRequirement + min: 1800 # LostParadise - 30 min startingGear: BotanistGear icon: "JobIconBotanist" supervisors: job-supervisors-hop diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/clown.yml b/Resources/Prototypes/Roles/Jobs/Civilian/clown.yml index ce217c942b..f8fa97bcab 100644 --- a/Resources/Prototypes/Roles/Jobs/Civilian/clown.yml +++ b/Resources/Prototypes/Roles/Jobs/Civilian/clown.yml @@ -5,7 +5,7 @@ playTimeTracker: JobClown requirements: - !type:CharacterOverallTimeRequirement # DeltaV - Playtime requirement - min: 7200 #2 hrs + min: 14400 # LostParadise - 4 hours startingGear: ClownGear icon: "JobIconClown" supervisors: job-supervisors-hop diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/janitor.yml b/Resources/Prototypes/Roles/Jobs/Civilian/janitor.yml index 4db2ce81b8..1b01824c77 100644 --- a/Resources/Prototypes/Roles/Jobs/Civilian/janitor.yml +++ b/Resources/Prototypes/Roles/Jobs/Civilian/janitor.yml @@ -3,6 +3,9 @@ name: job-name-janitor description: job-description-janitor playTimeTracker: JobJanitor + requirements: + - !type:CharacterOverallTimeRequirement + min: 1800 # LostParadise - 30 min startingGear: JanitorGear icon: "JobIconJanitor" supervisors: job-supervisors-hop diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/service_worker.yml b/Resources/Prototypes/Roles/Jobs/Civilian/service_worker.yml index 403f05dc51..ee745b2d22 100644 --- a/Resources/Prototypes/Roles/Jobs/Civilian/service_worker.yml +++ b/Resources/Prototypes/Roles/Jobs/Civilian/service_worker.yml @@ -5,7 +5,7 @@ playTimeTracker: JobServiceWorker requirements: - !type:CharacterOverallTimeRequirement - min: 7200 # DeltaV - 2 hours + min: 1800 # LostParadise - 30 min startingGear: ServiceWorkerGear icon: "JobIconServiceWorker" supervisors: job-supervisors-service diff --git a/Resources/Prototypes/Roles/Jobs/Engineering/technical_assistant.yml b/Resources/Prototypes/Roles/Jobs/Engineering/technical_assistant.yml index 3c13fbd7bd..6b03fa81a7 100644 --- a/Resources/Prototypes/Roles/Jobs/Engineering/technical_assistant.yml +++ b/Resources/Prototypes/Roles/Jobs/Engineering/technical_assistant.yml @@ -6,7 +6,7 @@ antagAdvantage: 3 # DeltaV - Reduced TC: External Access + Engineering requirements: - !type:CharacterOverallTimeRequirement # DeltaV - to prevent griefers from taking the role. - min: 14400 # 4 hours + min: 1800 # LostParadise - 30 min # - !type:DepartmentTimeRequirement # Lost Paradise - return time limit # department: Engineering # time: 54000 #15 hrs diff --git a/Resources/Prototypes/Roles/Jobs/Medical/medical_intern.yml b/Resources/Prototypes/Roles/Jobs/Medical/medical_intern.yml index 197542acf3..12818a4284 100644 --- a/Resources/Prototypes/Roles/Jobs/Medical/medical_intern.yml +++ b/Resources/Prototypes/Roles/Jobs/Medical/medical_intern.yml @@ -5,7 +5,7 @@ playTimeTracker: JobMedicalIntern requirements: - !type:CharacterOverallTimeRequirement - min: 7200 + min: 1800 # LostParadise - 30 min # - !type:DepartmentTimeRequirement # Lost Paradise - return time limit # department: Medical # time: 54000 # 15 hrs diff --git a/Resources/Prototypes/Roles/Jobs/Science/research_assistant.yml b/Resources/Prototypes/Roles/Jobs/Science/research_assistant.yml index c87f00cbd6..13daf550ba 100644 --- a/Resources/Prototypes/Roles/Jobs/Science/research_assistant.yml +++ b/Resources/Prototypes/Roles/Jobs/Science/research_assistant.yml @@ -5,7 +5,7 @@ playTimeTracker: JobResearchAssistant requirements: - !type:CharacterOverallTimeRequirement - min: 7200 + min: 1800 # LostParadise - 30 min # - !type:DepartmentTimeRequirement # Lost Paradise - return time limit # department: Science # time: 54000 #15 hrs From fbe7837175d82b52c0d29ceb3aa1cc92c6d59dfa Mon Sep 17 00:00:00 2001 From: MegaDaimond <158335048+MegaDaimond@users.noreply.github.com> Date: Fri, 6 Sep 2024 19:09:23 +0700 Subject: [PATCH 5/6] =?UTF-8?q?=D0=9F=D0=BE=D0=B4=D1=8B=D0=BC=D0=B0=D0=B5?= =?UTF-8?q?=D0=BC=20=D1=85=D0=B8=D0=BC=D0=B8=D1=8E=20=D0=BD=D0=B0=20=D0=BD?= =?UTF-8?q?=D0=BE=D0=B2=D1=83=D1=8E=20=D0=BF=D0=BB=D0=B0=D0=BD=D0=BA=D1=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../signs.rsi/direction_chemistry.png | Bin 605 -> 480 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/direction_chemistry.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/direction_chemistry.png index 2d1c1e7740488b72040ead5d56d2eb180bd65d29..a9273418d9f334d3a215dd17ccab8b52bf1dffd7 100644 GIT binary patch delta 455 zcmV;&0XY8M1mFXZBYyw^b5ch_0Itp)=>Px$nn^@KRCt{2+CgrDKokbxH%&KoOX9nT zY)#$D5x4`JE_w!++(D1v)(b!nLND>UfWgsuz|g@ossEP{aG1ycM57Ca2mk;8007_# znfn1|7U@oiGeL;Rh*l*;Vn~cLETn3_8!u1Gzb3mK#A}-Ae1GCKOZiSBQcJlr-hODz zzUDPcxg#le_8RSR`^Kg*N9Oaq{1Y@^eL}EbUL_=gOO|%~Q?%CdcO6*He9|-vAqCFRop9 zYRuMYO^1lh4}bNlhHpjP(_usTR-fb5A2vjvbzk%G72eb$`FF=d`Rczwc&qb-{0jed zJ^%m!0000000000z`unjLs|n%J)d{CS?dD^>SO!T@|Is8K-V<^_Bs97^LaJjsk>Qg z5ZPA{W|rgL$Z_A^IrrGz-1F|9nZ3DVpMaJ>R3F=ymO%HA^#P|W?YE(tF>alEo!GuK xk6RyL{dRqTlSS0l$M&VczW@LL0000yr60HoAMp>7rQQGl002ovPDHLkV1oGK-gy83 delta 581 zcmaFBe3xZ{ay^rZr;B4q1>@UUzJ7-d1X^W}EX&cJ*nMEzqG$`JcNciM&mGuQ-k`kU zEo&5?kY3`aH+!y?s%Lt23B20uk!CYb{&#n%*tX&wnm8d|AIL|Nhtd@V(+YWj#c$+z)kIv{=!zWPjB4~k|F(KCMmh+!GrW?-)e%-O*A7_$C-QriubqRl0uY2i}uk`h$O4X90jZy5%xi6fT z%gX0iX&z!ezV_Zm?WESf-&g#~J$p1uc#=~RU)W~GE&Ja4e_!`2!rH^^%jdM8Pwf`g z=bt}V(t7b!wO8%A*_X6Zm@{m5{@Al(>V-{)eV1lA%+JmFyYG(7?q!osXNi5!*1P+9 z?&`FQzY}ykg^o$Zf4`J-*zDO)<3fu?&vxES*K4`#HglOz?v=H_o-LF4l{{5UW)=TW z(SNUhIbT<@7ZhN`g6fe)e}uD?7^T#%E1q}$^BlRN7Zbx*+@JUU`N!nzBFbp9?3+Z|q5y>*<{<{`tFCP2=|CN;W%GC%t;{xpD5}l`b~5L6xWYJRYx@ zpB(q|kaanO%<(zrAMaz3f3oQv|ABi~U!0eDbGZJ@o=;VF`>X96uGUrAE9~rU2(h^T xJhEP|{hsuLDH>nn8&p(W9avm|=)otB8s_`W@*n%3ixe;bfv2mV%Q~loCIBQy6fpn* From d43f9d95cf016d4ab22b54f6cbc22e1f3800a88d Mon Sep 17 00:00:00 2001 From: Lost-Paradise-Bot <172407741+Lost-Paradise-Bot@users.noreply.github.com> Date: Fri, 6 Sep 2024 12:30:35 +0000 Subject: [PATCH 6/6] =?UTF-8?q?=D0=98=D0=B7=D0=BC=D0=B5=D0=BD=D0=B5=D0=BD?= =?UTF-8?q?=D0=B8=D1=8F=20(#74)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Resources/Changelog/ChangelogLPP.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/Resources/Changelog/ChangelogLPP.yml b/Resources/Changelog/ChangelogLPP.yml index eae2d09463..4b9a1c1e38 100644 --- a/Resources/Changelog/ChangelogLPP.yml +++ b/Resources/Changelog/ChangelogLPP.yml @@ -104,3 +104,10 @@ Entries: id: 11 time: '2024-09-05T12:18:27.0000000+00:00' url: https://github.com/Lost-Paradise-Project/Lost-Paradise/pull/69 +- author: JayJacobs + changes: + - type: Tweak + message: Изменено время начальных ролей. + id: 12 + time: '2024-09-06T12:30:02.0000000+00:00' + url: https://github.com/Lost-Paradise-Project/Lost-Paradise/pull/74