forked from shiptest-ss13/Shiptest
-
Notifications
You must be signed in to change notification settings - Fork 17
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Shiptest sync nov12 #70
Merged
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 Fixes shiptest-ss13#3700 by requiring a confirmation pop up to give up on missions. Minor QoL. ## Why It's Good For The Game Prevents people from accidentally abandoning missions when they didn't mean to, and provides more time to reconsider it. ## Changelog :cl: add: Added a confirmation pop up for abandoning missions. /: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 ![kali_andhi_ingame](https://github.com/user-attachments/assets/dff8226f-0cfd-4086-be04-34941df001ab) ![kali_andhi](https://github.com/user-attachments/assets/71eaa7d3-ac03-4721-b0c4-001e0d686acc) ![kali_andhi_areas](https://github.com/user-attachments/assets/16497551-4328-49ee-932d-247a80079168) Adds the Kali Andhi-class, a new class of NGR destroyer that makes up the bulk of the NGR's young fleet. This class's activity in securing NGR's territorial claims has made them an unwelcome sight for the PGF especially. The Kali Andhi is a combat ship, comparable to the Crying Sun or the Colossus, featuring good armament and plenty of space for the crew to interact. Crew count is as follows: - 1 NGR Captain - 1 Lieutenant; Commands the Operatives, organizes and executes away missions - 1 Ensign; Mans the bridge, manages communications, coordinates the support crew - 3 Operatives; Soldiers, plain and simple. Can be armed with a Sidewinder, a Hydra DMR, or an Asp. - 1 Wrecker; Organize and handle the storage bay, retrieve resources, and occasionally scout for the Operatives - 1 Mechanic; Operate and maintain the power and life support systems - 1 Medical Doctor; Maintain the crew's general health, organize and manage medical supplies, bag and tag corpses - 2 Initiates; General-purpose muscle for cleaning and maintaining the ship. Also adds a set of NGR Tan floor decals, NGR wall and desk flags, and tweaks a few of the NGR outfits. ![kali_salute](https://github.com/user-attachments/assets/98f17072-4b00-4c44-ab79-f74f744aa09c) ## Why It's Good For The Game NGR needs a ship and the Hyena doesn't count. ## Changelog :cl: add: the NGR Kali Andhi-class destroyer add: NGR floor decals and flags balance: red space suit armor made equivalent to sec hardsuits /: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: Sun-Soaked <[email protected]> Co-authored-by: meemofcourse <[email protected]> Co-authored-by: Sun-Soaked <[email protected]>
## About The Pull Request Wasteplanets no longer spawn manhacks. I don't think the live manhack fields fits the aesthetic of them (nor is it particularly interesting in gameplay) ## Changelog :cl: balance: wasteplanets no longer spawn manhacks /:cl: Co-authored-by: Bjarl <[email protected]>
<!-- 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 Hello everybody my name is market pliers and today we will be pulling the plug ## Why It's Good For The Game fixes shiptest-ss13#3682 ## Changelog :cl: fix: the kilo sawnoff shotgun is no longer the private domicile of The Void /: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: Theos <[email protected]>
<!-- 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 Removes a bunch of unused config options to reduce confusion when people edit the config, and prevents people from using options that are fully deprecated. ## Why It's Good For The Game See about ## Changelog :cl: config: Removes a lot of old, unused config options /: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 setting force wielded or unwielded to 0 would cause it to permanently keep the other value since it skipped setting that value when wielded/unwielded ## Why It's Good For The Game why?? ## Changelog :cl: code: weapons which can be wielded may now have a force of 0 when wielded or unwielded /: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: Theos <[email protected]>
<!-- 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 a NT fax machine to the Delta-class * Replaces PGF vessels' fax machines with correct subtypes * Replaces the Lavaland listening post's and Sandplanet distillery's faxes with correct subtypes * Fax requests now make a sound alert * Fax machines are now, by default, offset by 6 pixels <!-- 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 consistency good. also we probably should stop missing faxes <!-- 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: The Delta-class now has a fax machine add: Fax machines are now offset by 6 pixels fix: Fixed some faxes' subtypes admin: Fax requests now make a noise /: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 This PR adds a whitelist of medical items to the suit storage slots of Frontiersmen, NGR, Hardliners, and Nanotrasen smocks, as well as expanding the whitelist for the non-factional surgical apron. Currently, I don't know of any items that work in the smocks aside from oxytanks and a PDA for the NT smock. Whereas other, more generic suits(such as winter coats and labcoats) would be more useful to wear by having a suit slot in them. This is a shame, because the four smock sprites are very pleasing, and compliment their faction uniform well. Pulling from labcoats and medical winter coats, with a few tweakings of my own, I have created a whitelist for the suit storage slot to be used on each smock, including but not limited to surgical tools, medical scanners, chemistry tools, and a few generic items. NOTE: While working on this, I discovered a few things that may warrant attention. The Hardliner and Frontiersmen smocks are the "base" suit model for all the factional gear, meaning future edits to them that we don't want all their equipment to inherit may be difficult if we don't add a placeholder model. Additionally, in the future, it may be smart to put the faction AFTER the category of item it is, e.g: "/clothing/suit/medical_smock/nanotrasen" instead of what it is now, "/clothing/suit/nanotrasen/medical smock" for easier grouping or cross-faction changes. ## Why It's Good For The Game Players will feel less inclined to forgo the cool-looking smocks for other clothes simply because they don't have suit storage. Makes medical inventory management slightly easier. ## Changelog :cl: add: Added a suit storage whitelist to the Nanotrasen, Hardliner, NGR, and Frontiersmen smocks. Expands the whitelist of the surgical smock. /: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 Fixing unavailable inbox donuts ## Why It's Good For The Game No ERROR in box ## Changelog :cl: imageadd: added icons for inbox donuts /: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: Feenie <[email protected]>
## About The Pull Request Basically ParadiseSS13/Paradise#27327
<!-- 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 Crusher Code slightly cleaner Crushers do more damage <!-- 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 I want to see how they feel like this. <!-- 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: balance: Crusher damage has been slightly increased across the board. /: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: Erika Fox <[email protected]> Co-authored-by: Erika Fox <[email protected]> Co-authored-by: Sun-Soaked <[email protected]> Co-authored-by: Theos <[email protected]>
…azines (shiptest-ss13#3719) <!-- 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 the strict type-check for allowed ammo lists (in ballistics, im not touching cells. yet.) with a typecache of any allowed magazine & an available list of blacklisted specific ammo types. Etherbor guns can now take both civilian and military etherbor cells, mirroring sharplite weapons which can accept both standard and upgraded cells. Behind every blade of grass. ## Why It's Good For The Game The shredder can now take slug boxes again Any gun where you can find or make empty magazines can now take those empty magazines. Guncrates conveniently avoided this by emptying non-subtyped magazines. Guns with alternate ammunition in magazines no longer require those alternate ammunition magazine types to be added to their allowed types despite only really changing the ammunition the magazine starts with ## Changelog :cl: fix: guns with magazines can no longer sometimes refuse to accept those magazines balance: etherbor military and civilian weapon cells are interchangeable between military and civilian arms /: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: Theos <[email protected]>
## About The Pull Request Changes the Kansatsu-class to be aspawned. Contact an admin if you would like to have it spawned in. ## Why It's Good For The Game Maptainer request. ## Changelog :cl: balance: Kansatsu has been removed from the player-accessible ship pool. /: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.
About The Pull Request
Why It's Good For The Game
Gotta keep it fresh!