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

Хуйня #4519

Closed
wants to merge 396 commits into from
Closed

Хуйня #4519

wants to merge 396 commits into from

Conversation

Wyderar
Copy link

@Wyderar Wyderar commented Sep 26, 2023

About the pull request

Проебали куда-то грузовики

Changelog

🆑
fix: Пресеты грузовиков теперь в коде
/:cl:

carrotman2013 and others added 30 commits September 6, 2023 13:42
опечатка
Продажа ксен на черном рынке (почему он черный?)
Wyderar and others added 21 commits September 24, 2023 10:04
фиксы ксеноботиков в 3 часа ночи
This reverts commit 7fe77de.
Alright, so this should close up most of the ways around the delays when
running around with multiple shotguns. At this point, we just don't want
people using multiple shotguns.

Double barrel shotguns are likely coming back after this is merged with
a slight nerf.

The CC/damage potential of multiple shotguns spitfiring rounds is too
much. We've already been down this argument before though. This PR just
closes up the gaps.

<details>
<summary>Screenshots & Videos</summary>

Put screenshots and videos here with an empty line between the
screenshots and the `<details>` tags.

</details>

:cl: Morrow
fix: Fixed a few ways around fire group delays
/:cl:
Фикс интела на фиорине, ремап мехбэя, уголок меха на аламо и нормандии.
Наконец то на русском и не выглядит как бомжатский форк.
@cm13-github cm13-github added the Merge Conflict PR can't be merged because it touched too much code label Sep 26, 2023
@cm13-github
Copy link
Contributor

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@Wyderar Wyderar closed this Sep 26, 2023
@Wyderar Wyderar deleted the map-fixes branch September 26, 2023 13:54
@Wyderar Wyderar restored the map-fixes branch September 26, 2023 13:54
@github-actions github-actions bot added Sprites Remove the soul from the game. Mapping did you remember to save in tgm format? Sound Blast 5 minutes of bass boosted music to our players Fix Fix one bug, make ten more labels Sep 26, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Fix Fix one bug, make ten more Mapping did you remember to save in tgm format? Merge Conflict PR can't be merged because it touched too much code Sound Blast 5 minutes of bass boosted music to our players Sprites Remove the soul from the game.
Projects
None yet
Development

Successfully merging this pull request may close these issues.