Skip to content
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 83 commits into from
Jun 30, 2024

Conversation

MysticalFaceLesS
Copy link
Member

[Перенос №9] - (#734)

meemofcourse and others added 30 commits June 16, 2024 06:11
[MIRROR] Additional SUNS decals i missed, creates a decals folder
Починил отображение мориты в руках , переработал пачки патронов , ребаланс урона калибра 5.56 и .308. Расширил ассортимент в карго
Обновлен файл

Signed-off-by: MrCat15352 <[email protected]>
Очередной фикс пушек
[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]>
Отключаем крючки из кор кода и сам мод
* Обновлена информация по инициализации

* Починил модпак на наши руинки, теперь всё работает. Плюс внес наши пути в файлик сборки билда.
…/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]>
Проведен ремап севиора , сделаны мелкие фиксы атмоса и косметические перестановки. Подчищены хвосты от модпака ивент
small fix
[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
molnizz and others added 12 commits June 27, 2024 17:03
* Бредик

* Update nanotrasen_teardrop.dmm

* Update nanotrasen_teardrop.dmm

* Украли танк

* Танк вернуся
[MIRROR] Fixes medical cyborgs being unable to interact with carbons
[MIRROR] Gives the lever-action rifle a gunslinger ability and removes the gunslinger damage buff from the shadow.
Починка оутфитов интека
@MysticalFaceLesS MysticalFaceLesS added the 🔱Слияние Бета и Альфы ➰ Мы мержим ветки между собой label Jun 30, 2024
Copy link

Pull Request содержит конфликты. Устраните их, чтобы мы смогли оценить и принять запрос.

@github-actions github-actions bot added 💬 TGUI Кто-то решил потрогать интерфейсы 🪓 НЕ МОДУЛЬНО 🪓 Не мудульно да, переделать бы 🗺 Мапинг Это чисто карты, карта... 🎨 Спрайты 🎨 Есть спрайты 🔊 Звуки 🔊 Изменения звуков 🧱 Код 🧱 Изменения .dm файлов 🏭 Github 🏭 Изменения .github файлов 🔵 Требуется проверка labels Jun 30, 2024
@MysticalFaceLesS MysticalFaceLesS merged commit f9b7ba7 into alpha-stable Jun 30, 2024
6 of 7 checks passed
@MysticalFaceLesS MysticalFaceLesS deleted the bye branch June 30, 2024 21:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
🎨 Спрайты 🎨 Есть спрайты 🏭 Github 🏭 Изменения .github файлов 💬 TGUI Кто-то решил потрогать интерфейсы 🔊 Звуки 🔊 Изменения звуков 🔱Слияние Бета и Альфы ➰ Мы мержим ветки между собой 🔵 Требуется проверка 🗺 Мапинг Это чисто карты, карта... 🧱 Код 🧱 Изменения .dm файлов 🪓 НЕ МОДУЛЬНО 🪓 Не мудульно да, переделать бы
Projects
None yet
Development

Successfully merging this pull request may close these issues.