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 24.12.2024 #908

Closed
wants to merge 117 commits into from
Closed

Conversation

AyIong
Copy link
Collaborator

@AyIong AyIong commented Dec 24, 2024

Что этот PR делает

Мерге апстрим, кокфликтов не было, кек

Deadgebert and others added 30 commits December 20, 2024 13:05
…gstation#88542)

## About The Pull Request

The amount of synthflesh required to unhusk now changes based on the
purity of synthflesh
60u for 100% purity, 80u for 75% purity, 100u for 60% purity and below.

## Why It's Good For The Game

Encourages people to interact with the purity system a bit more. Most of
the time, players only use synthflesh for unhusking with no regard for
the purity of the chem.

## Changelog

:cl:
balance: Synthflesh required for unhusking now between 60u and 100u
depending on purity.
/:cl:

---------

Co-authored-by: SyncIt21 <[email protected]>
## About The Pull Request

Add `UNIQUE_RENAME` flag to binary devices (pumps, valves, etc.) so you
can rename them with a pen. Add a check to
`/obj/machinery/atmospherics/update_name` to accommodate this.

## Why It's Good For The Game

On a lot of maps the roundstart atmos pumps are labelled and if you end
up swapping them you lose that. Also sometimes you just want to label
your inscrutable atmos setup and while you can use a hand labeller it's
kind of ugly.

## Changelog

:cl:
qol: Atmos devices like valves and pumps can now be renamed with a pen.
/:cl:
Stops sass from screaming about deprecated apis.
## About The Pull Request
- Fixes tgstation#87235

Nested access levels after you unlock the crate for the 2nd time was too
much even for the captain to deal with

## Changelog
:cl:
fix: personal ordered crates can be unlocked & relocked as many times
again after the 1st attempt
/:cl:
## About The Pull Request

Closes tgstation#88592


![image](https://github.com/user-attachments/assets/adf09947-985b-48c8-8f08-e91dd02ffce3)

## Why It's Good For The Game
Map consistency, bartenders need it to do their job

## Changelog
:cl:
map: Added a Condi-Master to Birdshot's bar
/:cl:
…n#88598)

## About The Pull Request
- Fixes tgstation#87829

Ensures we can't enter invalid values that actually run timed in this
specific case

## Changelog
:cl:
fix: greyscale modify menu has better validation for player entered
colours
/:cl:
tgstation#88600)

## About The Pull Request

You can now wear shoes with digitigrade legs thanks to tgstation#88096, but UI
slots weren't informed of this change.

## Changelog
:cl:
fix: Fixed shoes slot being semi-transparent when you have digitigrade
legs
/:cl:
## About The Pull Request

Nitroglycerin heals heart damage when metabolized

## Why It's Good For The Game

- I thought it'd be a fun nod to one of the actual uses of
Nitroglycerin.
- "Plausible Deniability" to chemists making Nitroglycerin. 
- Adds more niche chem effects to the ecosystem chemists may experiment
with.

## Changelog

:cl: Melbert
add: Nitroglycerin now heals heart damage.
/:cl:
## About The Pull Request
Teleporter code is at least +15 years old. This no longer applies.

## Why It's Good For The Game
Accuracy.

## Changelog
:cl:
spellcheck: Update teleporter machine desc to be accurate
/:cl:
## About The Pull Request
- Fixes tgstation#88103

## Changelog
:cl:
fix: fixed runtime when sealing mecha cabin with air tank installed
/:cl:
## About The Pull Request

There were two variables mixed up. It was `SEND_SOUND(holder,
radio_noise)`, though it should be `SEND_SOUND(holder, radio_receive)`.
Now everything is in place
And also added `COOLDOWN_START(src, audio_cooldown, 0.5 SECONDS)` so
that you don't hear two sounds at the same time when you talk into the
radio

<details>
<summary>Screenshots/Videos</summary>


https://github.com/user-attachments/assets/1afc1b36-4b6e-41d0-825d-aab6d9bdf694

</details>

## Why It's Good For The Game

it's just a code issue
## Changelog
:cl:
fix: fix radio sound output when receiving a message
sound: the sound of receiving your own messages over the radio is no
longer played
/:cl:
…gstation#88608)

## About The Pull Request
- if an explosion epicenter is not on a station area, then it will not
screen shake all mobs on the z level if it was really far
## Why It's Good For The Game
- why should a bomb from 100 tiles away screenshake the entire z level?
- players have brought up their annoyance with icebox gitbtonite shaking
the entire z level every time one explodes.
## Changelog
:cl: grungussuss
del: screenshake from explosions will no longer happen when it's really
far and not on a station area (turf)
/:cl:
## About The Pull Request
`5 SECONDS` instead of `50`

## Why It's Good For The Game
Better code.

## Changelog
:cl:
code: Improved teleporter SECONDS defines
/:cl:
## About The Pull Request
Apparently adding a tiny coffee machine worth of power to make this
accurate:

`to_chat(user, span_warning("You vastly increase projector power and
override the safety and security protocols."))`

was too much. So let's just do a grammar tweak to fix it.

Is 

## Why It's Good For The Game
Accurate descriptions.

## Changelog
:cl:
spellcheck: Fix holodeck emag message claiming to increase power
/:cl:
## About The Pull Request

This makes it so leeching walk and ascended rust heretic healing effects
(the healing that occurs during life ticks) have the healing amount
multiplied by `DELTA_WORLD_TIME(SSmobs)`, to compensate for
skipped/delayed fires.

## Why It's Good For The Game

Delays in SSmobs firing (i.e explosions pausing all non-ticker
subsystems) can very easily get you killed if you're relying on the rust
heretic healing mid-combat.

## Changelog
:cl:
qol: Rust heretic healing (leeching walk, rust ascension) now, so server
lag shouldn't fuck you over nearly as much if you're relying on the
healing.
/:cl:
…ow!" (tgstation#88610)

## About The Pull Request

Made bioscrabmle() proc's armor check silent and moved text from a
successful block into its early return.

## Why It's Good For The Game

Less than 100 protection from bioscramblers doesn't do anything, so text
about "armor softening the blow" is nonsensical, both as there is no
blow to soften, and as armor below 100 doesn't actually do anything. A
bit of a nitpick, but its been annoying me to all hell every time I
encounter one (as RD's coat provides some protection). Only other source
of BIO armor checks is Phazon, but the text makes sense there and
nothing runs armor checks against FIRE and ACID, so there's nothing else
to fix.

## Changelog
:cl:
spellcheck: Bioscrambler no longer informs you about "your armor
softening the blow!"
/:cl:
tgstation-ci bot and others added 21 commits December 24, 2024 17:02
## About The Pull Request

Port of ParadiseSS13/Paradise#27676 and
VOREStation/VOREStation#16734

> Instead of relying on `is-disabled` and `is-visible`, which BYOND
happily will automatically change for you whenever you send a client
text, we now use a Child element to swap between the legacy output and
browser output in separate preset panes.
> 
> TL;DR: chat would flash white under 516, now doesn't

I cleared cache before each test video below, just to be 100% sure

<details>
<summary>Testing Evidence: BYOND 515</summary>


https://github.com/user-attachments/assets/8d661cc3-585e-4f8e-9399-76df8bc0a281

</details>

<details>
<summary>Testing Evidence: BYOND 516</summary>


https://github.com/user-attachments/assets/c0d31fb4-6ef5-4d49-81a8-c767c5e24cc2

</details>

## Why It's Good For The Game

flickering chat hurts my eyes

## Changelog
:cl: Absolucy, ShadowLarkens, S34N
fix: Fixed chat rapidly flickering in BYOND 516.
/:cl:
)

## About The Pull Request
Maked `fieldset_block` and `examine_block` more stylish and neat, also
`fieldset_block` no longer has a centred title.
Renamed `examine_block` to `boxed_message` and adds
`custom_boxed_message` which can be colored.

- AdminPMs, admin tickets and vote results has been wrapped into
`fieldset_block` for comfort and visibility
- Health Analyzer results painted to blue
- Vote notice and tips of the round wrapped to purple
`custom_boxed_message`
- Tooltip text border color, now uses text color, not just white

## Why It's Good For The Game
Demonstration in both themes

<details><summary>Dark</summary>


![image](https://github.com/user-attachments/assets/7175379b-b053-4fb7-bd25-65c744a21c56)

![image](https://github.com/user-attachments/assets/1728e72b-0110-4b81-9d61-8779f5fdc3a0)

![image](https://github.com/user-attachments/assets/5e6f9604-35b8-4840-b6b4-35a68f49a997)

</details>

<details><summary>Light</summary>


![image](https://github.com/user-attachments/assets/6a3d693b-e0dc-4a4b-b4d7-2ded54ce0d67)

![image](https://github.com/user-attachments/assets/c4f5e089-180f-4d13-806a-fa64f01740a3)

![image](https://github.com/user-attachments/assets/a46d52c4-ad37-4637-8cae-c4b00139efc1)

</details>

## Changelog

:cl:
qol: AdminPMs, admin tickets, vote results and started vote notification
are now much more visible in the chat.
qol: Boxed messages in chat (like examine), has been restyled.
/:cl:
## About The Pull Request
Implements Edge DevTools for 516 users (coders)
Thanks to [S34N](ParadiseSS13/Paradise#25363)

<details><summary>Images</summary>


![image](https://github.com/user-attachments/assets/9025d45a-a1be-4e95-b1ee-4adfb29d687e)

![image](https://github.com/user-attachments/assets/abe1b936-9fb5-4001-8f21-cbeeb62def45)

</details>

---------

Co-authored-by: AnturK <[email protected]>
## About The Pull Request

Was just scrolling through the Paradise github since they seem to have
more work done for 516 to see if there's anything I can port over, found
this and thought why not.

Ports parts of ParadiseSS13/Paradise#25105
Specifically, updaing all hrefs to use the internal ``byond://``, and
adding it to grep.

## Why It's Good For The Game

More work towards 516.

## Changelog

Nothing player-facing.
@github-actions github-actions bot added TGUI Добавление или изменение существующего интерфейса на базе фреймворка TGUI 🔉 Звук Нам скорее всего нравится как это звучит. 🖌️ Спрайты Вы заработали свою миска-рис и кошко-жена. Партия гордится вами! 🗺️ Изменение Карты В этом ПРе затронут файл не станционной карты. Может и не один. 🎸 Инструменты Мы выдаем себя за реальное сообщество разработчиков. 🙏 Слияние с восходящим потоком О великий восходящий поток, спасибо что приносишь нам свои дары контента и багфиксов labels Dec 24, 2024
@Gaxeer
Copy link
Collaborator

Gaxeer commented Dec 25, 2024

не из той ветки сделал, негодяй!

@Gaxeer Gaxeer closed this Dec 25, 2024
@AyIong AyIong deleted the merge-upstream branch January 3, 2025 16:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
🎸 Инструменты Мы выдаем себя за реальное сообщество разработчиков. 🖌️ Спрайты Вы заработали свою миска-рис и кошко-жена. Партия гордится вами! 🙏 Слияние с восходящим потоком О великий восходящий поток, спасибо что приносишь нам свои дары контента и багфиксов 🔉 Звук Нам скорее всего нравится как это звучит. TGUI Добавление или изменение существующего интерфейса на базе фреймворка TGUI 🗺️ Изменение Карты В этом ПРе затронут файл не станционной карты. Может и не один.
Projects
None yet
Development

Successfully merging this pull request may close these issues.