Merge upstream 21.03.2024 #1116
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
* add recharge stations to perma * Revert "add recharge stations to perma" This reverts commit ce48320. * add recharge stations to perma, this time with a updated sdmm * 1080pCats fix --------- Co-authored-by: S34N <[email protected]>
* Parrots no longer hold items they don't have. * Whoops.
* Fix flying bayonet overlay * Make it simpler
…eSS13#24680) * electropack is less silly * dont need this anymore * Update code/game/objects/items/devices/radio/electropack.dm Co-authored-by: Luc <[email protected]> --------- Co-authored-by: S34N <[email protected]> Co-authored-by: Luc <[email protected]>
…seconds. (ParadiseSS13#24356) * Admins now update the shuttle timer in minutes, not seconds. (As in the units, not how long it takes.) * Apply suggestions from code review Co-authored-by: Contrabang <[email protected]> --------- Co-authored-by: Contrabang <[email protected]>
* Convert a few more bitflags that weren't bit-shifting. * Update a few comments around bitflags. * Add some parentheses around bitflag combination defines. * Fix some whitespace consistency issues, mostly with bitflags.
* Collar on a chick stay when it grow into a chicken. Collar on a chick stay when it grow into a chicken. Fixes ParadiseSS13#24412 * Update code/modules/mob/living/simple_animal/friendly/farm_animals.dm Co-authored-by: Contrabang <[email protected]> --------- Co-authored-by: Pierre-Louis <[email protected]> Co-authored-by: Contrabang <[email protected]>
* Moves weapons sprites out of items.dmi * lets revert this * oversight from energy melee PR
* Adds the ismecha check * I am a dummy, thanks contra
…13#24358) * bump to yarn 4.1.0 (automated changes) * fix prettier issues * 4.1.1 * this gets auto-commited on build
* it never had a range........ * slide to the left * guh
* sprites * fixik * lil animation
* fixes syndicate sensory being emp weak * Update code/modules/surgery/organs/augments_internal.dm Co-authored-by: Contrabang <[email protected]> * fixes it --------- Co-authored-by: Contrabang <[email protected]>
* all at once * no * ah yes * minor pixel adjustments * moved * Update code/modules/clothing/suits/armor_suits.dm Co-authored-by: Henri215 <[email protected]> --------- Co-authored-by: Henri215 <[email protected]>
* New TGchat settings section * New Chat Settings Tab & Reorder Tabs * Annihilate dropdowns * Normal Divider * Max Total Messages 10000 -> 2000 * Remove removed things * Rebuild
* updates contributing.md * Empty-Commit
…4686) * Lets us install tgui merge drivers on windows * test this * gamer mode * debug * do it like this * test * test this * stop it being weirdly relative * more relative fixes * try cat * indentation * update CI stuff to cache * correct this * yarn * yarn consistency * do we even need to do this? (no we don't) * properly cache yarn deps in ci * Why do we even have that step --------- Co-authored-by: github-actions <[email protected]>
* Adds the Syndicate Organ Extractor * ipc moment * fix bug, prevents putting organs in dead bodies to extract * Apply suggestions from code review Co-authored-by: Henri215 <[email protected]> * renames sprite * Apply suggestions from code review Co-authored-by: DGamerL <[email protected]> * replace xx yy --------- Co-authored-by: Henri215 <[email protected]> Co-authored-by: DGamerL <[email protected]>
…24528) * Update laser.dm * Update code/modules/projectiles/guns/energy/laser.dm Co-authored-by: Henri215 <[email protected]> * Update code/modules/projectiles/guns/energy/laser.dm Co-authored-by: Luc <[email protected]> --------- Co-authored-by: Henri215 <[email protected]> Co-authored-by: Luc <[email protected]>
…S13#24588) * Re-added the account info paper on creating a new account. * Review suggestions.
…24454) * Updates checkgrep to report unnecessary loops * improved message * global lists are better too * much better * Apply suggestions from code review Co-authored-by: GDN <[email protected]> * update to modern check_grep format --------- Co-authored-by: GDN <[email protected]> Co-authored-by: S34N <[email protected]>
* NO MORE EATING BRAINS * Update code/modules/mob/living/simple_animal/hostile/mining/gutlunch.dm Co-authored-by: DGamerL <[email protected]> --------- Co-authored-by: S34N <[email protected]> Co-authored-by: DGamerL <[email protected]>
* its time to PAPERWORK * remove test item * autodoc / henri Co-authored-by: Henri215 <[email protected]> --------- Co-authored-by: Henri215 <[email protected]>
* human_mob * items * grey_mob * drask_mob * vox_mob * code, lets fucking hope i didnt forget anything * i forgot stupid fuckign shit * also i love to delete wrong things * Update code/modules/clothing/head/misc_hats.dm Co-authored-by: Henri215 <[email protected]> * Update code/modules/client/preference/loadout/loadout_hat.dm Co-authored-by: 1080pCat <[email protected]> * moved to other cowboy hats --------- Co-authored-by: Henri215 <[email protected]> Co-authored-by: 1080pCat <[email protected]>
…4530) * stabbing time * examine text * oopsie * spans * add to jumpboots * contra review * henri/gdn reviews * contra + burzah review * span swap Co-authored-by: Contrabang <[email protected]> --------- Co-authored-by: Contrabang <[email protected]>
Co-authored-by: NanoMap Generation <[email protected]>
* The bear update! * more sprites * more bearprites * diversify * removing comments * description and mapping * duplicate * Update code/modules/mob/living/simple_animal/hostile/bear.dm --------- Co-authored-by: Contrabang <[email protected]>
github-actions
bot
added
🗺️ Изменение Карты
Gaxeer
approved these changes
Mar 20, 2024
…SS13#24711) * restrict !merge_upstream to PR author or repo members * proper syntax please
* icons and shit * other icons * mhm * contras order
* fixes an exploit * length
|
Дозакинь коммиты |
m-dzianishchyts
force-pushed
the
merge-upstream
branch
from
6f336f0 to
25e5034
Compare
dj-34
approved these changes
Mar 21, 2024
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.
Что этот PR делает
Мержит оффов.
Changelog
🆑
tweak: Немного поправлен интерфейс консоли клонирования.
fix: Исправлено несколько проблем, связанных с недавним обновлением клонирования.
fix: Исправлен визуальный баг, при котором попугай держит вещи, которых у него на самом деле нет.
fix: Исправлена анимация вращения огнестрельного оружия с обвесами при его броске.
fix: Мехи теперь не могут проходить сквозь стены арены вампира.
fix: Исправлена проблема с радиусом действия телекинеза.
fix: Имплант Qani-Laaca Sensory Computer из аплинка теперь защищен от ЭМИ.
fix: Исправлена проблема с выходом из станции зарядки.
tweak: Электропак теперь бьет током мгновенно по сигналу.
tweak: Время до прибытия шаттла в админ панели теперь устанавливается в минутах.
tweak: Клик на тело в интенте Grab теперь отстегивает его.
tweak: Крабы Лаваленда (Gutlunch, Gubbuck, Gutshank) теперь не поедают мозги и импланты.
tweak: Размер окна листа бумаги значительно увеличен.
imageadd: Новые иконки способностей для крав-маги, демона резни, госта и ксеноморфа.
imageadd: Спрайты всех радио-устройств были перерисованы.
imageadd: Спрайты ковбойских шляп были перерисованы.
add: Добавлена ковбойская шляпа СБ.
add: Добавлено СБ пончо.
add: Новая позиция в аплинке - Organ Extractor (20 ТК). Позволяет извлекать внутренние органы и импланты без инструментов. Полученный орган хранится в контейнере экстрактора и не портится. Полученный орган можно так же просто имплантировать в другое тело, в том числе в свое. Читать далее.
add: Создание нового счета в терминале управления счетами теперь сопровождается печатью информации о новом счете.
add: TGchat: Вкладки чата теперь можно менять местами.
tweak: TGchat: Выпадающие списки в настройках заменены на кнопки.
tweak: TGchat: Доступен предпросмотр шрифта при его изменении.
add: Ботинки Combat, Jump и Mining теперь могут хранить survival/combat ножи.
tweak: Стоимость SWAT Crate увеличена с 800 до 900.
imageadd: Медведь Hudson теперь имеет уникальный спрайт.
add: Добавлены полярный, черный и бурый медведи, а также шапки из их шкур.
fix: Космические медведи теперь не меняют спрайт в зависимости от того, в космосе они или нет.
/:cl: