Merge Upstream [01.08.2024] #1408
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
…aradiseSS13#26310) * Update guardian.dm Signed-off-by: Faron <[email protected]> * Update code/game/gamemodes/miniantags/guardian/guardian.dm Signed-off-by: DGamerL <[email protected]> --------- Signed-off-by: Faron <[email protected]> Signed-off-by: DGamerL <[email protected]> Co-authored-by: DGamerL <[email protected]>
* Fixes crafting multiples of recipes in a sublist * Reduces some As * missed one * But wait there is more. I think I got them all now.
…f the briefcase (ParadiseSS13#26317) * Agent007 * Unintended change reverted. * Different coding practices my beloathed. * Stuck in the C# mines.
…eSS13#26337) * Nullspace fix * Update code/game/objects/structures/guillotine.dm Co-authored-by: DGamerL <[email protected]> Signed-off-by: Spaghetti-bit <[email protected]> * Update code/game/objects/structures/guillotine.dm Co-authored-by: Luc <[email protected]> Signed-off-by: Spaghetti-bit <[email protected]> --------- Signed-off-by: Spaghetti-bit <[email protected]> Co-authored-by: DGamerL <[email protected]> Co-authored-by: Luc <[email protected]>
* fix: syndie depot bots patrol correctly * skip animation (and init sleeping) altogether
…y This You Filthy Casual! (ParadiseSS13#26043) * Refactors parrying and how parrying is handled. Also gives most of the melee wizard weapons parrying as well as most two handed weapons. * Forgor the blood spear :) * Renames `special_parry_condition` to `requires_two_hands` * Apply suggestions from code review Co-authored-by: DGamerL <[email protected]> Signed-off-by: Spaghetti-bit <[email protected]> * Update code/datums/components/parry.dm Co-authored-by: Luc <[email protected]> Signed-off-by: Spaghetti-bit <[email protected]> * Apply suggestions from code review Co-authored-by: Luc <[email protected]> Signed-off-by: Spaghetti-bit <[email protected]> * applies suggestion from @lewcc * Removes the two handed requirement from cult spear as per @qwerty's request * Apply suggestions from code review (1/2) from hal Co-authored-by: Charlie <[email protected]> Signed-off-by: Spaghetti-bit <[email protected]> * Apply suggestions from code review (2/2) * ...accidentally removed an icon in `energy_melee_weapons.dm` when I deconflicted stuff. 💀 ready for review. * Again, variable added back during deconflict. issues resolved. * Update code/game/objects/items/weapons/shields.dm Signed-off-by: DGamerL <[email protected]> --------- Signed-off-by: Spaghetti-bit <[email protected]> Signed-off-by: DGamerL <[email protected]> Co-authored-by: DGamerL <[email protected]> Co-authored-by: Luc <[email protected]> Co-authored-by: Charlie <[email protected]>
* aaaaaaaaaaaaaaa * Forgor * Adds missing /proc/ --------- Signed-off-by: DGamerL <[email protected]>
Co-authored-by: NanoMap Generation <[email protected]>
* Securiblade, Sheaths * Snakesfang and Cleaver * Crates and Armory * Origin Tech Fix * Chargers can now accept securiblades * Clan Cleaver is now Breach Cleaver * Armor Checking * Comment and description fixes * State comment * More Comments * Contains list fix Co-authored-by: 1080pCat <[email protected]> Signed-off-by: PollardTheDragon <[email protected]> * Breacher sword hates doors * Tab indentation * Breacher Armor Buff - Status Effect while wielding * Breach Cleaver Sounds - courtesy of Stoniest * Snakesfang Codersprites * Define Fix * Breach Cleaver - Icon Codersprites * Breach Cleaver Codersprites * Gave help-intent attack on cleaver an animation * Reduced sound intensity of wielded harm * Moved variables below inherits * Buff spacing, guard clause * Improved examine * Guard clauses the secsword powercell * Sword mode defines * Added undefs * Spacing * Securiblade loreful examine_more * Examine_More for all swords * Grammar Co-authored-by: Luc <[email protected]> Signed-off-by: PollardTheDragon <[email protected]> * Moved defines, added auto-docs, grammar * Fixed secsword recharging * Secsword burn function fix * Cleaver Armor Buff Fix * Fix to buff * Securiblade burn fix, stamina charge reduction fix * Breach Cleaver - Wielding sprite consistency, fixed sheath orientation when unsheathed * Fixes securiblade EMP oversight * Snakesfang can parry now * Spelling * Removed define indents * Early returns * A whole lot of fixes. Qdels the cell on delete. * stun_delay proc doc * Update code/datums/uplink_items/uplink_general.dm Signed-off-by: DGamerL <[email protected]> * Merged IF statements, relocated inits * Armor change * Remove null in cell variable * Ifs to Switch * Revert "Armor change" This reverts commit 6b61e33. * Better Ifs to Switch * Removes roundstart armory blade, increases crate cost to 550 * Removed extraneous loc check, removed extraneous link cell proc * Added null check to secsword/emp_act * Added clear_cell proc to replace duplicate icon updates and cell nulls * No vars in proc argument * Properly nulls cell. Fixes cell sabotage for sword * Just the Snakesfang * Appearance update Co-authored-by: Ryan <[email protected]> Signed-off-by: PollardTheDragon <[email protected]> * Appearance update Co-authored-by: Ryan <[email protected]> Signed-off-by: PollardTheDragon <[email protected]> * Update code/game/objects/items/weapons/melee/melee_misc.dm Signed-off-by: DGamerL <[email protected]> --------- Signed-off-by: PollardTheDragon <[email protected]> Signed-off-by: DGamerL <[email protected]> Co-authored-by: 1080pCat <[email protected]> Co-authored-by: S34N <[email protected]> Co-authored-by: Luc <[email protected]> Co-authored-by: DGamerL <[email protected]> Co-authored-by: Ryan <[email protected]>
…S13#26039) * Chair go engarde! * White-space my beloathed. * Reduces damage of the bar stool to 8- wielded to 10, Reduces chair to 6, wielded to 8. * Update code/game/objects/structures/stool_bed_chair_nest/chairs.dm Co-authored-by: CRUNCH <[email protected]> Signed-off-by: Spaghetti-bit <[email protected]> * Applies suggestions from @Sirryan2002 --------- Signed-off-by: Spaghetti-bit <[email protected]> Co-authored-by: CRUNCH <[email protected]>
…S13#25687) * wrench a bunch of acts * atmospherics * some last few things * last iswrench changes for anything that isn't construction * Update code/game/machinery/pipe/pipe_construction.dm Co-authored-by: DGamerL <[email protected]> Signed-off-by: Luc <[email protected]> * Apply suggestions from code review Co-authored-by: DGamerL <[email protected]> Signed-off-by: Luc <[email protected]> * thank you dgamer * oopsie daisy * tests and addresses some introduced bugs * proper testing * proper ci * Update code/game/objects/structures/fluff.dm Co-authored-by: Burzah <[email protected]> Signed-off-by: Luc <[email protected]> * Update code/game/objects/structures/fluff.dm Co-authored-by: Burzah <[email protected]> Signed-off-by: Luc <[email protected]> * thank you burza 🙏 Co-authored-by: Burzah <[email protected]> Signed-off-by: Luc <[email protected]> * Apply suggestions from code review Co-authored-by: Burzah <[email protected]> Signed-off-by: DGamerL <[email protected]> * Update code/modules/recycling/disposal-construction.dm Signed-off-by: DGamerL <[email protected]> --------- Signed-off-by: Luc <[email protected]> Signed-off-by: DGamerL <[email protected]> Co-authored-by: DGamerL <[email protected]> Co-authored-by: Burzah <[email protected]>
…25919) * ezpz tweak * Boomerang go brrrr * Revert "Boomerang go brrrr" This reverts commit 703b45c. --------- Signed-off-by: DGamerL <[email protected]>
* boom boom pow * a few more sounds * Add different forms to uplink and prize counter * new and improved * Fuse sound or not * it's now a box and works properly. * Reviews * Minor tweaks * static list * ope * adjacency checks * angry
…6028) * Defib sound moment * Update defibrillator.dm * Apply suggestions from code review Co-authored-by: Matt <[email protected]> Signed-off-by: CRUNCH <[email protected]> * Fixing some minor typos for cyborg upgrade flavour text Throws in some missing apostrophes, capitalisation, and the letter "s." * Briefcase Full of Cash buff Increases the amount of cash in the Syndicate Briefcase Full of Cash from 600 Cr to 1000 Cr * Reverts double-feature PR * Reverts a broken revert * Reverting again because Ebba told me to * And reverting yet again * Update robot_upgrades.dm --------- Signed-off-by: CRUNCH <[email protected]> Co-authored-by: Matt <[email protected]>
* ebent * WHYYY * bobobo * adds ton of epic stuff * messages added * Outfit! * Indentation! Arrhghg * Gamemode checks, antag check stuff and outfit changes and tourist icon * ID icon, random species, gender, hair, a few comments and logs. * Mirroring review * Applies suggestion Co-authored-by: Ryan <[email protected]> Signed-off-by: Pedro <[email protected]> * Tourist Id's now have linked accounts, code cleaning as per reviews * Following suggestion * Apply suggestions as per review * Addresses the risk of two people having the same account * Typos and final cleaning * Checking for jobban/Not showing as tourist on manifest * Orbit test * compile * ebent * WHYYY * bobobo * adds ton of epic stuff * messages added * Outfit! * Indentation! Arrhghg * Gamemode checks, antag check stuff and outfit changes and tourist icon * ID icon, random species, gender, hair, a few comments and logs. * Mirroring review * Tourist Id's now have linked accounts, code cleaning as per reviews * Applies suggestion Co-authored-by: Ryan <[email protected]> Signed-off-by: Pedro <[email protected]> * Following suggestion * Apply suggestions as per review * Addresses the risk of two people having the same account * Typos and final cleaning * Checking for jobban/Not showing as tourist on manifest * Orbit test * TGUI Bundle Rebuild * Applies suggestions --------- Signed-off-by: Pedro <[email protected]> Co-authored-by: Ryan <[email protected]>
…Y rare trait) (ParadiseSS13#25957) * yippie itt works * Update tripAI.dm * Update code/modules/admin/verbs/tripAI.dm Co-authored-by: Matt <[email protected]> Signed-off-by: 1080pCat <[email protected]> * Update code/datums/station_traits/neutral_traits.dm Co-authored-by: Burzah <[email protected]> Signed-off-by: 1080pCat <[email protected]> --------- Signed-off-by: 1080pCat <[email protected]> Co-authored-by: Matt <[email protected]>
* RnD console * Undefine local defines * [ci skip] * Build and update /tg/ui * Reformat /tg/ui * Apply suggestions from code review Co-authored-by: Ryan <[email protected]> Signed-off-by: Arthri <[email protected]> * Snake casing [ci skip] * If statement over ternary * Document menu variables * Replace user with ui.user * Add documentation to copied variables [ci skip] * Rename icon to ui_icon * Factor out wait message box * Reorganize settings menu * Refactor technology row * [ci skip] * Build and update /tg/ui * Fix errors * [ci skip] * Build and update /tg/ui --------- Signed-off-by: Arthri <[email protected]> Co-authored-by: Arthri <[email protected]> Co-authored-by: /tg/ui Builder <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Ryan <[email protected]> Co-authored-by: Burzah <[email protected]>
* things were attempted * take two * take three * i meant to add this bit * no linear loot * hopefully this will make things less thingamabob than they are * added indents in deepstorage_award spawner * Sirryan2002's review Co-authored-by: Ryan <[email protected]> Signed-off-by: Kano <[email protected]> * removed an unnecessary var and documented them * these too * these should've been removed too * added indents to line 53 and 54 * rest of the requested changes * remapped some parts of the ruin, added a few more notes and made ruin monsters not to randomly wander into depths of chasm * changes in chasm.dm + chasm no longer eats lightbulb machinery + made a new subtype of chasm that actually teleports people to a random place instead of dropping them in corner of station z-level * requested changes * commit commit * everything is in shambles * comma * Update code/modules/awaymissions/mission_code/ruins/deepstorage.dm Co-authored-by: warriorstar-orion <[email protected]> Signed-off-by: Kano <[email protected]> * Update code/modules/awaymissions/mission_code/ruins/deepstorage.dm Co-authored-by: warriorstar-orion <[email protected]> Signed-off-by: Kano <[email protected]> * Update code/modules/awaymissions/mission_code/ruins/deepstorage.dm Co-authored-by: warriorstar-orion <[email protected]> Signed-off-by: Kano <[email protected]> * Update code/modules/awaymissions/mission_code/ruins/deepstorage.dm Co-authored-by: warriorstar-orion <[email protected]> Signed-off-by: Kano <[email protected]> * Update code/modules/awaymissions/mission_code/ruins/deepstorage.dm Co-authored-by: warriorstar-orion <[email protected]> Signed-off-by: Kano <[email protected]> * Update code/modules/awaymissions/mission_code/ruins/deepstorage.dm Co-authored-by: warriorstar-orion <[email protected]> Signed-off-by: Kano <[email protected]> * Update code/modules/awaymissions/mission_code/ruins/deepstorage.dm Co-authored-by: warriorstar-orion <[email protected]> Signed-off-by: Kano <[email protected]> * Update code/modules/awaymissions/mission_code/ruins/deepstorage.dm Co-authored-by: warriorstar-orion <[email protected]> Signed-off-by: Kano <[email protected]> * Update code/modules/awaymissions/mission_code/ruins/deepstorage.dm Co-authored-by: warriorstar-orion <[email protected]> Signed-off-by: Kano <[email protected]> * warriorstar-orion review * Update code/modules/awaymissions/mission_code/ruins/deepstorage.dm Co-authored-by: warriorstar-orion <[email protected]> Signed-off-by: Kano <[email protected]> * Update code/modules/awaymissions/mission_code/ruins/deepstorage.dm Co-authored-by: warriorstar-orion <[email protected]> Signed-off-by: Kano <[email protected]> * Update code/modules/awaymissions/mission_code/ruins/deepstorage.dm Co-authored-by: warriorstar-orion <[email protected]> Signed-off-by: Kano <[email protected]> * Update code/modules/awaymissions/mission_code/ruins/deepstorage.dm Co-authored-by: warriorstar-orion <[email protected]> Signed-off-by: Kano <[email protected]> * Update code/modules/awaymissions/mission_code/ruins/deepstorage.dm Co-authored-by: warriorstar-orion <[email protected]> Signed-off-by: Kano <[email protected]> * Update code/modules/awaymissions/mission_code/ruins/deepstorage.dm Co-authored-by: warriorstar-orion <[email protected]> Signed-off-by: Kano <[email protected]> * Somewhere, a heavy door has opened. + gateopener and fleshling now notifies players about a blast door has been opened * area changes + Floating rock bits now has area + Some lights inside the ruin is now under space/powered area which aligns rest of the chasm lights * little adjustments + changed some floors + replaced some polarized windows with tinted ones (oops) * how did these get in here * Update code/game/turfs/simulated/floor/chasm.dm Co-authored-by: warriorstar-orion <[email protected]> Signed-off-by: Kano <[email protected]> * check if it's space * Update code/modules/awaymissions/mission_code/ruins/deepstorage.dm Co-authored-by: warriorstar-orion <[email protected]> Signed-off-by: Kano <[email protected]> * changes in turf check + Added two procs that will ping-pong on each other and provide a valid turf * atoms * there can be only one + apparently airless variation of this was introduced in a PR that was merged before this one. * fix + renamed crematorium as incinerator. + removed a rogue morgue tray in incinerator room. + added access to an accessless airlock. + changed improper tags of two blastdoors to relevant ones. --------- Signed-off-by: Kano <[email protected]> Co-authored-by: Ryan <[email protected]> Co-authored-by: warriorstar-orion <[email protected]>
…seSS13#26293) * Corrects the price comments for the bundles * contra review * Update code/game/objects/items/weapons/storage/uplink_kits.dm Signed-off-by: DGamerL <[email protected]> --------- Signed-off-by: DGamerL <[email protected]> Co-authored-by: DGamerL <[email protected]>
* Introduce constants for map size and pixes per turf * Scale markers with zoom * Remove unused state * Center map by default * Fix zooming offset * Add view reset button * Fix exaggerated dragging when zoomed * Remove zoom from local state * Rewrite centering code * Allow opening air alarms from map view * Rename Marker to MarkerIcon * Factor out generic map marker * Implement name highlighting * Fix oversight * Save settings across UI opens * Do not sanitize air alarm names They are already automatically sanitized by Inferno * Build and update tgui * force ci * Make labelStyle optional * Make labelStyle optional again * [ci skip] * Build and update /tg/ui * Reformat /tg/ui * Autodec variables [ci skip] --------- Co-authored-by: Arthri <[email protected]> Co-authored-by: /tg/ui Builder <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Burzah <[email protected]>
* t checkout master Revert "Fixing fulton pack not working (ParadiseSS13#26153)" This reverts commit 67353fd. * Revert "Cult magic attacks and attacks on stun mark can now be blocked by shields (ParadiseSS13#25771)" This reverts commit 9ea58e1. * Revert "[s] Stunbaton no longer triggers shields twice (ParadiseSS13#26197)" This reverts commit cd88b3d.
* Blind * comma * Update code/modules/games/cards.dm Co-authored-by: Ryan <[email protected]> Signed-off-by: CRUNCH <[email protected]> * Update gun.dm * this applies to other blind people, not you * dedent * Reformatting * Update bloodcrawl.dm * Apply suggestions from code review Co-authored-by: Luc <[email protected]> Signed-off-by: CRUNCH <[email protected]> * Update cards.dm --------- Signed-off-by: CRUNCH <[email protected]> Co-authored-by: Ryan <[email protected]> Co-authored-by: Luc <[email protected]>
* Adds CI for missing pipe connections * fix box * fix delta * fixes meta * partially fixes cere * yah * cere fix * holy shit * adds unary stuff too * im dumb * yeah
github-actions
bot
added
🗺️ Изменение Карты
ss220bot
added
📜 CL валиден
📜 CL невалиден
and removed
📜 CL валиден
📜 CL невалиден
labels
…iseSS13#26353) * Hold my brain, brain holder. * Update misc_admin_procs.dm * woops
Legendaxe
approved these changes
Aug 1, 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
🆑
experimental: Добавлено парирование при выборе двуручного оружия.
add: Новые шумовухи: Петарды и ложные (decoy) гранаты.
add: Добавлено парирование стульями!
add: Добавлена возможность взять стул в обе руки.
add: Ремап космической руины Deepstorage, со своим мини-боссом.
add: Добавлено новое оружие ближнего боя - меч «Snakesfang». К мечу прилагаются ножны для ношения. Он может быть заточен с помощью точильного камня. Его покупка стоит 25 ТК.
add: Добавлен мидраунд ивент «Прибытие туристов».
add: Добавлена новая туристическая экипировка в инвентарь администратора.
add: Добавлен новый трейт станции «AI Triumvirate». Очень редко на станции будет целых три ядра ИИ.
add: Добавлена кнопка сброса обзора у консолей камер.
add: Crew Monitor'ы (портативные и консольные) теперь могут подсвечивать имена. Подсветка осуществляется по имени, а не по ckey, ref или uid. Это означает, что при выделении одного человека с именем «Unknown» будут выделены все люди с именем «Unknown». Это сделано намеренно и предотвращает злоупотребление Crew Monitor'ом для обнаружения генокрадов.
add: Двойной щелчок на маркерах карты в окне просмотра карты Crew Monitor'а теперь выделяется соответствующее имя.
add: выделенные имена на мониторах экипажа теперь будут отображаться на карте в виде пульсирующей иконки
tweak: Карты Crew Monitors и Central Atmospheric Consoles теперь центрированы по умолчанию.
tweak: Crew Monitor теперь запоминает настройки.
tweak: Маркеры карты (на мониторах экипажа и центральных атмосферных консолях) теперь увеличиваются при увеличении масштаба.
tweak: Маркеры карты теперь центрируются на тайле.
tweak: В меню деконструкции R&D-консолей теперь отображается текущий уровень технологии, уровень технологии вставленного объекта и полученный уровень технологии при деконструкции.
tweak: Кнопка очистки и извлечения диска в R&D-консолях теперь расположена в правом верхнем углу секции диска.
tweak: Главное меню R&D-консолей теперь содержит информацию о каждой технологии.
tweak: Консоли R&D больше не отображают меню «Deconstructive Analyzer», меню Протолата, или меню «Circuit Imprinter», если они не связаны между собой.
tweak: Консоли R&D теперь используют в качестве навигации вкладки, а не кнопки.
tweak: При дефибрилляции теперь есть один do_after длительностью 5 секунд, а не два отдельных - 3 и 2 секунды.
tweak: На стулья теперь нужно нажимать ALT, чтобы поставить их на ножки, но также их и не нужно держать в руках, чтобы поставить их.
tweak: Карты Таро теперь не исчезают, если бросить их в не моба.
tweak: Disposal'ы теперь перемещаются владыкой Сингуло.
tweak: Парирование двуручным оружием теперь требует, чтобы вы держали его в обоих руках.
tweak: Парирование энергетическим мечом и телескопическим щитом теперь требует, чтобы они были активны.
fix: Различные мелкие фиксы.
fix: Увеличение или уменьшение масштаба (на мониторах экипажа и центральных атмосферных консолях) теперь сохраняет центральную точку.
fix: Теперь названия по типу «Warden's Office Air Alarm» не отображается как Warden's Office Air Alarm на атмосферных консолях.
soundadd: Новый звук для дефибриллятора.
fix: Технологические диски больше не обновляются автоматически.
fix: Исправлено, что причудливые хранилища не обновляли состояние своих иконок.
fix: Исправлена ошибка мержа, из-за которой ВСЕ двери и створки не блокировали тепло, даже теплозащитные на СМе.
fix: Исправлен портфель с фальшивым дном, благодаря чему оружие, находящееся в фальшивом дне портфеля, снова может стрелять. Теперь вы можете выступить в роли агента 007 и одновременно бить людей по лицу и стрелять в них.
fix: Мехи депо Синдиката правильно патрулируют периметр депо.
del: Подменю «Linked Devices» в R&D консолях теперь является частью меню «Settings».
del: В диск-меню консолей R&D больше нет подменю копирования. При вставке пустого диска будет показано, что можно скопировать.
/:cl: