Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge Upstream 15.01.2025 #1746

Merged
merged 37 commits into from
Jan 15, 2025
Merged

Merge Upstream 15.01.2025 #1746

merged 37 commits into from
Jan 15, 2025

Conversation

ss220app[bot]
Copy link

@ss220app ss220app bot commented Jan 15, 2025

This pull request merges upstream/master. Resolve possible conflicts manually and make sure all the changes are applied correctly.

Changelog

🆑 ParadiseSS13
tweak: Администраторы теперь могут выдавать специальные законы ИИ и боргам при вызове Отряда смерти.
add: Камеры улучшены и теперь отображают освещение и тени на изображениях.
fix: Трава больше не отображается на фотографиях как парящая, показывая темноту под ней.
imageadd: Изменён спрайт ящика с рудой.
add: Добавлены подтяжки в ассортимент Autodrobe.
imageadd: Обновлён спрайт ветра, теперь он больше напоминает частицы пыли.
tweak: Командам ERT уровня Amber/Red добавлен Crew Pinpointer, команда Gamma получает NAD Pinpointer.
tweak: РЦД боргов теперь используют картриджи, РЦД боргов Синдиката изменения не затронули.
fix: Исправлены звуки взлома сейфов при ношении стетоскопа на шее.
add: Цели заданий теперь отображаются при появлении в раунде (в данный момент это касается Директора исследований, Робототехников, Учёных и Вирусолога).
fix: Перчатки для синтеза теперь корректно активируются.
fix: "His Grace" теперь навсегда получает свойство "nodrop" после Вознесения.
add: Добавлены хирургические подносы (зелёная коробка для инструментов) в рецепты из титана; для создания требуется один лист титана.
tweak: Хирургические подносы (перемещаемые зелёные столики) теперь называются "surgical instrument table".
tweak: Стоимость крафта столика хирургических инструментов увеличена с двух до трёх листов титана.
tweak: Обновлены спрайты Зеркала и Волшебного зеркала авторства atpengineer.
add: Ржавчина еретиков добавлена для Ревенантов.
add: Ржавчину теперь можно удалять с помощью сварочного аппарата.
add: На ржавых тайлах больше нельзя класть плитку или использовать РЦД.
fix: Исправлены отображения абстрактных предметов при осмотре моба.
tweak: Склад Синдиката получил несколько новых товаров для снабжения агентов в секторе.
tweak: Автохирурги на складе Синдиката стали слишком дорогими, поэтому теперь импланты требуют хирургической установки.
fix: Сообщение для администраторов при появлении SIT обновлено, учитывая инфляцию TC в 2023 году. Теперь вероятность выдачи слишком малого количества TC снижается. Упс.
fix: Больше нельзя блокировать огонь или голографические лучи.
imagedel: Дионы больше не имеют человеческих глаз поверх своих собственных.
tweak: Удалено неработающее меню выбора цвета глаз у слаймолюдей.
add: Добавлены новые эффекты галлюцинации в меданализаор и химсканер.
fix: Исправлены сообщения о времени взлома шкафа, которые отображали некорректную продолжительность.
/:cl:

Summary by Sourcery

Update cameras to display lighting and shadows, add suspenders to Autodrobe, update wind sprite to resemble dust particles, add surgical trays to titanium recipes, and resprite mirrors. Update job objectives display on spawn, fix various bugs related to safe cracking sounds, toilet labels, fusion gauntlets, and "His Grace" item. Introduce new rust sprites and mechanics, including removal with a welder and building restrictions on rusted tiles. Enhance medical and chemical scanners with hallucination effects, and fix breakout message times for lockers.

New Features:

  • New rust sprites and mechanics have been added. Rust can be removed with a welder, and you can no longer build on rusted tiles.
  • Medical and chemical scanners now have hallucination effects.
  • Admins can now choose whether to give AI and cyborgs Terminator laws when calling a Death Squad.
  • Cameras now display lighting and shadows in images.
  • Suspenders have been added to the Autodrobe.
  • The wind sprite has been updated to look more like dust particles.
  • Surgical trays have been added to the titanium recipes.
  • Mirrors have been resprited.
  • Job objectives are now displayed on spawn for Research Director, Roboticists, Scientists, and Virologist.

Drsmail and others added 30 commits January 12, 2025 18:47
…iseSS13#27663)

* 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 <[email protected]>
Signed-off-by: Drsmail <[email protected]>

* high-importance style text on laws update

Signed-off-by: Drsmail <[email protected]>

* Laws uppdate + sound

* Update sound to much much bette one, made by dj-34

* Removed old comment

Co-authored-by: Burzah <[email protected]>
Signed-off-by: Drsmail <[email protected]>

---------

