Merge Upstream 23.11.2024 #1666
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
…han the combat log (ParadiseSS13#27372) * cable multitool pulse will no longer spit out results in the combat log * made the cable pulse msg prettier * Update code/modules/power/cables/cable.dm Co-authored-by: Contrabang <[email protected]> Signed-off-by: Toastical <[email protected]> * made the text red * made the successful message blue again --------- Signed-off-by: Toastical <[email protected]> Co-authored-by: Contrabang <[email protected]>
* fuck me fixes motion sensitive cameras * from locate to target
* initial commit * tgui patch * more fixes * It's Assistant now, not Civilian * review suggestions * make it tsx * update tgui bundle * code quality * fix choosing assistant * convert idcard skins to asset * use ranks + some quality updates * TGUI agent ID (Russian edition) * Fixed new_appearance * Job_icons * DME updated * Changed icon ordering * Updated comment * Add crew_list * Your to ID * WE MUST PLEASE THE LINTER GODS. Also DMIcon instead of assets * Fixed the HUD icon * var instead of proc * Move hud_icon declaration * Apply suggestions from code review Co-authored-by: Luc <[email protected]> Signed-off-by: Chap <[email protected]> * Move agent ID to seperate file * Job_icon first * Requested changes * A little more sanitization * Update tgui/packages/tgui/interfaces/AgentCard.tsx Co-authored-by: Arthri <[email protected]> Signed-off-by: Chap <[email protected]> * Update tgui/packages/tgui/interfaces/AgentCard.tsx Co-authored-by: Arthri <[email protected]> Signed-off-by: Chap <[email protected]> * Bundle update * WE MUST PLEASE THE LINTER --------- Signed-off-by: Chap <[email protected]> Co-authored-by: larentoun <[email protected]> Co-authored-by: larentoun <[email protected]> Co-authored-by: Adrer <[email protected]> Co-authored-by: Luc <[email protected]> Co-authored-by: Arthri <[email protected]>
* That's illegal * Requested changes --------- Co-authored-by: Adrer <[email protected]>
* modsoup * Update code/modules/mod/mod_theme.dm Co-authored-by: CRUNCH <[email protected]> Signed-off-by: PopeDaveThe3th <[email protected]> * Update code/modules/mod/mod_theme.dm Co-authored-by: CRUNCH <[email protected]> Signed-off-by: PopeDaveThe3th <[email protected]> * Update code/modules/mod/mod_theme.dm Co-authored-by: CRUNCH <[email protected]> Signed-off-by: PopeDaveThe3th <[email protected]> * ogre * Update code/modules/mod/mod_theme.dm Co-authored-by: Henri215 <[email protected]> Signed-off-by: PopeDaveThe3th <[email protected]> * Update code/modules/mod/mod_theme.dm Co-authored-by: Henri215 <[email protected]> Signed-off-by: PopeDaveThe3th <[email protected]> * Update code/modules/mod/mod_theme.dm Co-authored-by: Henri215 <[email protected]> Signed-off-by: PopeDaveThe3th <[email protected]> * Update code/modules/mod/mod_theme.dm Co-authored-by: Henri215 <[email protected]> Signed-off-by: PopeDaveThe3th <[email protected]> * Update code/modules/mod/mod_theme.dm Co-authored-by: Henri215 <[email protected]> Signed-off-by: PopeDaveThe3th <[email protected]> * Update code/modules/mod/mod_theme.dm Co-authored-by: Henri215 <[email protected]> Signed-off-by: PopeDaveThe3th <[email protected]> * Update code/modules/mod/mod_theme.dm Co-authored-by: Henri215 <[email protected]> Signed-off-by: PopeDaveThe3th <[email protected]> * Update code/modules/mod/mod_theme.dm Co-authored-by: Henri215 <[email protected]> Signed-off-by: PopeDaveThe3th <[email protected]> * Update mod_theme.dm Co-authored-by: Git-GoR <[email protected]> Signed-off-by: PopeDaveThe3th <[email protected]> * Update mod_theme.dm Co-authored-by: Git-GoR <[email protected]> Signed-off-by: PopeDaveThe3th <[email protected]> * Update mod_theme.dm Co-authored-by: Git-GoR <[email protected]> Signed-off-by: PopeDaveThe3th <[email protected]> * Update code/modules/mod/mod_theme.dm Co-authored-by: Henri215 <[email protected]> Signed-off-by: PopeDaveThe3th <[email protected]> * Update code/modules/mod/mod_theme.dm Co-authored-by: Henri215 <[email protected]> Signed-off-by: PopeDaveThe3th <[email protected]> * yep * suits * Update code/modules/mod/mod_theme.dm Co-authored-by: Luc <[email protected]> Signed-off-by: PopeDaveThe3th <[email protected]> * Update code/modules/mod/mod_theme.dm Co-authored-by: Luc <[email protected]> Signed-off-by: PopeDaveThe3th <[email protected]> * Update code/modules/mod/mod_theme.dm Co-authored-by: Luc <[email protected]> Signed-off-by: PopeDaveThe3th <[email protected]> * Update code/modules/mod/mod_theme.dm Co-authored-by: Luc <[email protected]> Signed-off-by: PopeDaveThe3th <[email protected]> * Update code/modules/mod/mod_theme.dm Co-authored-by: Luc <[email protected]> Signed-off-by: PopeDaveThe3th <[email protected]> * Update code/modules/mod/mod_theme.dm Co-authored-by: Luc <[email protected]> Signed-off-by: PopeDaveThe3th <[email protected]> * Update code/modules/mod/mod_theme.dm Co-authored-by: Luc <[email protected]> Signed-off-by: PopeDaveThe3th <[email protected]> * Update code/modules/mod/mod_theme.dm Co-authored-by: Luc <[email protected]> Signed-off-by: PopeDaveThe3th <[email protected]> * Update code/modules/mod/mod_theme.dm Co-authored-by: Luc <[email protected]> Signed-off-by: PopeDaveThe3th <[email protected]> * Update code/modules/mod/mod_theme.dm Co-authored-by: Luc <[email protected]> Signed-off-by: PopeDaveThe3th <[email protected]> * Update code/modules/mod/mod_theme.dm Co-authored-by: Luc <[email protected]> Signed-off-by: PopeDaveThe3th <[email protected]> * Update code/modules/mod/mod_theme.dm Co-authored-by: Luc <[email protected]> Signed-off-by: PopeDaveThe3th <[email protected]> * Update code/modules/mod/mod_theme.dm Co-authored-by: Luc <[email protected]> Signed-off-by: PopeDaveThe3th <[email protected]> * changes * taka * Update code/modules/mod/mod_theme.dm Co-authored-by: CRUNCH <[email protected]> Signed-off-by: PopeDaveThe3th <[email protected]> * crunch changes * Update code/modules/mod/mod_theme.dm Co-authored-by: CRUNCH <[email protected]> Signed-off-by: PopeDaveThe3th <[email protected]> * Update code/modules/mod/mod_theme.dm Co-authored-by: Burzah <[email protected]> Signed-off-by: PopeDaveThe3th <[email protected]> * single letter typo * somniworld suggestions --------- Signed-off-by: PopeDaveThe3th <[email protected]> Co-authored-by: CRUNCH <[email protected]> Co-authored-by: Henri215 <[email protected]> Co-authored-by: Git-GoR <[email protected]> Co-authored-by: Luc <[email protected]> Co-authored-by: Burzah <[email protected]>
Co-authored-by: Bmon <[email protected]>
…13#27368) * Fixes grenades not exploding 15% of the time you are shot * userdanger it
…ys (ParadiseSS13#26962) * test 1 * Bottles * quick fix * brighter reagent bottle * removes old lids * Update code/modules/reagents/reagent_containers/chemical_bottle.dm Co-authored-by: Burzah <[email protected]> Signed-off-by: DGamerL <[email protected]> --------- Signed-off-by: DGamerL <[email protected]> Co-authored-by: Bmon <[email protected]> Co-authored-by: DGamerL <[email protected]> Co-authored-by: Burzah <[email protected]>
…!!! (ParadiseSS13#27232) * fix * HIDEEYES --------- Co-authored-by: Bmon <[email protected]>
* erguertbngio3eunf3o2we4if * woop de doo
* refactor: Elementize decals. * fix for cases of managed_overlay being a single item * Update code/datums/elements/decal_element.dm Co-authored-by: Luc <[email protected]> Signed-off-by: warriorstar-orion <[email protected]> * review comments --------- Signed-off-by: warriorstar-orion <[email protected]> Co-authored-by: Luc <[email protected]>
* added Russian Nians * adds a new space ruin Voidhopper of Nexus aka freighter * forgot a quotation mark * Convert maps to TGM new : _maps/map_files/RandomRuins/SpaceRuins/freighter.dmm new : code/modules/unit_tests/atmos/test_ventcrawl.dmm Automatically commited by: tools\mapmerge2\fixup.py * fixed file format of the ruin * renamed Russian Nians to Soviet Nians * see above * down with russian nians, long live soviet nians * added a ruin paper per Warriorstar's request * the name russiannian just will not be fully replaced * forgetting commas and adding a new subtype of paper for the shipping manifest * I think using quotation marks is causing me issues * further removal of the term "russian" in preperation of a PR removing lots of referrals to russia * added some new Poly voice lines * accidentally commited the wrong PR... Signed-off-by: Hayden Redacted <[email protected]> * made the shipping manifest ticked * worked on the perspective of some stairs * made changes requested by warriorstar * changed formatting of the sovietnian's loot Co-authored-by: warriorstar-orion <[email protected]> Signed-off-by: Hayden Redacted <[email protected]> * forgot to add a new line * i think this is causing the tests to fail perchance * purging the term russian to be in line with a recent PR doing the same Signed-off-by: Hayden Redacted <[email protected]> * fixed sovietnian to snake_case Signed-off-by: Hayden Redacted <[email protected]> * i may forget snake case exists * second time's the charm like a snake's two fangs * added warriorstar's suggestions * reverted a file that was accidentally converted * fixed merge issues * added an extra line Co-authored-by: Burzah <[email protected]> Signed-off-by: Hayden Redacted <[email protected]> * Update code/modules/awaymissions/mission_code/ruins/nian_freighter.dm Co-authored-by: Burzah <[email protected]> Signed-off-by: Hayden Redacted <[email protected]> * Update code/modules/awaymissions/mission_code/ruins/nian_freighter.dm Co-authored-by: Burzah <[email protected]> Signed-off-by: Hayden Redacted <[email protected]> --------- Signed-off-by: Hayden Redacted <[email protected]> Co-authored-by: warriorstar-orion <[email protected]> Co-authored-by: Burzah <[email protected]>
* minesweeper with no style * less string operations * review and aylongo tgui changes * bundle * minesweeper with no style * less string operations * review and aylongo tgui changes * bundle * bundle * bundle * silent. pda is booming * codestyle * review * revert * Apply suggestions from code review Co-authored-by: Henri215 <[email protected]> Signed-off-by: Burzah <[email protected]> * adjusts the name of a proc --------- Signed-off-by: Burzah <[email protected]> Co-authored-by: Burzah <[email protected]> Co-authored-by: Henri215 <[email protected]>
…ute_abductee runtime (ParadiseSS13#27289)
…hen contents change (ParadiseSS13#26897) * Fixes ParadiseSS13#26844 * removed some extra whitespace * camel case'd everything that wasn't inherited and also switched seed lavelling to use the new update_name() * ...and a little to the left... * Alright, that's all set, hopefully! * Update code/datums/components/label.dm Co-authored-by: DGamerL <[email protected]> Signed-off-by: Pidgey <[email protected]> * Picky, picky. * Update code/datums/components/label.dm Co-authored-by: warriorstar-orion <[email protected]> Signed-off-by: Pidgey <[email protected]> * Update code/datums/components/label.dm Co-authored-by: warriorstar-orion <[email protected]> Signed-off-by: Pidgey <[email protected]> * Update code/datums/components/label.dm Co-authored-by: warriorstar-orion <[email protected]> Signed-off-by: Pidgey <[email protected]> * One more tweak, hopefully. --------- Signed-off-by: Pidgey <[email protected]> Co-authored-by: DGamerL <[email protected]> Co-authored-by: warriorstar-orion <[email protected]>
Co-authored-by: Adrer <[email protected]>
…seSS13#27414) * Update stunbaton.dm * Update code/game/objects/items/weapons/stunbaton.dm Co-authored-by: Contrabang <[email protected]> Signed-off-by: CRUNCH <[email protected]> --------- Signed-off-by: CRUNCH <[email protected]> Co-authored-by: Contrabang <[email protected]>
…d only does so once (ParadiseSS13#27415)
* Added envirosuits to departmental vendors * added envirosuits to garment bags * added mining envirosuit to mining wardrobe locker * fixed genedrobe organization
* api: Spawn pools, a distributed loot manager. * meh * documentation and cleanups * how do numbers work * word wrapping * fixes found from prototyping
Co-authored-by: Bmon <[email protected]>
This reverts commit fc3dceb.
github-actions
bot
added
💾 Изменение конфига
m-dzianishchyts
added
the
📃 Требуется изменение WIKI
Legendaxe
approved these changes
Nov 23, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
💾 Изменение конфига
Ф-ф-фуриор...?
Документация
Улучшения и дополнения в документации
📃 Требуется изменение WIKI
Эти изменения необходимо внести на нашу WIKI.
🖌️ Спрайты
Вы заработали свою миска-рис и кошко-жена. Партия гордится вами!
🙏 Слияние с восходящим потоком
Боже, храни Короля!
📜 CL валиден
🔉 Звук
Услада для ушей.
TGUI
Кто-то решил потрогать интерфейсы.
🗺️ Изменение Карты
В этом ПРе затронут файл не станционной карты. Может и не один.
Документация
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: В ПДА добавлена игра Сапер.
add: Ревенант теперь может свободно общаться с гостами.
add: Мосты на Лаваленде теперь имеют переменную длину. Количество мостов увеличено.
add: Добавлена косморуина с гигантской советской молью.
add: Костюмы плазмаменов теперь доступны в автоматах, шкафчиках и и чехлах для одежды отделов.
soundadd: Добавлена пара версий звучания гитары.
imageadd: Обновлен спрайт флакона из темного стекла.
imagedel: Удалено несколько вариантов стеклянных флаконов.
fix: Исправлено отображение заполненности флаконов и бикеров.
fix: Частицы из ускорителя теперь корректно передают энергию сингулярности.
fix: Из станящей руки борга больше нельзя достать батарейку.
fix: Исправлены ошибки в сдерживающей механики экспериментора абдукторов.
fix: Сварка теперь поджигает легковоспламеняющиеся цели.
fix: Медибот теперь корректно отображается при сборке.
fix: Гранату в руке противника снова можно взорвать с некоторым шансом при стрельбе по нему.
fix: Исправлено отображение заклинаний мага в руках.
fix: Снаряды мага больше не настигают его самого при касте во время движения.
fix: Камеры с датчиком движения вне комнаты ВКД теперь тоже работают.
tweak: Камеры с датчиком движения замечают движение в области видимости. Для камеры в комнате ВКД - вся область, как и ранее.
tweak: MODsuit'ы получили уникальные имена, обновлено описание.
/:cl: