Upstream sync #2580
Merged
Upstream sync #2580
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
* fland update * ore boxes cuz tstalker wantrs them
* marathon update * ore boxes for tstalker
* bagel update * bagel update
* Station AI has their name displayed in announcements now. * I'm so sorry * Corrections * part 2 * part 3 :| * part 4 * Whitespace * Fixing whitespace part 1 * No more whitespace * PLEASE NO MORE WHITESPACE
added stuff
* Add disabled station anchors versions * remove this
* fix * add structural damage taken to a lot of other things * do requested changes * how did this happen
* No Mr.Snail, I expect you to die! * emoting
* Allow mice to walk slowly * add more
…window (#31425) * Delete construction for solar assembly, it's the way to do it * Fix description of solar tracker electronics
Give line edit focus when window is opened No longer require pressing enter to set the text Give feedback when user hits the maximum label length Co-authored-by: Eoin Mcloughlin <[email protected]>
* make tesla brighter * radius to 10
* Added a ClothingShoesBootsMagBase, to allow the other versions of the magboots to have their own contraband settings * Changed Science Boots to not be contraband * Made ClothingShoesBootsMagBase abstract * Removed Engineering Contraband from base magboots. Now only the CE's Advanced Magboots are contraband (Grand Theft Contraband). Blood Reds are Syndie Contraband.
* Remove unused VVs params and usings from entityUid, MorgueComponent into Entity<MorgueComponent> ent * remove unnecesary VVs cuz datafields add em
* Recompress some lobby images to be under a 1mb * oops
* Remove midround zombies * super rare, like, 1/651 chance every few minutes. * weight to 1 --------- Co-authored-by: Ubaser <[email protected]>
teleporting while pulling crash fix Co-authored-by: YourUsername <[email protected]>
* fix: Check revenant ability costs correctly * refactor: Idiomatically get negative value
fixes smoothing stuff
* Adds salvage magnet board to lathe as default recipe, changes board sprite to supply sprite * Adds the salvage magnet board to the QM's locker, science cannot be trusted and never should be * my body is a machine that turns commits pushed to the wrong branch into machinations on git --------- Co-authored-by: PJBot <[email protected]>
* Delete antagonist shuttles. * Remove neutral shuttles.
…gs + honkbot slipping 2 (#31011) * Lets do this again * I noticed this way to late
add interior rooms to the vgroid
This reverts commit 119dd61.
Add "X.A.N.A." as an AI Anyways I don't think we're gonna get sued for trademark infringement of an old dead French TV show yeah?
…eam-sync # Conflicts: # .github/PULL_REQUEST_TEMPLATE.md # Content.Server/GameTicking/GameTicker.Spawning.cs # Resources/Prototypes/Datasets/Names/ai.yml # Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml # Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml # Resources/Prototypes/Maps/cog.yml # Resources/Prototypes/Roles/Jobs/Civilian/visitor.yml # Resources/Prototypes/Roles/Jobs/departments.yml # Resources/ServerInfo/Guidebook/Security/Forensics.xml # Resources/Textures/Structures/Furniture/Tables/reinforced.rsi/state_7.png # Resources/Textures/Structures/Walls/solid.rsi/meta.json # Resources/Textures/Structures/Walls/solid.rsi/reinf_construct-0.png # Resources/Textures/Structures/Walls/solid.rsi/reinf_construct-1.png # Resources/Textures/Structures/Walls/solid.rsi/reinf_construct-2.png # Resources/Textures/Structures/Walls/solid.rsi/reinf_construct-3.png # Resources/Textures/Structures/Walls/solid.rsi/reinf_construct-4.png # Resources/Textures/Structures/Walls/solid.rsi/reinf_construct-5.png # Resources/Textures/Structures/Walls/solid.rsi/reinf_over0.png # Resources/Textures/Structures/Walls/solid.rsi/reinf_over1.png # Resources/Textures/Structures/Walls/solid.rsi/reinf_over2.png # Resources/Textures/Structures/Walls/solid.rsi/reinf_over3.png # Resources/Textures/Structures/Walls/solid.rsi/reinf_over4.png # Resources/Textures/Structures/Walls/solid.rsi/reinf_over5.png # Resources/Textures/Structures/Walls/solid.rsi/reinf_over6.png # Resources/Textures/Structures/Walls/solid.rsi/rgeneric.png # Resources/Textures/Structures/Walls/solid.rsi/solid0.png # Resources/Textures/Structures/Walls/solid.rsi/solid1.png # Resources/Textures/Structures/Walls/solid.rsi/solid2.png # Resources/Textures/Structures/Walls/solid.rsi/solid3.png # Resources/Textures/Structures/Walls/solid.rsi/solid4.png # Resources/Textures/Structures/Walls/solid.rsi/solid5.png # Resources/Textures/Structures/Walls/solid.rsi/solid6.png # Resources/Textures/Structures/Walls/solid.rsi/solid7.png
github-actions
bot
added
Status: Needs Review
lzk228
added a commit
that referenced
this pull request
Sep 17, 2024
Co-authored-by: lapatison <[email protected]> Co-authored-by: lzk <[email protected]>
lzk228
added a commit
to lzk228/space-station-14
that referenced
this pull request
Sep 21, 2024
lzk228
added a commit
that referenced
this pull request
Sep 24, 2024
Co-authored-by: lapatison <[email protected]> Co-authored-by: faint <[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
Медиа
Проверки
Изменения