Signed-off-by: Drsmail <[email protected]>
Co-authored-by: Christasmurf <[email protected]>
Co-authored-by: Luc <[email protected]>
Co-authored-by: Burzah <[email protected]>
* Now light is shown on photography

* Also fixed grass disposition on photos

* Fixes icon ordering

* Simplified atom sorting pipeline for captured atoms

* Applied review suggestions
* Ore Box Resprite

* Sprite touchups
<!-- By ticking or leaving ticked the option "Allow edits and access to secrets by maintainers" you give permission for repository maintainers to push changes to your branch without explicitly asking. -->

<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull request process. -->

## What Does This PR Do

<!-- Include a small to medium description of what your PR changes. -->
<!-- Document all changes, as not doing this may delay reviews or even discourage maintainers from merging your PR! -->
<!-- If your PR fixes an issue, add "Fixes #1234" somewhere in the PR description. This will automatically close the bug upon PR submission. -->

## Why It's Good For The Game

<!-- Add a short description of why you think these changes would benefit the game. If you can't justify it in words, it might not be worth adding. -->

## Images of changes

<!-- If you did not make a map or sprite edit, you may delete this section. You may include a gif or mp4 of your feature if you want. -->

## Testing

<!-- How did you test the PR, if at all? -->

<hr>

### Declaration

- [ ] I confirm that I either do not require [pre-approval](https://github.com/ParadiseSS13/Paradise/blob/master/docs/CODE_OF_CONDUCT.md#types-of-changes-that-need-approval) for this PR, or I have obtained such approval and have included a screenshot to demonstrate this below.
  <!-- Replace the box with [x] to mark as complete. -->
  <!-- Ensure there are no spaces between the x and the square brackets [] else this will not work properly. -->
<hr>

## Changelog

:cl:
add: Added new things
del: Removed old things
tweak: Tweaked a few things
fix: Fixed a few things
wip: Added a few works in progress
soundadd: Added a new sound thingy
sounddel: Removed an old sound thingy
imageadd: Added some icons and images
imagedel: Deleted some icons and images
spellcheck: Fixed a few typos
experiment: Added an experimental thingy
/:cl:

<!-- Both :cl:'s are required for the changelog to work! You can put your name to the right of the first :cl: if you want to overwrite your GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the icon ingame) and delete the unneeded ones. Despite some of the tags, changelogs should generally represent how a player might be affected by the changes rather than a summary of the PR's contents. -->
<!-- If a PR has no impact on players (i.e. a code refactor that does not change functionality) then the entire Changelog heading and contents can be removed. -->
* Resprites wind dust.

* pngcrush
* RCD nerf + migration

* Warrior review

* Fixes weird behaviour
* Make AI automated messages log more normally.

* Made it a bit more generic.

* Merge error.
* stethosco

* Update code/game/objects/structures/safe.dm

Co-authored-by: Contrabang <[email protected]>
Signed-off-by: Bm0n <[email protected]>

* Update code/game/objects/structures/safe.dm

Co-authored-by: Contrabang <[email protected]>
Signed-off-by: Bm0n <[email protected]>

---------

Signed-off-by: Bm0n <[email protected]>
Co-authored-by: Bmon <[email protected]>
Co-authored-by: Contrabang <[email protected]>
…e wheeled one (ParadiseSS13#27897)

* Adds surgical tray crafting recipe, renames and increases cost for the wheeled one

* Changes cost
* New Mirror Sprites by ATPEngineer

* Mirror Breaking code edits

* Update code/game/objects/structures/mirror.dm

Co-authored-by: Contrabang <[email protected]>
Signed-off-by: Tojo <[email protected]>

---------

Signed-off-by: Tojo <[email protected]>
Co-authored-by: Contrabang <[email protected]>
…heretic rust to revenants. (ParadiseSS13#27367)

* puts rust on hold

* fixes overlays

* defines it

* need this

* fuck

* never work on conflicts during a rpg

* continue work

* rust works
* fuck sorry

* Update code/modules/mob/living/carbon/examine.dm

Co-authored-by: DGamerL <[email protected]>
Signed-off-by: Qwertytoforty <[email protected]>

---------

Signed-off-by: Qwertytoforty <[email protected]>
Co-authored-by: DGamerL <[email protected]>
…eSS13#27398)

* depot spawner variety

* del: north star gloves (i forgot to), agent id

* remove autosurgeons
* This annoys me

* Almost forgot this
* To be TM'd

* mob dropdown fix

* Converts the remaining missing hrefs
* updates "Check New Players" verb

* bam
* Remove obscure reference.

* Build Rust library

---------

Co-authored-by: paradisess13[bot] <165046124+paradisess13[bot]@users.noreply.github.com>
Removed the human eyes layered on top of dionea, and removed the option to change the color of diona and slimepeople eyes.
…radiseSS13#27616)

* finally revenge on all those evil doctors

* Adds medical machinery to the hallucination list

* forgor

* spacing

* Update code/game/objects/items/devices/scanners.dm

Co-authored-by: Contrabang <[email protected]>
Signed-off-by: Luc <[email protected]>

* bbetter docs

* Improved health shuffle, add some other silly things for being dead

---------

Signed-off-by: Luc <[email protected]>
Signed-off-by: Burzah <[email protected]>
Co-authored-by: Contrabang <[email protected]>
Co-authored-by: Burzah <[email protected]>
)

* Fixes Locker breakout message

* Update code/game/objects/structures/crates_lockers/closets/secure/secure_closets.dm

Co-authored-by: Contrabang <[email protected]>
Signed-off-by: Burzah <[email protected]>

* Update code/game/objects/structures/crates_lockers/closets.dm

Co-authored-by: Contrabang <[email protected]>
Signed-off-by: Burzah <[email protected]>

* Apply suggestions from code review

Signed-off-by: Burzah <[email protected]>

---------

Signed-off-by: Burzah <[email protected]>
Co-authored-by: Contrabang <[email protected]>
@ss220app ss220app bot added the 📃 Требуется изменение WIKI Эти изменения необходимо внести на нашу WIKI. label Jan 15, 2025
Copy link

sourcery-ai bot commented Jan 15, 2025

Reviewer's Guide by Sourcery

This pull request merges the upstream/master branch, resolving conflicts and applying all changes. It includes a variety of tweaks, additions, and fixes across various game systems.

Sequence diagram for medical scanner hallucination effects

sequenceDiagram
    participant User as User
    participant Scanner as Medical Scanner
    participant Target as Scan Target
    participant Hallucination as Hallucination System

    User->>Scanner: Use scanner
    alt User is hallucinating
        Scanner->>Hallucination: Check for hallucination effects
        Hallucination->>Scanner: Apply random effects
        Scanner-->>User: Show altered scan results
        Note over Scanner,User: May show:
        Note over Scanner,User: - Wrong reagent amounts
        Note over Scanner,User: - Fake overdoses
        Note over Scanner,User: - Incorrect health values
    else Normal operation
        Scanner->>Target: Scan health status
        Target-->>Scanner: Return actual values
        Scanner-->>User: Show accurate results
    end
Loading

Class diagram for rust element system

classDiagram
    class datum_element_rust {
        +rust_overlay: image
        +Attach(atom/target)
        +Detach(atom/source)
        +handle_examine()
        +apply_rust_overlay()
        +welder_tool_act()
        +handle_tool_use()
        +on_interaction()
    }

    class datum_element_rust_heretic {
        +on_entered()
        +on_exited()
    }

    class obj_effect_glowing_rune {
        +Initialize()
    }

    datum_element_rust <|-- datum_element_rust_heretic
    datum_element_rust_heretic --> obj_effect_glowing_rune

    note for datum_element_rust "Base rust element that handles
rust overlays and interactions"
    note for datum_element_rust_heretic "Extended rust element with
special effects for heretics"
Loading

State diagram for camera flash system

stateDiagram-v2
    [*] --> FlashOff: Initialize
    FlashOff --> FlashOn: Toggle Flash
    FlashOn --> FlashOff: Toggle Flash

    state FlashOn {
        [*] --> Active
        Active: Light enabled
        Active: Full lighting in photos
    }

    state FlashOff {
        [*] --> Inactive
        Inactive: Light disabled
        Inactive: Ambient lighting in photos
    }
Loading

File-Level Changes

Change Details Files
Admins can now specify AI and cyborg laws when calling a Death Squad.
  • Added a prompt for admins to set AI and cyborg laws to Terminator when spawning a Death Squad.
code/modules/admin/verbs/deathsquad.dm
Cameras now render lighting and shadows, and grass no longer appears floating in photos.
  • Cameras now include lighting objects in photos.
  • Fixed grass appearing as floating in photographs.
code/modules/paperwork/photography.dm
Added new rust sprites and mechanics.
  • Added new rust sprites.
  • Rust can now be removed with a welder.
  • Rusted tiles prevent tile and RCD usage.
  • Added rust effects to walls and floors.
  • Added a rust status effect.
  • Updated mapping helpers for rust.
code/game/turfs/simulated/walls.dm
code/game/turfs/simulated/floor/misc_floor.dm
code/datums/status_effects/debuffs.dm
code/game/turfs/turf.dm
code/modules/mapping/mapping_helpers.dm
rust/src/milla/api.rs
code/datums/elements/rust_element.dm
Updated medical and chemscanners to display hallucination effects.
  • Medical and chemscanners now display hallucination effects.
code/game/objects/items/devices/scanners.dm
Updated Syndicate Depot items and prices.
  • Added new items to the Syndicate Depot.
  • Adjusted prices of existing items.
code/game/objects/effects/spawners/depot_spawners.dm
Updated RCD interaction to use new attack chain.
  • Updated RCD interaction to use the new attack chain.
code/game/objects/items/weapons/RCD.dm
Updated various item interactions and descriptions.
  • Fixed safe cracking sounds with stethoscope on neck.
  • His Grace now permanently has nodrop when ascended.
  • Fixed abstract items showing on mob examine.
  • Added surgical trays to titanium recipes.
  • Surgical trays are now called surgical instrument tables.
code/game/objects/structures/safe.dm
code/game/objects/items/his_grace.dm
code/modules/mob/living/carbon/examine.dm
code/game/objects/items/stacks/sheets/mineral.dm
code/game/objects/structures/tables_racks.dm
Updated job objectives display.
  • Job objectives are now displayed when spawning.
  • Updated description of the "Construct Additional Cyborgs" objective.
code/controllers/subsystem/SSjobs.dm
code/game/jobs/job_objectives/science.dm
Miscellaneous tweaks and fixes.
  • Added suspenders to Autodrobe.
  • Fixed pyro claws deployment with items in hands.
  • Fixed breakout messages for lockers.
  • Updated TC suggestion for infiltrator team.
  • Removed non-functional eye color menu for slimepeople.
  • Updated Diona eye color.
  • Added new hallucination effects.
code/game/machinery/vendors/generic_vendors.dm
code/game/objects/items/weapons/twohanded.dm
code/game/objects/structures/crates_lockers/closets.dm
code/game/objects/structures/crates_lockers/closets/secure/secure_closets.dm
code/game/turfs/simulated/floor/plating.dm
code/modules/admin/verbs/infiltratorteam_syndicate.dm
code/modules/client/preference/preferences.dm
code/modules/mob/living/carbon/carbon_emote.dm
code/modules/paperwork/silicon_photography.dm
code/modules/hallucinations/hallucinations.dm
code/modules/mob/living/carbon/human/species/diona_species.dm

Tips and commands

Interacting with Sourcery

  • Trigger a new review: Comment @sourcery-ai review on the pull request.
  • Continue discussions: Reply directly to Sourcery's review comments.
  • Generate a GitHub issue from a review comment: Ask Sourcery to create an
    issue from a review comment by replying to it.
  • Generate a pull request title: Write @sourcery-ai anywhere in the pull
    request title to generate a title at any time.
  • Generate a pull request summary: Write @sourcery-ai summary anywhere in
    the pull request body to generate a PR summary at any time. You can also use
    this command to specify where the summary should be inserted.

Customizing Your Experience

Access your dashboard to:

  • Enable or disable review features such as the Sourcery-generated pull request
    summary, the reviewer's guide, and others.
  • Change the review language.
  • Add, remove or edit custom review instructions.
  • Adjust other review settings.

Getting Help

@github-actions github-actions bot added 🗺️ Изменение Карты В этом ПРе затронут файл не станционной карты. Может и не один. 🔉 Звук Услада для ушей. 🖌️ Спрайты Вы заработали свою миска-рис и кошко-жена. Партия гордится вами! 🎸 Инструменты Мы выдаем себя за реальное сообщество разработчиков. 🙏 Слияние с восходящим потоком Боже, храни Короля! Merge Conflict Ну блять... labels Jan 15, 2025
Copy link

@sourcery-ai sourcery-ai bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We have skipped reviewing this pull request. It seems to have been created by a bot (hey, ss220app[bot]!). We assume it knows what it's doing!

@ss220app ss220app bot added the 📜 CL валиден Этот чейнджлог будет успешно опубликован label Jan 15, 2025
@AyIong
Copy link
Collaborator

AyIong commented Jan 15, 2025

!build_rust

@AyIong
Copy link
Collaborator

AyIong commented Jan 15, 2025

!build_rust

@github-actions github-actions bot removed the Merge Conflict Ну блять... label Jan 15, 2025
@AyIong
Copy link
Collaborator

AyIong commented Jan 15, 2025

!build_rust

@Legendaxe Legendaxe merged commit 94917e0 into master Jan 15, 2025
19 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
🎸 Инструменты Мы выдаем себя за реальное сообщество разработчиков. 📃 Требуется изменение WIKI Эти изменения необходимо внести на нашу WIKI. 🖌️ Спрайты Вы заработали свою миска-рис и кошко-жена. Партия гордится вами! 🙏 Слияние с восходящим потоком Боже, храни Короля! 📜 CL валиден Этот чейнджлог будет успешно опубликован 🔉 Звук Услада для ушей. 🗺️ Изменение Карты В этом ПРе затронут файл не станционной карты. Может и не один.
Projects
None yet
Development

Successfully merging this pull request may close these issues.