-
Notifications
You must be signed in to change notification settings - Fork 130
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
Conversation
…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
Signed-off-by: Charlie Nolan <[email protected]>
* 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>
Signed-off-by: Charlie Nolan <[email protected]>
Co-authored-by: Toastical <[email protected]>
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]>
* yes * undo * switching to paralyze
) * 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]>
Reviewer's Guide by SourceryThis 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 effectssequenceDiagram
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
Class diagram for rust element systemclassDiagram
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"
State diagram for camera flash systemstateDiagram-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
}
File-Level Changes
Tips and commandsInteracting with Sourcery
Customizing Your ExperienceAccess your dashboard to:
Getting Help
|
There was a problem hiding this 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!
!build_rust |
!build_rust |
!build_rust |
This pull request merges upstream/master. Resolve possible conflicts manually and make sure all the changes are applied correctly.
Note
Requires Wiki Update:
www.github.com/ParadiseSS13/Paradise/pull/27857
www.github.com/ParadiseSS13/Paradise/pull/27927
www.github.com/ParadiseSS13/Paradise/pull/27897
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: