Merge Upstream 23.10.2024 #1609
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
* Datumize microbattery * comments + feedback when you're revivable * More comment * more datumization * Explaining myself * Being able to charge while not having a microbattery * Better comment Co-authored-by: 1080pCat <[email protected]> Signed-off-by: BiancaWilkson <[email protected]> * Changes proc name to be more accurate --------- Signed-off-by: BiancaWilkson <[email protected]> Co-authored-by: 1080pCat <[email protected]>
* Fix `image-rendering` method in Image component * Update tgui.bundle.js
Co-authored-by: [email protected] <[email protected]>
* fix: dupe corpse nullspace spawning * remove unused defines too
* Multiply by 2 * Moved the multiplication inside --------- Co-authored-by: Adrer <[email protected]>
* lint: forbid whitespace in empty list decls * Update tools/ci/check_grep2.py Co-authored-by: Contrabang <[email protected]> Signed-off-by: warriorstar-orion <[email protected]> * close enough to grab a bunch --------- Signed-off-by: warriorstar-orion <[email protected]> Co-authored-by: Contrabang <[email protected]>
* gdn pls * updates
… space (ParadiseSS13#27075) * better shuttle smoothing * also missed these * ghhh * pwease
) * destupifies beepsky / ed209s * make sure hands happen * Update code/modules/mob/living/carbon/human/human_defense.dm Co-authored-by: Luc <[email protected]> Signed-off-by: Qwertytoforty <[email protected]> * lewcs stuff --------- Signed-off-by: Qwertytoforty <[email protected]> Co-authored-by: Luc <[email protected]>
* refactor: Eliminate text access fields. * set script PR number * make diffstat delta exactly 0
* Better BSA beam sprite * Changed front_turf finding --------- Co-authored-by: Adrer <[email protected]>
…cessory edition. (ParadiseSS13#26927) * Init * adds functionality for hats to be placed on hats. * species sprites * Removes modsuit stuff * applies a bunch of suggestions from lewc * batched suggestions (1/2) Co-authored-by: Luc <[email protected]> Signed-off-by: Spaghetti-bit <[email protected]> * typecasts loop removes unnecessary length check uses forceMove * one more forgotten typecast * turn-around city 3 * turnaround city 3.1 * : -> . * removes if(length) * Applies suggestions from @lewcc --------- Signed-off-by: Spaghetti-bit <[email protected]> Co-authored-by: Luc <[email protected]>
* wip * some formatting and copying over UI * it compiles now * oops * Moves WATT_TICK_TO_JOULE to the power defines file. fixes UI * spelling and announcement fixes * Handle offsets for different directions * laser comes from the correct tile now * Added north and south sprites for the laser * Adjust offsets for north and south sprites * finished all north and south sprites * tgui rebuild. Also sprites and code begoon * Rebuild TGUI * put PTLs in maps * Repositions PTL room door in cyberiad * fix if spacing * undef and unundeffed define * Removed overlapping stuff in some maps * Actually makes the changes to metastation * Fixes more mapping stuff * Fix more unit test failures * unmirror multitile component grid * Fixes multitile * explosions no longer make a hole in the beam * This should fix it * Stray pipe begone! * Ok I think I fiigured it out * Rebuild Tgui * removes redundant removals of components parts and a redundant check. various style fixes * Adds blocking to the beam and objects other than living beings take damage now. * not using kwargs now. should work. * Style changes and fixes some mobs getting hit by the laser that shouldn't be. * Review changes and fixes trying to access wall turf's location. * allow the new wall turf to form to we can properly access it. * Moves the ptl beam effect to an atom proc that is overriden by the different types of things that can end up in the beam. * Fixes some comments, adds clarifications, removes redundant usage of src * moves the announcement threshold to a global var. Fixes ghost interaction. * Revert "moves the announcement threshold to a global var. Fixes ghost interaction." This reverts commit 7916ee7. * Makes announcement threshold a static variable of the PTL * power safty check on the mob ptl function * Rebuild TGUI
* wip test 1 * sprites * code added * vendors and locker spawns set * added to prisoner locker * accidental deletion * sprite fix * Update code/modules/clothing/under/color.dm Co-authored-by: Nathan Winters <[email protected]> Signed-off-by: Bm0n <[email protected]> * new kidan sprites * Update code/modules/clothing/under/color.dm Co-authored-by: Henri215 <[email protected]> Signed-off-by: Bm0n <[email protected]> * Update code/modules/clothing/under/color.dm Co-authored-by: Henri215 <[email protected]> Signed-off-by: Bm0n <[email protected]> --------- Signed-off-by: Bm0n <[email protected]> Co-authored-by: Bmon <[email protected]> Co-authored-by: Nathan Winters <[email protected]> Co-authored-by: Henri215 <[email protected]>
…as adds sounds to attaching stuff (ParadiseSS13#26945) * Fixes guns playing scredriver sounds when they shouldn't be * Update code/modules/projectiles/gun.dm Co-authored-by: Luc <[email protected]> Signed-off-by: 1080pCat <[email protected]> --------- Signed-off-by: 1080pCat <[email protected]> Co-authored-by: Luc <[email protected]>
…iseSS13#26954) * Added check to prevent appearance of shell count on speedcharger * Undo Added check to prevent appearance of shell count on speedcharger * Correct undo of edgecase check * Added proc override for update_desc() for speedcharger
…diseSS13#26953) * Added fax machines to admin room * Made GLOB.adminfaxes hold the received fax, instead of the original * Added an explicit return statement * Remove trailing newline in core/modules/paperwork/faxmachine.dm Co-authored-by: Luc <[email protected]> Signed-off-by: leoworm <[email protected]> --------- Signed-off-by: leoworm <[email protected]> Co-authored-by: Luc <[email protected]>
…6955) * I cast ORB THROW * Adds ran_zone * Lewc review
… Offsets (ParadiseSS13#26958) * Update trash.dm * Creation * Update ussp.dmm * Update trash.dm * Update code/game/objects/items/trash.dm Co-authored-by: Luc <[email protected]> Signed-off-by: CRUNCH <[email protected]> * Update trash_spawners.dm --------- Signed-off-by: CRUNCH <[email protected]> Co-authored-by: Luc <[email protected]>
* ert lore * vest changes * modsuit changes * suit changes * Update helmet.dm Co-authored-by: Silverplate <[email protected]> Signed-off-by: PopeDaveThe3th <[email protected]> * Update helmet.dm Co-authored-by: Silverplate <[email protected]> Signed-off-by: PopeDaveThe3th <[email protected]> * Update helmet.dm Co-authored-by: Silverplate <[email protected]> Signed-off-by: PopeDaveThe3th <[email protected]> * Update helmet.dm Co-authored-by: Silverplate <[email protected]> Signed-off-by: PopeDaveThe3th <[email protected]> * Update helmet.dm Co-authored-by: Silverplate <[email protected]> Signed-off-by: PopeDaveThe3th <[email protected]> * Update ert_hardsuits.dm Co-authored-by: Silverplate <[email protected]> Signed-off-by: PopeDaveThe3th <[email protected]> * Update ert_hardsuits.dm Co-authored-by: Silverplate <[email protected]> Signed-off-by: PopeDaveThe3th <[email protected]> * Update ert_hardsuits.dm Co-authored-by: Silverplate <[email protected]> Signed-off-by: PopeDaveThe3th <[email protected]> * Update ert_hardsuits.dm Co-authored-by: Silverplate <[email protected]> Signed-off-by: PopeDaveThe3th <[email protected]> * helm * naming * Update mod_theme.dm Co-authored-by: Gatchapod <[email protected]> Signed-off-by: PopeDaveThe3th <[email protected]> * capitalized * Update ert_hardsuits.dm * 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 armor_suits.dm --------- Signed-off-by: PopeDaveThe3th <[email protected]> Co-authored-by: Silverplate <[email protected]> Co-authored-by: Gatchapod <[email protected]> Co-authored-by: Henri215 <[email protected]>
* kidangloves * clothwrap
|
!build_milla |
github-actions
bot
added
Документация
|
Building MILLA failed, see the action run log for details: https://github.com/ss220club/Paradise-SS220/actions/runs/11474970807 |
1 similar comment
|
Building MILLA failed, see the action run log for details: https://github.com/ss220club/Paradise-SS220/actions/runs/11474970807 |
github-actions
bot
added
Кибериада
|
!build_rust |
|
Building Rust library failed, see the action run log for details: https://github.com/ss220club/Paradise-SS220/actions/runs/11475674349 |
|
Там надо будет skirt шмотки вырезать с модуля ParadiseSS13#26935 и полы, которые ты зачем то нам и туда закинул |
Полы нам закинул так как у нас модульные полы, и уже подчищенные |
так или иначе нам иконки с теми полами уже не нужны, там можно оставить путь до оффовских полов |
Это модуль огнетушителя в продвинутых и атмосовых МОДах теперь установлен на кнопочки быстрого доступа |
AyIong
force-pushed
the
merge-upstream
branch
from
f878173 to
b98d62a
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
🎸 Инструменты
Мы выдаем себя за реальное сообщество разработчиков.
Документация
Улучшения и дополнения в документации
🖌️ Спрайты
Вы заработали свою миска-рис и кошко-жена. Партия гордится вами!
🙏 Слияние с восходящим потоком
Боже, храни Короля!
📜 CL валиден
Этот чейнджлог будет успешно опубликован
TGUI
Кто-то решил потрогать интерфейсы.
Керберос
Этот ПР изменил что-то на Керберосе (DeltaStation)
Кибериада
Этот ПР изменил что-то на Кибериаде (BoxStation)
Цереброн
Этот ПР изменил что-то на Цереброне (MetaStation)
Документация
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.
Надо бы Rust ребилднуть
Changelog
🆑 ParadiseSS13
add: Плазмемы теперь могут надевать шляпу на шлем
add: Портированы юбки с TG
add: Спавнеры мусора теперь создают ещё и разные гильзы
tweak: Mining Vendor получил картинки в интерфейс
tweak: КПБ теперь получают уведомление когда могут воскреснуть
fix: КПБ могут войти в зарядник не имея микро-батарею
fix: Капканы решили что срабатывать на летающих людей не православно, и теперь снова срабатывают только по ходячим
tweak: Love pen теперь содержит Pax вместо любви и медленно восстанавливает этот реагент со временем. Короче, юзабельно + весело теперь (с) Сиротка
tweak: Mole crush СМа теперь генерирует аномалии
fix: PACMAN показывает оставшееся время точно
tweak: Suit Storage Unit теперь может хранить рюкзак
tweak: Ящик РнД с карго, теперь содержит компоненты для создания сервера РнД и его контроллера
fix: Позитронный мозг больше не будет предлагаться призракам если в нём уже есть игрок
fix: Секботы больше не будут пиздить труп игнорируя всё вокруг
fix: Секботы в режиме задержания, будут действительно задерживать людей. Вы больше не можете съебаться от него без сторонней помощи или антистана
tweak: Пушки теперь будут делать клик при навешивании фонарика/штыка
fix: Пушки больше не воспроизводят звук отвёртки когда не должны
tweak: Кристальный шар (scrying orb) наносит больше урона при броске, возвращается в руку и ломает конечности, в которые попадает
fix: Добавлен strong arm в протолат к остальным имплантам
fix: [АДМИН] Если дать кому-то цель на кусочек СМа или ядро с нюки, то этому кому-то будет выдан набор для выполнения цели
tweak: Закреплённые кнопки МОДа теперь показывает какой модуль активен
tweak: Модуль огнетушителя в продвинутых и атмосовых МОДах теперь может быть активирован через кнопку быстрого доступа
fix: N23 Rotary Janitation Launcher теперь можно прикрутить к меху уборщика
fix: Фейковые артефакты теперь выглядят в руках как настоящие
fix: Пластитановые окна теперь более устойчивы к способностям больших мобов, которые ломали их с одного удара
fix: Новостник теперь распознаёт карту внутри кошелька
tweak: Коробки с патронами для дробовика теперь вмещают 8 пуль вместо 7
imageadd: Коробки с патронами для дробовика получили респрайт
imageadd: Новый спрайт луча БСА
imageadd: Все перчатки подогнаны под новый спрайт киданов (У нас новый спрайт киданов откачен, временно)
imageadd: Респрайт ПДА by fridhelm1. Так же, магисрака, дефектив и самая бесполезная роль (НТР), получили свой собственный спрайт для ПДА
/:cl: