-
Notifications
You must be signed in to change notification settings - Fork 32
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
апстримец #143
Merged
Merged
апстримец #143
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
# Description Access wire is cool, this PR adds it back to airlocks --- <!-- 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> https://github.com/user-attachments/assets/622d01ac-01e5-4290-af26-6175fa3eca6c </p> </details> --- # Changelog :cl: - add: Airlocks once again have access wires. Happy hacking!
# Description This PR creates Loadout Groups specific to Science jobs, and provides a discount on all science loadout items in return for having the group limit behavior. --- # Changelog :cl: Mocho - add: Science Job related items are now part of a Science loadout group, and have all been significantly discounted. - add: Added more clothing to the science section in loadouts. - tweak: Adjusted command loadout item pricing. - tweak: Added localization strings for the new loadout groups. --------- --------- Signed-off-by: gluesniffler <[email protected]> Co-authored-by: DEATHB4DEFEAT <[email protected]>
# Description This PR adds Bartender-Specific loadout item groups. Very simple, it removes some of the items from the Bartender's Locker, and replaces them with giving the bartender a choice of which "Bar Gun" he wishes to start with. Currently just the classic beanbag double barrel, but now the bartender can elect to spend some of his loadout points to instead start with a Mosin(Preloaded with Rubber bullets) Also while I was at it, I added missing localizations. <details><summary><h1>Media</h1></summary> <p> ![image](https://github.com/user-attachments/assets/ca51fc69-966e-429e-b035-9c6d4f6d2dc9) </p> </details> # Changelog :cl: - add: Added missing Localizations for Departments, Jobs, and Loadout Item Groups. - add: Bartender-Specific loadouts! Bartenders can now choose to spawn with either their classic shotgun, or a Mosin Nagant that comes preloaded with rubber bullets. --------- Signed-off-by: VMSolidus <[email protected]> Co-authored-by: DEATHB4DEFEAT <[email protected]>
# Description Cherry-Picks space-wizards/space-station-14#28077 For our downstreams so that they don't get sandbox violation errors when attempting to compile with the Latest Dotnet 8 Co-authored-by: Pieter-Jan Briers <[email protected]>
# Description Changes the Loadouts to Lawyer's and Atmos very slightly, Lawyer's for the purpose of Simplicity and Atmos for preperation of a Backpack Unbloating. --- # TODO [X] do da thing --- <details><summary><h1>Media</h1></summary> <p> ![Example Media Embed](https://example.com/thisimageisntreal.png) </p> </details> --- # Changelog :cl: - tweak: Stuffed Lawyer's Pockets with Space Law guides! - remove: Took away Atmos backpacks as Starting equipment. --------- Signed-off-by: Miller <[email protected]>
# Description "Walking by default" is now implemented as a client-side toggle in the settings. Also, fixed walking alerts being shitcode and not displaying the correct walking/running state. One issue still persists: if you press the "toggle walk" button while typing in the chat, it still resets the walking state to default. I don't know what causes it, probably the input field leaking button-up input events instead of marking them as handled. <details><summary><h1>Media</h1></summary> <p> https://github.com/user-attachments/assets/97d5b495-ea9b-4854-a6b0-84815ed5a332 </p> </details> # Changelog :cl: - add: You can now choose whether you want to walk or run by default in the settings. --------- Signed-off-by: Mnemotechnican <[email protected]> Co-authored-by: VMSolidus <[email protected]>
# Conflicts: # Resources/Prototypes/Roles/Jobs/Civilian/lawyer.yml
github-actions
bot
added
Изменения: C#
Изменяет какие-либо файлы .cs
Изменения: Локализация
Изменяет какие-либо файлы .ftl
Изменения: Карта
Изменяет какие-либо файлы карт
Изменения: Интерфейс
Изменяет какие-либо файлы .xaml
labels
Sep 14, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Labels
Изменения: C#
Изменяет какие-либо файлы .cs
Изменения: Интерфейс
Изменяет какие-либо файлы .xaml
Изменения: Карта
Изменяет какие-либо файлы карт
Изменения: Локализация
Изменяет какие-либо файлы .ftl
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.
важные фиксы и апстрим