Merge Upstream #4
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
# 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 <evilexecutive@gmail.com>
…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 <aiden@djkraz.com> Co-authored-by: VMSolidus <evilexecutive@gmail.com> Co-authored-by: DEATHB4DEFEAT <77995199+DEATHB4DEFEAT@users.noreply.github.com>
# 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 <aiden@djkraz.com> Co-authored-by: VMSolidus <evilexecutive@gmail.com> Co-authored-by: DEATHB4DEFEAT <77995199+DEATHB4DEFEAT@users.noreply.github.com>
…ngines into upstreammerge
|
RSI Diff Bot; head commit 456473c merging into 9b8f5ba Resources/Textures/Objects/Materials/materials.rsi
Resources/Textures/Objects/Materials/ore.rsi
|
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.
No description provided.