forked from shiptest-ss13/Shiptest
-
-
Notifications
You must be signed in to change notification settings - Fork 78
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
#10 Перенос обновлений с Beta на Alpha сервер #797
Merged
Merged
Conversation
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
[MIRROR] Additional SUNS decals i missed, creates a decals folder
Починил отображение мориты в руках , переработал пачки патронов , ребаланс урона калибра 5.56 и .308. Расширил ассортимент в карго
Обновлен файл Signed-off-by: MrCat15352 <[email protected]>
Очередной фикс пушек
Update: CODEOWNERS
Add: New areas
…n use organs in them now
[MIRROR] Does some things with customizable foods and in short you can use organs in them now
Bumps the npm_and_yarn group with 2 updates in the /tgui directory: [webpack](https://github.com/webpack/webpack) and [ws](https://github.com/websockets/ws). Updates `webpack` from 5.91.0 to 5.92.0 - [Release notes](https://github.com/webpack/webpack/releases) - [Commits](webpack/webpack@v5.91.0...v5.92.0) Updates `ws` from 7.5.3 to 7.5.10 - [Release notes](https://github.com/websockets/ws/releases) - [Commits](websockets/ws@7.5.3...7.5.10) --- updated-dependencies: - dependency-name: webpack dependency-type: direct:production dependency-group: npm_and_yarn - dependency-name: ws dependency-type: direct:production dependency-group: npm_and_yarn ... Signed-off-by: dependabot[bot] <[email protected]>
Отключаем крючки из кор кода и сам мод
End of ivent
* Обновлена информация по инициализации * Починил модпак на наши руинки, теперь всё работает. Плюс внес наши пути в файлик сборки билда.
…/npm_and_yarn-cd0ec3b17d Bump the npm_and_yarn group across 1 directory with 2 updates
Bumps the npm_and_yarn group with 2 updates in the /tgui directory: [ws](https://github.com/websockets/ws) and [braces](https://github.com/micromatch/braces). Updates `ws` from 7.5.10 to 8.17.1 - [Release notes](https://github.com/websockets/ws/releases) - [Commits](websockets/ws@7.5.10...8.17.1) Updates `braces` from 3.0.2 to 3.0.3 - [Changelog](https://github.com/micromatch/braces/blob/master/CHANGELOG.md) - [Commits](micromatch/braces@3.0.2...3.0.3) --- updated-dependencies: - dependency-name: ws dependency-type: direct:production dependency-group: npm_and_yarn - dependency-name: braces dependency-type: indirect dependency-group: npm_and_yarn ... Signed-off-by: dependabot[bot] <[email protected]>
Проведен ремап севиора , сделаны мелкие фиксы атмоса и косметические перестановки. Подчищены хвосты от модпака ивент
…ey have left on examine
[MIRROR] Mild Zero Gravity Buff AKA Tables Are Below Me
[MIRROR] fixes the black market sawn illestren to actually be sawed off
[MIRROR] Energy/Laser guns display their charge and how many shots they have left on examine
…orse than anything else
Дофиксы карт
* Бредик * Update nanotrasen_teardrop.dmm * Update nanotrasen_teardrop.dmm * Украли танк * Танк вернуся
[MIRROR] Fixes medical cyborgs being unable to interact with carbons
Hyena Foreman fix
[MIRROR] Gives the lever-action rifle a gunslinger ability and removes the gunslinger damage buff from the shadow.
Co-authored-by: Sadhorizon <[email protected]>
Co-authored-by: generalthrax <[email protected]>
Починка оутфитов интека
Fix broken outfits
Pull Request содержит конфликты. Устраните их, чтобы мы смогли оценить и принять запрос. |
github-actions
bot
added
💬 TGUI
Кто-то решил потрогать интерфейсы
🪓 НЕ МОДУЛЬНО 🪓
Не мудульно да, переделать бы
🗺 Мапинг
Это чисто карты, карта...
🎨 Спрайты 🎨
Есть спрайты
🔊 Звуки 🔊
Изменения звуков
🧱 Код 🧱
Изменения .dm файлов
🏭 Github 🏭
Изменения .github файлов
🔵 Требуется проверка
labels
Jun 30, 2024
Signed-off-by: Mr_DarkBladeS <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Labels
🎨 Спрайты 🎨
Есть спрайты
🏭 Github 🏭
Изменения .github файлов
💬 TGUI
Кто-то решил потрогать интерфейсы
🔊 Звуки 🔊
Изменения звуков
🔱Слияние Бета и Альфы ➰
Мы мержим ветки между собой
🔵 Требуется проверка
🗺 Мапинг
Это чисто карты, карта...
🧱 Код 🧱
Изменения .dm файлов
🪓 НЕ МОДУЛЬНО 🪓
Не мудульно да, переделать бы
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
[Перенос №9] - (#734)