Merge Upstream 11.10.2024 #1651
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
* cabinet man * Kubrick and the Beast (Doomba Track) * all the people rest by the maintainers request when the sun goes down * Dvorak Demon - Ambient god I need Adderall I cranked this whole thing out faster than my fucking lab report * Hot-Honed Holophone * Apply suggestions from code review Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com> Signed-off-by: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com> * changes for ebba * listen I can only make so many music jokes in commits * adds a little more * Update space_areas.dm * I'm very stupid * adds cameras to dvorak * jesus no almost forgot that * better cameras from EBBA * Update code/game/machinery/camera/camera_presets.dm Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com> * Update code/game/machinery/camera/camera_presets.dm Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com> --------- Signed-off-by: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com> Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com> Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
* makes pda bombs not lie to you * Update code/datums/uplink_items/uplink_traitor.dm Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com> Signed-off-by: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com> --------- Signed-off-by: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com> Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
…ParadiseSS13#27287) * Update bio_chip_death_alarm.dm * contra review
…aradiseSS13#27286) * You can no longer start a new escape attempt from abductor experimental machines every second * Limits you to one escape attempt at a time
* [FIX] Fixes for xenomorphs * Update living.dm * Update alien_base.dm
* Init * Implements `tgui_input_color` * Implements most color wheel conversions to TGUI * Iteration two, went over titles and made sure most color inputs are functional. * Implements preferences for large buttons, swapped buttons, and disabled TGUI * Iteration three... the weird ones. (as null|color) * Removes `as color|null` and `as null|color` * Merge conflict resolution, again. * Color input bundle and panel bundle * CSLint being picky. * Picky `while ()` instead of `while()` * Apply suggestions from code review Co-authored-by: Aylong <69762909+AyIong@users.noreply.github.com> Signed-off-by: Spaghetti-bit <yumyumkillkill@gmail.com> * WIP * de-bri'ish colour into color Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com> Signed-off-by: Spaghetti-bit <yumyumkillkill@gmail.com> * Aylong review applied. - Removed an extra space in machine.dm - UI_STATE + Runechat color now uses TGUI_INPUT_COLOR * Apply suggestions from code review Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com> Signed-off-by: Spaghetti-bit <yumyumkillkill@gmail.com> * Removes an unintentional space to `paradise.scss` * Update code/modules/tgui/tgui_input/color_input.dm Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com> Signed-off-by: Spaghetti-bit <yumyumkillkill@gmail.com> * Adds "is_color" regex from TG * Fixes a few conflicting files * TGUI Merge conflict moment v3 * V4? * V5.... * God please don't explode. Builds TGUI like the linter wants. * Update code/modules/tgui/tgui_input/color_input.dm Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com> Signed-off-by: Spaghetti-bit <yumyumkillkill@gmail.com> * Rebuilds TGUI, again <3 * Lint be damned --------- Signed-off-by: Spaghetti-bit <yumyumkillkill@gmail.com> Co-authored-by: Aylong <69762909+AyIong@users.noreply.github.com> Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com> Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
* Fix DmIcon BSOD * tgui rebuild --------- Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
* creation * Update dj.dmm * Update dj.dmm * Update dj.dmm * NO FAKES HERE! It's ALL real! * Update dj.dmm * update * Update space_areas.dm * Update space_areas.dm * Update space_areas.dm * grille removal * Notes * update
* creation * Update ussp_tele.dmm * Update code/modules/paperwork/paper.dm Co-authored-by: warriorstar-orion <orion@snowfrost.garden> Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com> * reformat * config --------- Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com> Co-authored-by: warriorstar-orion <orion@snowfrost.garden>
* [TGUI] Loadout * Loadout Tweaks * Cleanup * Almost there * Allow to sort alphabetical * UX tweaks * Note and remove tweaks from scarf * Oh fuck * Ooops * Sorting features * Global search * Rebuild * Sure * Rebuildo and some review changes * TGUI REBUILDO! --------- Co-authored-by: ROdenFL <ROdenFL@yandex.ru> Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
* [TM ONLY] RustG update * Certified Balls Moment * NO HALF SENDS * oogabooga * AAAAAAAAAAAAAAAAAAAAAAAA * Please work I am losing it I am losing it I am losi * AAAAAAAAAAAAAAAAAAAAAAAAAAA * Final changes
* Mimestrogen start * Removes some clown bits from Mimestrogen * Forgot to use M instead of C when copying a line * Fixes the emote. Hadn't realised it calls an emote instead doing a custom one. * Uses mind.miming instead of the mute trait * Makes the screen greyscale, some comments in the code * Fixed perma greyscale * Changed a mime_message. * Removes an unneeded variable The variable was already commented out anyway. * Forgot something in a comment * Fixed the description and added a drink description * Recipes for Mimestrogen * Stops Vox from taking damage that's for IPC * Moved a comment one space * Wrong variable for the pasted check * Remove proposed recipe 1, add a comment space * Change check method for damage dealing Instead of relying on syntheticness, it's better to check if the individual is affected by Toxin damage or not. Also removes some unneeded comments. * Just so I don't have to deal with a conflict. * Make the tox_mod check work better Makes it so people can't heal from a negative tox mod. * Accidentally had a line to remove Signed-off-by: WenlockTheBritishHobo <168675688+WenlockTheBritishHobo@users.noreply.github.com> * makes mind.miming switch make more sense Signed-off-by: WenlockTheBritishHobo <168675688+WenlockTheBritishHobo@users.noreply.github.com> * Apply suggestions from code review Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com> Signed-off-by: WenlockTheBritishHobo <168675688+WenlockTheBritishHobo@users.noreply.github.com> * Applying suggestion from code review I don't know why there needs to be a line between client.color and update_client_colour so I've just done an if else with the trait removal in both. Signed-off-by: WenlockTheBritishHobo <168675688+WenlockTheBritishHobo@users.noreply.github.com> * Apply suggestions from code review Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> Signed-off-by: WenlockTheBritishHobo <168675688+WenlockTheBritishHobo@users.noreply.github.com> * funny -> entertaining Signed-off-by: WenlockTheBritishHobo <168675688+WenlockTheBritishHobo@users.noreply.github.com> * Apply suggestions from code review Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> Signed-off-by: WenlockTheBritishHobo <168675688+WenlockTheBritishHobo@users.noreply.github.com> * Better formatting in message list Signed-off-by: WenlockTheBritishHobo <168675688+WenlockTheBritishHobo@users.noreply.github.com> --------- Signed-off-by: WenlockTheBritishHobo <168675688+WenlockTheBritishHobo@users.noreply.github.com> Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com> Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
… into an antag (ParadiseSS13#27046) * Makes being jobbanned more clear to player who somehow still get made into an antag * Apply suggestions from code review Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com> * Update code/modules/antagonists/_common/antag_datum.dm Co-authored-by: Sheep <46016730+Scribble-Sheep@users.noreply.github.com> Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com> * Update code/game/gamemodes/game_mode.dm Co-authored-by: Sheep <46016730+Scribble-Sheep@users.noreply.github.com> Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com> --------- Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com> Co-authored-by: Sheep <46016730+Scribble-Sheep@users.noreply.github.com>
Co-authored-by: Adrer <adrermail@gmail.com>
* Adds missing updatepaths * Update tools/UpdatePaths/Scripts/27006_shell_box.txt Co-authored-by: warriorstar-orion <orion@snowfrost.garden> Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com> --------- Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com> Co-authored-by: warriorstar-orion <orion@snowfrost.garden>
Co-authored-by: Bmon <no@email.com>
* get them all * uhh * suggestions apply + CI * medbot faid fixed + script
* dropdown * Update tgui/packages/tgui/interfaces/BrigTimer.js Co-authored-by: Aylong <69762909+AyIong@users.noreply.github.com> Signed-off-by: ROdenFL <ROdenFL@yandex.ru> --------- Signed-off-by: ROdenFL <ROdenFL@yandex.ru> Co-authored-by: Aylong <69762909+AyIong@users.noreply.github.com> Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
* Adds Bitfields to the VV menu * oops * fixed * oops * woo --------- Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
* Modernizes abductor baton * Contra review * lewc review * Fixes logic. * returns origional funcionality * testing, removes uneeded return else * fixed logic * Update code/game/gamemodes/miniantags/abduction/abduction_gear.dm Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com> Signed-off-by: Silverplate <118299273+silverplatedelta@users.noreply.github.com> --------- Signed-off-by: Silverplate <118299273+silverplatedelta@users.noreply.github.com> Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
* TGUI Chameleon * TGUI cham shoes * Searchbar and outfit * Adds selected to data * Remove unused spritesheet * Remove unused file * New bundle * Field access type * One more time * Please leave me alone linter * Re-adds some improper tags --------- Co-authored-by: Adrer <adrermail@gmail.com> Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
* Double spaces * more space and misspelling * Fixing punctuations * Not now * double dots * Apply suggestions from code review Signed-off-by: Henri215 <77684085+Henri215@users.noreply.github.com> --------- Signed-off-by: Henri215 <77684085+Henri215@users.noreply.github.com>
* docs: Add tutorial on bitflags * add bit about max flags, also fix horrible admonition font size * accidentally a word * better terminology * include contra's docs, better distinction between value and variable (hopefully), better example without a leading 0 * fuck * this should stay higher up * fix operator
Документация
|
!build_rust |
AyIong
approved these changes
Nov 10, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
🎸 Инструменты
Мы выдаем себя за реальное сообщество разработчиков.
Документация
Улучшения и дополнения в документации
📃 Требуется изменение WIKI
Эти изменения необходимо внести на нашу WIKI.
🖌️ Спрайты
Вы заработали свою миска-рис и кошко-жена. Партия гордится вами!
🙏 Слияние с восходящим потоком
Боже, храни Короля!
📜 CL валиден
Этот чейнджлог будет успешно опубликован
🔉 Звук
Услада для ушей.
TGUI
Кто-то решил потрогать интерфейсы.
Керберос
Этот ПР изменил что-то на Керберосе (DeltaStation)
Кибериада
Этот ПР изменил что-то на Кибериаде (BoxStation)
Документация
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
🆑 ParadiseSS13
add: Лодаут теперь на TGUI рельсах.
add: Палитра цветов теперь на TGUI рельсах.
add: Все предметы типа Хамелеон теперь на TGUI рельсах.
add: Добавлен новый реагент - Миместроген. Как Шутостерон, но наоборот.
add: Спутник D.V.O.R.A.K теперь имеет случайное наполнение в помещениях.
tweak: Некоторые руины СССП были перестроены.
tweak: Некоторые руины СССП теперь встречаются в раунде не больше раза.
tweak: Дубинка абдуктора теперь станит после 2-го удара. Усыпление теперь происходит с задержкой.
tweak: МЕГА швабра уборщика теперь размещает проекцию "мокрый пол".
tweak: Мобы теперь враждебны к ксеноморфам.
fix: Цвет крови ксеноморфов теперь одного цвета (зеленый).
fix: Исправлен спам уведомлениями о смерти при воздействии ЭМИ на имплант.
fix: Исправлена логика побега из экспериментора абдукторов.
fix: Исправлена ошибка БЛЯТЬ при взаимодействии с торговыми автоматами.
fix: Поварской колпак теперь лучше сидит в руке.
fix: Комбат шотган теперь тоже отображается за спиной.
fix: Картонные коробки снова можно перекрасить ручкой.
fix: Администрация снова может без проблем отправлять факсы через соответствующую панель.
/:cl: