[IN WORK] October 2025 Cherrypick - New Food (Merge Last) - #704
Open
Ossa88 wants to merge 96 commits into
Open
Conversation
<!-- 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! --> Turns out the high chance whitesands mineral turf had the same path as the basic one and overwrote it. ## 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. --> Fixes are good ## Changelog :cl: fix: high chance mineral turfs /: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. --> (cherry picked from commit 863eef8fd1c75fe8878dae33443a4be51435ff87)
## About The Pull Request - Makes most mobs use the proper firesound as the gun they're holding (notably not for the Cobra cause I think it'd suck if it sounded silenced) - Fixed a few mobs inheriting stuff - Gave new sharplite weapons to some VI mobs - Made VI smg mob shoot slightly faster - Fixes Softsuit Ramzi mob pistol ## Why It's Good For The Game Consistency ## Changelog :cl: fix: Fixed most simplemobs to use the firesound that their gun has + some smaller stat fixes fix: Softsuit Ramzi no longer has a Cottonmouth balance: VI SMG mob now shoots slightly faster /:cl: (cherry picked from commit 6cbf067c959acf9b63da34c1b12de9fc8cabba51)
Throws a beer bottle at my unloved child so it'll be better. <img width="1312" height="1280" alt="image" src="https://github.com/user-attachments/assets/0da68641-993a-455f-97a4-143e67ed8960" /> >armory lost ringneck, gained hellfire >bandoliers >redesign of rec spaces Raleigh is better. It's not good enough though. :cl: add: The Raleigh has received a redesign. Please pay 250kcr to purchase a new one. /:cl: (cherry picked from commit b072f58ef44ccef13c3ebc0af9eb9e26c4180e98)
<!-- 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! --> ERTs and inspectors were using normal job datums for access. Which meant they couldnt use the ERT outpost bays and associated areas. Adds proper job datums and some general define sanity for region access. Also removes the microbombs from Ramzi ERT ## 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. --> ERTs should have ERT access I think. And the Ramzi ERT microbombs made them a bit of a pain to use. ## Changelog :cl: fix: ERT access del: Ramzi ert microbomb /: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. --> (cherry picked from commit d0c6e612d4c179eef778dd7fb8a01e9665c0f0a1)
<!-- 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 sprites for the SecurEye app on the modular console, tablet and laptop <!-- 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 Immersion <!-- 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: imageadd: Added sprites for the SecurEye app code: SecurEye app code now references the new icon state /: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. --> (cherry picked from commit 9023d33fd81dbbd13b07f840835b37562bf2d36e)
<!-- 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 two new Etherbor weapons to the game. The 4-beam burst VG-F3 and the 5-beam burst Marine Corps VG-A5. This PR also adds a few these weapons to a few of the current PGF ship lineup. Also replaces one of the two SG-8's on both the Corona and Atira with a VG-F3. **Images:** <img width="965" height="323" alt="image" src="https://github.com/user-attachments/assets/2cf12506-0f8d-4f91-9955-e2fb1bf843d4" /> <img width="521" height="522" alt="Screenshot 2025-08-10 035539" src="https://github.com/user-attachments/assets/60ed978f-2acc-416c-8314-daf414f9d06e" /> **Video:** Medium range, Military https://github.com/user-attachments/assets/c86b0d14-4562-4a36-acde-8a5635fec915 Close range, Military https://github.com/user-attachments/assets/3f76dfa0-8812-48f2-9610-b86c541ed71f Medium range, Civilian https://github.com/user-attachments/assets/2b2c3fbd-23f4-46fc-8962-16c657ab0d83 Close range, Civilian https://github.com/user-attachments/assets/47f1435b-39bd-423d-85cc-9a7a1bda1fa5 <!-- 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 burst guns follow the design philosophy of Etherbor weapon design more faithfully and contribute an interesting and applicable alternative to the BG-12/BG-16 beam guns. <!-- 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 two new Etherbor burst gun variants /: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: DIB-DOG <DaneOfThieves@gmail.com> Co-authored-by: Changelogs <action@github.com> Co-authored-by: thgvr <81882910+thgvr@users.noreply.github.com> Co-authored-by: Gristlebee <56049844+Gristlebee@users.noreply.github.com> (cherry picked from commit 49cf51ff53ffed00640f5410f16788252376fa17)
<!-- 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 snouted/kepori and activates Vox variations for the syndie mask, ramzi mask, frontiersman mask, gas mask, explorer mask, breath mask, medical mask, and surgical mask. Also adds new loadout item, safety goggles. **SPRITES:** <img width="188" height="186" alt="Screenshot 2025-09-18 163959" src="https://github.com/user-attachments/assets/13d85f13-31f0-46f9-926d-58662513ea4d" /> <img width="183" height="184" alt="Screenshot 2025-09-18 164004" src="https://github.com/user-attachments/assets/fa628fc4-cb29-4e63-a997-744084c1b6f2" /> <img width="771" height="193" alt="Screenshot 2025-09-18 150418" src="https://github.com/user-attachments/assets/5dd69a09-e877-42a1-8d04-f92bc3bc6af1" /> <img width="1032" height="263" alt="Screenshot 2025-09-18 032946" src="https://github.com/user-attachments/assets/638ca1ab-f984-41a7-9fdf-a91964ecface" /> <img width="1533" height="382" alt="image" src="https://github.com/user-attachments/assets/6a9e0d61-f27b-4d3e-85c0-656624feacb4" /> **IN GAME:** <img width="237" height="148" alt="Screenshot 2025-09-18 163437" src="https://github.com/user-attachments/assets/005f33f7-b529-4512-937c-111419a5103b" /> <img width="204" height="112" alt="Screenshot 2025-09-18 163700" src="https://github.com/user-attachments/assets/05f3ef07-038b-4f35-b73a-a0953ca72d1c" /> <!-- 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 long as I've been playing shiptest (which isn't as long as many admittedly) there haven't been snouted variations for some of the most basic and common masks in the game. I've noticed this has driven most players to use the balclava or facemask items exclusively, as they have supporting sprites. Seeing as the masks just got resprited by thearbiber in #5314 (and look great to boot) this should encourage the wear of these common masks by removing the sprite clipping. The safety goggles effectively act like the cold/heat goggles (that being they are mostly cosmetic and cover your eyes) but have a unique look and I think they'd look cute/handy on a lot of character designs. Comes with "skier" and "biker" alt skins. <!-- 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 some new snouted mask 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. --> --------- Signed-off-by: DIB-DOG <DaneOfThieves@gmail.com> Co-authored-by: Changelogs <action@github.com> Co-authored-by: Erika Fox <94164348+Erikafox@users.noreply.github.com> (cherry picked from commit a7d7c144618db4355fbfd429432ebedd555d6ad0)
<!-- 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 moves these export calls done by the redbot subsystem to aysnc to prevent them holding up more important things <!-- 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 <img width="1357" height="28" alt="image" src="https://github.com/user-attachments/assets/4fdb5812-f472-436f-8247-ad78846b0399" /> seems to hold up world init for something that may not even work right now <!-- 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: redbot should no longer stall init super hard /: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. --> (cherry picked from commit 181022800b983069a8b85f531a829d0bca4bd8ea)
<!-- 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 broken in shiptest-ss13/Shiptest#5096 also some removal of unused var and some define sanity (I need to deprecate the old faction defines.) <!-- 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. --> ## Changelog :cl: fix: simple hostile humans should now have armor again /: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. --> (cherry picked from commit a2ae705b9e4850c45d51625515e482cfbd6901ee)
potentially fixes the "none of our verbs load on reconnect" :cl: fix: verbs should now load on reconnect /:cl: (cherry picked from commit 724b111aa7923659eb5737df995b65cc0f2809f9)
## About The Pull Request pajama pants arent camo ## Changelog :cl: fix: Red pajama pants now have the correct name /:cl: (cherry picked from commit 09507425daa713efee88bc09e79d60785b64cc7c)
## Why It's Good For The Game shouldnt have it. its not supposed to be like this ## Changelog :cl: fix: L204 Resistor no longer zooms like a DMR /:cl: (cherry picked from commit b34c2ce5ee21bef6aeff9b9ffd9d37f576bd95f4)
<!-- 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 wanted this to be the loot instead originally ## Why It's Good For The Game Yes ## Changelog :cl: balance: replaces amperage on deepstorage with surge /: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. --> (cherry picked from commit be267044adbc7d9d21d8dc291e52f90fae9c8859)
## About The Pull Request its 50 like the rest ## Why It's Good For The Game 20 is actually abysmal dogshit i could hit it once with a knife and it'd be disabled ## Changelog :cl: balance: species prosthesis are no longer 20 health max /:cl: (cherry picked from commit 0928e54ee392864b7fddbfc4c456019cc68f0d5a)
<!-- 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 a var for mobs to ignore SSD effects (ignore_SSD) (the zzz indicator and passing out), which is false by default. ## 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. --> Mainly intended as a developer convenience option when you want to take screenshots and such and not worry about your dolls falling over and passing out. ## Changelog :cl: add: ignore_SSD var /: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. --> (cherry picked from commit 54490134093b270d1a9b83f4bc7a1570176f2675)
<!-- 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 is a partial port of BeeStation/BeeStation-Hornet#7804, which is itself a partial port of Skyrat-SS13/Skyrat-tg#6259. This adds the annoyed emote, and the sweat emote, and it also adds the framework for future animated emotes. Annoyed: <img width="339" height="493" alt="image" src="https://github.com/user-attachments/assets/57c43deb-167a-44cf-8981-b02941916e4e" /> Sweat: <img width="281" height="180" alt="image" src="https://github.com/user-attachments/assets/1f19fc84-f5a6-446c-8499-3bd2707b56b8" /> ## Why It's Good For The Game I thought that these emotes could add a bit of fun flavor to the game. ## Changelog :cl: itsmeowdev, carpotoxin add: Added the sweat emote and the annoyed emote /: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: zimon9 <122945887+zimon9@users.noreply.github.com> Co-authored-by: FalloutFalcon <86381784+FalloutFalcon@users.noreply.github.com> (cherry picked from commit 56891ca14a4d73372f81fbed153980b25d82e741)
Ports [tg's 2021 refactor ](tgstation/tgstation#55444 movetypes in anticipation of Wet Tiles (2025) better management of movement sources :cl: ghommie, erika (port fox) fix: jitteriness, melee attack animations and resting/standing up should no longer momentarily disable the floating movetype. /:cl: (cherry picked from commit fed5bb80a1a595a14154a300424c2030e66a5714)
<!-- 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 dog the internet here fuckin suuuuuucks ## Changelog :cl: add: outposts now generate an aura of reduced radio interference /: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. --> (cherry picked from commit 006f390c32c957967cff50988cb09d343ab1b36c)
<!-- 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 vars for ruins to store what faction controls or had controlled them, defaulting to a new unknown faction <!-- 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 Future proofing adding stuff like scanning planets for information, selecting greeble mobs based on the faction of the ruin, ect <!-- 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 N/A nothing player facing yet. <!-- Both 🆑's are required for the changelog to work! You can put your name to the right of the first 🆑 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. --> (cherry picked from commit 0b17a22ddc63c6b8084e2f8d1f90d5ab5381cade)
## About The Pull Request some ramzi had doubled weapons due to assigning a new weapon to their right hand. Fixes that. For future reference Ramzi (as servants of the antichrist) are all left-handed Changes the Ramzi Cleaner (stormtrooper sniper rifle, unused thus far)'s rifle from a boomslang to a taipan to match the "Higher Quality Of Equipment" trend stormtroopers have ## Changelog :cl: fix: certain ramzi will no longer duel wield at you /:cl: Signed-off-by: Erika Fox <94164348+Erikafox@users.noreply.github.com> Co-authored-by: FalloutFalcon <86381784+FalloutFalcon@users.noreply.github.com> (cherry picked from commit 7fbfbaaadc16bf65b251515e1c42af83d6ef0b3b)
## About The Pull Request sprites by @thearbiber mag-fed, pump-action shotgun used mostly by Frontie simplemobs but also on the cargo market (Lanchester Import, 3000 cr) 6 round capacity, quick wield-time, though with more recoil than conventional shotguns. fires and racks fairly quickly though (similarly to the Brimstone though slower) <img width="267" height="333" alt="image" src="https://github.com/user-attachments/assets/e79ea911-9989-462a-9e33-ff782c594348" /> https://github.com/user-attachments/assets/47f862c4-308f-41de-b357-e61bb21e03a2 Currently mapped in on the Tortuga and in the Cavecrew ruin ## Why It's Good For The Game Frontiersmen were slated to get a Shotgun for a while. Never did. Now they do. There's also the fact pretty much every indie shotgun on the market is Hunter's Pride, figure we put a little treat out there for those who don't like wood ## Changelog :cl: thearbiber, generalthrax add: Added Slammer shotgun to cargo for 3000 credits. 6 round mag pump-action, above average recoil, high fire-rate. add: Frontiersmen Doorkickers now use this shotgun. No stat change /:cl: (cherry picked from commit fdaabc0642a323cd8a4f120bd280c3c0e2052db7)
## Why It's Good For The Game forgot to add ruin_type to the planet datum lol also fixes a single doubled pipe ## Changelog :cl: fix: Moon ruin(s) can actually spawn fix: Fixes a single double pipe on CLIP moon /:cl: --------- Co-authored-by: Gristlebee <56049844+Gristlebee@users.noreply.github.com> (cherry picked from commit 5e292e445bdd51875bfb862961b7d95e33e929af)
<!-- 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 couple of things to the Kali Andhi, fixes a minor bug, and tweaks one other thing - Goggles are added to the Captain, LT and Ensign's lockers - The Captain, LT, Ensign, and Operative's lockers are given a security messenger bag in addition to the standard backpack that comes in their lockers (is this appropriate? I'm not sure -- I can instead swap them with a plain messenger bag if not) - The mechanic's locker is given a standard grinder pack and a dufflebag - The portside and starboard side cargo buttons on the table in the cargo bay didn't work before, but they should now - The railing in the cargo bay surrounding the oxygen canister in the bay had its layer adjusted so that the railing now renders under the canister instead of over it - A few missing pipes to the combustion thrusters were added Before: <img width="130" height="121" alt="image" src="https://github.com/user-attachments/assets/2b65e825-4a7e-4602-8679-f9dd68a3794d" /> After: <img width="131" height="140" alt="image" src="https://github.com/user-attachments/assets/418c18f0-a2d5-4c1b-8616-23d851256b8e" /> ## Why It's Good For The Game The aim of this PR is to add a bit more flexibility to players in order to select the outfit they want to present, and to bring a bit of parity with the previous Kali Andhi iteration. ## Changelog :cl: add: Added a bunch of equipment to the Kali Andhi fix: fixed a few buttons and a mismatched layer fix: fixed missing pipes to the combustion engines in the Kali Andhi /: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. --> (cherry picked from commit 877986b39b0c32b335466eb217133d0cee0df84f)
## About The Pull Request fixes the issue of certain undershirt sprites clipping with the sarathi torso sprite <img width="668" height="666" alt="image" src="https://github.com/user-attachments/assets/cb83a465-1695-4998-88bf-d263fac46537" /> ## Why It's Good For The Game aesthetic purposes ## Changelog :cl: add: Sarathi Dimorphism Sprites /:cl: (cherry picked from commit 7f2557614f9da5c830b0505391f83c8f01055f72)
<!-- 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 * Refactors (copies over uniform code) accessory code so that it can now support current bodytypes. It does not include any sprites. Might pave the way for a more in-depth accessory system later <!-- 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 yeah <!-- 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: Species support for accessories (no icons adapted 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: meem <75212565+meemofcourse@users.noreply.github.com> Co-authored-by: FalloutFalcon <86381784+FalloutFalcon@users.noreply.github.com> (cherry picked from commit 62697f4586c4d59d2d5135221b0f18d118bb07d3)
## About The Pull Request ports tgstation/tgstation#61032 from tg ## Why It's Good For The Game another pre-req + easier to make small objects (world icons) clickable ## Changelog :cl: Ghommie, erika (port fox) fix: bees, hivelord, its brood and legion skulls no longer use the MOUSE_OPACITY_OPAQUE setting that makes the invisible portions of their icons count toward mouse clicks, which can get in the way of players trying to click stuff below their layer. Instead, to be easier to click on, they use a component that gives them a near-invisible underlay. /:cl: (cherry picked from commit ec75e09208828df8a6651f8b092f3dc77c46257d)
<!-- 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 ~~Updates the equip delays for all items to be slightly faster, and~~ allows equipping armor while moving (not hardsuits). Also, fixes a number of factional suit items using the wrong equip delay values <!-- 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 ~~Some of the equip delays were pretty dang long and felt honestly just clunky. While you don't put on/off clothes too often, it did feel silly when just slipping on gloves took over a second, or putting on/removing a jacket took two whole seconds.~~ A decent number of factional suits were using the hard-suit equip delay and restrictions, when half the time you were just tossing on a jacket. <!-- 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 some factional suit items using the wrong equip delay balance: You can now move while equipping armor, such as bulletproof vests. /: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. --> (cherry picked from commit 55c4c87cfee7d992665191c71fc6d3dc214066c6)
…robably do not exist. Will need further work.
… sense... edited the others.
… with generic meat
Ossa88
changed the title
Collaborator
Author
|
Only Reference 82b7f66 and newer commits. |
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
20 participants
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.
More Food and cooking updates.
This is a branch of the other cherrypick as it needed modifications in that cherrypick and I do not want to hold up that PR from merging in a few days.
Shiptest PR #5094
$$\color{red}SHIPTEST$$
[MDB IGNORE]Another Newfood: Plates, Eggs, Pancakes, Griddles & Oven (#5094)
## About The Pull Request Portshttps://github.com/BeeStation/BeeStation-Hornet/pull/10726
https://github.com/BeeStation/BeeStation-Hornet/pull/10920
https://github.com/BeeStation/BeeStation-Hornet/pull/11467
https://github.com/BeeStation/BeeStation-Hornet/pull/12359
Shouldn't be too confusing of a change, the player facing bits are:
Pancake batter
Cracking eggs on griddles
Grilling steaks
Prepping meat, meatballs, patties
Baking pizzas in oven
Baking dough recipes in oven
All of these should have information available on examine on how to
further prepare them, as well as the current state of cooking. A green
chat message is sent and green is used for things that don't need more
cooking. If you cook something after that, it will burn and turn into
trash.
Other than player facing stuff, finally repaths the rest of food towards
/obj/item/food path.
Details
Why It's Good For The Game
Changelog
🆑
add: Added new things
add: Added more things
del: Removed old things
balance: rebalanced something
fix: fixed a few things
soundadd: added a new sound thingy
sounddel: removed an old sound thingy
imageadd: added some icons and images
imagedel: deleted some icons and images
spellcheck: fixed a few typos
code: changed some code
refactor: refactored some code
config: changed some config setting
admin: messed with admin stuff
server: something server ops should know
/:cl: