Merge Upstream 08.03.2024 #1067
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
* sprites * pixel shift * sprite update
* OpenDream Typemaker Prep * Update code/datums/radio_frequency.dm Co-authored-by: GDN <[email protected]> --------- Co-authored-by: GDN <[email protected]>
… chickens (ParadiseSS13#24409) * fixes chicks * Update code/modules/mob/living/simple_animal/friendly/farm_animals.dm Co-authored-by: Contrabang <[email protected]> * Update code/modules/mob/living/simple_animal/friendly/farm_animals.dm Co-authored-by: Contrabang <[email protected]> --------- Co-authored-by: Contrabang <[email protected]>
… into merge (ParadiseSS13#23926) * Surely this will not have any critical balance implications * Apply suggestions from code review Co-authored-by: Henri215 <[email protected]> * oops * marm fixes * fixes signal * how on earth did I do that * adds twitch to nanocalcium * respect armor, lowers throw * IPC can use, fuck up heartless people * no crawl slowdown / meth * *slightly* turns down the drug effect * renames it will deal with pr desc soon * finishes it * rnd version empable * Apply suggestions from code review Co-authored-by: Henri215 <[email protected]> * Nerfs twitches visuals, due to a reported novastation bug where the visuals would endlessly stack * Apply suggestions from code review Co-authored-by: Luc <[email protected]> * C-C-C-Changes * Epilepsy Warning: Drug has vibrant visual effects! * safety * Apply suggestions from code review Co-authored-by: DGamerL <[email protected]> * removes twitch name, make mix explode * oops --------- Co-authored-by: Henri215 <[email protected]> Co-authored-by: Luc <[email protected]> Co-authored-by: DGamerL <[email protected]>
* Refresh TGUI blank window fix * Whoopsie * Separate things
…radiseSS13#24252) * Puts some of the stack crafting code onto the stack recipe datum to allow for more and easier customization of what happens when a recipe is crafted. * Very important spacing. * Better returns. * Removed \the macro, fixed bug in message that occurs when lacking resources for a construction. * The do_after() should probably be on do_build()
* non gravity movement, flat second immobilized removed * let it be * naming * Update code/controllers/subsystem/SSthrowing.dm * Update code/controllers/subsystem/SSthrowing.dm Co-authored-by: Contrabang <[email protected]> * Revert "Update code/controllers/subsystem/SSthrowing.dm" This reverts commit 20ef2af. * comment update --------- Co-authored-by: Contrabang <[email protected]>
* test 1 claim_job comment spaces start * yay, its BROKE * Update bot.dm * alcohol is the only escape * static * it works * spacing * cleanbot list cleanup * comments * space AREA This is what insanity looks like. Every bot PR breaks something, without fail. fixed replace tiles? broke hull breach fixed hullbreach? broke cleanbots fixed hullbreach? well also broke it * Comment Sorting * comments 2/2 * comments 3/? * comments 4/? * autodoc 1/? * maketile doesnt drop * maketile update * floor - snake_case + if else * Floor - comments * floor - snake_case 2/? * cleanbot turf reservation comment * floorbot ignore list * comments * var/atom/A * target check. null runtime * tile clean comment removal * again * reviews. final_result removal * comment block * avoid bot TRUE * comments ?/? I lost track of how manny comment commits there are * autodocs * autodoc * autodocs * ignore_job -= target.UID() additions * anchored Noticed that, if a tile is in space, they will dance around it as they do not anchor. Now they do * runtime fix * ignore_job edits. clean after 30 * typo * fix before replace, DUH * ignore job clearing * Time Dilation 106% no more * eat tile fix, oops * replace plating * comment shift * lets try again * mode ! * process_type = null + to_chat cleanup + ignore_job bot_reset * remove extra ignore_job * target.loc * TRUE * ignore job and revert loc * move speed and such * comment with proc * God I hate myself * TRUE / FALSE * comments :) * else if * pesky comment * mods are asleep, rename the vars * small edits * Make ignore_job culling based on amount of bots alive. 1 job per bot * Revert move speed changes. Bots move slower than security on cere * Emag fixes oof * ++ * + 1? * ++ * comment * dropped metal amount * paranthesis * no need for absolute * Thanks VSC conflict resolver for duplicating this here * Emag is a bool now, self remind comment removed * Documentation * move speed null nulled * replace_tile lag / freeze fix + removed extra job stuff * clarification about which list is being used in comment
…S13#24130) * tgui chat message stacking improvements * drops to 30 * baller * reviews * Update tgui/packages/tgui-panel/settings/SettingsPanel.js Co-authored-by: S34N <[email protected]> * Update tgui-panel.bundle.js --------- Co-authored-by: S34N <[email protected]>
…diseSS13#24280) * shards put in hands * Update code/game/gamemodes/cult/runes.dm Co-authored-by: 1080pCat <[email protected]> --------- Co-authored-by: 1080pCat <[email protected]>
* Gives non-engiborgs red crowbars * Update code/game/objects/items/tools/crowbar.dm Co-authored-by: Henri215 <[email protected]> * Update code/game/objects/items/tools/crowbar.dm Co-authored-by: Henri215 <[email protected]> --------- Co-authored-by: Henri215 <[email protected]>
* test * I hate mulebot * no need to change this apparently * INVOKE Begone, no change noticed
* initial commit (broken) * load the html * fix this * Fix various issues with browser statpanel * Fix Alt Clicking opening up a window and Add back some object verbs to the browser stat panel * Optimize stat panel and fix guardian verbs * Restyles Stat Panel, Adds Subpanel Sub-Categories * Use better layout for verbs in stat panel * Updates statpanel verb widths to be more dynamic at higher screen resolutions. * Adjust stat panel grid item widths and breakpoints * refactors statpanel to use tgui API * CI moment * more CI * this stupid thing * Apply suggestions from code review Co-authored-by: GDN <[email protected]> Co-authored-by: Burzah <[email protected]> * Update code/modules/client/client_procs.dm * ci fix * emergency mc debug view * temp revert some code change suggestions due to massive runtiming * proper atom click topic implementation * optimise * mob clicking in stat panels work * yeet spell tab thingy * yeet simple stat panel pref * allow insertion of html into MC tab content * tidy up status tab * Apply suggestions from code review * fix this * fix CI * oops * fix index runtime * fixes MC tab showing up for mentors, fixes runtime * safeties! * Return of theme support * more fixes * fix view range pref, tidy prefs tab * Remove old stat panel from themes * fixes * make sure verbs don't go missing * fix ooc/looc breaking * Revert "make sure verbs don't go missing" This reverts commit 7d07ad4. * fix this properly * fix stat panel hitting rate limiters * fix borg status tab * Object Window Niceties * Adds file cycling for icon2base64 * optimizes icon2html() for icon files known to be in the rsc at compile time * CI moment * remove dupe emergency shuttle timers * more robust verb updates * statpanel tweaks * zip archived changelog to avoid search results * optimise * fix mentor chat wonkyness when disabled * debug log moment * i am very smart * reintroduce this because it was needed * better time listings * less jank * stops telling admins they arent mentors * returns MC tab pref for admins * Update code/controllers/subsystem/SSstatpanel.dm Co-authored-by: Luc <[email protected]> * lewcc * OD typemaker prep --------- Co-authored-by: GDN <[email protected]> Co-authored-by: Burzah <[email protected]> Co-authored-by: Aylong <[email protected]> Co-authored-by: Luc <[email protected]>
* Updated on_mob_move to be called on all mob movement. * Call parent in mob/living/Moved
…o ParadiseSS13-master
github-actions
bot
added
🗺️ Изменение Карты
github-actions
bot
added
the
Керберос
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.
Changelog
🆑 ParadiseSS13
add: Новый химикат - Мефедрон (Mephedrone). Увеличивает вашу скорость передвижения и атаки нанося немного урона. При передозировке вы можете уклоняться от пуль, однако будете получать большой урон сердцу и много токсинов.
add: Новый имплант - Qani-Laaca Sensory Computer. Можно купить в аплинке за 40ТК или сделать в РнД имея 5 нелегала. При активации, вводит мефедрон, имеет 5 минут КД.
add: Вкладки справа сверху потерпели много изменений, теперь они не бйондовские, в ТГУИ стиле, не должны лагать если выбрана вкладка Status и имеют подкатегории. Как на ТГ короче.
add: Осколок стекла теперь можно скрафтить из стекла. Круговорот стекла восстановлен.
tweak: Floorbot и Cleanbot теперь имеют более точное распределение работы. Они больше не будут делать одинаковую работу.
tweak: Floorbot будет делать из металла тайлы самостоятельно, выкидывая излишки на пол. А так же его нельзя сдвинуть когда от кушает и делает метал.
tweak: TGchat теперь стакает все дублирующиеся сообщения в течении 30 секунд вместо 5 по-умолчанию. Можно сменить в настройках (Максимум 10 минут)
tweak: TGchat теперь может сохранять до 10к сообщений, вместо 1к. Можно сменить в настройках до 25к.
tweak: Конвертация с помощью осколка, теперь будет помещать осколок в руку а не бросать его на пол. Это про культ если кто не понял.
fix: Скилы делающие вас невидимым, теперь прячут ваш HUD от силиконов.
fix: Симпл мобы теперь видят в темноте, как люди и прочие расы, только в большем радиусе.
fix: Цыплята больше не теряют имя которое вы им даёте когда вырастают.
fix: Теперь снова можно кричать если вас пересадили в очеловеченную мартышку.
fix: Культисты перестают быть культистами после удаления.
fix: Боты теперь емагаются во время ионной бури, как и должны были.
fix: Refresh TGUI больше не должен вызывать белых окон, которые нельзя закрыть. Плюс поставлена защита от дурака.
fix: Активированный МОД снова защищает от перцовки.
fix: Очки защищают перцовки тоже.
fix: Предметы созданные из материала в руке, теперь мопещаются в свободную руку, если таковая имеется.
fix: Floorbot Больше не прокладывает пол в космосе.
fix: Кнопка чейнджлога снова должна менять свой цвет в зависимости от того, есть ли там что-то новое или нет. Но ты должно быть уже это заметил, если не читаешь в дискорде.
fix: Какой-то фикс травы, я серьёзно не понял.
fix: Мониторы ИИ снова могут мигать.
del: Лампочки и вендоры больше не будут время от времени мигать. Должно чуть меньше лагать к слову.
wip: После добавления пары настроек в ТГчат, на FullHD мониках проблема с вылезающими за рамки настройками, особенно это заметно в фуллскрине. Фикс будет на днях, наверное.
/:cl: