#19 Перенос обновлений с Beta на Alpha сервер #946
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
Добавление новой анимации приземления шаттлов
Signed-off-by: Molnia <[email protected]>
Update planet_types.dm
UPDATE: Turn ON cost vending
ADD: New structures
Замена спрайтов Глока, ЮСП и магазинов к ним
FIX: add table dmi
UPDATE: ANTI-Vandalizm mechnizm of Vending
ADD: Anti-vandal
* База * Выпиливаем ненужный пак * Встраиваем гост рольки на аванпост, чиним некоторые баги и огрехи на карте зимнего астероида * Прописываем, что повара могут драться и в зонах бара и ботаники * Добавляем горничную одежду тактическую но белого цвета и без статов, для рольки * И вот сюда добавляем аутфиты, джобки, спавн на аванпост ролек. * Реворк аванпоста * Внесены доработки в карту зимнего аванпоста. Втсречайте, новый бар! * Обновлена карта * Добавляем крафт и новый объект мусорный стол из Scrapa за 10 штук! * Добавлены новые занавески * А это полы на будущее. Плюс новый снег * обновлен аванпост * Добавлен вариант барного деревянного стола * Добавлены различные новые структуры, тюрфы, полы, снег * Добавлены новые лестницы * фикс * Добавлены атласы * удаляем мусор * Исправляем ошибки лестниц и включаем их * Добавляем тех пол новый * Добавлена мраморная плитка * Добавлен новый вид полов для морозильника. Цвета новые * Добавляем пути в дме * Добавлен набор стеклянных полов * Протестирована новая плитка * Отключаем замену пыли на ржавчину для стеклянного пола и мрамора * Сделаны текстурки для перевернутого стола из мусора. Уменьшена прочность до 60 * Добавляем новые вариации столов из плазмостекла, усиленного стекла, пластитанового стекла, титанового стекла, усиленного стекла, плазмоусиленного стекла * Еще столы * Добавлены еще две роли для гостов, это бродяга и артист (клоун). Пофикшены мелкие недочеты у других ролек * Исправлены опечатки * Добавлен параметр фракции для всех гост ролек. А то как бы они гражданины Элизиума * Исправлен доступ для мэйдочки, до этого она не могла покинуть свою комнату... * Исправлены спавнеры ролек гостов * Замена дроп спавна у бомжа на грязный матрасс * Покупаем повару обувь * Отправляем в щитспавн indie_space - по приказу Head of Maps * Поправлены карты, на второй аванпост добавлены гост рольки * Чиним и выключаем халявную еду во всех автоматах. Плюс одежда тоже. * Добавлен стол синдикатовского варианта. Пофикшен требуемый материал для усиленного стеклянного стола * Добавлен синдикатный стол * Сделаны спрайты для синди металла --------- Signed-off-by: MrCat15352 <[email protected]>
FIX: Missed Dead mouse sprites
…st-ss13#3332) <!-- 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 <!-- Describe The Pull Request. Please be sure every change is documented or this can delay review and even discourage maintainers from merging your PR! --> Adds the Mauler, Spitter and Pounder and their respective magazines to the Black Market ## Why It's Good For The Game <!-- Please add a short description of why you think these changes would benefit the game. If you can't justify it in words, it might not be worth adding. --> They're illicit, pirate weapons, and the Spitter itself was made in mind for black market usage in it's descriptions, so they're fitting additions to the black market, and gives these interesting weapons a place to be bought and seen. ## Changelog :cl: add: Adds the Mauler, Spitter, and Pounder to the black market /: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. -->
<!-- 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 <!-- Describe The Pull Request. Please be sure every change is documented or this can delay review and even discourage maintainers from merging your PR! --> shiptest-ss13#3341 Gun safeties can be toggled in 1st level storage slot (e.g hands, suit slots, belts, pockets, back) instead of just the hands. Guns in containers (e.g. backpacks) aren't togglable. ## Why It's Good For The Game <!-- Please add a short description of why you think these changes would benefit the game. If you can't justify it in words, it might not be worth adding. --> Seems like a nice QOL thing to have. ## Changelog :cl: add: Gun safeties can be toggled from 1st level storage slots. /: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. -->
NT cap gloves no longer lie about shockproofing <!-- 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 NT captain gloves no longer lie about being shock-proof. ## Why It's Good For The Game whoops ## Changelog :cl: fix: NT captain gloves no longer lie about shockproofing /: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. -->
<!-- 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 This should add a box of rubbershot ammo to the outpost cargo market. ## Why It's Good For The Game This will allow players the ability to purchase rubbershot for training activities without having to require RnD beforehand. ## Changelog :cl: add: Adds a rubbershot box to the outpost market /: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. -->
…ptest-ss13#3334) <!-- 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 Nerfs most hollowpoint rounds by 5 damage. Nerfs 8mm hollowpoint by 6 damage for a total of 49 damage. ## Why It's Good For The Game This is mostly because .357 Hollowpoint does exactly 50 damage, which crits an unarmored limb (which is most players' limbs) in a single shot. The nerf doesn't hit HP so hard it isn't worth it, because you're still doing the same damage as weapons much higher up on the totem pole, but it ensures the only weapon that can crit a limb in a single shot is a .45-70 firing hollowpoint or explosive ammo. And sniper rifles like the Scout, if those ever get something like hollowpoint. ## Changelog :cl: balance: Reduced hollowpoint damage by 5 (and 8mm Hollowpoint by 6) /: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. -->
FIX: дюп боргов и неверный дроп со сломанных шаттерсов
FIX: лишний 13 кадр анимации хвоста
FIX: add light switch on Atmos ship Nemo-class
Update: Configs after merge
FIX: Нашлись провода
MysticalFaceLesS
requested review from
RalseiDreemuurr,
molnizz and
MrCat15352
as code owners
github-actions
bot
added
🪓 НЕ МОДУЛЬНО 🪓
Gecko slight rework
Add: Night planet types and some fixes
MysticalFaceLesS
changed the title
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.
[Перенос №18] - (#929)