[pull] master from shiptest-ss13:master#474
Open
pull[bot] wants to merge 2043 commits intoLatentish:masterfrom
Open
[pull] master from shiptest-ss13:master#474pull[bot] wants to merge 2043 commits intoLatentish:masterfrom
pull[bot] wants to merge 2043 commits intoLatentish:masterfrom
Conversation
github-actions
bot
added
Sprites
Map Change
Github
Code Change
Ship
Ruin
tgui
DME Edit
Config
Sound
labels
<!-- 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 This PR swaps a few defined variables around to help them make a bit more sense, and potentially resolves a problem currently with the orbit menu getting passed a null value ## Why It's Good For The Game I want to have my cake and eat it too ## Changelog :cl: fix: fixes the orbit menu breaking /: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 basically just a shorter one <img width="1075" height="277" alt="image" src="https://github.com/user-attachments/assets/a1020c85-a40d-4b99-8cc6-097faf4a56de" /> ## Why It's Good For The Game variety good for clothes. ## Changelog :cl: add: alt thigh high /: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 all of these <img width="1524" height="394" alt="image" src="https://github.com/user-attachments/assets/5e651e54-1c27-4809-97d0-e9ca9bd2aed6" /> ## Why It's Good For The Game more clothing options ## Changelog :cl: add: miniskirt+suit rolldowns /: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 <!-- Describe The Pull Request. Please be sure every change is documented or this can delay review and even discourage maintainers from merging your PR! --> Reimplements underbarrel guns to work off right mouse button. Underbarrel guns can be fired/interacted with while attached to a gun with right mouse. Fixes a couple bugs (flaregun runtimes, single round magazine funkiness, egun ammo toggle button not showing) Readds the riot grenade launcher, added a range cap and increased the detonation timer. Underbarrel shotgun is now properly two shots, and is now semi auto. ## Why It's Good For The Game More right mouse interactions to fill out the roster, and makes using underbarrels a lot less janky compared to the previous implementation. Fixes are good Realigns the underbarrel shotty to act like it's supposed since I figured out the single shot bug, and the riot grenade launcher nerf should stop it from being too oppressive so it can used again. ## Changelog :cl: add: RMB Underbarrels balance: Underbarrel shotgun two rounds and semi auto balance: Riot grenade launcher has it's range lowered, and grenade detonation time upped fix: Flareguns, single shot magazines, underbarrel egun ammo toggles /: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. -->
…5496) <!-- 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 Basic emergency tanks are effectively removed, with extended-capacity emergency tanks replacing them. Actual extended capacity emergency tanks now use the previously unused 'emergency-tst' sprite in order to differentiate them, but they don't have any actual differences. Their volumes were kept at 2. A visual and auditory alert system was also implemented to warn a user of a tank if their tank is getting low in pressure. <img width="153" height="46" alt="image" src="https://github.com/user-attachments/assets/fb0377af-77e3-414e-8da1-da7bd14c569f" /> In the above image, the tank makes a sound and sends a voice alert regarding its pressure status. This alert only makes a sound and notification when the pressure drops below 200 kPa, and again when the pressure approaches 0 kPa. The idea for the vocal notifications are that these alarms aren't standardized, so they can be dismissed if a user is unaware to their significance -- a vocal notification makes it so that the purpose of the alarm is clear.  This gif shows the various overlay states for the pressure alert system, going from empty, to full pressure, respectively. There's also some minor unrelated cleanup of commented out code regarding energy latches ## Why It's Good For The Game A minor complaint I've heard a couple of times had to do with how readily emergency tanks emptied during use. I've also seen people only realize that their tank's run out when they get the status indicator that their character is lacking oxygen. This should help alleviate instances of that. ## Changelog :cl: add: Added an emergency tank pressure alert system balance: Increased emergency tank volumes /: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 Makes it so the shredder simplemob wears and has the armor base of the frontiersmen tactical armor instead of their hardsuit, which only has 2 bullet resistance iirc. ## Why It's Good For The Game the guy carrying the big gun shouldnt be dying to one candor mag might not be worth adding. --> ## Changelog :cl: balance: gives the frontiersmen shredder enemy actual armor /: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 This PR makes it so that people in seats, wheelchairs, gurneys, or other buckleable moveables stay buckled when moving between floors ## Why It's Good For The Game I figure this is a small little quality of life addition so that one doesn't need to keep rebuckling things between floors ## Changelog :cl: fix: fixed buckling between floors on an elevator /: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. -->
…n headsets (#5627) ## About The Pull Request <img width="303" height="100" alt="image" src="https://github.com/user-attachments/assets/172c5a53-c3ff-4416-84b5-53fb3ff1a0d6" /> <img width="317" height="72" alt="image" src="https://github.com/user-attachments/assets/aac2c901-e624-4880-84d9-b8d7829d1eb7" /> Banshee <img width="293" height="209" alt="image" src="https://github.com/user-attachments/assets/05030ef7-769d-4566-8e41-ed81b81eb4fc" /> Leyak <img width="191" height="201" alt="image" src="https://github.com/user-attachments/assets/05716224-eada-474b-888d-5de1da80754c" /> Cirrus & Gauze (Not sure about the Gauze) <img width="674" height="376" alt="image" src="https://github.com/user-attachments/assets/707fc293-ecb4-403c-aeed-569714c74421" /> <img width="574" height="441" alt="image" src="https://github.com/user-attachments/assets/ba844918-153a-4f4d-9277-c607c5a3c6ca" /> Nimbus <img width="837" height="662" alt="image" src="https://github.com/user-attachments/assets/3dff6885-ccb6-45fa-8ac2-2b743049d312" /> Mercury <img width="338" height="415" alt="image" src="https://github.com/user-attachments/assets/4d4f836d-88ad-43d1-9040-13cbde3a8ba7" /> Derecho <img width="420" height="307" alt="image" src="https://github.com/user-attachments/assets/4c409b8f-9703-4092-a0d0-0a733eee8537" /> Haboob <img width="319" height="194" alt="image" src="https://github.com/user-attachments/assets/51902e24-a929-4aea-a26b-01da3da104ae" /> Kali and Karst had pre-existing relays that I replaced Hardliners and Cybersun share the Cybersun frequency Adds servers / relays for every frequency alongside headset variants for the three factions All of the headsets and encryption keys (except for Specifically the SUNS encryption keys) share the same icons. SUNS technically has its own bowman sprite but it has no on_mobs so I just set it to default ## Why It's Good For The Game In lore the Syndicate is pretty much all but dissolved. We're closing in on 10 years since the war. Mappers also want private frequencies for the factions for their own inner collaboration instead of having to share with what could be their bitter enemies. ## Changelog :cl: add: Added new Frequencies for Cybersun (Shared with Hardliners), NGR, and SUNS add: New relays and servers for these frequencies (preset on all post-Syndicate factions) add: Captains and officers will have the new headsets del: Removed access to the Syndicate frequency (mostly) /:cl: --------- Signed-off-by: generalthrax <139387950+generalthrax@users.noreply.github.com> Co-authored-by: Erika Fox <94164348+Erikafox@users.noreply.github.com>
`0.3` -> `30` :cl: fix: Fixed Gorlex Hardliners receiving a 0.3% discount on cloaking devices instead of 30% /: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 A small tweak to the name/description of pavement for spelling and grammar reasons. Previously it appeared like this in game: <img width="913" height="113" alt="image" src="https://github.com/user-attachments/assets/4dead442-59ce-4644-b1c5-a5d9f9b3a9fa" /> <!-- 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 Just a tiny change for readability. <!-- 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: spellcheck: pavement /: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 some falsewalls in trifuge maint were broken ## Changelog :cl: fix: trifuge falsewalls /: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 Meant to fix the various docking issues ive noticed over the past few uptimes, along with making some player facing docking stuff easier to comprehend. Meant to be a minor PR, you know the old song and dance In no particular order: - Makes docking error messages less fucking vauge and weird. This isn't even because they're player facing, this is because i geniuely couldnt figure out wtf they meant without looking up the code. This means an admin might actually figure out what is causing a particular docking issue - - Some more docking errors for for adjustable docks since those handle docking different from regular docks. - Fixes improperly mapped docking ports on some ships - - Firefly docking port is no longer extremely dangerous due to missing `disable_on_owner_ship_dock` - - June's Docking port now can dock to other ships - Fixes slimegirl that occurs due to ships sometimes stealing the mobile or even transit docking port from other ships. This should in theory make ship to ship docking a lot less fucked up, but also long rounds (>4 hours) should be a lot more stable - - Should make docking ports a lot less prone to random breakages and errors - Adds edgecase handling for a fair bit of ship code - - Makes Very Big ships have less janky transit zones - - Checking if a ship can dock to an adjustable dock doesn't actually said dock anymore, saving perf and making adjust. docking port bugs less common - Quick dock is now Actually Quick. it should search all docking ports on an overmap object (barring outposts, those have their own handling) to find one that you can actually dock to - Uploading shuttle map templates no longer breaks the overmap sprite due to missing faction datum Needs TM During an early round due to it touching pretty vital code. Otherwise, it shouldn't be noticable too much. ## Why It's Good For The Game Working shipcode that works better is good. ## Changelog :cl: add: Quick dock now searches for docking ports your ship can land at, rather than picking the first option and failing. Quicker! add: Makes docking port messages less vauge. add: Adjusts transit vlevel sizes for larger ships add: In case you are unable to dock to something, you should be given more feedback fix: Shuttle errors due to docking ports being stolen fix: Edgecase handling for docking ports, should fix very rare shuttle bugs fix: Kali, Corona, Dwayne, Firefly, Scarab, Venetia, Typhoon, June, and especially the Quasar have either proper docking ports or fixed docking ports fix: Firefly is now not extremely dangerous to dock to fix: Shuttle code should be less prone to breaking in general /: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. --> --------- Signed-off-by: rye-rice <58402542+rye-rice@users.noreply.github.com> Co-authored-by: retlaw34 <58402542+retlaw34@users.noreply.github.com> Co-authored-by: Sarah C <93578146+SapphicOverload@users.noreply.github.com>
🆑 fix: Fixed new languages added to the game not showing up in character preferences /🆑
## About The Pull Request Adjusts ingredient diversity in the fridges so you can make like 3 or 4 recipes about Added two oxygen closets along the main hallway in the Cirrus Added bathroom lock to the crew bathroom and made the command bathroom not lock the crew bathroom Removes a duplicate recharger on Nimbus ## Why It's Good For The Game Just some minor quality of life ## Changelog :cl: add: Added more ingredients to Cirrus / Nimbus add: Oxygen closets in Cirrus fix: Cirrus command bathroom no longer locks crew bathroom, lock to crew bathroom fix: Removed duplicate recharger on Nimbus /: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 replaces a missing console on the kiwi <img width="798" height="676" alt="image" src="https://github.com/user-attachments/assets/94361589-a4c6-4aad-8d18-0a20aab6df39" /> ## Why It's Good For The Game replaces a missing console on the kiwi ## Changelog :cl: fix: replaces a missing console on the kiwi /: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. -->
## Why It's Good For The Game I feel like this is better to be in the hands of your own agency rather than being a gamey quirk you, the player, has no control over ## Changelog :cl: del: Removed phobia trait /: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 Minor changes to the description of the Woeful Cthonian for spelling/grammar. <!-- 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 clarity and ease of reading <!-- 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: spellcheck: cthonian-class description /: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. --> --------- Signed-off-by: OnlineGirlfriend <50865623+OnlineGirlfriend@users.noreply.github.com> Co-authored-by: Erika Fox <94164348+Erikafox@users.noreply.github.com>
<!-- 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 outposts now have proper baseturfs minus Trifuge, since that would require actual map changes and i just want to ping someone and have this merged resolves #2526 ## Why It's Good For The Game Any kind of situation where a turf on an outpost gets destroyed for any reasons reveals that every outpost doesn't have a proper baseturf set up ## Changelog :cl: fix: Outposts now have proper baseturfs /: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. --> Co-authored-by: retlaw34 <58402542+retlaw34@users.noreply.github.com>
<!-- 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 Adds missing directionals for SUNS bedsheet. <!-- 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 This was the only bedsheet that didn't have directionals, now you will be able to enjoy a cozy SUNS bedsheet facing east and south as well <!-- 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: add directionals for SUNS bedsheet /: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 Spellchecks drink_reagents.dm and makes small edits for consistency. <!-- 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 Readability, you love to see it! <!-- 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: spellcheck: drink_reagents.dm /: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. --> --------- Signed-off-by: OnlineGirlfriend <50865623+OnlineGirlfriend@users.noreply.github.com> Co-authored-by: Erika Fox <94164348+Erikafox@users.noreply.github.com>
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
20 participants
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] (v2.0.0-alpha.1)
Can you help keep this open source service alive? 💖 Please sponsor : )