Upstream sync #531
Merged
Upstream sync #531
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
* Prep for DoorRemote Status * Door Remote Mode Messages * plural opens and closes * never trust webedits --------- Co-authored-by: Plykiya <[email protected]>
* remove rped * trol --------- Co-authored-by: deltanedas <@deltanedas:kde.org>
- Fix text drawing being offset. - Fix beacon snapping and distance check. - Fix DrawData being offset. - Fix bounds check for map objects not using PixelSize.
Fix puller not being improperly unset on PullableComponent while being unpulled. When unpulled, the pullableComp has its puller field set to null after the message signifying the pulling has stopped has been sent. Since the component has a field to determine whether its owner is being pulled which is determined by the puller field, systems listening on the event would think that the owner of the component was still being pulled.
replace ig
* GetGrid * GridExists * TryGetGrid
Insul Chance
Update drinks.yml Why would this need to be 2+2=4 when 1+1=2 is the more logical reaction?
* Added verb action to Glue/Lube system * Changes based on feedback * Fix TryGlue/Lube to use Entity<> rather than EntityUid, Component
Are you kidding me EFCore doesn't sanitize this itself?
- Fix the free node check considering the whole tile and not the poly. - Clear maps on direction resets. - More robust arrival checks for pathfinding nodes.
* g * a * jetpak
Co-authored-by: wrexbe <[email protected]>
* add * rename * change damage type and lower price * 6 tc * fix? * missed listing * Update Resources/Textures/Objects/Storage/boxes.rsi/meta.json * Update Resources/Textures/Objects/Storage/boxes.rsi/meta.json * Update Resources/Textures/Objects/Storage/boxes.rsi/meta.json --------- Co-authored-by: metalgearsloth <[email protected]>
PuroSlavKing
added a commit
that referenced
this pull request
Sep 16, 2024
* Plushie Update! (#654) <!-- 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 --> <!-- 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]? --> By multiple requests i bring my PR from Frontier The [PLUSHIE UPDATE!](new-frontiers-14/frontier-station-14#886) This PR add a prize vendor machine where you can trade prize ticket for a toy/plushie, to get ticket you win those in arcade machines. This PR will give a chance for everyone to get the toys they need in a special machine and will make plushies in general more random and fun, in term of random spawns. WARNING THIS PR DOES NOT MAP THE PRIZE VENDOR AND WILL MOSTLY NEED TO BE MAPPED. --- <!-- 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 --> - [x] Prize Vendor - [x] Prize Tickets - [x] New Toys/Plushies - [x] Prizes --- <!-- 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> --- <!-- 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: - add: A ton of new plushies has arrived - add: Prize counter are here, get your prizes by winning games and getting prize tickets! and find prize balls!! * prize counter to spawner * Arachne Plushie (#531) Added everyone's favorite Arachne as an adorable soft toy --- - [x] Place plushie in spawn location(s) --- <details><summary><h1>Media</h1></summary> <p>  </p> </details> --- :cl: - add: Plushie * ooopsie --------- Co-authored-by: FoxxoTrystan <[email protected]> Co-authored-by: CodedCrow <[email protected]>
PuroSlavKing
added a commit
that referenced
this pull request
Sep 16, 2024
* [Port] Xenowears (#12) * Xenowears (#519) <!-- 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 --> <!-- 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]? --> Add a bit of clothing specie related and some tiny misc changes. Normally i wanted to add the spooders changes here but with the other spider specie coming in il hold myself for now. --- <!-- 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 --> - [x] Add clothings - [x] Loadouts/Vending machines --- <!-- 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> --- <!-- 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: - add: Xenowears! new non-human related clothings. --------- Signed-off-by: FoxxoTrystan <[email protected]> Co-authored-by: DEATHB4DEFEAT <[email protected]> Co-authored-by: VMSolidus <[email protected]> * ooopsie --------- Signed-off-by: FoxxoTrystan <[email protected]> Co-authored-by: FoxxoTrystan <[email protected]> Co-authored-by: DEATHB4DEFEAT <[email protected]> Co-authored-by: VMSolidus <[email protected]> * [Port] Plushie (#11) * Plushie Update! (#654) <!-- 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 --> <!-- 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]? --> By multiple requests i bring my PR from Frontier The [PLUSHIE UPDATE!](new-frontiers-14/frontier-station-14#886) This PR add a prize vendor machine where you can trade prize ticket for a toy/plushie, to get ticket you win those in arcade machines. This PR will give a chance for everyone to get the toys they need in a special machine and will make plushies in general more random and fun, in term of random spawns. WARNING THIS PR DOES NOT MAP THE PRIZE VENDOR AND WILL MOSTLY NEED TO BE MAPPED. --- <!-- 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 --> - [x] Prize Vendor - [x] Prize Tickets - [x] New Toys/Plushies - [x] Prizes --- <!-- 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> --- <!-- 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: - add: A ton of new plushies has arrived - add: Prize counter are here, get your prizes by winning games and getting prize tickets! and find prize balls!! * prize counter to spawner * Arachne Plushie (#531) Added everyone's favorite Arachne as an adorable soft toy --- - [x] Place plushie in spawn location(s) --- <details><summary><h1>Media</h1></summary> <p>  </p> </details> --- :cl: - add: Plushie * ooopsie --------- Co-authored-by: FoxxoTrystan <[email protected]> Co-authored-by: CodedCrow <[email protected]> * [Fix] EE Migration (#14) * [Tweak] Add Einstein Engines Folders (#17) * [Tweak] EE Prototypes Folder * [Tweak] EE RU FTL * fix dublicate * yaml fixes --------- Signed-off-by: FoxxoTrystan <[email protected]> Co-authored-by: FoxxoTrystan <[email protected]> Co-authored-by: DEATHB4DEFEAT <[email protected]> Co-authored-by: VMSolidus <[email protected]> Co-authored-by: CodedCrow <[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.
No description provided.