Merge Upstream 20.01.2025 #1755
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
![ss220app[bot]](https://avatars.githubusercontent.com/u/131299570?s=60&v=4){kind=small}
* idk what i am doing * reverts config.toml * restores test_tiny * migrates the handlabeler to new attack_chain * return signals + datum autodoc * return defines to handlabeler.dm * trailing newline * handlabeler goes backpack if no label now * moved the labeling stuff out of interact_with_atom * guard clause --------- Co-authored-by: Toastical <toastical@toaster.com> Co-authored-by: Toastical <toast@toaster.com>
* Silly double negatives. * value for coeff + contra reccomendation * simplified logic (thanks funnyman) Co-authored-by: Charlie Nolan <funnyman3595@gmail.com> Signed-off-by: Erikos <Erikos66@outlook.com> --------- Signed-off-by: Erikos <Erikos66@outlook.com> Co-authored-by: Charlie Nolan <funnyman3595@gmail.com>
…3#27838) * Update contractor_kit.dm Adds the handheld mirror. Signed-off-by: adddfff33 <erikkhafizov56@gmail.com> * Update code/modules/antagonists/traitor/contractor/items/contractor_kit.dm Signed-off-by: Luc <89928798+lewcc@users.noreply.github.com> * Update code/modules/antagonists/traitor/contractor/items/contractor_kit.dm Signed-off-by: Luc <89928798+lewcc@users.noreply.github.com> --------- Signed-off-by: adddfff33 <erikkhafizov56@gmail.com> Signed-off-by: Luc <89928798+lewcc@users.noreply.github.com> Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
* wire cutting * change item interact signal * typo * unneeded thingy mcbob --------- Co-authored-by: Toastical <toastical@toaster.com> Co-authored-by: Toastical <toast@toaster.com>
* add mantis blades * fix nuclear only * fix .dme edit * fix linter * new attack chain * maybe fix linter * add NT mantis blade to syndicate 6 * newline * add list * fix nested types * ability to pry open doors with two blades * Update code/game/machinery/doors/airlock.dm Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com> Signed-off-by: Mira <42539014+MiraHell@users.noreply.github.com> * requested changes * remove transform * replace sleep with addtimer * Update code/datums/uplink_items/uplink_general.dm Co-authored-by: PopeDaveThe3th <80988376+PopeDaveThe3th@users.noreply.github.com> Signed-off-by: Mira <42539014+MiraHell@users.noreply.github.com> * Update code/datums/uplink_items/uplink_general.dm Co-authored-by: PopeDaveThe3th <80988376+PopeDaveThe3th@users.noreply.github.com> Signed-off-by: Mira <42539014+MiraHell@users.noreply.github.com> * Update code/game/objects/items/weapons/storage/uplink_kits.dm Co-authored-by: PopeDaveThe3th <80988376+PopeDaveThe3th@users.noreply.github.com> Signed-off-by: Mira <42539014+MiraHell@users.noreply.github.com> * Update code/modules/research/designs/weapon_designs.dm Co-authored-by: PopeDaveThe3th <80988376+PopeDaveThe3th@users.noreply.github.com> Signed-off-by: Mira <42539014+MiraHell@users.noreply.github.com> * Update code/modules/research/designs/weapon_designs.dm Co-authored-by: PopeDaveThe3th <80988376+PopeDaveThe3th@users.noreply.github.com> Signed-off-by: Mira <42539014+MiraHell@users.noreply.github.com> * Update code/modules/surgery/organs/augments_arms.dm Co-authored-by: PopeDaveThe3th <80988376+PopeDaveThe3th@users.noreply.github.com> Signed-off-by: Mira <42539014+MiraHell@users.noreply.github.com> * Update code/modules/surgery/organs/augments_arms.dm Co-authored-by: PopeDaveThe3th <80988376+PopeDaveThe3th@users.noreply.github.com> Signed-off-by: Mira <42539014+MiraHell@users.noreply.github.com> * Update code/modules/surgery/organs/augments_arms.dm Co-authored-by: PopeDaveThe3th <80988376+PopeDaveThe3th@users.noreply.github.com> Signed-off-by: Mira <42539014+MiraHell@users.noreply.github.com> * Update code/modules/surgery/organs/augments_arms.dm Co-authored-by: PopeDaveThe3th <80988376+PopeDaveThe3th@users.noreply.github.com> Signed-off-by: Mira <42539014+MiraHell@users.noreply.github.com> * Update code/modules/surgery/organs/augments_arms.dm Co-authored-by: PopeDaveThe3th <80988376+PopeDaveThe3th@users.noreply.github.com> Signed-off-by: Mira <42539014+MiraHell@users.noreply.github.com> * Update code/modules/surgery/organs/augments_arms.dm Co-authored-by: PopeDaveThe3th <80988376+PopeDaveThe3th@users.noreply.github.com> Signed-off-by: Mira <42539014+MiraHell@users.noreply.github.com> * add safetys and some cleanup * return parry sound * snake case and replace CALLBACK with VARSET_CALLBACK * move attacking logic and update item and uplink description * cleanup * first attempt * fix conditional statement * update paradise.dme * edit whitespace * signal interceptors * improve some logic * oops * use COMSIG_INTERACTING * return one whitespace * subtype for mantis blades * replace .GetComponent() with signal * fix typo * better naming * attempt_cancel_message and some logic * split logic --------- Signed-off-by: Mira <42539014+MiraHell@users.noreply.github.com> Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com> Co-authored-by: PopeDaveThe3th <80988376+PopeDaveThe3th@users.noreply.github.com>
…aradiseSS13#25078) * Refactor/deduplicate camera eye code Camera Eyes previously had duplicated logic across several files. This change uncooks the spaghetti. Additionally, half-baked support for TG's multicam feature has been removed, as it was not functional or in use. * lets ff now * Camera Eye refactor fixes and finishing touches This change completes a refactor of AI eyes, which were previously used by xenobio consoles, syndicate and abductor camera consoles, shuttle docking computers, holograms, and, of course, the AI. Duplicated logic has been extracted to an abstract base mob, /mob/camera/eye, from which new types for each of the above now derive. Functionality is largely the same, with only a few minor cosmetic differences (i.e. camera eyes are now appropriately named given their type and user), as well as a quality-of-life enhancement for holograms, slowing their movement speed to base run speed to prevent users from accidentally zooming out of calls. * Camera eye refactor: Fix AI acceleration toggle The acceleration toggle was broken in the camera eye refactor, as previously the boolean was stored on the AI rather than its eye. This change fixes that. * Camera eye refactor: Fix syndicate cam visibility With the camera eye refactor, the syndicate advanced camera consoles lost the ability to view maintenance tunnels and other areas without active cameras, seeing static in their place instead (as all other cameras do). This change reinstates the original behavior. * Camera eye refactor: Convert spaces to tabs * Camera eye refactor: Fix CRLF * Apply suggestions from code review General minor code quality improvements suggested by GDNgit Co-authored-by: GDN <96800819+GDNgit@users.noreply.github.com> * Apply suggestions from code review Rename parameter names to avoid src accesses, remove an ambiguous and unused mob_define and holopad range variable from a previous WIP, change the for loop in /mob/camera/eye/relaymove to a for-to loop, and change the chat message warning, sent when an AI Eye is created on an AI that already has one, to a stack trace * Adds toggle to AI commands for fast holograms * Refactor ripped Hologram Eye relaymove Previously, the relaymove proc for hologram eyes was redundant and nearly impossible to read. It has been separated out into a few different named procs, and has had its use of `spawn` removed. * Remove unnecessary src access * Fix bug involving shuttle placement outlines The camera eye refactor that this commit is a part of introduced a bug that prevented shuttle placement outlines from showing up on first use of the shuttle console. This change fixes that bug. * Unrevert some changes from ParadiseSS13#26306 lost in merge * Remove erroneous free xray vision on advanced cams * Autodoc camera acceleration vars * Remove redundant null var initialization per code review Co-authored-by: Drsmail <60036448+Drsmail@users.noreply.github.com> Signed-off-by: asciodev <81930475+asciodev@users.noreply.github.com> * Changed variables to camel_case, autodocs, cleanup Changed a number of camera eye-related variables to camel_case style, added appropriate autodoc comments, as per code review. Also removed an unused cameranet function, modified the call signature of a cameranet function to be more semantic, and changed a qdel-on-initialize in camera eyes to return INITIALIZE_HINT_QDEL instead. Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com> * Remove stray qdel(src) per code review Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com> Signed-off-by: asciodev <81930475+asciodev@users.noreply.github.com> --------- Signed-off-by: asciodev <81930475+asciodev@users.noreply.github.com> Co-authored-by: GDN <96800819+GDNgit@users.noreply.github.com> Co-authored-by: Drsmail <60036448+Drsmail@users.noreply.github.com> Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Co-authored-by: Toastical <toast@toaster.com>
* Re-buff immovable rods * More deadly collisions.
* Add Cheese Crate * newline fix
* Admins can change AI laws in Death Squad spawn event * Refactored some text * Adds ERT coms to an ai and cyborgs * Spelling Thanks Christasmurf Co-authored-by: Christasmurf <25437893+Christasmurf@users.noreply.github.com> Signed-off-by: Drsmail <60036448+Drsmail@users.noreply.github.com> * high-importance style text on laws update Signed-off-by: Drsmail <60036448+Drsmail@users.noreply.github.com> * Laws uppdate + sound * Update sound to much much bette one, made by dj-34 * Removed old comment Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com> Signed-off-by: Drsmail <60036448+Drsmail@users.noreply.github.com> * Fix cyborg radio and refactor how ai gets his * Fix cyborg radio and refactor how ai gets his * Removed empty lines * spelling Co-authored-by: Mira <42539014+MiraHell@users.noreply.github.com> Signed-off-by: Drsmail <60036448+Drsmail@users.noreply.github.com> --------- Signed-off-by: Drsmail <60036448+Drsmail@users.noreply.github.com> Co-authored-by: Christasmurf <25437893+Christasmurf@users.noreply.github.com> Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com> Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com> Co-authored-by: Mira <42539014+MiraHell@users.noreply.github.com>
* No more ugly * Resprites the cryo anomaly too * Update code/modules/mod/modules/modules_engineering.dm Signed-off-by: Burzah <116982774+Burzah@users.noreply.github.com> --------- Signed-off-by: Burzah <116982774+Burzah@users.noreply.github.com> Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
* first test * hmmm * lets see * new shelves * crafting * deconstruction * fixes * more crafting
…eSS13#27998) * fix icon state and unsheath sound * fix other sheaths * don't need this
* fix sprite * turned off sprite * no rewind animation
* Update vampire_powers.dm * Revert "Update vampire_powers.dm" This reverts commit 53a0596. * NanoMap Auto-Update (Mon Oct 5 06:34:42 UTC 2020) * sprite * steam-begone * fixes * fix2 * fix3 * fixesN * Update paradise.dme * Update paradise.dme * Update paradise.dme * Update paradise.dme * NanoMap Auto-Update (Sat Jan 21 01:38:50 UTC 2023) * Update paradise.dme * Update paradise.dme * sprites * Revert "sprites" This reverts commit c6854d0. * icons * fix --------- Co-authored-by: NanoMap Generation <action@github.com>
…13#27974) * Double Examine is advertised more clearly Atoms with double-examine now advertise the fact on a single examine. * Changes per request Double examining atoms without blurbs now gives regular examine message * Changed double examine prompt Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com> Signed-off-by: ExusA <67055922+ExusA@users.noreply.github.com> --------- Signed-off-by: ExusA <67055922+ExusA@users.noreply.github.com> Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
…fines (ParadiseSS13#27913) * economy machinery now uses tgui_input_number * Update code/modules/economy/economy_machinery/economy_machinery.dm Signed-off-by: Burzah <116982774+Burzah@users.noreply.github.com> * pin range defines + replacing hardcoded ranges * account pin generator uses defines --------- Signed-off-by: Burzah <116982774+Burzah@users.noreply.github.com> Co-authored-by: Toastical <toastical@toaster.com> Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com> Co-authored-by: Toastical <toast@toaster.com>
* screwing * revert test_tiny and config.toml * forgot the power variant switch * eyestabbing --------- Co-authored-by: Toastical <toastical@toaster.com>
* yeah * yeah * lock tf in * aaaa * fix * im going to have a fucking stroke i hate mindflayers * dynamic is ready * fucking hell * yes * warrior review * blah blah * updates based on ParadiseSS13#27811 * ok fix * makes the menu usable during secret * ok RANDOM BULLSHIT GO! * Dynamic final changes * fixes some missing budget
ss220app
bot
added
the
📃 Требуется изменение WIKI
|
🧙 Sourcery has finished reviewing your pull request! Tips and commandsInteracting with Sourcery
Customizing Your ExperienceAccess your dashboard to:
Getting Help
|
github-actions
bot
added
Merge Conflict
Документация
![sourcery-ai[bot]](https://avatars.githubusercontent.com/in/48477?s=60&v=4){kind=small}
m-dzianishchyts
force-pushed
the
merge-upstream
branch
2 times, most recently
from
136f467 to
9eb5ff3
Compare
m-dzianishchyts
force-pushed
the
merge-upstream
branch
from
9eb5ff3 to
ec19a38
Compare
|
!build_rust |
Legendaxe
approved these changes
Jan 20, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
💾 Изменение конфига
Ф-ф-фуриор...?
Документация
Улучшения и дополнения в документации
📃 Требуется изменение WIKI
Эти изменения необходимо внести на нашу WIKI.
🖌️ Спрайты
Вы заработали свою миска-рис и кошко-жена. Партия гордится вами!
🙏 Слияние с восходящим потоком
Боже, храни Короля!
📜 CL валиден
Этот чейнджлог будет успешно опубликован
🗺️ Изменение Карты
В этом ПРе затронут файл не станционной карты. Может и не один.
Документация
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.
This pull request merges upstream/master. Resolve possible conflicts manually and make sure all the changes are applied correctly.
Important
Configuration Change:
www.github.com/ParadiseSS13/Paradise/pull/27600
Note
Requires Wiki Update:
www.github.com/ParadiseSS13/Paradise/pull/27838
www.github.com/ParadiseSS13/Paradise/pull/27975
www.github.com/ParadiseSS13/Paradise/pull/27594
Changelog
🆑 ParadiseSS13
fix: Ручной лейблер снова может снимать метки с предметов.
fix: Теперь можно положить ручной лейблер в рюкзак.
tweak: Голопады теперь открывают своё меню только в интенте помощи и с пустой рукой, чтобы предотвратить случайные нажатия во время боя.
add: Вендор посуды у повара теперь содержит бумажные пакеты для старта бизнеса с упакованной едой.
del: Удалён спавнер декоративной куртки из отеля Rocky Motel.
add: Добавлен новый предмет для предателей: клинки богомола, включая версию NT на уровне технологий Синдиката 6.
add: Добавлена настройка "Fast Holograms" в командах ИИ, которая устанавливает скорость голограмм голопада на уровень скорости камеры (по умолчанию отключено).
tweak: Голограммы голопада замедлены до базовой скорости бега, чтобы предотвратить случайное завершение голографического вызова.
tweak: Вероятность трейта "Нашествие карпов" снижена.
tweak: Что за хуйня?! оказалась недостаточно смертоносной и теперь будет разрывать время и пространство.
add: Добавлен "элитный" ящик сыра в карго.
fix: Киборгов больше нельзя спамить с помощью емага.
tweak: Перерисована капсула нанофраста.
tweak: Капсула нанофраста теперь вращается при запуске.
add: Добавлены три новых типа книжных шкафов: металлические (крафтятся), металлические NT и из пластали (крафтятся).
imageadd: Обновлены спрайты деревянного книжного шкафа.
fix: Исправлено исчезновение ножен меча при нажатии на них с телекинезом.
fix: Исправлен спрайт электрически заряжённой руки.
imageadd: Добавлены новые спрайты для портативного монитора экипажа, анализатора машин и интерфейса контрактника.
fix: Исправлена проблема, из-за которой MedHUD из Rod of Asclepius терялся при надевании и снятии других очков MedHUD.
imageadd: Добавлены новые спрайты для деревянного шкафа.
tweak: Подробное описание при двойном осмотре объектов теперь более заметно.
tweak: Двойной осмотр объектов без подробного описания теперь выводит стандартное сообщение осмотра.
imageadd: Перерисованы иконки инженерного и сервисного модулей в выборе модулей киборга.
fix: Торговые автоматы теперь используют TGUI окна ввода.
tweak: Всё защитное снаряжение и очки теперь доступны детективу в меню лодаута.
add: Добавлен новый режим игры: Динамический. Похож на Триаду, но может добавлять всех, некоторых или ни одного антагониста.
del: Большинство режимов игры с предателями, вампирами и генокрадами заменены на Динамический.
/:cl:
Summary by Sourcery
Update camera control code, add mantis blades, improve atmospherics and vent pump processing, add dynamic gamemode, and make various fixes and improvements.
New Features:
Tests: