Апстрим #323
Merged
Апстрим #323
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
# Description Picked 400 commits (and skipped many, many more) from WizDen since #540. Stopped at commit 332f54a3aebe669f6e50d26e7b047f0bdc28e0fb (Lobby Refactor). --- # TODO - [x] Pick - [x] Compile - [x] Fix runtime errors - [ ] Fix up humanoid profile editor - [ ] Test everything --- # Changelog :cl: - add: Merged 400 WizDen PRs. Happy testing! --------- Co-authored-by: Plykiya <[email protected]> Co-authored-by: FungiFellow <[email protected]> Co-authored-by: osjarw <[email protected]> Co-authored-by: Ubaser <[email protected]> Co-authored-by: beck-thompson <[email protected]> Co-authored-by: Leon Friedrich <[email protected]> Co-authored-by: Magnus Larsen <[email protected]> Co-authored-by: Hanz <[email protected]> Co-authored-by: Kukutis96513 <[email protected]> Co-authored-by: potato1234_x <[email protected]> Co-authored-by: Gotimanga <[email protected]> Co-authored-by: Mangohydra <[email protected]> Co-authored-by: TsjipTsjip <[email protected]> Co-authored-by: lzk <[email protected]> Co-authored-by: SlamBamActionman <[email protected]> Co-authored-by: Morb <[email protected]> Co-authored-by: MilenVolf <[email protected]> Co-authored-by: KrasnoshchekovPavel <[email protected]> Co-authored-by: metalgearsloth <[email protected]> Co-authored-by: Nemanja <[email protected]> Co-authored-by: DrSmugleaf <[email protected]> Co-authored-by: Ed <[email protected]> Co-authored-by: KittenColony <[email protected]> Co-authored-by: ShadowCommander <[email protected]> Co-authored-by: Mr. 27 <[email protected]> Co-authored-by: T-Stalker <[email protected]> Co-authored-by: ERROR404 <[email protected]> Co-authored-by: Errant <[email protected]> Co-authored-by: Jezithyr <[email protected]> Co-authored-by: Psychpsyo <[email protected]> Co-authored-by: no <[email protected]> Co-authored-by: K-Dynamic <[email protected]> Co-authored-by: Ciac32 <[email protected]> Co-authored-by: deltanedas <[email protected]> Co-authored-by: NotSoDana <[email protected]> Co-authored-by: Simon <[email protected]> Co-authored-by: Repo <[email protected]> Co-authored-by: Tayrtahn <[email protected]> Co-authored-by: nao fujiwara <[email protected]> Co-authored-by: Michael <[email protected]> Co-authored-by: Vasilis <[email protected]> Co-authored-by: Lamrr <[email protected]> Co-authored-by: slarticodefast <[email protected]> Co-authored-by: Jay <[email protected]> Co-authored-by: Just-a-Unity-Dev <[email protected]> Co-authored-by: nikthechampiongr <[email protected]> Co-authored-by: Flareguy <[email protected]> Co-authored-by: Tyzemol <[email protected]> Co-authored-by: Alzore <[email protected]> Co-authored-by: Pok <[email protected]> Co-authored-by: RumiTiger <[email protected]> Co-authored-by: Verm <[email protected]> Co-authored-by: Pieter-Jan Briers <[email protected]> Co-authored-by: Killerqu00 <[email protected]> Co-authored-by: Ty Ashley <[email protected]> Co-authored-by: exincore <[email protected]> Co-authored-by: 0x6273 <[email protected]> Co-authored-by: Kara <[email protected]> Co-authored-by: Ygg01 <[email protected]> Co-authored-by: Łukasz Mędrek <[email protected]> Co-authored-by: Hannah Giovanna Dawson <[email protected]> Co-authored-by: TurboTracker <[email protected]> Co-authored-by: OnsenCapy <[email protected]> Co-authored-by: pigeonpeas <[email protected]> Co-authored-by: Cojoke <[email protected]> Co-authored-by: Tornado Tech <[email protected]> Co-authored-by: Rio <[email protected]> Co-authored-by: vorkathbruh <[email protected]> Co-authored-by: Sphiral <[email protected]> Co-authored-by: PrPleGoo <[email protected]> Co-authored-by: Moomoobeef <[email protected]> Co-authored-by: username <[email protected]> Co-authored-by: Boaz1111 <[email protected]> Co-authored-by: Джексон Миссиссиппи <[email protected]> Co-authored-by: Brandon Li <[email protected]> Co-authored-by: Jajsha <[email protected]> Co-authored-by: RiceMar1244 <[email protected]> Co-authored-by: IProduceWidgets <[email protected]> Co-authored-by: youtissoum <[email protected]> Co-authored-by: ike709 <[email protected]> Co-authored-by: icekot8 <[email protected]> Co-authored-by: keronshb <[email protected]> Co-authored-by: VMSolidus <[email protected]> Co-authored-by: Geekyhobo <[email protected]> Co-authored-by: FoxxoTrystan <[email protected]>
# Description Title Upstream cherry pick fucked it, this fixes it. --- <details><summary><h1>Media</h1></summary> <p> ### Before  ### After  </p> </details> --- # Changelog :cl: - fix: Reverse engineering machine UI works again.
# Description title --- # Media im lazy, imagine arachne but they arent big errors. --- # Changelog :cl: - fix: Arachne no longer turn into errors when they take damage
# Description Cocoon size is now based on the humanoids height/width, or the sprite scale/size. Also makes it so we aren't calling a command to change the scale. --- <details><summary><h1>Media</h1></summary> <p> ### Large Oni https://github.com/user-attachments/assets/c26f6b34-39f7-437c-af86-715185855aff ### Small Felinid https://github.com/user-attachments/assets/5a82affb-b8b7-4b79-aa39-37f5a7a2e35e ### Mouse https://github.com/user-attachments/assets/42d7b41e-7333-4052-a1d1-698ce337706e ### Dragon https://github.com/user-attachments/assets/210eab03-416c-4795-a384-9e502fe794a2 </p> </details> --- # Changelog :cl: - tweak: Cocoon sizing has been changed to reflect the size of the entity inside better.
<!-- This is a semi-strict format, you can add/remove sections as needed but the order/format should be kept the same Remove these comments before submitting --> # Description <!-- Explain this PR in as much detail as applicable Some example prompts to consider: How might this affect the game? The codebase? What might be some alternatives to this? How/Who does this benefit/hurt [the game/codebase]? --> This PR updates the Gax map, fixing some important things. --- # TODO <!-- A list of everything you have to do before this PR is "complete" You probably won't have to complete everything before merging but it's good to leave future references --> --- <!-- This is default collapsed, readers click to expand it and see all your media The PR media section can get very large at times, so this is a good way to keep it clean The title is written using HTML tags The title must be within the <summary> tags or you won't see it --> <details><summary><h1>Media</h1></summary> <p>  </p> </details> --- # Changelog <!-- You can add an author after the `:cl:` to change the name that appears in the changelog (ex: `:cl: Death`) Leaving it blank will default to your GitHub display name This includes all available types for the changelog --> :cl: - fix: Gax station: fixed arrivals being unable to dock due to meteor shielding and translated security camera names to English.
# Description Apparently the psionic power rolls were not including a D100 roll in the baseline, so people were getting new psionic powers waaaaaay slower than was intended. Also, makes late-join psions use the glimmer calculation. # Changelog :cl: - tweak: Psionic Rolls should now generate larger, random amounts of Potentia. This should make it a lot easier to obtain powers.
* Check for flavor text equality in profile. * Fix some characters being deleted from flavor text Sometimes the last few characters of the flavor text would get deleted. This fixes this issue. (cherry picked from commit 9f1d95e3353493f28d579b562de348a322312885) # Description This PR fixes some database issues present in The Wizmerge. # Changelog No changelog, this isn't player facing. --------- Co-authored-by: Pieter-Jan Briers <[email protected]> Co-authored-by: Evgencheg <[email protected]> Co-authored-by: beck-thompson <[email protected]> Co-authored-by: dffdff2423 <[email protected]>
# Description Crawling on tables was janky, if you stood up while crawling, or laid down while climbing, it would push you to the edge of the table and break. Solves #995 --- <details><summary><h1>Media</h1></summary> <p> https://github.com/user-attachments/assets/08aa0e22-0363-45d8-810f-c69f7a796d7c https://github.com/user-attachments/assets/5a31df3c-f01c-4500-94fb-f4beb3c6e007 </p> </details> --- # Changelog :cl: - fix: You can properly lay down and stand up on tables now. Co-authored-by: VMSolidus <[email protected]>
…g A Fixture (#1049) # Description Title Intended to stop players from making slender men type characters with height maxed and width at the minimum, and vice versa The ratio can be modified via the species' prototype Also fixes the issue of players being able to noclip because they're fixture has no radius by setting the Height and Width to the species default if none is provided. (technically this also fixes Urists always being as small as possible) Solves #865 #497 Partially resolves #995 --- <details><summary><h1>Media</h1></summary> <p> https://github.com/user-attachments/assets/1b3b32f1-5976-41f8-935b-7d53106e5452 </p> </details> --- # Changelog :cl: - tweak: Height and width are now constrained by each other. - fix: Humanoids can no longer phase through walls. --------- Signed-off-by: Aiden <[email protected]> Co-authored-by: VMSolidus <[email protected]> Co-authored-by: DEATHB4DEFEAT <[email protected]>
# Description Bluespace crystals would turn into ore when ejected from autolathe, lead me down a rabbit hole of issues with them. - fixes above mentioned - normality crystals dont appear as bluespace when inserted into lathes anymore - adds textures for ores and crystals (grey cuz its "normal" duh) - fixes glimmer drain using a DIFFERENT normality crystal that was made with chems - the old chem version now gives new normality crystals - add crafting recipes for bluespace parts (fixes not being able to reverse engineer them) Fixes #980 --- <details><summary><h1>Media</h1></summary> <p>  </p> </details> --- # Changelog :cl: - fix: Bluespace crystals now properly eject from lathes. - fix: Bluespace parts can be reverse engineered. --------- Signed-off-by: Aiden <[email protected]> Co-authored-by: VMSolidus <[email protected]> Co-authored-by: DEATHB4DEFEAT <[email protected]>
# Description There were some missing meta.json entries.
# Description This PR fixes the Singer trait, as well as the Harpy singing ability. As a bonus, the action button is no longer hardcoded to the species. # Changelog :cl: - fix: Fixed Harpy singing not opening the Midi Player.
# Description Fixes cleaning forensics off of an object being impossible unless it has a scent. Explained in the latest (to date) comment to #715. Also removes some unnecessarily duplicated code and inverts an if condition. # Changelog :cl: - fix: Soap once again can be used to clean evidence off.
# Description - Generalizes cocooning - Allows any mob to be cocooned - Cocoon bloodsucking moved to vampirism system - Any blood sucker can drink from cocoons - Vampirism no longer fails if bloodstream isn't normal blood, but gives a pop up - Vampirism `WebRequired` actually works in a way that makes sense - Adds cocooning and bloodsucker to all spider mobs + Arachnids resolves #978 --- # Changelog :cl: - tweak: All spiders, arachne, and arachnids can cocoon mobs, and drink their blood. --------- Co-authored-by: VMSolidus <[email protected]>
* fix orphaned storage grid pieces getting stuck to the cursor * instead of denying it, update it smartly # Description This cherry-picks space-wizards/space-station-14#27960 Which should fix our storage UI bugs. Co-authored-by: Nemanja <[email protected]>
# Description - Adjusts the "danger" status threshold in Air Alarms to 20 kPa, resulting in "warning" status at the expected 90 kPa. - Fixes the issue where air alarms had "danger" status at 20 kPa and "warning" status at 21 kPa --- # Changelog :cl: zelezniciar - fix: Fixes Air Alarms not entering danger/warning state when pressure is low --------- Co-authored-by: VMSolidus <[email protected]>
BL02DL
approved these changes
Nov 16, 2024
Farrellka-dev
force-pushed
the
upstream2
branch
from
5f84e9c to
edbf785
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Описание обновления:
Апстрим... Помогите....
Медиа
Проверки
Изменения
🆑 Farrellka