Shiptest Mirror #5 [MDB IGNORE] #12
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 If you have a cigarette equipped, and someone else has an un-lit cigarette equipped, you can light theirs via help intent+target mouth  ## Why It's Good For The Game New co-op interaction ## Changelog :cl: add: If you are smoking a cigarette, you can light someone else's cigarette via help intent while targeting the mouth /: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 Kills mutation toxin. Simple as. <!-- 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 1. Xenobio content. Ew. 2. I've only seen this used for griefing or accidentally. 3. Admins already have a dedicated species change button if need be. <!-- 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: del: mutation toxin /: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 Continuation of #2628, which was merged without a testmerge. This fixes some ERT outfits, adds a Syndicate Inspector ERT (which had the outfit defined but not the ERT), and fixes the independent sechud background. Also messes with the CMM Inspector's icon.  <!-- 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 blame zephyr <!-- 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: ACLF Syndicate Inspector ERT fix: Independent background icons fix: ERT Outfits not having access and proper names /: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 a bunch of new socks and shirts for Kepori, and digitigrade versions of the pride and grayscale thigh-highs. I also updated some of the already existing socks (like bee and bisexual socks) to use the sprites of their grayscale counterparts as a base so they're not just a flat sprite. On top of this I noticed Kepori their left arms and legs also had right arm and leg sprites and vice versa when facing east/west, so I removed the extra parts from those. In practice there will be no noticeable difference in this outside of amputees now showing their sides correctly. ## Why It's Good For The Game Now you can express your pride as a Kepori or with digitigrade legs! ## Images Kepori with the tank top and the bee socks  Kepori with a polo shirt and nonbinary socks  Lizard with the trans socks  ## Changelog :cl: imageadd: Added more Kepori socks imageadd: Added more Kepori shirts imageadd: Added digitigrade pride thigh-highs fix: Fixed Kepori arms having both left and right sprites per single arm /:cl:
…CentCom (#2653) <!-- 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 pull requests ports: * BeeStation/BeeStation-Hornet#9408 * BeeStation/BeeStation-Hornet#9236 This pull request reverts: * tgstation/tgstation#70072 The requests manager is now a thing.  It also adds little offices with fax machines for factions to CentCom, which recieve the physical paper and can send faxes back (though admins can still make use of the fax panel).  They can also fax each other, if ever needed.  <!-- 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 * Gives admins the ability to see a very easy to use recap of all requests that occur in a round. This system is readily extendible to support other types of requests, should someone care to add it. * Better admin tools, admins can now send faxes directly via the new Fax Manager verb, and faxes are show in the request panel instead of its own panel. * You can now LARP as a Cybersun minimum wage intern handling 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: bobbahbrown, itsmeow, meemofcourse add: CentCom now has some small offices, which recieve physical faxes. add: Fax machines now announce that they have received a fax over radio. add: Fax machines announce important faxes VERY LOUDLY. balance: Faxes no longer require a subspace ansible crystal. code: Faxes now use typepath instead of varedit. tweak: Changed how special/faction faxes work. Login is no longer required to use special faxes. admin: Add Requests Manager to view all fax messages/prayers/centcom and syndicate requests/and nuke code requests within a round. admin: Removed old fax manager in favor of Requests Manager, added "Send Fax Message" verb to send admin faxes via a menu. fix: Fixed runtime when ghosts tried to view paper. /: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 Removes alien surgical and engineering tools from the analyzer loot pool, removes the lost abductor spawn from ice planet portals ## Why It's Good For The Game Abductors in general have been removed for a variety of reasons, and these are effectively the last places you can still get their stuff. ## Changelog :cl: del: Removed abductor tools from the wrecked analyzer loot pool del: Removed lost abductor from iceplanet portal loot pool /: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 Fixed bees being able to open the Shepherd Apiary Adds more Light Fixtures around the shepherd Added some farming plots in the apiary so bees can actually make honey Fixed bees being able to open the Shepherd Apiary Sorry for fucking up the previous 2 PRs :( ## Changelog :cl: add: Adds more Light Switches around the shepherd add: Added some farming plots in the apiary so bees can actually make honey fix: Fixed bees being able to open the Shepherd Apiary /: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 two flashes, a Recharger, a stamp and a wideband to the Ranger bridge. And a commander pistol,mags and ammo to the lieutenant closet and security closet,and adds a 9mm ammo disk for the autolathe. Also removes the ORM due to latency's request. ## Why It's Good For The Game It lets the captain recharge their e-rifle, complete the cyborg shell, stamp paperwork and actually talk to people for once. The commanders are to give a bit more firepower,as before the security specialist had only one derringer (!!) and i feel like the lieutenant could do with a bit more firepower,too. The ORM was removed due to having refineries in outposts. ## Changelog :cl: add: Added two flashes, a recharger, a stamp, two commanders, ammo for them and a wideband to the Ranger bridge. del: The Ranger's ORM. /: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 Adds stamps for various ShipTest specific factions which lacked them. For now they're only available for administrator spawn and I'll add them to their respective ships properly in a separate PR. Primarily this is for my own sanity of not continuing to suffer executive dysfunction by touching .dmis and so people re/mapping ships can add them if applicable. On-paper <img width="210" alt="rctHIwKQ80" src="https://github.com/shiptest-ss13/Shiptest/assets/46308162/feb22c6e-b28f-4423-9621-8d1b50de917c"> Higher resolution stamps          ## Why It's Good For The Game Currently factions like Inteq Risk Management, the Colonial Minutemen, and Syndicate subfactions are using vanilla stamps which oftentimes feel out of place. Adding stamps for the command structure of Inteq, GOLD and BARD of the Minutemen, as well as for Donk! Co. and Cybersun lets players and admins have flavor in an otherwise relatively anemic part of the game. ## Changelog :cl: add: Added new ShipTest faction specific stamps /: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: meem <[email protected]>
…bat Specialty (#2691) <!-- 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 There's a typo in the Corvus-class Response Vessel's description. <!-- 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 Fixes a typo in the Corvus-class Response Vessel's description. <!-- 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: Fixed a single typo in the description of the Corvus-class Response Vessel. /: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   Did something go terribly wrong? Do you have wounded? Are _you_ wounded? Do you have money? You're in luck! The Valor-Class is Inteq's medical component of their fleet, and provides a great service for a meager* fee! Armed with a tiny patient recovery vessel and spacious medical facilities, this flying field hospital is ready to provide rapid tactical care for all that ails you (beyond the mental scarring of losing all your friends). This comes at the expense of relying on other ships for food, research or armaments. It is staffed by: * 1 Vanguard * 1 Honorable Corpsman * 3 Corpsmen * 2 Enforcers * 2 Recruits <!-- 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 it's the inteq medical ship it uses the inteq content <!-- 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: Valor-Class Field Care Crusier add: Haste-Class Ambulance /: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: meem <[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 Direct port of tgstation/tgstation#53796, making non-motorized wheelchairs able to be folded. This was a cut-paste job with minor tweaking, if something breaks please yell at me. <!-- 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 Zevo can play their gay little lizard in peace  Also allows for medships to keep wheelchairs in stock or smth idk <!-- 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: tweak: non-motorized wheelchairs can now be folded imageadd: a few sprites to support the above /: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 Picks up where the brave Draggeru left off, giving her sprites a second chance at life! More information can be found in the original PR shiptest-ss13/Shiptest#2439 <!-- 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 my pompous bastards and I want them NOW  Note: The majority of these items are still unimplemented, although some can now be found on the Aegis. The primary goal of this PR is to give future SUNS ships something to work with (and maybe allow for some cheeky events in the meantime) <!-- 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: Draggeru, Cre add: adds all of the clothing intended for SUNS, including uniforms for the captain, xo, cmo, scientists, miners, engineers, and doctors add: several job outfits to support future SUNS content /: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: Skies-Of-Blue <[email protected]> Co-authored-by: meem <[email protected]>
github-actions
bot
added
Code Change
Config
DME Edit
Sprites
Map Change
Sound
tgui
Github
Dependencies
labels
|
Map failure, I'll have a look when I wake up |
|
Fixed |
|
why do we even have the mapdiffbot and why is it breaking now |
|
I don't know but this should be fine to merge regardless |
|
Wheelchairs are back |
|
|
|
Checks passed |
|
speedmerge time |
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
Merges Shiptest's latest changes while addressing issues in any modular files (I'll explain what one needs to do when mirroring later, ideally with a readme on the modular folder).
All changes I personally made were tested.
Why It's Good For The Game
Parity and functionality.
Changelog
🆑
code: Vampirism blood level tracking now uses signals, same way the species was changed to behave
code: Unmirrored new_player.dm, changed cryopod logic
/:cl: