#23 Перенос обновлений с Beta на Alpha сервер #1141
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
Микрофикс flower
Event: Add event rifle (SVD)
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may not be viewable. --> <!-- You can view Contributing.MD for a detailed description of the pull request process. --> Edits ration heaters to be able to be put back inside of ration packs. It's really, really annoying that you can take ration heaters OUT of ration packs, but CANNOT put them back in. This fixes this by making them both the same size as the rations themselves, and adding ration heaters to the list of accepted items that can be put in ration packs. :cl: code: Changes flameless ration heaters to "small" items code: Adds flameless ration heaters to the ration pack item whitelist. /:cl: <!-- Both :cl:'s are required for the changelog to work! You can put your name to the right of the first :cl: if you want to overwrite your GitHub username as author ingame. --> <!-- You can use multiple of the same prefix (they're only used for the icon ingame) and delete the unneeded ones. Despite some of the tags, changelogs should generally represent how a player might be affected by the changes rather than a summary of the PR's contents. -->
…t-ss13#3417) <!-- Write **BELOW** The Headers and **ABOVE** The comments else it may not be viewable. --> <!-- You can view Contributing.MD for a detailed description of the pull request process. --> ## About The Pull Request No longer player accessible as of shiptest-ss13#3296 which means less yeehaw ## Why It's Good For The Game ~~horse~~ goliathback cowboy combat ## Changelog :cl: balance: you no longer need a lasso to ride a goliath del: no more lasso /:cl: <!-- Both :cl:'s are required for the changelog to work! You can put your name to the right of the first :cl: if you want to overwrite your GitHub username as author ingame. --> <!-- You can use multiple of the same prefix (they're only used for the icon ingame) and delete the unneeded ones. Despite some of the tags, changelogs should generally represent how a player might be affected by the changes rather than a summary of the PR's contents. --> Signed-off-by: Theos <[email protected]>
Фикс абуза легкосоздаваемых предметов и их продажи
* Даем дебаг аутфиту трейт на майндшилд и фиксим рантаймы с именем * Добавляем знаменитую биту высших офицеров НТ
Fix researches
Fixing runtimes
* Чиним аванпост. Бедного котика в синди зоне больше не будут убивать турели * Чиним сайгу, магазины теперь отображаются нормально
MysticalFaceLesS
added
🔱Слияние Бета и Альфы ➰
MysticalFaceLesS
added
🧱 Код 🧱
* Делаем основу для пака по неону * Добавляем атласы * Делаем разноцветные неоновые лампы * Делаем разноцветные декали напольные со слоем в -41 * Добавляем цвета и вывески * А это атлас для респрайтов шахтерки * Добавлены все неоновые вывески * Обновляем карту аванпоста под неон
* Все, на тест изменения. Поправить цифры потом * Вводим новые значения
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
[Перенос №22] - (#1122)