[pull] master from cmss13-devs:master #847
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
![pull[bot]](https://avatars.githubusercontent.com/in/12910?s=60&v=4){kind=small}
…5367) ## About the pull request Adds the ability to apply lenses from prescription eyewear into HUDs/mesons/specialist optics. ## Explain why it's good for the game QoL change that makes life easier for those that have characters with impaired vision, allows the use of these eyepieces without obscuring the mask slot, be it reserved for smokes, scarfs, coifs, etc. # Testing Photographs and Procedure <details> <summary>Screenshots & Videos</summary> N/A </details> # Changelog :cl: Stakeyng add: Added the ability to combine prescription glasses with eyewear for varying roles /:cl: --------- Co-authored-by: Drathek <76988376+Drulikar@users.noreply.github.com>
# About the pull request chairs in permabrig now face south (towards their table) instead of north, towards the wall <!-- Remove this text and explain what the purpose of your PR is. Mention if you have tested your changes. If you changed a map, make sure you used the mapmerge tool. If this is an Issue Correction, you can type "Fixes Issue #169420" to link the PR to the corresponding Issue number #169420. Remember: something that is self-evident to you might not be to others. Explain your rationale fully, even if you feel it goes without saying. --> # Explain why it's good for the game perma prisoners should be able to sit at their chair and be facing the paper and pen instead of the wall?? # Changelog :cl: maptweak: Alamayer PermaBrig Chairs face the right way /:cl:
# About the pull request removed double lights near engineering workshop:  moved some lights that were on the marshals reinforced windows to nearby walls because I don't like windows on walls before:  after:  <!-- Remove this text and explain what the purpose of your PR is. Mention if you have tested your changes. If you changed a map, make sure you used the mapmerge tool. If this is an Issue Correction, you can type "Fixes Issue #169420" to link the PR to the corresponding Issue number #169420. Remember: something that is self-evident to you might not be to others. Explain your rationale fully, even if you feel it goes without saying. --> # Explain why it's good for the game double lights bad. for the marshals light movement I just didn't like it, and I don't think there's anywhere else where lights are on windows(?) # Changelog :cl: fix: removed a light fixture being doubled on trijent maptweak: moved some trijent lights in marshals off windows /:cl:
# About the pull request SG kit now has 3 drums inside, and removes the drums purchasable from the vendor. # Explain why it's good for the game Similar rationale to #4454 It's a bad choice to take anything but SG drums. By removing the mandatory purchases, smartgunners can now spend their points on utility instead. # Changelog :cl: balance: 3 smartgun drums now spawn in the SG's equipment crate. Smartgun drums cannot be purchased from the SG vendor. /:cl:
# About the pull request There is no OB cannon on WO # Explain why it's good for the game # Testing Photographs and Procedure <details> <summary>Screenshots & Videos</summary> Put screenshots and videos here with an empty line between the screenshots and the `<details>` tags. </details> # Changelog :cl: fix: Overwatch now works on Whiskey Outpost again, not that you will use it. /:cl:
# About the pull request This PR simply allows the all hands on deck message for a CO spawning in to send the message and sound to those inside containers on the ship (e.g. cryopods). # Explain why it's good for the game Restores old behavior before cryopods (though I swear this worked before with people in cryopods) # Testing Photographs and Procedure <details> <summary>Screenshots & Videos</summary>  </details> # Changelog :cl: Drathek fix: Fix all hands on deck message not sending to those in cryopods /:cl:
# About the pull request Cleans up some duplicate, unused, and/or obsolete (due to native DM implementation) defines. Each change is isolated in its own commit if any are objectionable. - `Clamp()` - functionally identical to and replaced by native `clamp()`, introduced in 513: https://www.byond.com/docs/ref/#/proc/clamp - `Tan()` - functionally identical to and replaced by native `tan()`, introduced in 513: https://www.byond.com/docs/ref/#/proc/tan - `roundNearest()` - functionally identical to and replaced by native 2-argument `round(x, 1)`: https://www.byond.com/docs/ref/#/proc/round - `IsInRange()` - never used and identical to `ISINRANGE()` define, elected to keep the latter as it is in the DEFINES folder - `CEILING(x, 1)` - when 1 is the second argument, replaced by the functionally identical and simpler `Ceiling()` define, which itself can be replaced by native `ceil()` when we move to 515: https://www.byond.com/docs/ref/#/proc/ceil - `n_ceil()` - functionally identical to and replaced by `Ceiling()` - `FLOOR(x, 1)` - when 1 is the second argument, replaced by the functionally identical and simpler `Floor()` define, which itself can be replaced by native `floor()` when we move to 515: https://www.byond.com/docs/ref/#/proc/floor - `LERP()` - a version was implemented in projectile code, moved it out to the DEFINES folder and switched to a slightly more robust version from TGMC: https://github.com/tgstation/TerraGov-Marine-Corps/blob/2da5c237640d73e3e66ad79e34861e9682f4609c/code/__DEFINES/maths.dm#L87-L90 <!-- Remove this text and explain what the purpose of your PR is. Mention if you have tested your changes. If you changed a map, make sure you used the mapmerge tool. If this is an Issue Correction, you can type "Fixes Issue #169420" to link the PR to the corresponding Issue number #169420. Remember: something that is self-evident to you might not be to others. Explain your rationale fully, even if you feel it goes without saying. --> # Explain why it's good for the game Less duplication leads to greater maintainability. # Testing Photographs and Procedure <details> <summary>Screenshots & Videos</summary> Put screenshots and videos here with an empty line between the screenshots and the `<details>` tags. </details> # Changelog No player-facing changes.
# About the pull request just adding what should already be possible... <!-- Remove this text and explain what the purpose of your PR is. Mention if you have tested your changes. If you changed a map, make sure you used the mapmerge tool. If this is an Issue Correction, you can type "Fixes Issue #169420" to link the PR to the corresponding Issue number #169420. Remember: something that is self-evident to you might not be to others. Explain your rationale fully, even if you feel it goes without saying. --> # Explain why it's good for the game give more option for MT # Testing Photographs and Procedure <details> <summary>Screenshots & Videos</summary> Put screenshots and videos here with an empty line between the screenshots and the `<details>` tags. </details> # Changelog :cl: add: Add the ability to build multi tile assembly from metal sheets. /:cl: Co-authored-by: Julien <jverger.ingx@gmail.com>
# About the pull request Fixes dead marines being able to man and fire the M56D. Also adds a `stat` check to the M2C as well. It doesn't have the same problem as the M56, but when dragging it onto your body a progress indicator will flash up before quickly disappearing, so this just stops it appearing in the first place. # Explain why it's good for the game Dead marines firing machine guns is spooky. # Testing Photographs and Procedure <details> <summary>Screenshots & Videos</summary> **Before:** https://github.com/cmss13-devs/cmss13/assets/57483089/e4e6fd55-ed71-493f-9f52-4c517f4eec61 **After:** https://github.com/cmss13-devs/cmss13/assets/57483089/6459571f-02b8-457f-bb14-a6105c11ab19 </details> # Changelog :cl: fix: Fixed dead marines being able to man and fire the M56D. /:cl:
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.
See Commits and Changes for more details.
Created by
pull[bot]
Can you help keep this open source service alive? 💖 Please sponsor : )