Merge upstream #973
Merged
Merge upstream #973
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
(cherry picked from commit 87c89ea)
Syringe requires hands and breaks on change Co-authored-by: Plykiya <plykiya@protonmail.com> (cherry picked from commit 17b80ba)
* Delete Resources/Textures/Objects/Vehicles/atv.rsi/vehicle.png * Add files via upload * Delete Resources/Textures/Objects/Vehicles/atv.rsi/Vehicle.png.png * Add files via upload * Update meta.json * Update meta.json * . (cherry picked from commit cef8a17)
(cherry picked from commit 90063db)
(cherry picked from commit 2033dd0)
(cherry picked from commit 8d08284)
* Minor lawdrobe changes * Updates to advertisements, thank you messages, and emaged / contraband inventory * Removed the 9th lawdrobe advertisement as it was unused * Removed soap --------- Co-authored-by: beck <beck3629@uw.edu> (cherry picked from commit 4b35946)
(cherry picked from commit 5252057)
* veganmeatball * testedthis * moreplant (cherry picked from commit 5f61380)
(cherry picked from commit 7b7b864)
* fourteenloko * inverse (cherry picked from commit a846966)
(cherry picked from commit 15a431b)
* Buff zombie resists Tweaks zombies to be tankier but still have a similar damage grouping for a specific weakness * Removed unnecessary values of 1 (cherry picked from commit 0000f1b)
(cherry picked from commit 937238f)
Atmospherics thermomachines now properly invalidate tiles they add heat to. (cherry picked from commit 1e62e44)
* Update thief.yml * Update stealTargetGroups.yml * Update objectiveGroups.yml * Update pets.yml (cherry picked from commit faed7a3)
(cherry picked from commit dd79536)
scissors uplink catalog localization and just catalog update, with adding scissors to the chameleon set (cherry picked from commit 7af183e)
(cherry picked from commit 4638170)
let there be air air time (cherry picked from commit 24fd1a9)
(cherry picked from commit 3c82e00)
* fix * Remove stripes * empty (cherry picked from commit 2a5be69)
made a new nukie song lel. (cherry picked from commit 806c0d1)
* Remove unecessary prototypes * Put unecessary prototypes in migration.yml (cherry picked from commit dbc27b5)
(cherry picked from commit 1a1bdec)
- every category of type "cargoProduct" was edited to "cargoproduct-category-name-{categoryName}"
- file "cargoproduct-categories.ftl" was added to english localization to localize categories of cargoProduct
- CargoConsoleMenu.xaml.cs got tweaks which prevent issues with strings comparisons
(cherry picked from commit 6e38b99)
…en bounds are exceeded (#25939) (cherry picked from commit 08e1b79)
* Remove unnecessary datafield names, syringes with stuff in them start in inject mode * No trash tag * Remove ViewVariables since DataField has them implicitly * Revert "No trash tag" This reverts commit 2c42172653d2cc70d58bd5bedf61a880b939bf20. * Get rid of tags entirely for PrefilledSyringes --------- Co-authored-by: Plykiya <plykiya@protonmail.com> (cherry picked from commit 5cb48c9)
(cherry picked from commit 3f32fa8)
* Add a toggle for progress bar colors * yeah this thing * PJB review * optimization (cherry picked from commit f3f4616)
(cherry picked from commit 677fd3c)
* Backpacks * move to wearables * Update Resources/Prototypes/Catalog/uplink_catalog.yml * Update Resources/Prototypes/Entities/Clothing/Back/backpacks.yml --------- Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> (cherry picked from commit 1d72d07)
(cherry picked from commit 209846b)
* rework * update logic (cherry picked from commit c35ff87)
bombening (cherry picked from commit 90be67e)
* Kill the static InRangeUnOccluded * Adjusted 4 more EntitySystems that were missed. (cherry picked from commit 7d275a4)
(cherry picked from commit f259f2f)
I love code!!11!!!1!
github-actions
bot
added
S: Needs Review
Changes: C#
|
Deepfryer is broken |
|
So is mail, will require some additional work before this can be merged |
|
All issues fixed:tm: |
LaryNevesPR
pushed a commit
to LaryNevesPR/Estacao-Andromeda
that referenced
this pull request
Jan 3, 2025
# Description Part of the important gameplay loop for engineering is that they're supposed to be repairing the station when shit breaks it, so the ImmovableRod event is a key part of the game. However, it was currently commented out because people didn't like it gibbing characters with no reactability? Well news flash for people, there's a datafield for that. I can also directly control how much damage it deals. So in exchange for uncommenting the Immovable Rod event, I've set the immovable rod spawned to be a little fairer for players, while still being able to cause damage to the station that will require repairs(And also expose players to vacuum. So that it puts them in danger. # Changelog :cl: - add: Immovable Rod Event has returned - add: Immovable Rod Event has been made more fair. It won't automatically gib people, just crit them with a ton of blunt damage(That you can survive by wearing good armor), or just being an Oni funnily enough.
LaryNevesPR
pushed a commit
to LaryNevesPR/Estacao-Andromeda
that referenced
this pull request
Jan 3, 2025
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.
About the PR
Yaml linter passed locally, still need to do some additional testing
TODO:
Changelog
🆑