merge live - #3837
Merged
Merged
Conversation
…n-14 into shooting-3
…n-14 into shooting-3 # Conflicts: # Resources/Locale/en-US/_Starlight/ui-options/ui-options-tts.ftl
…n-14 into shooting-3 # Conflicts: # Resources/Prototypes/_Starlight/Entities/Effects/weapon.yml # Resources/Prototypes/_Starlight/Entities/Objects/Weapons/Guns/Projectiles/effects.yml
…n-14 into shooting-3 # Conflicts: # Resources/Prototypes/_Starlight/Entities/Objects/Weapons/Guns/Pistols/pistols.yml # Resources/_Starlight/migration.yml
<!-- IT'S NOT WIZDENS REPO, IF YOU WANT TO ADD YOUR CHANGES ON ALL SERVERS, CREATE PR TO WIZDENS REPO --> ## Why we need to add this We either need to be in _StarLight, or in _Starlight, mixing the two directories causes a lot of problems with merge conflicts and confusion on Windows. This PR moves everything that remained in Prototypes/_StarLight and put it into Prototypes/_Starlight ## 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. **Changelog** :cl: mikeysaurus - tweak: changed _StarLight folder instance in Prototypes to _Starlight.
## Short description Adds a new Mail Companion handheld for Mail Technicians that can scan station mail and temporarily track the intended recipient through suit sensors using a handheld crew-monitor style HUD. ## Why we need to add this Mail delivery currently lacks a dedicated in-game tool for locating recipients once a delivery has been assigned. This adds a mail-specific tracking device that makes the Mail Technician role more functional and flavorful without providing unlimited tracking: - tracking only works on scanned delivery items - tracking requires suit sensors with coordinate transmission enabled - tracking lasts for 1 minute - the device enters a 30 second recalibration cooldown after expiry - opening the tracked delivery immediately resets the device and clears the cooldown This improves role gameplay for Mail Technicians while keeping the tool limited and dependent on existing suit sensor mechanics. ## Media (Video/Screenshots) - Mail Companion item sprite and in-hand sprites - Mail Companion HUD showing recipient, job, coordinates, timer, and nav map tracking - Mail Companion recalibration state after tracking expires ## 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. ## Media (Video/Screenshots) https://github.com/user-attachments/assets/c1ca75ad-aea7-4a45-b2de-42259d1681aa **Changelog** :cl: NEVEC - add: Added the Mail Companion for Mail Technicians to scan deliveries and track recipients through suit sensors. - add: Added a dedicated crew-monitor style HUD and custom Mail Companion sprites. - tweak: Mail Companion tracking now expires after 1 minute and enters a 30 second recalibration cooldown. - fix: Opening the tracked delivery now immediately resets the Mail Companion so it can be used again.
<!-- IT'S NOT WIZDENS REPO, IF YOU WANT TO ADD YOUR CHANGES ON ALL SERVERS, CREATE PR TO WIZDENS REPO --> ## Short description <!-- What do you propose to change with your PR? --> Fixes crash. ## 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. --> Servers crashing ## Media (Video/Screenshots) <!-- If your PR contains in-game changes you must provide screenshots/videos of the changes. --> Can't demo it not crashing ## 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: redmushie, Rinary - fix: Fixed crash from putting shoes on while moving.
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
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