Merge with upstream #59
Closed
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
|
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
github-actions
bot
added
Admin
Code Change
DME Edit
Map Change
Sprites
tgui
Config
labels
|
Please add This one PR is responsible for 34% of the files and 17% of the storage used. |
<!-- 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 I don't know how we've gotten this far without stable concrete mix. It's a staple of concrete related situations. Adds a chemical jug of concrete mix (in an ideal world this would be a big chalky bag) to the outpost for 1000 credits. <!-- 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 Construction fluff. Also useful for a ship I'm planning. <!-- 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: You can now purchase concrete mix at the outpost. For concrete making. /: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 small optimization to reduce the size of SSmachines processing <!-- 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 <!-- 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: code: ctf machines now only process while ctf is running /: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! --> Original code and new alert icons by Rylie, a few bug fixes and modifications by me, and PRed on behalf of her. The sweating alert icons specifically are from Citadel Station Adds comfortable temperature ranges for species. Instead of the temp indicator only showing up when you hit dangerous temps and start taking damage, it will now show up once you exceed your comfortable range. Being in temperature damage is now indicated by a sweating/fan overheat alert for organics and IPCs respectively in the case of overheating, or shivering if you're too cold. Comfortable temp ranges are provisional, and Im open to changing them. ## Why It's Good For The Game <!-- 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. --> Gives a bit more nuanced feedback on your temperature, and provides a transition state between from "you're a bit warm" to "you are now dying of heatstroke" instead of immediately going from fine to melting alive with no HUD warning. ## Changelog :cl: Rye-Rice, Gristlebee add: Comfortable Temperature ranges imageadd: Temperature HUD alerts /: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  Woah! Best sprite showcase of 2024! Note: Those goggles, unlike the ones that factions have, do NOT have a sechud. They are just fancy sunglasses. <!-- 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 - Probably good to have them seperated, just like how inteq did it. - Indie sec drip. - I REALLY want this for the #3380. <!-- 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: Added "ballistic goggles" - new indie security clothing item. imageadd: Added Kepori bulletproof helmet sprites. /: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 https://github.com/user-attachments/assets/a8715ea0-0721-4025-8a5a-74296290ae77 Defines some pgf flavored laser turrets. Maps the light variant onto the Crying Sun as a replacement for the weak turrets currently installed (shouldn't be a major upgrade). The turrets are: Standard - uses the pgf assault rifle laser Light - uses the pgf pistol laser Heavy - uses the pgf sniper laser and a heavier disabler beam. Also organizes the file slightly and renames the faction define for solcon (solgov -> solcon) <!-- 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 More turret definitions is good. Also I need these for a ship. <!-- 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 PGF now has it's own turret offerings. They come in light, normal, and heavy flavor. /: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: FalloutFalcon <[email protected]>
…ips (#3344) <!-- 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! --> Adds the inteq wintercoat and hoodie to the Talos, Colossus, Vaquero and Valor uniform lockers. ## Why It's Good For The Game <!-- 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. --> If you're cold, the Sarathi are cold too. The Inteq wintercoat is only obtainable as an alt pref-option to the armor vest for enforcers, and the hoodie isn't mapped anywhere as far as I'm aware. It'd be nice to able to see them in game more often for aesthetic options and it's a nice flavorful thing to have to keep warm with. ## Changelog :cl: add: Inteq wintercoats and hoodies in the Talos, Colossus, Vaquero and Valor uniform lockers /: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. -->
#3333) ## About The Pull Request Doubles the amount of rounds in .45-70 ## Why It's Good For The Game Beacon takes the cake for The Worst Ammo Efficiency In The Game By Far (500 credits for 12 bullets, you are Shooting 40 Credits Each Shot, the equivalent of shooting half a Plasteel Sheet each shot) ## Changelog :cl: balance: .45-70 boxes increased from 12 to 18 add: .45-70 hollow point boxes and A Singular .45-70 Explosive Round is now available in the black market /:cl: --------- Signed-off-by: generalthrax <[email protected]>
Signed-off-by: Mark Suckerberg <[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 This fix removes a second increment to the dist_travelled variable. This line appears to have caused the throwing range of items to be halved, effectively. This fix should make it so that thrown objects go as far as they are intended to. ## Why It's Good For The Game Resolves the issue linked here: #3487 ## Changelog :cl: fix: fixed halved throw range /: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 Partial port of Mojave-Sun/mojave-sun-13#2076 and surrounding PRs Adds bullet handfuls. You can only have the same type of ammunition in a handful. No mismatched stacks Spent casings are not stackable. Generally, the rule is: * By default, stacks can contain 12 rounds. * Pistol-equivalent stacks contain 15 rounds. * Shotshell stacks contain 8 rounds. * Rifle stacks contain 15 rounds. * Large calibre stacks contain 5 rounds. Also replaces old ammo boxes with storage boxes that come pre-filled with stacks of bullets like this:  Here's how the stacks look:   ## Changelog :cl: add: Added bullet stacks, they allow you to stack ammo of the same type into a group. balance: Changed old ammo boxes into storage items containing stacks of bullets /: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: thgvr <[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. --> # please please, please do not port this to tg or a non-ship server. this is me asking nicely to not to, i do not want this on a non-shiptest-like server Shoutout to braided for being the first hairstyle to make me go "This is unsalvageable" ## About The Pull Request part of project re:hair It's that time again for the ✨re:hair ✨ pull request! Hair cuts/Replacement chart in case your character breaks: Braid (High) --> Ponytail (Braided) - Done by @Imaginos16 Braid (Floorlength) --> Ponytail (Braided Short) - Done by @Imaginos16 Ponytail (Long) --> Ponytail (Straight) - Done by rye-rice Ponytail (High) --> Ponytail (Straight Short) - Done by rye-rice Ponytail 2 --> Ponytail (Grace) - Done by rye-rice Ponytail 3 --> Ponytail (Grace) - Done by rye-rice Ruby - Done by rye-rice Ruby (Long) - Done by rye-rice Ponytail (Country) - Done by @Imaginos16 Bobcurl - Done by @Imaginos16 Braided \\ Braided Front | --> The Dumpster Braid (Low) | Braid (Short) / ## Why It's Good For The Game    ## Changelog :cl: Imaginos16, rye-rice add: A few hairstyles have been resprited! del: the Braided and Braid line of hairs. /: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 <[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 <!-- 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 <!-- 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: update path txt for ammo boxes, thgvr will be FIRED for forgeting this. /: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 Does what it says on the tin, finally implementing sprites done in collaboration with the exceedingly talented Spookywastaken. Thank you for that first sprite dog, I wouldn't have finished this monstrosity without your help.  This PR also surprisingly fixes a bug where the broken state of the smartfridge wouldn't display due to the fact someone forgot to add it in code. Whoops. <!-- 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 Death to all cruft in our server. <!-- 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: Spooky, PositiveEntropy imageadd: Smartfridges and Booze-O-Mats have been resprited! /: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 Replaces the HOS, Law and CE stamps with the inteq stamps that actually exist already. Also repaths IRMG and CLIP stamps. <!-- 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 Feels like an oversight. I think someone added them and forgot to actually make them player-accessible. Repathing because factional stamps together are nice. <!-- 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: Added a honorable corpsman stamp and tweaked honorable arti one. add: Inteq ships now use inteq stamps. code: Repathed IRMG and CLIP 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. -->
## About The Pull Request This helmet has a Vox sprite available that used to work (but doesn't anymore for some reason), this PR makes it correctly show up now. ## Why It's Good For The Game Fixes species support for an item that should have it. ## Changelog :cl: fix: War Correspondent helmet has a proper sprite for Vox. /:cl:
…g Yard (#3544) <!-- 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! --> The ruin had the base revolver type mapped. Replaces it with a Viper.  ## Why It's Good For The Game <!-- 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. --> I DEMAND- ## Changelog :cl: fix: Abandoned Miskilamo Shipbreaking Yard ruin has the correct revolver subtype. /: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! --> Rock Planet shipping dock ruin has a rattlesnake instead of the ringneck case.  ## Why It's Good For The Game <!-- 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. --> Seems like the ringneck got mapped in by mistake, since the crate had two rattlesnake mags, and the gun there before was the TEC-9, which the rattlesnake was supposed to replace. ## Changelog :cl: fix: Shipping dock ruin correctly has a rattlesnake instead of a ringneck case /: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 I shouldnt have to explain every god damn detail but here: - Resprites the Candor - Resprites the Ashhand - Removes the Shadow skins nobody used - Adds Shadow skins people will use - Gives the Shadow and Ashand inhands - Redoes the flaming arrow inhands - Fixes the boomslang fitting on the belt ## Why It's Good For The Game  ## Changelog :cl: add: Various sprite improvemnts fix: Boomslang no longer fits on the belt /:cl: --------- Co-authored-by: retlaw34 <[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 Reformats anomaly code to be mildly less 2023. Anomalies now only have one core instead of aCore and bCore (what was i smoking). This core can receive multiple codes on the *same* frequency. Some anomaly cores now have unique detonation effects for when they are activated outside of an anomaly. A few samples of this include: setting things on fire, radiation poisoning, disappearing. Includes a new anomaly to try and balance out positive vs negative. The new anomaly is called the Transfusion. It steals blood until it is no longer hungry, at which point it will give blood to those lacking in it. <!-- 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 More sandboxy nature + decision making in conflict around anomalies. <!-- 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: Erika Fox add: Transfusion anomaly; yum! Blood! add: Anomaly cores now have an effect when detonated out of the anomaly add: new anomaly description fluff /: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: 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 that stuff to the Hyena. <!-- 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 There is an NGR combat ship and a Hyena replacement in the works rn. Good time to add some fluff. <!-- 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: Added stamps for New Gorlex Republic. add: Added secret documents for New Gorlex Republic. /: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. -->
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
Merge with upstream
Why It's Good For The Game
Merge with upstream
Changelog
🆑
server: Merge with upstream
/:cl: