[pull] master from cmss13-devs:master #861
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}
# About the pull request This PR ports tgstation/tgstation#77283 and corrects an incorrect default value in update paths. # Explain why it's good for the game Fixes an edge case with map merge tools. # 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 fixes issue #5512 by turning oxygentank into fueltank subclass # Explain why it's good for the game having to move oxygen into custom tank to fill custom flamethrowertank is a bug # 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: allows custom flamethrower tanks to be filled directly from oxygentank /:cl: --------- Co-authored-by: vincibrv <vojtechvincibr@seznam.cz>
# About the pull request Basically adds three more magazines to the MP handgun cases for a total of six magazines, as before the pistols were moved to seperate guncases. # Explain why it's good for the game MPs should be able to fill their holster belts without raiding squad preps. # Testing Photographs and Procedure Working (probaly) # Changelog :cl: add: Added three more magazines to each of the MP's handgun cases /:cl:
# About the pull request As title. This PR continues my work from #5128 and adds the defines for PMCs, Mercenaries, VAI and TWE. I have also changed how the global lists for highcommand (both USCM and WY) work and have made a new global list of all USCM officers to allow for easy reference in #5202. To do the above I have added a default_faction var on paygrades, along with a variable to indicate if a paygrade refers to an "officer" or not, and if the officer is a "flag" officer, for senior leadership. I have also updated the Syndicate ID card to work properly. <!-- 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 # 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: Adds paygrade defines for PMCs, VAI, Mercenaries and TWE. code: Adds code to populate reference lists for certain paygrades. fix: Fixes PMC synth not using the correct grade. add: Syndicate ID card repathed and works with paygrades. /:cl:
# About the pull request properly made some comment to doc standard with /// create a new area type /area/almayer/mnt it will be a parent to hull area. changed hull/lower_hull to hull/lower (same for upper) added two maintenance areas /area/almayer/mnt/lower/constr and /area/almayer/mnt/lower/s_bow added a bunch of missing apc because of all the recent change in hull areas... map tweak hull areas where a lot to bright so i moved a bunch of light (hope it doesn't break the freeze....) <!-- 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 1-making hull area match well separated area will help a lot people to use the system to locate dead people etc.... 2-making hulls areas darker will add a more fitting vibe to it. 3-seperate hull and maint area is in preparation to the future also allow to know hull area area with access to exterior hull and know maint aren't 4-adding more apc will allow them have area being unpowered... # 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: corrected the name of an area from "Lower Deck Starboard Hull" to "Lower Deck Starboard-Aft Hull". fix: added apc's to area that where missing one. maptweak: added some areas to almayers (constr site, Starboard-Bow Maintenance, Bow Hull(port and starboard),cryo maintenance. /:cl: --------- Co-authored-by: Julien <jverger.ingx@gmail.com> Co-authored-by: Drathek <76988376+Drulikar@users.noreply.github.com> Co-authored-by: Nanu308 <59782240+Nanu308@users.noreply.github.com>
# About the pull request I realised the marine role category title was never fixed from the rank rework rebranding Squad Marine to Squad Rifleman. This fixes it. <!-- 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 # 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: spellcheck: The latejoin menu marine category title is now Marines instead of Squad Riflemen, as this was an inaccuracy. /:cl:
…fallof slower (#5410) # About the pull request adds more warnings to aproaching cas # Explain why it's good for the game gives xenos even more clues about incoming firemission, should prevent silent cas unless you are runner who runs in straight form the other sife of map directly into FM # 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: added messages when the CAS sonic boom is played soundadd: reduced volume falloff of CAS sonic boom /:cl: --------- Co-authored-by: vincibrv <vojtechvincibr@seznam.cz> Co-authored-by: Doubleumc <Doubleumc@users.noreply.github.com> Co-authored-by: SabreML <57483089+SabreML@users.noreply.github.com> Co-authored-by: Drathek <76988376+Drulikar@users.noreply.github.com>
# About the pull request Adds a bolted version of the blood and medical vendors Only the Field Equipment Vendors can down be taken down for FOB Adds new pill bottle crate to requisitions Makes medical crates ordered via req cheaper to compensate <!-- 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 Centralizes requisition gameplay and increases its overall importance in the gameloop. This is just part 1 of a requisitions centralization update. I highly advise TMing this, to properly balance overall requestion prices and perhaps add more medical crates as needed # 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: LTNTS add: bolted version of blood and medical vendors add: pill bottle crate balance: cheaper medical crates from req balance: less items in med vendors, mainly pill bottles /:cl: --------- Co-authored-by: Drathek <76988376+Drulikar@users.noreply.github.com>
# About the pull request I swear I do actually test my PRs 😢. Fixes #5529 by refactoring the 'Queen locator' to track targets with `/datum/weakref`s, rather than their index in a global list. # Explain why it's good for the game Bugfix. (Honestly no idea how I missed this one) It makes the code much simpler and easier to understand (arguably). # Testing Photographs and Procedure <details> <summary>Screenshots & Videos</summary> https://github.com/cmss13-devs/cmss13/assets/57483089/97552c21-c28a-49a8-a4aa-6ff03209062e </details> # Changelog :cl: fix: Fixed the xeno 'queen locator' giving the wrong location when a tunnel was selected. /:cl:
# About the pull request <!-- 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. --> Deadchat will no longer get notified about any facehugs inside a tutorial area. This is the best solution I can think to this problem, an alternative being checking the hive of the facehugger and canceling based on that. Recommendations are welcome. # Explain why it's good for the game Tutorials are irrelevent to the main game, and players shouldnt be notified that someone is using the tutorial system. # Testing Photographs and Procedure <details> <summary>Screenshots & Videos</summary>  No dchat message. </details> # Changelog :cl: fix: Dchat is no longer notified of hugs from tutorials /: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 : )