Upstream sync #2534
Merged
Upstream sync #2534
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
* box update * remove invalid
* Make AI overlay use vis1 I think this is what get_hear in 13 uses idk this shit is esoteric. vis1 is luminosity vis2 is line of sight. * boark
* Added codeword highlighting * Updated to support more codeword roles, color is set serverside * Review feedback * Change to a Component-based system using SessionSpecific * Tidied up CanGetState, set Access restrictions on component * Clean-up * Makes the injection ignore brackets, restore some codewords, remove "Taste/Touch" from adjectives
* first draft * Fixed it all, just need to rename stuff * Rename and add comments * Clean-up * Access added
changed reptile chest marking count to 3
initial comnit
* Fix the folded folding chair * Whoops
add new loot into vgroid procgen
* add space debris to salvage magnet * multiplication * necessary mercy for NPCs * back and forth on mercy
make snapCardinals false for the nanotrasen sign. Co-authored-by: Zachary Yona <[email protected]>
* Delete Resources/Textures/Structures/Wallmounts/signs.rsi/anomaly.png * Add files via upload
* Fixed Minor Mistake * Fixed the NEW sprite and added Jumpskirt Fix
…eam-sync # Conflicts: # Resources/Textures/Clothing/Uniforms/Jumpskirt/security.rsi/equipped-INNERCLOTHING.png # Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi/equipped-INNERCLOTHING.png
* Makes meteor swarms spawn meteorite walls with 1/10 health of an asteroid wall. * Changed MeteorRock prototype base - Rebased MeteorRock to AsteroidRock from Basewall - MeteorRock now only changes the Destructible damage value * Tried to fix comments
fix revenant being blocked by walls
* Fix broken tests directly mutating entities from wrong thread. * fix build * gundam * stuff --------- Co-authored-by: metalgearsloth <[email protected]>
* weh * Fix broken tests directly mutating entities from wrong thread. * fix build * gundam * weher * WHY --------- Co-authored-by: Pieter-Jan Briers <[email protected]>
Make suicide logs include the username, as well as the character(where possible)
more ItemTogglePointLight fixes
…minor rewrite on respawn command and new erase command (#30433) * Localize respawn command, allow for it to use userids, and make it use [Dependency] attributes * Make respawn verb available for offline players * Make erase available for offline players A thousand admins rejoice * Reorder verbs in code * Add erase command * Fix localisation for erase command * Address reviews and add completion to respawn command * Complete reviews which I forgor
Morb0
pushed a commit
that referenced
this pull request
Sep 1, 2024
Co-authored-by: lapatison <[email protected]> Co-authored-by: NotSoDamn <[email protected]> Co-authored-by: lzk <[email protected]>
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.
Описание PR
Медиа
Проверки
Изменения