#17 Перенос обновлений с Beta на Alpha сервер #921
Merged
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
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may not be viewable. --> <!-- You can view Contributing.MD for a detailed description of the pull request process. --> ## About The Pull Request - SSU 'Lock' now displays a Red Light  - SSU hacked 'Super-UV' Decontamination now displays a flashing red-yellow light to distinguish from the Locked state  - Feedback for failing to activate UV Decontamination due to Safeties  - Feedback for failing to activate UV Decontamination due to the SSU being empty  <!-- Describe The Pull Request. Please be sure every change is documented or this can delay review and even discourage maintainers from merging your PR! --> ## Why It's Good For The Game Some QoL for the Suit Storage Unit, including feedback and a visible lock state <!-- Please add a short description of why you think these changes would benefit the game. If you can't justify it in words, it might not be worth adding. --> ## Changelog :cl: add: Suit Storage Units now provide feedback when Decontamination fails to activate imageadd: Suit Storage Units now have a visible red light when Locked - when hacked, Decontamination now has a red-yellow flashing light to distinguish from the Locked light. /:cl: <!-- Both :cl:'s are required for the changelog to work! You can put your name to the right of the first :cl: if you want to overwrite your GitHub username as author ingame. --> <!-- You can use multiple of the same prefix (they're only used for the icon ingame) and delete the unneeded ones. Despite some of the tags, changelogs should generally represent how a player might be affected by the changes rather than a summary of the PR's contents. -->
## About The Pull Request Adds general sprites to the Frontiersmen for the Vox. Your average grunts...  Frontiersman uniform, sans armor  Deckhands!  Vessel Command  Fleet Command  ## Why It's Good For The Game The faction rooted in Vox history finally has sprites to represent the Vox themselves. That's pretty cool I think. ## Changelog :cl: Cloudbreak add: Frontiersman sprites for the Vox! /:cl:
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may not be viewable. --> <!-- You can view Contributing.MD for a detailed description of the pull request process. --> ## About The Pull Request <!-- Describe The Pull Request. Please be sure every change is documented or this can delay review and even discourage maintainers from merging your PR! --> Flipped tables had an issue where they didnt block movement properly from it's outward side, or it's inward if you flipped it while diagonal. Adds an extra proc to help check the directions and fixes the other checks so people can't occasionally phase directly through a flipped table. Also adds an examine hint to flipped tables on how to right them, and changes the span classes to macros ## Why It's Good For The Game <!-- Please add a short description of why you think these changes would benefit the game. If you can't justify it in words, it might not be worth adding. --> Bugfixes are good. ## Changelog :cl: add: Examine hints for flipped tables fix: You can no longer phase through a flipped table. /:cl: <!-- Both :cl:'s are required for the changelog to work! You can put your name to the right of the first :cl: if you want to overwrite your GitHub username as author ingame. --> <!-- You can use multiple of the same prefix (they're only used for the icon ingame) and delete the unneeded ones. Despite some of the tags, changelogs should generally represent how a player might be affected by the changes rather than a summary of the PR's contents. -->
…nder water (shiptest-ss13#3283) <!-- Write **BELOW** The Headers and **ABOVE** The comments else it may not be viewable. --> <!-- You can view Contributing.MD for a detailed description of the pull request process. --> ## About The Pull Request <!-- Describe The Pull Request. Please be sure every change is documented or this can delay review and even discourage maintainers from merging your PR! --> You can once again scoop reagents from a water turf using a beaker. Adds an examine hint for the action. Repaths acid turfs under water so they inherit the scooping behavior. Pouring from a reagent container is now bound to disarm instead of help. Changes the span classes to span macros ## Why It's Good For The Game <!-- Please add a short description of why you think these changes would benefit the game. If you can't justify it in words, it might not be worth adding. --> Reagent scooping got disabled and commented out in shiptest-ss13#1900 I think due to conflicting with the fishing code. This PR cleans up the scooping code so it works again. Pouring out a container is now bound to using disarm instead of help intent. I feel it's more intuitive, and should cut down on accidentally spilling your hard earned reagents on the floor due to a misclick. Repaths acid under water mainly so it inherits the scooping behavior, and it seems logical to be able to scoop from it since it's also a liquid. Changes all the relevant turfs to the new paths. THE TAR NO LONGER LIES TO ME ABOUT BEING ABLE TO SCOOP IT. ## Changelog :cl: fix: water turfs reagent scooping code: span classes to span macros refactor: acid turfs repathed under water refactor: Pouring out a reagent container is now bound to disarm intent instead of help intent. /:cl: <!-- Both :cl:'s are required for the changelog to work! You can put your name to the right of the first :cl: if you want to overwrite your GitHub username as author ingame. --> <!-- You can use multiple of the same prefix (they're only used for the icon ingame) and delete the unneeded ones. Despite some of the tags, changelogs should generally represent how a player might be affected by the changes rather than a summary of the PR's contents. -->
…shiptest-ss13#3273) <!-- Write **BELOW** The Headers and **ABOVE** The comments else it may not be viewable. --> <!-- You can view Contributing.MD for a detailed description of the pull request process. --> ## About The Pull Request title. closes shiptest-ss13#3272 <!-- Describe The Pull Request. Please be sure every change is documented or this can delay review and even discourage maintainers from merging your PR! --> ## Why It's Good For The Game <!-- Please add a short description of why you think these changes would benefit the game. If you can't justify it in words, it might not be worth adding. --> ## Changelog :cl: fix: Hardliner troopers should no longer spawn as Hardliner pilots /:cl: <!-- Both :cl:'s are required for the changelog to work! You can put your name to the right of the first :cl: if you want to overwrite your GitHub username as author ingame. --> <!-- You can use multiple of the same prefix (they're only used for the icon ingame) and delete the unneeded ones. Despite some of the tags, changelogs should generally represent how a player might be affected by the changes rather than a summary of the PR's contents. -->
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may not be viewable. --> <!-- You can view Contributing.MD for a detailed description of the pull request process. --> ## About The Pull Request Fixes a minor wiring issue on the Shetland, where the input and output power lines are shorted together. Before:   After:   ## Why It's Good For The Game <!-- Please add a short description of why you think these changes would benefit the game. If you can't justify it in words, it might not be worth adding. --> This short bypasses the SMES units aboard and more or less renders them useless. This change should fix this, and allow them to work as they're supposed to. ## Changelog :cl: fix: fixed a short on the Shetland /:cl: <!-- Both :cl:'s are required for the changelog to work! You can put your name to the right of the first :cl: if you want to overwrite your GitHub username as author ingame. --> <!-- You can use multiple of the same prefix (they're only used for the icon ingame) and delete the unneeded ones. Despite some of the tags, changelogs should generally represent how a player might be affected by the changes rather than a summary of the PR's contents. -->
) Literally four characters. Technically second PR but my first fix. <!-- Write **BELOW** The Headers and **ABOVE** The comments else it may not be viewable. --> <!-- You can view Contributing.MD for a detailed description of the pull request process. --> ## About The Pull Request Fixes an error where processing a dough slice in a processor or on a cutting board would make you get the parent spaghetti item, rather than the intended one. The Creation  The Reaction  <!-- Describe The Pull Request. Please be sure every change is documented or this can delay review and even discourage maintainers from merging your PR! --> ## Why It's Good For The Game As funny as "The Food" is, I would like to be able to cook spaghetti. And I don't mean code spaghetti. <!-- Please add a short description of why you think these changes would benefit the game. If you can't justify it in words, it might not be worth adding. --> ## Changelog :cl:Aquidu fix: Fixed a bug relating to literal spaghetti code. /:cl: <!-- Both :cl:'s are required for the changelog to work! You can put your name to the right of the first :cl: if you want to overwrite your GitHub username as author ingame. --> <!-- You can use multiple of the same prefix (they're only used for the icon ingame) and delete the unneeded ones. Despite some of the tags, changelogs should generally represent how a player might be affected by the changes rather than a summary of the PR's contents. -->
Fix after merge (map)
Update: Fix price and maps
Signed-off-by: Molnia <[email protected]>
Signed-off-by: Molnia <[email protected]>
Update: canister.dm
Signed-off-by: Molnia <[email protected]>
Add: New Planet and a lot work in the future
* Update: Add ruin and fix old station * Update rockplanet_distillery.dmm Signed-off-by: Molnia <[email protected]> * Update rockplanet_distillery.dmm Signed-off-by: Molnia <[email protected]> * Update rockplanet_distillery.dmm Signed-off-by: Molnia <[email protected]> * weatywaeyayhterdstdhesrhse * eltown * fix and update sprites * Delete _maps/_mod_celadon/RandomRuins/BeachRuins/el_town.dmm Signed-off-by: Molnia <[email protected]> * new dry turf * fixes --------- Signed-off-by: Molnia <[email protected]>
* Update: Add ruin and fix old station * Update rockplanet_distillery.dmm Signed-off-by: Molnia <[email protected]> * Update rockplanet_distillery.dmm Signed-off-by: Molnia <[email protected]> * Update rockplanet_distillery.dmm Signed-off-by: Molnia <[email protected]> * weatywaeyayhterdstdhesrhse * eltown * fix and update sprites * Delete _maps/_mod_celadon/RandomRuins/BeachRuins/el_town.dmm Signed-off-by: Molnia <[email protected]> * new dry turf * fixes * Update: icon chasm --------- Signed-off-by: Molnia <[email protected]>
* Update: Add ruin and fix old station * Update rockplanet_distillery.dmm Signed-off-by: Molnia <[email protected]> * Update rockplanet_distillery.dmm Signed-off-by: Molnia <[email protected]> * Update rockplanet_distillery.dmm Signed-off-by: Molnia <[email protected]> * weatywaeyayhterdstdhesrhse * eltown * fix and update sprites * Delete _maps/_mod_celadon/RandomRuins/BeachRuins/el_town.dmm Signed-off-by: Molnia <[email protected]> * new dry turf * fixes * Update: icon chasm * Update mod_celadon.dme Signed-off-by: Molnia <[email protected]> --------- Signed-off-by: Molnia <[email protected]>
Signed-off-by: nasend <[email protected]>
Signed-off-by: nasend <[email protected]>
Вайдбенд на Bubble-class и security ньюкастеры на ЦК
Update: drinks
Fix: calibr 5.56x45, 5.56x39
Add EVENT: planet and ruins and ghost roles
Update: Bolt config
…/npm_and_yarn-07a849e1ae Bump micromatch from 4.0.4 to 4.0.8 in /tgui in the npm_and_yarn group across 1 directory
MrCat15352
requested review from
MysticalFaceLesS,
RalseiDreemuurr and
molnizz
as code owners
github-actions
bot
added
💬 TGUI
* Добавлен шурф варианта синдикат. Перемещены файл атласа и отредактирован путь. * Обновлен спррайт шаррфа
molnizz
approved these changes
Aug 31, 2024
MrCat15352
added
🔆 Обновление 🔆
MysticalFaceLesS
changed the title
This was referenced Sep 7, 2024
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.
[Перенос №16] - (#888)