Update from Shiptest on 2024-07-06 #82
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 This pull request contains an incredible number of changes to item names and descriptions regarding everything drinkable. This has been a long time coming, and was put off for quite a while due to my own procrastination. This is almost certainly going to have mapping errors, but I'm not checking them all myself. I'll let the tests figure it out for me. - Space Mountain Wind changed to Comet Trail - Dr. Gibb changed to Tadrixx - Starkist changed to Lunapunch - PWR Game changed to Pacfuel - Lemon Lime changed to Orange Soda - Nuka Cola removed - Thirteen Loko changed to Vimukti - Fetching Fizz removed - Manhattan Project removed - Narsour removed - Monkey Energy changed to Xeno Energy - unbranded water bottle changed to Ryuunosuke Reserve - space beer changed to Bizircan Brewery GDM - Magm-Ale changed to RHIMBASA TAP - Space Cola reflavored - Tonic water reflavored - Soda water reflavored - Grey Bull changed to Crosstalk - E-Fuel removed - Canned Air reflavored - Molten Bubbles reflavored and refactored - Plasma Fizz reflavored and refactored - Gin reflavored - Whiskey reflavored - Vodka reflavored - Tequila reflavored - Patron reflavored - Rum reflavored - Holy water reflavored - Vermouth reflavored - Kahlua reflavored - Goldschlager reflavored - Cognac reflavored - Wine reflavored - Absinthe reflavored, randomization removed - Premium Absinthe reflavored - Lizard Wine reflavored, again - Hard Cider reflavored - Amaretto reflavored - Grappa reflavored - Sake reflavored, as well as random reskins - Fernet reflavored - Orange Juice reflavored - Cream reflavored - Tomato Juice reflavored - Lime Juice reflavored - Grenadine reflavored - Applejack reflavored - Champagne reflavored - Blazaam reflavored to Hyperspace Highball(I've never even heard of this?) - Trappist Bleu reflavored - Hooch reflavored - Moonshine reflavored - Creme de Coconut reflavored - Cuba Libre reflavored to Frontier Libre - White Russian reflavored to White Gezenan - Irish Cream reflavored to Zohil Cream - Manly Dorf reflavored to Shortstop - B-52 reflavored to AM-G - Irish Coffee reflavored to Gezenan Coffee - Black Russian reflavored to Black Rachnid - Manhattan reflavored to Twelve Crossings - Red Mead reflavored to Drop-pod - Allies Cocktail reflavored to Canton Cocktail - Acid Spit reflavored to Cracked Moon - Amasec reflavored to Ren Kirsi - Irish Car Bomb reflavored to Lightspeed - Syndicate Bomb reflavored to Gorlex Surprise - Hivemind Eraser reflavored to Hivemind - Erika Surprise reflavored to Terraformer Surprise - Driest Martini reflavored to Saltflat - Banana Honk reflavored to Creamtruck - Silencer reflavored to Choker - Hippie's Delight reflavored to Between the Mandibles - Alexander reflavored to Ash-Shield - Amaretto Alexander reflavored to Happy Huntsman - Sidecar reflavored to Bridge Bunny - Kamikaze reflavored to Mothball - Moscow Mule reflavored to Gorlex Gator - Fernet Cola reflavored to Weldline - Branca Menta reflavored to Mirage - Bug Spray reflavored to Stunball - Jack Rose reflavored to Jackalope - Duplex reflavored to North-South - Mauna Loa reflavored to Inner Fire - Mudder's Milk reflavored to Miner's Milk - Freezer Burn reflavored to Hullbreach - Archmagus' brew removed - Cogchamp removed - Shambler's Juice reflavored to Shoal Punch - Gibb Floats reflavored to Tadrixx Float Vending machines reflavored Good lord I hope I didn't miss anything. Immense thanks to Stripes for doing all of the writing for this, with some help from our lore team. We miss you. I hope you're doing well. <!-- 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 Distances us from TG, and helps build our setting. <!-- 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: @thestripes, @meemofcourse , @GenericDM tweak: reflavors nearly every drink ingame /: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: Stripes <[email protected]> Co-authored-by: meemofcourse <[email protected]> Co-authored-by: Theos <[email protected]>
…ans in them now (#2981) <!-- 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 things with the edible component are now viable for being added to custom foods and have support for adding filling colors custom food fillings now take colors rather than objects because they only use colors. Technically this can maybe possibly let you add goofy ones but it's weird. ## Why It's Good For The Game organ burge.r....................... ## Changelog :cl: add: you can now put organs inside burgers or on pizzas /: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 THE LONG AWAITED SEQUEL! This PR adds a ton of things, but let's start with the most important changes:  Not only has every job has been tweaked and resprited visually, but you might've noticed at least three unfamiliar faces to the roster of the Saint Roumain's Militia! This is because now, there are new jobs for people to enjoy! These include: - The Flamebearer, a member of the ecclesiastical sect of the Church of Saint Roumain, focused on preaching the word of Saint Roumain, the Ashen Huntsman, through the holy text of the Liber Incendium! - The Machinist, a dedicated hunter focused on engineering prowess. Most workers of Hunter's Pride incidentally are Machinists by trade back in Illestren! - The Hunter Colligne, effectively a secondary rank to the Montagne. They are trainee Hunter Montagnes effectively, learning the art of hunting and commandeering to eventually lead their own cadre of Hunters as a Montagne. All jobs within the SRM also have unique job icons exclusive to them. Hope you enjoy it! The SRM now boast an exclusive hardsuit for themselves, based on knight's armor!  This PR tweaks some minor stuff aboard the Elder-class, specifically to accomodate the new jobs. A Shadow slot has been killed in exchange for one Colligne, one Machinist and one Flamebearer slot. And finally, this PR does the absolutely random thing of updating the ID-less icon and its background for no other reason other than I could.  <!-- 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 Pleade join my shipse I begge... <!-- 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: PositiveEntropy add: The Hunters of Illestren have now allowed for Hunter Collignes, Machinists and Flamebearers to now roam the Frontier aboard their humble fleet! imageadd: The Saint Roumain's Militia has been fully resprited! imageadd: All SRM jobs now have unique HUD icons! imageadd: The Unknown Job HUD icon has 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. --> --------- Signed-off-by: thgvr <[email protected]> Co-authored-by: FalloutFalcon <[email protected]> Co-authored-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. --> ## About The Pull Request some of the so_afters args were scrambled causing the target to be bad <!-- 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 the do_after pr did not receive and test merge and caused a few bugs to slip through. fixing bugs is good! <!-- 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: fixed multiple of the do_afters not working due to misplaced args /: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: Sun-Soaked <[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 killing 200000 goliaths so I can harvest nothing from them and upgrade my crusher with no trophies ## Why It's Good For The Game runtime I think ## Changelog :cl: fix: mobs will no longer stick around after being butchered sometimes /: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 Removed the sanity check I had put in for character adjectives during a previous fix. It was well intentioned, but as it turns out, if someone is loading a charslot that existed before guestbook was ported or never saved with one, they wouldn't have an adjective saved in their save file, resulting in nulling the variable for generic_adjective, which causes this sanity check to fail and the selection not to show. The goal was meant to prevent a guestbook malfunction from locking up prefs as runtimes can break it, but after spending hours and hours on going over prefscode and analyzing character loading and generation, it's clear that I would have to address this at the point of charslot loading. I just want this fixed in time for wednesday uptime. BETTER handling will come later, in a separate PR, when I am SURE that they won't break charslots, as well as some other prefs fixups. There's a lot of code in prefs that does not work or do anything, but for now, let's keep it simple. Should be ready to testmerge or full merge. ## Changelog :cl: fix: Generic adjective selection will show for everyone. /:cl:
fixed atmos gas mask sprite, deleted duplicate (why it was here?). <!-- 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 atmos gas mask sprite, deleted duplicate (why it was here?).    <!-- 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 You dont have duplicate sprite in repo and broken sprite with annoying pixel. <!-- 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: Atmos mask sprite /: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]>
<!-- 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 Allows you to float over tables if you are in a 0g environment. <!-- 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 Having to climb over something waist high at best while Floating is kind of silly. Spacers rejoice. <!-- 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: you can now float over tables when in 0g balance: you no longer shatter glass tables when floating /: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 Gezenan raksha vests and navywear used to have full limb protection for their (already pretty solid) armour vests / jackets. Also allows them to hold a greater variety of objects like regular armour vests (+1 montagne hat description change to reflect the fact it is no longer armoured) ## Why It's Good For The Game an armoured vest with no visible limb protection should not give limb protection + they already behaved strangely compared to normal armoured vests ## Changelog :cl: del: Removed invisible limb armour from Gezenan marine + navywear add: Allowed Gezenan armour to hold all guns like normal armour fix: Fixed Montagne hat description to reflect the fact it is no longer armoured /:cl:
## About The Pull Request before, buying the sawn illestren off the black market just gave you a sawn illestren except it was the same size and didn't fit on belts. no longer the case. also fixed the presawn double barrel shotgun to be the same because it behaved the same ## Why It's Good For The Game i bought a shitty sawed off bolt action rifle i expect to get a shitty sawed off bolt action rifle ## Changelog :cl: fix: The black market sawed off Illestren is now actually sawed off, and can fit on your belt fix: The presawn double barrel shotgun can now fit on the belt like normal sawn off double barrels /:cl:
…eft on examine (#3100) <!-- 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! --> Energy weapons now show on examine how much charge they have, or if they have a cell installed or not. They also show how many shots they have left on the current fire mode. Also changes all the span classes to marcos ## 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. --> QOL change, while it is true you have the charge indicator on the sprite, it's not the most reliable or accurate. This makes it a lot easier to keep track of how many shots you have left. I also often see people try to charge guns with no cells and wonder why it doesnt work, so some extra textual indication couldnt hurt. ## Changelog :cl: add: Energy guns show how much charge and shots they have remaining, or if it doesnt have a cell installed on examine. code: span classes to span macros for energy.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. -->
<!-- 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 Hunter's, Flamebearer's and Shadow's lockers now get the wooden cabinet sounds, instead of metal closet ones. <!-- 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 Sounds are sitting there, might as well use them. <!-- 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: SRM cabinets - namely, Hunter's, Shadow's and Flamebearer's - now use cabinet sounds. /: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. -->
… anything else (#3113) <!-- 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 Presently, 9mm loses 20% damage with no other direct stat changes This pr reduces the price of 9mm boxes by 20% so the bullets aren't as expensive as any other standard pistol bullet while dealing less damage ## Why It's Good For The Game Usually bullets are significantly more expensive to counteract QOL stuff like killing things significantly faster or being fired from a contender and 9mm does neither ## Changelog :cl: balance: 9mm boxes are now cheaper than other pistol calibers to account for the lower damage per bullet /: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 after feedback from admins, they clog the context menu too much. <!-- 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 was not fully considering the context menu and it does bloat it yea. <!-- 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: admin: reverted filling admin context menus with alot of not useful stuff by rehiding it behind a toggle. /: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: Sun-Soaked <[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 reorganizes most of the gun spritesheets into separate files, making it not fucking agony to look through This also repaths pistols and revolvers, this is a mystery tool we will need later. This also take the liberty of removing belt_mirror.dmi because fuck that file, all suit storage slots will pull from either mob overlay icon or back.dmi as a fallback. ## Why It's Good For The Game Would be very helpful for the 5 million gun rewokrs that are done, but not implmented yet. While it is true i'm waiting on gun attachments, this is more pressing than that. ## Changelog :cl: add: Resprites the E-50 and gives it proper inhands now! fix: The Syndicate sniper rifle fires at a normal rate of fire and has the correct recoil now. /: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 Title. <!-- 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 Mobs buckled can just. Walk with 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: fix: Dog beds start anchored now. Mobs can no longer move while buckled. /: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. -->
github-actions
bot
added
Code change
|
Some of these updates have caused significant issues for players, and their poor documentation isn't helping. It might be a good idea for us to revert parts of this (ex. Combustion Engines and... whatever was done to the Hyena.) |
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
Brings in the changes from Shiptest upstream until 2024-07-06
Why It's Good For The Game
Bug fixes and new features improve the codebase