forked from ParadiseSS13/Paradise
-
Notifications
You must be signed in to change notification settings - Fork 124
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
This pull request merges upstream/master. Resolve possible conflicts manually and make sure all the changes are applied correctly. > [!NOTE] > Requires Wiki Update: > www.github.com/ParadiseSS13/Paradise/pull/27384 > www.github.com/ParadiseSS13/Paradise/pull/27595 ## Changelog :cl: ParadiseSS13 add: Добавлен трейт UNKNOWN - трейт, который скрывает имя персонажа, информацию в sechud, голос, а также предотвращает возможность его изучения (examine). <!-- Adds TRAIT_UNKNOWN. A trait that will hide someones name, sechud, voice, and prevent them from being examined. (www.github.com/ParadiseSS13/Paradise/pull/27471) --> fix: Предметы больше не будут воспламеняться при их перемещении между руками, помещении в сумки/коробки/ремни и извлечении из них над лавой. <!-- Items will no longer catch on fire when swapping them between hands, or inserting into or removing them from bags/boxes/belts etc. over lava. (www.github.com/ParadiseSS13/Paradise/pull/27694) --> fix: Предметы больше не будут падать в пропасть при их перемещении между руками, помещении в сумки/коробки/ремни и извлечении из них над пропастью. <!-- Items will no longer fall into chasms when swapping them between hands, or inserting into or removing them from bags/boxes/belts etc. over chasms. (www.github.com/ParadiseSS13/Paradise/pull/27694) --> tweak: Изменение размера области экрана в настройках теперь автоматически обновляет его размер. <!-- Changing your viewport size in preferences now automatically updates your viewport size. (www.github.com/ParadiseSS13/Paradise/pull/27707) --> fix: Окно настроек теперь немного больше. <!-- The preferences window is slightly larger. (www.github.com/ParadiseSS13/Paradise/pull/27708) --> add: Добавлена футболка Great Wave — доступна в выборе нижнего белья в редакторе персонажа. <!-- Added the Great Wave undershirt - available in the underwear selection in character creator. (www.github.com/ParadiseSS13/Paradise/pull/27675) --> tweak: Кошельки теперь могут хранить конфетные деньги и шоколадные монеты. <!-- Tweaked wallet to hold candy cash and chocolate coins (www.github.com/ParadiseSS13/Paradise/pull/27574) --> fix: Турели на руинах мясокомбината больше не сбрасывают энергетические пушки при разборке. <!-- Turrets on meatpackers ruin no more drop energy guns on deconstruction. (www.github.com/ParadiseSS13/Paradise/pull/27422) --> add: Добавлены новые плюшевые игрушки для всех видов. <!-- New plushies for all species (www.github.com/ParadiseSS13/Paradise/pull/27384) --> add: Добавлено новое заклинание, превращающее людей в плюшевые игрушки. <!-- New spell that turns people into plushies (www.github.com/ParadiseSS13/Paradise/pull/27384) --> add: Добавлены новые плюшевые игрушки в лодаут. <!-- Adds new plushies to loadout (www.github.com/ParadiseSS13/Paradise/pull/27384) --> fix: Звук «пух» больше не использует pick-wight при попадании. <!-- Poof sound not using pick-wight on hit (www.github.com/ParadiseSS13/Paradise/pull/27384) --> tweak: Плюшевые игрушки всегда уничтожаются, если внутри них взрывается граната, включая светошумовые гранаты, химические гранаты и т.д. <!-- Plushies are always destroyed when a grenade goes off inside it- including flashbangs, chem grenades, ect (www.github.com/ParadiseSS13/Paradise/pull/27384) --> tweak: Плюшевые игрушки воксов и ниан теперь активируют гранаты внутри себя, даже если произносится их «кодовое слово для обнимашек». <!-- Vox & Nian plushies will now activate any grenades in them even if they're saying their 'hug word' (www.github.com/ParadiseSS13/Paradise/pull/27384) --> fix: Карты и ремни больше нельзя надевать при активном импланте антидроп. <!-- Now can't equip cards and belts throw active anti drop implant (www.github.com/ParadiseSS13/Paradise/pull/27713) --> fix: Попугаи больше не левитируют, пока сидят. <!-- Parrots no longer levitate while sitting. (www.github.com/ParadiseSS13/Paradise/pull/27452) --> fix: Попугаи теперь могут класть вещи на компьютеры и забирать их. <!-- Parrots can place things on computers and take them from. (www.github.com/ParadiseSS13/Paradise/pull/27452) --> tweak: Попугаи могут покидать своё любимое место и находить новое спустя время. <!-- Parrots can leave their favorite place and find a new one at some point. (www.github.com/ParadiseSS13/Paradise/pull/27452) --> fix: Обновлён спрайт голозначка на бронежилете, чтобы он соответствовал иконке. <!-- Updated the holobadge on armour vest sprite to match the icon. (www.github.com/ParadiseSS13/Paradise/pull/27677) --> fix: Простые торты теперь называются «простые торты», а не «ванильные торты» (так как уже существуют ванильные торты, это изменение убирает дублирование). <!-- Plain cakes are now called plain cakes instead of vanilla cakes (as we also have vanilla cakes, this removes a duplication). (www.github.com/ParadiseSS13/Paradise/pull/27686) --> fix: Если вы теряете необходимость дышать, то соответствующий индикатор на экране больше не будет «зависать». <!-- If you loose the need to breath with a breathing related alert on screen, it will no longer be stuck there (www.github.com/ParadiseSS13/Paradise/pull/27731) --> fix: КПБ больше не паникуют, думая, что им нужно дышать, хотя они этого не могут делать. <!-- IPCs no longer panic thinking they need to breath, when they cant. (www.github.com/ParadiseSS13/Paradise/pull/27737) --> tweak: Трейт станции Рейв теперь распространяется на каторгу и аванпост. <!-- The motivational mood lighting station trait now extends to labor camp and mining station. (www.github.com/ParadiseSS13/Paradise/pull/27695) --> imageadd: Обновлены спрайты квантумпадов и каргопадов. <!-- Resprited quantum pads and cargo pads (www.github.com/ParadiseSS13/Paradise/pull/27595) --> tweak: Квантумпады больше не создают искры. <!-- Quantum pads no longer make sparks (www.github.com/ParadiseSS13/Paradise/pull/27595) --> tweak: Формулировка закона «Pranksimov» изменена с «если это будет смешно» на «если это будет смешно для экипажа». <!-- Pranksimov's ending clause has been tweaked from "unless doing so would be funny." to "unless doing so would be funny to the crew." (www.github.com/ParadiseSS13/Paradise/pull/27634) --> /:cl:
- Loading branch information
Showing
358 changed files
with
4,176 additions
and
2,266 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.