No more merge conflict (I am going to try and kill it with hammers) - #5739
Closed
walksanatora wants to merge 124 commits into
Closed
No more merge conflict (I am going to try and kill it with hammers)#5739walksanatora wants to merge 124 commits into
walksanatora wants to merge 124 commits into
Conversation
(cherry picked from commit 8da8b74)
…n-14 into Starlight # Conflicts: # RobustToolbox
Fixes bug when you can't join to Delta
# Conflicts: # RobustToolbox
## Short description It's a lot of fixes. Like, a ton. Ports the marking fixes in Far Horizon [#819](Far-Horizons-SS14/Far-Horizons-SS14#819). ## Why we need to add this Bug fixes are bug fixes ## Media (Video/Screenshots) <img width="1183" height="325" alt="image" src="https://github.com/user-attachments/assets/a9fc98c5-068d-4932-89ca-b5704ee99634" /> <img width="582" height="352" alt="image" src="https://github.com/user-attachments/assets/7a99af74-1fdc-49d3-8ffd-16cafde3e438" /> <img width="1618" height="589" alt="image" src="https://github.com/user-attachments/assets/95049e5f-4f48-459f-8938-49a07e8c2095" /> <img width="256" height="840" alt="image" src="https://github.com/user-attachments/assets/50872d57-c99d-4c72-b8da-0ac49df3222c" /> ## Checks - [X] I do not require assistance to complete the PR. - [X] Before posting/requesting review of a PR, I have verified that the changes work. - [X] I have added screenshots/videos of the changes, or this PR does not change in-game mechanics. - [X] I affirm that my changes are licensed under the [MIT License](https://github.com/ss14Starlight/space-station-14/blob/Starlight/LICENSE.TXT) and grant permission for use in this repository under its conditions. **Changelog** :cl: wonderfulnewworld, Princess Gurchi - add: You can now select your Protogen frame for Nukeops, NukeopsCommander, NukeopsMedic, SpaceNinja, Wizard, and WizardDuelist. - add: Protogen Markings are now split up into their own categories, and now actually work on all species thanks to being split across new body layers. - tweak: Protogen Frame selection is a bit more clear in the menu now. - tweak: Basic-Class Medium Protogen Armor now has 5% Pierce Resist. - tweak: Proto-Moth Cold Resist +5%, Heat Vulnerability +5%. - tweak: Proto-Diona Slash Resist +15%, Heat Vulnerability +15%, Shock Vulnerability +20%. - tweak: Computer Boards are less nutritious, eat real food sometimes! - tweak: Updated ProtoKin's guidebook entry to specify they don't passively heal burn anymore. (This is due to their 50% healing reduction). - fix: Dwarves and Skeletons can open airlocks and pilot stuff again. - fix: Medical Huds (all types) can now correctly see Protogen health. - fix: Proto-Lagomorph metabolism now matches normal Lagomorph metabolism. - fix: Proto-Reptilians no longer freeze to death after leaving cryo healing pods. - fix: Protogen tails now correctly make the thump sound. - fix: Proto-Resomi use the base Resomi Gasp, Deathgasp, Sigh, Cough, and Yawn. - fix: All Protogen can now get hand implants. - fix: True Protogen can be picked up. - fix: ProtoKin can hear Empathy now. - fix: Proto-Vulps no longer starve 10x faster than they're supposed to. - fix: The Duty Officer's Winter Coat now has a suit storage slot.
## Short description <!-- What do you propose to change with your PR? --> Fixing a critical issue with security's wiring that prevents half of security being fed power correctly at every shift start. ## Why we need to add this <!-- What is the reason for adding these changes? Please post links to Discussions as well as Bug Reports here. Please describe how this will change the game balance. --> Critical issue. ## Media (Video/Screenshots) <!-- If your PR contains in-game changes you must provide screenshots/videos of the changes. --> <img width="316" height="321" alt="image" src="https://github.com/user-attachments/assets/89a16044-bf99-4b61-addc-de16a6ae57ce" /> <img width="534" height="598" alt="image" src="https://github.com/user-attachments/assets/bee88518-077d-43ea-bd4b-2d2d32f475e5" /> ## Checks <!-- check boxes for faster reviewing of your PR --> - [x] I do not require assistance to complete the PR. - [x] Before posting/requesting review of a PR, I have verified that the changes work. - [x] I have added screenshots/videos of the changes, or this PR does not change in-game mechanics. - [x] I affirm that my changes are licensed under the [MIT License](https://github.com/ss14Starlight/space-station-14/blob/Starlight/LICENSE.TXT) and grant permission for use in this repository under its conditions. **Changelog** <!-- If you want the players to know about changes made in this PR, specify them using the template outside the comment. Short and informative. :cl: STARLIGHT TEAM - add: Added Starlight. - remove: Removed SS13. - tweak: Changed SS14. - fix: Fixed Rinary. --> :cl: Cvlancer - fix: Fixed the east side security substation not receiving power by removing a cable terminal.
## Short description <!-- What do you propose to change with your PR? --> Fixes erroneous behavior with force prototypes. ## Why we need to add this <!-- What is the reason for adding these changes? Please post links to Discussions as well as Bug Reports here. Please describe how this will change the game balance. --> Force prototype brokey ## Media (Video/Screenshots) <!-- If your PR contains in-game changes you must provide screenshots/videos of the changes. --> ## Checks <!-- check boxes for faster reviewing of your PR --> - [X] I do not require assistance to complete the PR. - [X] Before posting/requesting review of a PR, I have verified that the changes work. - [X] I have added screenshots/videos of the changes, or this PR does not change in-game mechanics. - [X] I affirm that my changes are licensed under the [MIT License](https://github.com/ss14Starlight/space-station-14/blob/Starlight/LICENSE.TXT) and grant permission for use in this repository under its conditions.
## Short description <!-- What do you propose to change with your PR? --> Removes the large warden locker's prototype and art assets. A `migration.yml` entry has been created to replace any large variants of the lockers with normal ones. This isn't needed for mapping (the locker is not used in any maps) _but_ I didn't want to risk bricking any of the Event Coordinator's custom grids. ## Why we need to add this <!-- What is the reason for adding these changes? Please post links to Discussions as well as Bug Reports here. Please describe how this will change the game balance. --> It's not used in game. There was a brief period where two Wardens was being tested, but we went with implementing Duty Officers instead. ## Media (Video/Screenshots) <!-- If your PR contains in-game changes you must provide screenshots/videos of the changes. --> <img width="487" height="472" alt="image" src="https://github.com/user-attachments/assets/708fb627-257a-4f7c-929c-17f15da1f40d" /> fig. 1 - 'tis gone. ## Checks <!-- check boxes for faster reviewing of your PR --> - [x] I do not require assistance to complete the PR. - [x] Before posting/requesting review of a PR, I have verified that the changes work. - [x] I have added screenshots/videos of the changes, or this PR does not change in-game mechanics. - [x] I affirm that my changes are licensed under the [MIT License](https://github.com/ss14Starlight/space-station-14/blob/Starlight/LICENSE.TXT) and grant permission for use in this repository under its conditions. **Changelog** <!-- If you want the players to know about changes made in this PR, specify them using the template outside the comment. Short and informative. :cl: STARLIGHT TEAM - add: Added Starlight. - remove: Removed SS13. - tweak: Changed SS14. - fix: Fixed Rinary. --> :cl: Caws - remove: The large version of the warden locker has been removed due to being unused.
## Short description <!-- What do you propose to change with your PR? --> Basically every gun in the game can fit in your suit storage. Generally, for pistols: - They fit in your belt slot. - They fit in your suit storage slot. Generally, for rifles: - They fit in your back slot. - They fit in your suit storage slot. The hybrid taser didn't fit in your suit storage, even though the dominator and disabler pistols do. This PR fixes that. The ion rifle didn't fit on in your suit storage slow, even though all other rifles in the game do. This PR also fixes that. ## Why we need to add this <!-- What is the reason for adding these changes? Please post links to Discussions as well as Bug Reports here. Please describe how this will change the game balance. --> Bugfix as far as I can tell + consistency fix. This has driven me insane playing security recently because I usually put my disabler weapons in my suit storage. ## Media (Video/Screenshots) <!-- If your PR contains in-game changes you must provide screenshots/videos of the changes. --> <img width="812" height="474" alt="Hybrid Taser" src="https://github.com/user-attachments/assets/cb06360a-c846-463b-8b86-cd0098fa3606" /> fig. 1 - Before and After PR. I'm using the hotkey to put things into suit storage here. ## Checks <!-- check boxes for faster reviewing of your PR --> - [x] I do not require assistance to complete the PR. - [x] Before posting/requesting review of a PR, I have verified that the changes work. - [x] I have added screenshots/videos of the changes, or this PR does not change in-game mechanics. - [x] I affirm that my changes are licensed under the [MIT License](https://github.com/ss14Starlight/space-station-14/blob/Starlight/LICENSE.TXT) and grant permission for use in this repository under its conditions. **Changelog** <!-- If you want the players to know about changes made in this PR, specify them using the template outside the comment. Short and informative. :cl: STARLIGHT TEAM - add: Added Starlight. - remove: Removed SS13. - tweak: Changed SS14. - fix: Fixed Rinary. --> :cl: Caws - fix: Security's Hybrid Taser now fits in your suit storage, just like the Disabler and Dominator. - fix: The Ion Rifle now fits in your suit storage, just like other rifles.
## Short description <!-- What do you propose to change with your PR? --> manual port of space-wizards/space-station-14#43208 Empty water bottles are correctly suffixed in dev also why is pulped banana peel the only one with dashes that isn't a shorthand? ## Why we need to add this <!-- What is the reason for adding these changes? Please post links to Discussions as well as Bug Reports here. Please describe how this will change the game balance. --> fix is good ## Media (Video/Screenshots) <!-- If your PR contains in-game changes you must provide screenshots/videos of the changes. --> <img width="816" height="394" alt="image" src="https://github.com/user-attachments/assets/d3ec95c4-5e5c-4820-a13d-dc6951a6c758" /> ## Checks <!-- check boxes for faster reviewing of your PR --> - [X] I do not require assistance to complete the PR. - [X] Before posting/requesting review of a PR, I have verified that the changes work. - [X] I have added screenshots/videos of the changes, or this PR does not change in-game mechanics. - [X] I affirm that my changes are licensed under the [MIT License](https://github.com/ss14Starlight/space-station-14/blob/Starlight/LICENSE.TXT) and grant permission for use in this repository under its conditions. **Changelog** :cl: - fix: Some reagent bottles now have the correct labels.
…ce, new power source. (#4687) ## Short description Fully reworking the atmospherics to use the pipe layering system. Made the power source an actual power source instead of a shitty debug gen. Did some small reworks of places such as the CC pavilion and the entrance to security. ## Why we need to add this This maps unmaintained, and im tryna bring it up a bit more. Also the pipes look cooler when using pipe layering, and having an actual power source feels alot less cheaty then just a debug gen, and its also cooler. ## Media (Video/Screenshots) <img width="561" height="589" alt="image" src="https://github.com/user-attachments/assets/44a2d40f-1fe0-4c9c-9747-fa540dc8ae2d" /> ## Checks - [x] I do not require assistance to complete the PR. - [x] Before posting/requesting review of a PR, I have verified that the changes work. - [x] I have added screenshots/videos of the changes, or this PR does not change in-game mechanics. - [x] I affirm that my changes are licensed under the [MIT License](https://github.com/ss14Starlight/space-station-14/blob/Starlight/LICENSE.TXT) and grant permission for use in this repository under its conditions. **Changelog** If you want the players to know about changes made in this PR, specify them using the template outside the comment. Short and informative. :cl: STARLIGHT TEAM - remove: (CC_SC17) Completely removed the old atmospherics piping and such. - add: (CC_SC17) Completely new atmospherics piping and layout. - tweak: (CC_SC17) Security front entrance now stops those tiders from breakin in.
## Short description <!-- What do you propose to change with your PR? --> The siren for Code Violet has two problems - It's super loud - It abruptly cuts off at the end (it doesn't fade out) This PR drops the volume by -3dB, reduces it from 30 seconds to 25 seconds, and makes the ending fade out smoothly. ## Why we need to add this <!-- What is the reason for adding these changes? Please post links to Discussions as well as Bug Reports here. Please describe how this will change the game balance. --> The current siren is obnoxiously loud and long. The cut-off at the end makes it feel low quality. This PR fixes the abrupt cutoff and makes the siren a little less loud and a little less obnoxious. ## Media (Video/Screenshots) <!-- If your PR contains in-game changes you must provide screenshots/videos of the changes. --> https://github.com/user-attachments/assets/267ad40b-f3ee-46df-8b02-b76e5e322075 fig. 1 - Video of the changes to the siren sound. ## Checks <!-- check boxes for faster reviewing of your PR --> - [x] I do not require assistance to complete the PR. - [x] Before posting/requesting review of a PR, I have verified that the changes work. - [x] I have added screenshots/videos of the changes, or this PR does not change in-game mechanics. - [x] I affirm that my changes are licensed under the [MIT License](https://github.com/ss14Starlight/space-station-14/blob/Starlight/LICENSE.TXT) and grant permission for use in this repository under its conditions. **Changelog** <!-- If you want the players to know about changes made in this PR, specify them using the template outside the comment. Short and informative. :cl: STARLIGHT TEAM - add: Added Starlight. - remove: Removed SS13. - tweak: Changed SS14. - fix: Fixed Rinary. --> :cl: Caws - tweak: The siren for Code Violet is now a little quieter. - fix: The siren for Code Violet now fades out instead of just cutting off at the end.
## Short description <!-- What do you propose to change with your PR? --> The mime's vow of silence is really easily circumvented. The whole point of miming is **pantomiming.** This PR makes the vow of silence much stronger, preventing the mime from using the following while their vow is unbroken: - No writing while the vow is active. - No using AAC tablets while the vow is active. - No using sign language or hiveminds (like the Nexus) while the vow is active - No using NanoChat while the vow is active. - No printing non-blank NanoTasks. I figured it's funny if the mime can still print NanoTasks whilst maintaining their vow as long as the NanoTask itself is completely blank. One issue with this PR that I couldn't figure out was how to make the NanoChat messages fail more gracefully (the Mime is prevented from sending NanoChats properly, but the messages appear briefly before flickering out). I would appreciate if someone smarter than me can figure out how to prevent that message flickering. ## Why we need to add this <!-- What is the reason for adding these changes? Please post links to Discussions as well as Bug Reports here. Please describe how this will change the game balance. --> Writing, AAC tablets, sign language, hiveminds, NanoChat and NanoTasks all circumvent the point of the vow of silence. Discord support for mimes actually being silent is extremely strong, as seen in this thread: https://discord.com/channels/1272545509562777621/1513943733492777192 <img width="618" height="94" alt="image" src="https://github.com/user-attachments/assets/6c68c6c6-25f3-40e1-b02b-d04e7d59ba3c" /> ## Media (Video/Screenshots) <!-- If your PR contains in-game changes you must provide screenshots/videos of the changes. --> https://github.com/user-attachments/assets/28d8dd56-f9a9-460f-8646-e480cdd2b9d1 fig. 1 - Demo: AAC tablet prevention, NanoChat prevention, non-verbal language prevention, NanoTask writing prevention, blank NanoTasks are still allowed, writing prevention. Mime vow is then broken and I show that all of these things still work after the mime vow is broken. ## Checks <!-- check boxes for faster reviewing of your PR --> - [ ] I do not require assistance to complete the PR. - [x] Before posting/requesting review of a PR, I have verified that the changes work. - [x] I have added screenshots/videos of the changes, or this PR does not change in-game mechanics. - [x] I affirm that my changes are licensed under the [MIT License](https://github.com/ss14Starlight/space-station-14/blob/Starlight/LICENSE.TXT) and grant permission for use in this repository under its conditions. **Changelog** <!-- If you want the players to know about changes made in this PR, specify them using the template outside the comment. Short and informative. :cl: STARLIGHT TEAM - add: Added Starlight. - remove: Removed SS13. - tweak: Changed SS14. - fix: Fixed Rinary. --> :cl: Caws - tweak: Mimes can no longer use AAC tablets while their vow of silence is active. - tweak: Mimes can no longer bypass their vow of silence by writing. - tweak: Mimes can no longer bypass their vow of silence using sign language nor hiveminds (e.g. the Nexus). - tweak: Mimes can no longer bypass their vow of silence by using NanoChat. - tweak: Mimes can no longer bypass their vow of silence by using NanoTasks (they may only print NanoTasks if the description is blank).
Reverts #5628 pray to god this works
## Short description <!-- What do you propose to change with your PR? --> I Hope this works. ## Why we need to add this <!-- What is the reason for adding these changes? Please post links to Discussions as well as Bug Reports here. Please describe how this will change the game balance. --> ## Media (Video/Screenshots) <!-- If your PR contains in-game changes you must provide screenshots/videos of the changes. --> ## Checks <!-- check boxes for faster reviewing of your PR --> - [ ] I do not require assistance to complete the PR. - [ ] Before posting/requesting review of a PR, I have verified that the changes work. - [ ] I have added screenshots/videos of the changes, or this PR does not change in-game mechanics. - [ ] I affirm that my changes are licensed under the [MIT License](https://github.com/ss14Starlight/space-station-14/blob/Starlight/LICENSE.TXT) and grant permission for use in this repository under its conditions.
Reverts #5633 okay I *think* this will fix it.
## Short description <!-- What do you propose to change with your PR? --> ## Why we need to add this <!-- What is the reason for adding these changes? Please post links to Discussions as well as Bug Reports here. Please describe how this will change the game balance. --> ## Media (Video/Screenshots) <!-- If your PR contains in-game changes you must provide screenshots/videos of the changes. --> ## Checks <!-- check boxes for faster reviewing of your PR --> - [ ] I do not require assistance to complete the PR. - [ ] Before posting/requesting review of a PR, I have verified that the changes work. - [ ] I have added screenshots/videos of the changes, or this PR does not change in-game mechanics. - [ ] I affirm that my changes are licensed under the [MIT License](https://github.com/ss14Starlight/space-station-14/blob/Starlight/LICENSE.TXT) and grant permission for use in this repository under its conditions. --------- Co-authored-by: Pieter-Jan Briers <pieterjan.briers+git@gmail.com> Co-authored-by: pathetic meowmeow <uhhadd@gmail.com> Co-authored-by: PJBot <pieterjan.briers+bot@gmail.com> Co-authored-by: Princess Cheeseballs <66055347+Princess-Cheeseballs@users.noreply.github.com> Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com> Co-authored-by: Velken <8467292+Velken@users.noreply.github.com> Co-authored-by: Killerqu00 <killerqueen1777@gmail.com> Co-authored-by: Killerqu00 <47712032+Killerqu00@users.noreply.github.com> Co-authored-by: ScarKy0 <scarky0@onet.eu> Co-authored-by: osjarw <62134478+osjarw@users.noreply.github.com> Co-authored-by: SlamBamActionman <slambamactionman@gmail.com> Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com> Co-authored-by: ScarKy0 <106310278+ScarKy0@users.noreply.github.com> Co-authored-by: Pok <113675512+Pok27@users.noreply.github.com> Co-authored-by: Kip <32859367+kipdotnet@users.noreply.github.com> Co-authored-by: Steel <prorxan@gmail.com> Co-authored-by: āda <ss.adasts@gmail.com> Co-authored-by: Emisse <99158783+Emisse@users.noreply.github.com> Co-authored-by: c4llv07e <igor@c4llv07e.xyz> Co-authored-by: VideoKompany <135313844+VlaDOS1408@users.noreply.github.com> Co-authored-by: Thomas <87614336+Aeshus@users.noreply.github.com> Co-authored-by: Absotively <jen@jenpollock.ca> Co-authored-by: SabreML <57483089+SabreML@users.noreply.github.com> Co-authored-by: eoineoineoin <helloworld@eoinrul.es> Co-authored-by: Minerva <218184747+mnva0@users.noreply.github.com> Co-authored-by: deathride58 <deathride58@users.noreply.github.com> Co-authored-by: B_Kirill <153602297+B-Kirill@users.noreply.github.com> Co-authored-by: Julian Giebel <juliangiebel@live.de> Co-authored-by: beck-thompson <beck314159@hotmail.com> Co-authored-by: Simon <63975668+Simyon264@users.noreply.github.com> Co-authored-by: Archee <archee3@hotmail.co.uk> Co-authored-by: mack.wtf <mackamuir@gmail.com> Co-authored-by: DrSmugleaf <10968691+DrSmugleaf@users.noreply.github.com> Co-authored-by: Rodion <rc-alh@outlook.com> Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> Co-authored-by: deltanedas <39013340+deltanedas@users.noreply.github.com> Co-authored-by: sleepyyapril <123355664+sleepyyapril@users.noreply.github.com> Co-authored-by: eoineoineoin <github@eoinrul.es> Co-authored-by: Starlight <ss14-Starlight@outlook.com> Co-authored-by: Matt Idzik <matt.idzik1@gmail.com> Co-authored-by: starlightgithub[bot] <235886642+starlightgithub[bot]@users.noreply.github.com> Co-authored-by: SirLutz <zockerlutz1024@gmail.com> Co-authored-by: Rinary <rinary.super@gmail.com> Co-authored-by: Conflee <46701008+Conflee@users.noreply.github.com> Co-authored-by: wonderfulnewworld <shinsekaihibiki@gmail.com> Co-authored-by: InsoPL <lukasz.lindert@protonmail.com> Co-authored-by: Stella <stella.middleton@hotmail.com> Co-authored-by: rtasva <razwilson@outlook.com> Co-authored-by: Littlemen07 <marcjanus@hotmail.com> Co-authored-by: Shin <99152399+wonderfulnewworld@users.noreply.github.com> Co-authored-by: JohnnyMalawny <johnnymalawny@gmail.com> Co-authored-by: Lars Dormans <lars.dormans@live.nl> Co-authored-by: KamilaTech <116141907+KamilaTech@users.noreply.github.com> Co-authored-by: KamilaTech <Claude@kamila.tech> Co-authored-by: OrangeJuiceGoose <hissingwalnuts@gmail.com> Co-authored-by: Musiklie <jddcallaghan@icloud.com> Co-authored-by: bynddark8 <275497767+bynddark8@users.noreply.github.com> Co-authored-by: CawsForConcern <kopczynski.zesty@gmail.com> Co-authored-by: Forrestgod718 <dimitrif11@outlook.com> Co-authored-by: OMEGA <10322018+Omegalucky@users.noreply.github.com> Co-authored-by: Rhapsody <rhapsodysmail@gmail.com> Co-authored-by: Cvlancer <granewellstone@gmail.com> Co-authored-by: Maitake <heyitsmaitake@gmail.com> Co-authored-by: briochebear <bulbasaursoup@gmail.com> Co-authored-by: DocMoth <omnislash6429@gmail.com> Co-authored-by: XeroTec <243441788+xero-tec@users.noreply.github.com> Co-authored-by: Riley Winchester <122399990+rileywinchester@users.noreply.github.com> Co-authored-by: Whatstone <166147148+whatston3@users.noreply.github.com> Co-authored-by: KarmaKitsuna <130065372+KarmaKitsuna@users.noreply.github.com> Co-authored-by: Lukeb28 <66802174+Lukeb28@users.noreply.github.com> Co-authored-by: Arcane <234029700+ArcaneValiance@users.noreply.github.com> Co-authored-by: Red Mushie <82113471+redmushie@users.noreply.github.com> Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> Co-authored-by: War__Prophet <tripwiregamer@gmail.com> Co-authored-by: Jessica M <jessica@jessicamaybe.com> Co-authored-by: Ataman <Ataman@users.noreply.github.com> Co-authored-by: Matrix <ffcvyfvfc@gmail.com> Co-authored-by: beck-thompson <107373427+beck-thompson@users.noreply.github.com> Co-authored-by: Noxy <n@aux.sh> Co-authored-by: Menshin <Menshin@users.noreply.github.com> Co-authored-by: Noxy <22436953+noxypaws@users.noreply.github.com> Co-authored-by: ProPeperos <61984624+ProPeperos@users.noreply.github.com> Co-authored-by: DrSmugleaf <drsmugleaf@gmail.com> Co-authored-by: Orhu <49076185+Orhu@users.noreply.github.com> Co-authored-by: Ohelig <5841980+Ohelig@users.noreply.github.com> Co-authored-by: TeddiousbearPA <teddiousbear@gmail.com> Co-authored-by: Way <aaronfghg@gmail.com> Co-authored-by: Sparlight <twiksparlight@gmail.com> Co-authored-by: NoahHuffstutler <38667859+NoahHuffstutler@users.noreply.github.com> Co-authored-by: NoahHuffstutler <noah.huffsutler@gmail.com>
github-actions
Bot
added
the
S: Untriaged
Contributor
|
Thank you for your contribution! It appears you created a pull request from the master branch or another main development branch. This is something you should avoid doing, and thus this pull request has been automatically closed. We suggest you follow our git usage documentation. You can move your current work to another branch by following these commands. Then, you may recreate your pull request using the new branch. |
github-actions
Bot
added
the
S: Merge Conflict
Contributor
|
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
github-actions
Bot
added
S: Needs Review
Collaborator
Author
|
yeah uhh no that would squash the entire history... |
Contributor
|
Caution Review failedThe pull request is closed. ℹ️ Recent review info⚙️ Run configurationConfiguration used: Repository UI Review profile: CHILL Plan: Pro Plus Run ID: ⛔ Files ignored due to path filters (8)
📒 Files selected for processing (17)
📝 WalkthroughSummaryThis PR consolidates Starlight configuration and asset fixes.
User impact
Risk areas
Guideline gaps
WalkthroughThe change updates the Pursuit shuttle map, removes selected station jobs, changes an assistant loadout requirement, and adds corrected Umbrae vampire texture metadata. ChangesPursuit shuttle layout
Station jobs and loadout requirement
Umbrae vampire assets
Estimated code review effort: 3 (Moderate) | ~25 minutes ✨ Finishing Touches 💡 1⚔️ Resolve merge conflicts 💡
Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out. Comment |
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
18 participants
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.
Short description
Why we need to add this
Media (Video/Screenshots)
Checks