Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[MDB Ignore] Cherrypickening 2b: The stuff I found harder to port+ ex…
…tras. (#23) * [MDB Ignore] Rkz's Newfood: Part 1 of 4 (#3148) <!-- 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. --> This is a port of my beestation newfood pr. It's the culmination of many months of effort during my free time in university, and my first large-scale project on bee. Due to interest from a few shiptest people, I have ported the PR mostly-as-is from Bee, additional alterations where needed. Ports from TG: - tgstation/tgstation#49192 - tgstation/tgstation#53047 - tgstation/tgstation#53225 - tgstation/tgstation#53316 - tgstation/tgstation#53574 - tgstation/tgstation#66257 - tgstation/tgstation#69095 - tgstation/tgstation#71449 Ports from Bee, from yours truly: - BeeStation/BeeStation-Hornet#8748 A rundown of the plan: - This is Part 1 of newfood. This is basically the foundational newfood shit that's needed for the rest of the system we want to work. - Part 2 will complete all the foundational shit (killing oldfood), with some minor refactors to ready cooking for the upcoming features. This will conclude the development of the edible component and things left in limbo from part 1. It will remove the temporary vars and procs, and customizable food will be fully reenabled. - Part 3 will contain the cooking features (Griddle). Now for the changes: 1. convert bread to newfood 2. convert spaghetti to newfood 3. convert cake to newfood 4. Cleaned up the edible component. It should be a lot more consistent going forward, and will basically be completely functional as of part 2's merge. 5. Adds Food Storage component, which lets you hide small items in large food. (Stick a shard of glass inside a cake to fuck over someone.) 6. Adds FOOD_FINGER_FOOD food flag, which lets you eat food whilst moving. It applies to small food that really shouldnt take your full concentration to consume whilst walking, like lollipops! 7. Sets PRAGMATIC weights for as many foods as I could. Seriously this sucked really bad. candycorn and cakes are not the same ducking size. 8. food trash is sane, stuff thats clearly eaten on a plate and has a plate underneath it, will spawn a plate rubbish when completely eaten. (you dont eat the plate on cake any more smh) 9. Begins the framework of something called Accidental Consumption. Its basically if you end up eating non-food related it will cause you differing effects. This is again very early stages, and will require wounds, full newfood implementation, and bringing over tg's stomach metabolism. The proc exists, but its not getting called until part 2 or 3 is merged. 10. Adjusts some nutritional values. Minor, but I will note that I did so <!-- Describe The Pull Request. Please be sure every change is documented or this can delay review and even discourage maintainers from merging your PR! --> Newfood seems to be a heavily requested feature here. This is but the framework. Really, players wont notice the difference besides the incompatiblity between oldfood & newfood, but once the griddle is implemented in part 3, it will be glorious. When discussing with shiptest, I floated my plan and I received overall agreement. This should hopefully be less painful for me and for you than a bulk merge. <!-- 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. --> :cl: rkz, benbot(benjamin), Time-Green, SteelSlayer, floyd, Qustinuus, ArcaneDefence, FlowerCuco add: Food storage! Hide some glass in the captains cake! Begone digestive tract! add: Bread, Cake and Spaghetti to Newfood add: some smaller foods can now be eaten whilst on the run! (This ONLY applies to newfood items thus far!) add: converted edible component to work with newfood del: oldfood for Bread, Cake and Spaghetti del: Temporarily removes customfood bread, cake, pasta, and sandwiches tweak: edited a few messed up values tweak: food trash is sensible now. Finishing stuff like cake will actually spawn a plate rubbish. Instead of you eating the plate, biggun, perhaps properly dispose of it! fix: Wildly STUPID item weights. Candycorn and cakes are no longer the SAME size code: provides some semblance of sorting for signal defines /: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: thgvr <[email protected]> * Fixes "The Food" - Allows spaghetti to be processed. (#3288) Literally four characters. Technically second PR but my first fix. <!-- 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 an error where processing a dough slice in a processor or on a cutting board would make you get the parent spaghetti item, rather than the intended one. The Creation  The Reaction  <!-- 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 As funny as "The Food" is, I would like to be able to cook spaghetti. And I don't mean code spaghetti. <!-- 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:Aquidu fix: Fixed a bug relating to literal spaghetti code. /: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. --> * ports some tg botany code to fix novaflowers (#3063) <!-- 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 novaflowers werent applying firestacks so i ported a ton of botany code. novaflowers and nettles now use genes for there pickup and attack stuff clothing traits that only botany gloves use rn tgstation/tgstation#59107 tgstation/tgstation#56233 <!-- 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 better code c: <!-- 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: FalloutFalcon, MrMelbert, Coiax code: ported alot tg botany code along with gene desc and icons to be used more soon refactor: moves most plant effects into genetics stuff /: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]> * Modsuits (#3013) <!-- 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. --> finishes shiptest-ss13/Shiptest#1785 Todo - [x] Init icons are broken - [x] Do afters can be canceled by walking <!-- Describe The Pull Request. Please be sure every change is documented or this can delay review and even discourage maintainers from merging your PR! --> <!-- 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. --> :cl: FalloutFalcon, MrSamu99, Fikou add: a few shipments of MOD control units have found there way to the frontier, premium versions of existing hard suits with the latest tech! add: Ported modsuits from tg, no mapped stuff yet /: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]> Signed-off-by: FalloutFalcon <[email protected]> Co-authored-by: MrSamu99 <[email protected]> Co-authored-by: MrSamu99 <[email protected]> Co-authored-by: thgvr <[email protected]> * makes it compile * Fixes condiment packs (#3350) <!-- 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. --> fixes #2367 also removes the /food/ from the path since it does nothing <!-- Describe The Pull Request. Please be sure every change is documented or this can delay review and even discourage maintainers from merging your PR! --> <!-- 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. --> :cl: fix: condiment packs are no longer invisible and missing 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. --> --------- Signed-off-by: FalloutFalcon <[email protected]> * The Frontier Ablaze: Ramzi's Molotov Cookbook (#3432) ## About The Pull Request **The World Aflame**  Molotovs now create turf fires on its own turf and adjacent ones. As Hearthwine does something similar with a trickier conditional (contact), it creates turf fires beyond adjacent turfs now. ## Why It's Good For The Game Molotov's are exceedingly Nothing, and this should ignite An Inferno within every spacer's heart. Burns much less fiercely and causes less firestacks than hearthwine in absence of combustible material, but should be enough to deny people access to chokepoints or to cause a panic. ## Changelog :cl: balance: Molotov cocktails now create turf fires balance: Hearthwine now create turf fires in a 3x3 area /:cl: * Makes Ration Heaters smaller. (#3486) <!-- 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 Edits ration heaters to be able to be put back inside of ration packs. ## Why It's Good For The Game It's really, really annoying that you can take ration heaters OUT of ration packs, but CANNOT put them back in. This fixes this by making them both the same size as the rations themselves, and adding ration heaters to the list of accepted items that can be put in ration packs. ## Changelog :cl: code: Changes flameless ration heaters to "small" items code: Adds flameless ration heaters to the ration pack item whitelist. /: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. --> * SolCon/SolGov Hardsuits (And Its Subtypes) Can Now Stow Away Guns! (#3187) <!-- 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. --> Does what it says on the tin. You can now holster guns, ammo and such on the armor slot while equipping the hardsuit. <!-- Describe The Pull Request. Please be sure every change is documented or this can delay review and even discourage maintainers from merging your PR! --> I almost got shot because people got terrified at the fact I had a gun on my hand, when I couldn't holster due to this oversight. Amazing. <!-- 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. --> :cl: PositiveEntropy fix: You can now store guns, ammunition, and melee weapons on the armor slot when equipping a SolCon/SolGov hardsuit, and its subtypes! /: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. --> * The Ares Poster Now Correctly Calls The Planet Mars (#3193) <!-- 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. --> Does what it says on the 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! --> It was a weird misconception that for some reason SolCon decided to rename all the planets into their greek counterparts. This is very much not the case, especially since if it *was*, Terra would've been called Gaia and the moon would've been called Selene instead of Luna. This does however mean that Uranus is now called Caelus, though this will be depicted in a poster in another time. <!-- 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. --> :cl: PositiveEntropy fix: Mars and Venus are now referred to by their correct 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. --> * salty * cakes are ticked * removes the file instead, and fixes the ruins. * pepper * Floury * cheezy * cakey, milky, and saucy * barbecue was under barbecued * another sauce * hotsauce and soysauce * clowncake was ephemeral * reorders --------- Signed-off-by: thgvr <[email protected]> Signed-off-by: FalloutFalcon <[email protected]> Co-authored-by: Tsar-Salat <[email protected]> Co-authored-by: thgvr <[email protected]> Co-authored-by: Aquidu <[email protected]> Co-authored-by: Sun-Soaked <[email protected]> Co-authored-by: FalloutFalcon <[email protected]> Co-authored-by: MrSamu99 <[email protected]> Co-authored-by: MrSamu99 <[email protected]> Co-authored-by: generalthrax <[email protected]> Co-authored-by: Imaginos16 <[email protected]>
- Loading branch information
10 people
authored
Oct 13, 2024
1 parent
24c7fd3
commit 8ff6d17