Skip to content

Commit 6fe3e72

Browse files
Rykka-StormheartTheKnightofAuraPutnam3145Zandariosilicons
authored
Auto-Update to Cit-RP latest Master (#1)
* Service Borg Drink Fab upgrade (#6121) Updates Service Borg to have slightly more ingredients, now that more exotic ones have been added to make bar-tending complicated <!-- 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 Gives Grenadine and Cream to the borg drink maker <!-- 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 Grenadine and cream are two broadly used ingredients in drinks, far more common then some of the ones already available to borgs. We've had a lot of new niche ingredients added, and there's also still a lot of specialty ingredients that are a pain for our mechanical bartending friends to access if we want that artificial difficulty. <!-- Argue for the merits of your changes and how they benefit the game, especially if they are controversial and/or far reaching. If you can't actually explain WHY what you are doing will improve the game, then it probably isn't good for the game in the first place. --> ## Changelog <!-- If your PR modifies aspects of the game that can be concretely observed by players or admins you should add a changelog. If your change does NOT meet this description, remove this section. Be sure to properly mark your PRs to prevent unnecessary GBP loss. You can read up on GBP and it's effects on PRs in the tgstation guides for contributors. Please note that maintainers freely reserve the right to remove and add tags should they deem it appropriate. You can attempt to finagle the system all you want, but it's best to shoot for clear communication right off the bat. --> :cl: add: Added two existing reagents to borg machine /: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. --> * fixes hammer heads being called forks (#6128) <!-- 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 <!-- Argue for the merits of your changes and how they benefit the game, especially if they are controversial and/or far reaching. If you can't actually explain WHY what you are doing will improve the game, then it probably isn't good for the game in the first place. --> ## Changelog <!-- If your PR modifies aspects of the game that can be concretely observed by players or admins you should add a changelog. If your change does NOT meet this description, remove this section. Be sure to properly mark your PRs to prevent unnecessary GBP loss. You can read up on GBP and it's effects on PRs in the tgstation guides for contributors. Please note that maintainers freely reserve the right to remove and add tags should they deem it appropriate. You can attempt to finagle the system all you want, but it's best to shoot for clear communication right off the bat. --> :cl: fix: hammer heads are no longer called forks /: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. --> * CI: Skipping is native feature (#6125) <!-- Write **BELOW** The Headers and **ABOVE** The comments else it may not be viewable. --> <!-- You can view Contributing.MD for a detailed description of the pull request process. --> ## About The Pull Request Did you know this is pointless to have? [docs.github.com/en/actions/managing-workflow-runs/skipping-workflow-runs](https://docs.github.com/en/actions/managing-workflow-runs/skipping-workflow-runs) * [MDB IGNORE] [IDB IGNORE] atom damage (#5235) ## About The Pull Request adds generic system for atom health / integrity / damage everything that isn't flagged with not-bludgeonable can, well, now be bludgeoned. ## Why It's Good For The Game more interactive game world through the means of making people able to break Everything. ## Changelog :cl: add: atom damage - (almost) everything is now breakable. refactor: new /atom level materials system refactor: a lot of the combat system / click code refactor: melee attack styles /:cl: --------- Co-authored-by: silicons <no@you.cat> * Replikant Apparel, Armor, Leg Markings and 2nd Gen prosthetics. (#6127) <!-- 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 adds several new types of heavily replika-inspired bodysuits, a uniform with a few variants, a NT patch (designed for use with the aforementioned uniform), a hat, an alternative type of replikant stilt leg prosthetic and two pairs of leg markings (designed for use with the aforementioned alternate stilt legs), as well as loadout Selections for the uniform bases and bodysuits. Lore on these is simple and somewhat placeholder while the lore team considers definitive lore implementations. Four body-armor items are also added, however there is no way to obtain these at the moment except for adminspawn, since these warrant more of an open discussion regarding what the best way to implement them would be, (sec armor/cargo/cosmetic attachments/etc.) Thank you to TrojanCoyote for the base LSTR/ARAR/FKLR and armor sprites, help with descriptions. Some previews: Replikant apparel: ![uniformpreview](https://github.com/Citadel-Station-13/Citadel-Station-13-RP/assets/33434925/081a3a97-1aaf-4e47-bc2e-444d2a582c84) Replikant armor: ![armorpreview](https://github.com/Citadel-Station-13/Citadel-Station-13-RP/assets/33434925/ba900c26-eb51-4cef-a00a-42dc05a93120) Overview of all uniform parts for "STAR": ![starparts](https://github.com/Citadel-Station-13/Citadel-Station-13-RP/assets/33434925/0c62b91f-a656-412b-b28e-b44876a38319) Sleek Uniform (Skirt base + accessories / Sleeveless base): ![sleekuniform](https://github.com/Citadel-Station-13/Citadel-Station-13-RP/assets/33434925/ab3b7a7f-d3ee-4daa-a79e-e1f116391748) (Also has a long sleeve version with pants in both male and female version) <!-- 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 Beyond the increase of Replikant players recently, who have been having to resort to a lot of markings and underwear and custom loadout items to approximate their uniforms, in the future these may serve as an in-game presence to Replikant lore should they become a minor race (Lore currently WIP). In which case a second pass on the descriptions should be expected. <!-- Argue for the merits of your changes and how they benefit the game, especially if they are controversial and/or far reaching. If you can't actually explain WHY what you are doing will improve the game, then it probably isn't good for the game in the first place. --> ## Changelog <!-- If your PR modifies aspects of the game that can be concretely observed by players or admins you should add a changelog. If your change does NOT meet this description, remove this section. Be sure to properly mark your PRs to prevent unnecessary GBP loss. You can read up on GBP and it's effects on PRs in the tgstation guides for contributors. Please note that maintainers freely reserve the right to remove and add tags should they deem it appropriate. You can attempt to finagle the system all you want, but it's best to shoot for clear communication right off the bat. --> :cl: add: Added 8 Replikant bodysuits and side cap. add: Added 4 Sleek uniforms, a jacket and NT patch. add: Added 4 variants of Replikant armor. add: Added Gen 2 Replikant leg prosthetics. add: Added two pairs of Replikant leg markings. /: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. --> * Tridot body marking (forehead) (#6132) Marking for a humanoid's forehead that's 3 dots in a triangle. Alternate version is flipped upside down. * Replika Armor in Loadout (no defense stats) (#6139) ## About The Pull Request Adds replika armor to the loadout area as statless accessories. ## Why It's Good For The Game They can be worn on their own in the suit slot, as an accessory to undersuits OR normal suits (armor, voidsuits, ect) as well as carry accessories themselves, when worn alone. * Adds Replika Specific Body Marking (#6137) <!-- 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 1. **Adds Replika Body/Groin Synthskin Marking.** ## Why It's Good For The Game 1. _Extant Ward Spirit panels insufficient for design, too subtle. Adds new larger skintone paneling._ ## Changelog <!-- If your PR modifies aspects of the game that can be concretely observed by players or admins you should add a changelog. If your change does NOT meet this description, remove this section. Be sure to properly mark your PRs to prevent unnecessary GBP loss. You can read up on GBP and it's effects on PRs in the tgstation guides for contributors. Please note that maintainers freely reserve the right to remove and add tags should they deem it appropriate. You can attempt to finagle the system all you want, but it's best to shoot for clear communication right off the bat. --> :cl: add: Adds Replika specific body markings. /: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. --> * fixes gpses breaking on flight (#6135) Move() already calls it, so we were double calling Co-authored-by: silicons <no@you.cat> * Removes old duplicate backpack of holding singularity_act (#6130) <!-- 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 Funny enough, it was being overridden by the correct one https://github.com/Citadel-Station-13/Citadel-Station-13-RP/blob/a5ada8e75e396738fb53a1cad39e7d5122f49f79/code/game/objects/items/storage/backpack.dm#L64-L70 * Destroys the Universe (#6129) <!-- 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 kept putting off the gamemode removal (and eventual rewrite). This is a good way to start <details> <summary>POV</summary> ![image](https://github.com/Citadel-Station-13/Citadel-Station-13-RP/assets/34761877/2dbb9b26-4728-49d3-b066-55a7014fe4f4) </details> * Subtypes Corporate Crates, Fixes Mapped Biohazard Crate, Renames Advanced Voidsuit (#6126) <!-- 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 1. *Fixes Bug With Corporate Crates, Subtypes Them.* 2. *Removes Varedited Biohazard Bin and Places Normal Biohazard Bin.* 3. *Changes Advanced Voidsuit Name to Advanced Hardsuit.* ## Why It's Good For The Game 1. _I received reports of one specific corporate crate not rendering properly when opened. As I inspected it, I realized it would be more efficient to subtype all corporate crates, so I did that. HOWEVER, this did not repair the initial bug. For some reason the crate was not rendering its 'aethersecureopen' state, even though all variables and code seemed to be working properly. No other crate exhibited this issue. I discovered that by changing the name of the icon state from 'aethersecureopen' to 'aethersecopen', the state began to enforce and render properly. I suspected it might be a name length issue, but tests with other equally long icon states in the crate section disproved this theory. This may warrant further investigation._ 2. _This one avoided detection during my initial sweep through. Can't remember who just went in and tried to varedit bins to fix biohazards, but hopefully this is the last one they touched._ 3. _This has been driving me crazy for a few days, and yesterday especially. The Advanced Voidsuit is clearly misnamed, as it is in fact a Hardsuit. When I tried to order these yesterday I overlooked this cargo entry twice because I was looking for a hardsuit, not a voidsuit. This just fixes the name._ ## Changelog <!-- If your PR modifies aspects of the game that can be concretely observed by players or admins you should add a changelog. If your change does NOT meet this description, remove this section. Be sure to properly mark your PRs to prevent unnecessary GBP loss. You can read up on GBP and it's effects on PRs in the tgstation guides for contributors. Please note that maintainers freely reserve the right to remove and add tags should they deem it appropriate. You can attempt to finagle the system all you want, but it's best to shoot for clear communication right off the bat. --> :cl: add: Adds Corporate Crate Subtype, Reassigns Corporate Crates to It. fix: Fixes incorrectly mapped biohazard bin. tweak: Changes Name: Advanced Voidsuit to Advanced Hardsuit. /: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. --> * Adjusts Alarms on Shuttles (#6131) <!-- 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 1. **Remaps Alarms on Multiple Shuttle Submaps.** ## Why It's Good For The Game 1. _Some shuttle submaps are not using hidden alarms. This is gonna take a little live testing and stuff._ ## Changelog <!-- If your PR modifies aspects of the game that can be concretely observed by players or admins you should add a changelog. If your change does NOT meet this description, remove this section. Be sure to properly mark your PRs to prevent unnecessary GBP loss. You can read up on GBP and it's effects on PRs in the tgstation guides for contributors. Please note that maintainers freely reserve the right to remove and add tags should they deem it appropriate. You can attempt to finagle the system all you want, but it's best to shoot for clear communication right off the bat. --> :cl: fix: Replaces shuttle submap alarms with hidden 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. --> * Backpacks in Loadout (#6143) <!-- 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 Puts all the missing backpacks (default versions) into the utility tab for matrix recoloring. Equipping a backpack from the loadout and setting yourself to spawn with the same backpack in the main screen will overwrite, and autoequip the backpack+equipment. Adds security backpack to role restricted section. ## Why It's Good For The Game You can now matrix default backpacks automatically at round start. I would have just made it a selection for all types, but there are some that aren't meant to be accessed based on role and faction. I don't want to bloat the role restricted section THAT much, yet. * Hypokit placeable on Belt Slot (#6141) ## About The Pull Request Makes hypokits able to be put on the belt slot ## Why It's Good For The Game First aid kits already do this. If we were worried about abuse via belt storage we'd prevent kits from accepting vials. * various fixes + tweaks (#6138) see files changed: - fixes lowwalls clickblocking - pipes are now smaller - fxies some table stuff - air alarms - buffs scrubbers - buffs protean blob structure damage again are you happy now @Ghostcoffeee - both buffs and nerfs metal foam - nerfs inflatables - fixes weather --------- Co-authored-by: silicons <no@you.cat> * buffs borg lights (#6140) * minor inv fixes (#6142) - fixes some grammar issues with nodrop - fixes messages for 'reconsider xyz' calls Co-authored-by: silicons <no@you.cat> * fixes storage not dropping contents on destruction (#6146) oops * Objectifies Fish (#6144) * Updates the Description for CentCom Memorials (#6113) * Ore Stacking (#6136) <!-- 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 - All ores have been converted to become stacks. - Various for loops have been destroyed due to ore stacks now existing. - Bluespace crystals is detyped from being ores (request of Sili) - Mining satchels have been recoded to be more like ore boxes (there's an update I'd like to do to them later that will include even bigger ore satchels so I decided this was necessary) and their capacity has been buffed to carrying 200 ores instead of 50. People can now shove up to 7 ore stacks into their backpack with this update, so I decided that made sense. - .dm file containing ore box code was renamed. - fixed a bug that allowed you to dupe ores using the ore box ("take" was called twice when inserting ores by hand) - Some minor polishing of ore box code, particularly examine code, interaction feedback, and allowing you to climb onto boxes. - Ore boxes when destroyed will drop all of their ores, unless there's too much ore (up to 200 stacks will be dropped). It'll also drop 5 hardwood planks. People who accidentally shoot their box with their PKA, rejoice. - You can craft ore boxes using 5 hardwood planks. ## Why It's Good For The Game Having ores be stackable will greatly reduce lag. Otherwise, QoL changes good. ## Changelog <!-- If your PR modifies aspects of the game that can be concretely observed by players or admins you should add a changelog. If your change does NOT meet this description, remove this section. Be sure to properly mark your PRs to prevent unnecessary GBP loss. You can read up on GBP and it's effects on PRs in the tgstation guides for contributors. Please note that maintainers freely reserve the right to remove and add tags should they deem it appropriate. You can attempt to finagle the system all you want, but it's best to shoot for clear communication right off the bat. --> :cl: add: You can climb ore boxes. qol: Ore boxes will drop their contents when destroyed. You can also craft ore boxes using hardwood planks now. balance: Mining satchels can now carry 200 ores instead of 50. fix: Ore box examines look proper now. fix: Fixed a bug that allowed you to dupe ores using the ore box. imageadd: stacks_ore.dmi was added. It holds ore stack stuff. code: Orebox DM file renamed to ore_box.dm code: Bluespace crystals are detyped from being ores. refactor: Ore is now stackable. This will reduce lag when miners are out causing havoc or shoving ore onto conveyor belts. /: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. --> * Removes Carpotoxin from Fish-Based Dishes (#6148) <!-- 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 1. **Removes Carpotoxin from Fish-Based Dishes.** ## Why It's Good For The Game 1. _It's easy to forget about this and poison the crew. Carpotoxin in these foods made sense when we only had poisonous space carp, but now that we have a broad fishing system it doesn't do anything for us to have noob trap food items on the menu._ ## Changelog <!-- If your PR modifies aspects of the game that can be concretely observed by players or admins you should add a changelog. If your change does NOT meet this description, remove this section. Be sure to properly mark your PRs to prevent unnecessary GBP loss. You can read up on GBP and it's effects on PRs in the tgstation guides for contributors. Please note that maintainers freely reserve the right to remove and add tags should they deem it appropriate. You can attempt to finagle the system all you want, but it's best to shoot for clear communication right off the bat. --> :cl: del: Removes carpotoxin from fish-based dishes. /: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. --> * Fixes Broken Empty Gun Sprites (#6150) <!-- 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 1. **Fixes Broken Empty States for Various Guns.** ## Why It's Good For The Game 1. _Guys please report these when you notice them. I could've fixed all of these the day after my initial change PR was merged. Fixes empty states for: p90, wt274, and JSDF battle rifle._ ## Changelog <!-- If your PR modifies aspects of the game that can be concretely observed by players or admins you should add a changelog. If your change does NOT meet this description, remove this section. Be sure to properly mark your PRs to prevent unnecessary GBP loss. You can read up on GBP and it's effects on PRs in the tgstation guides for contributors. Please note that maintainers freely reserve the right to remove and add tags should they deem it appropriate. You can attempt to finagle the system all you want, but it's best to shoot for clear communication right off the bat. --> :cl: fix: Fixes missing icon sprites for empty ballistics. /: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. --> * Automatic TGS DMAPI Update (#6151) This pull request updates the TGS DMAPI to the latest version. Please note any breaking or unimplemented changes before merging. Co-authored-by: tgstation-server <tgstation-server@users.noreply.github.com> * kevlar upgrades no longer make you immortal (#6149) guess who fucked up? * Fixes Auril Castes not being able to wear hardsuits (#6157) <!-- 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 idk why they have to use the cycler at all but there we go <!-- 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 wearing hardsuits is good, especially when your body type / sprite sheet is identical to normal humans <!-- Argue for the merits of your changes and how they benefit the game, especially if they are controversial and/or far reaching. If you can't actually explain WHY what you are doing will improve the game, then it probably isn't good for the game in the first place. --> ## Changelog <!-- If your PR modifies aspects of the game that can be concretely observed by players or admins you should add a changelog. If your change does NOT meet this description, remove this section. Be sure to properly mark your PRs to prevent unnecessary GBP loss. You can read up on GBP and it's effects on PRs in the tgstation guides for contributors. Please note that maintainers freely reserve the right to remove and add tags should they deem it appropriate. You can attempt to finagle the system all you want, but it's best to shoot for clear communication right off the bat. --> :cl: fix:auril castes not being able to wear hardsuits /: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. --> * Skrell Update (#6153) <!-- 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 @granodd @Keekenox helped a TON in making these sprites! Actually most of the credit goes to them. Updates Skrell & Skrell Hair sprites: ![image](https://github.com/Citadel-Station-13/Citadel-Station-13-RP/assets/11361525/50931595-a881-47cb-82c5-303c3d1c2f17) Adds 3 Skrell-specific markings (feel free to use them on others but like might be ugly): ![9Al8mjVhRP](https://github.com/Citadel-Station-13/Citadel-Station-13-RP/assets/11361525/150b2dd8-7f6e-4bbc-9c26-8147969a249b) Base mannequin with all markings applied: ![image](https://github.com/Citadel-Station-13/Citadel-Station-13-RP/assets/11361525/8a896c48-7ccf-418f-ae3b-d4d8ac0ae1a0) This also changes the Skrell stats: - gives them darksight level 2 - gives them slightly more speed <!-- 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 no more androgynous barrel sprites all hail fidelity all hail thin waist <!-- Argue for the merits of your changes and how they benefit the game, especially if they are controversial and/or far reaching. If you can't actually explain WHY what you are doing will improve the game, then it probably isn't good for the game in the first place. --> ## Changelog <!-- If your PR modifies aspects of the game that can be concretely observed by players or admins you should add a changelog. If your change does NOT meet this description, remove this section. Be sure to properly mark your PRs to prevent unnecessary GBP loss. You can read up on GBP and it's effects on PRs in the tgstation guides for contributors. Please note that maintainers freely reserve the right to remove and add tags should they deem it appropriate. You can attempt to finagle the system all you want, but it's best to shoot for clear communication right off the bat. --> :cl: tweak:skrell 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. --> * Makes cups of water not cups of.. what? (#6154) <!-- 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 As title. ## Why It's Good For The Game What even is water? Apparently, our characters don't know. Now they do. ## Changelog <!-- If your PR modifies aspects of the game that can be concretely observed by players or admins you should add a changelog. If your change does NOT meet this description, remove this section. Be sure to properly mark your PRs to prevent unnecessary GBP loss. You can read up on GBP and it's effects on PRs in the tgstation guides for contributors. Please note that maintainers freely reserve the right to remove and add tags should they deem it appropriate. You can attempt to finagle the system all you want, but it's best to shoot for clear communication right off the bat. --> :cl: qol: Gave water a cup name so cups of water now appear as "cup of water" instead of "cup of.. what?" /: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. --> * Mar (Adds *mar emote) (#6147) <!-- 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 a voiced mar emote, ported from https://github.com/VOREStation/VOREStation/pull/7944. That PR has a handful of other emotes that we don't have either, if anyone else feels like porting other new ones too. https://github.com/Citadel-Station-13/Citadel-Station-13-RP/assets/25853190/38bb1580-6560-4c53-aa22-5aa46f3f244f ## Why It's Good For The Game Mar. Good for shadekin. ## Changelog <!-- If your PR modifies aspects of the game that can be concretely observed by players or admins you should add a changelog. If your change does NOT meet this description, remove this section. Be sure to properly mark your PRs to prevent unnecessary GBP loss. You can read up on GBP and it's effects on PRs in the tgstation guides for contributors. Please note that maintainers freely reserve the right to remove and add tags should they deem it appropriate. You can attempt to finagle the system all you want, but it's best to shoot for clear communication right off the bat. --> :cl: add: Mar. /: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. --> * adds a cropped sweater (#6160) <!-- 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 both a suit and an accessory version of a cropped sweater, sprite credit goes fully to @Keekenox Female: ![image](https://github.com/Citadel-Station-13/Citadel-Station-13-RP/assets/11361525/9e9bda1d-7b29-4836-9d89-df471f4432a7) M*le: ![image](https://github.com/Citadel-Station-13/Citadel-Station-13-RP/assets/11361525/f9eafc2b-7a06-4c9b-bf92-55934e6ab640) <!-- Describe The Pull Request. Please be sure every change is documented or this can delay review and even discourage maintainers from merging your PR! --> ## Why It's Good For The Game it was deemed so <!-- Argue for the merits of your changes and how they benefit the game, especially if they are controversial and/or far reaching. If you can't actually explain WHY what you are doing will improve the game, then it probably isn't good for the game in the first place. --> ## Changelog <!-- If your PR modifies aspects of the game that can be concretely observed by players or admins you should add a changelog. If your change does NOT meet this description, remove this section. Be sure to properly mark your PRs to prevent unnecessary GBP loss. You can read up on GBP and it's effects on PRs in the tgstation guides for contributors. Please note that maintainers freely reserve the right to remove and add tags should they deem it appropriate. You can attempt to finagle the system all you want, but it's best to shoot for clear communication right off the bat. --> :cl: add:cropped sweater /: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. --> * pet peeve solved (#6152) <!-- 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 changed the Vodka flavour. <!-- 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 Because it's really silly (stupid) to say it tastes like grain alcohol. <!-- Argue for the merits of your changes and how they benefit the game, especially if they are controversial and/or far reaching. If you can't actually explain WHY what you are doing will improve the game, then it probably isn't good for the game in the first place. --> ## Changelog \- "taste_description = 'grain alcohol'" \+ "taste_description = 'potato alcohol'" <!-- If your PR modifies aspects of the game that can be concretely observed by players or admins you should add a changelog. If your change does NOT meet this description, remove this section. Be sure to properly mark your PRs to prevent unnecessary GBP loss. You can read up on GBP and it's effects on PRs in the tgstation guides for contributors. Please note that maintainers freely reserve the right to remove and add tags should they deem it appropriate. You can attempt to finagle the system all you want, but it's best to shoot for clear communication right off the bat. --> :cl: tweak: vodka flavour /: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. --> * runtime maploading 2/3: multiz update (#6145) 3/3 is world structs and the fun that comes with that this pr has: - transitions - new multiz system - lookup optimizations - misc updates --------- Co-authored-by: silicons <no@you.cat> * various bugfixes (#6165) - test elevator GPS - weight ignores space noslow (yikes) - accessories (rings, etc) are still weighing - hologram offsets - water breathing collapsed lungs (check vacuum on inside & outside for collapse check?) - multitools won't work for circuit debugging - test fuel rod inhands to make sure it isn't showing the funny nuke sign --------- Co-authored-by: silicons <no@you.cat> * bandaids hypospray (#6159) bandaid; see comment i'll fix it proper later * Reverts reinforced windows dropping metal rods (#6155) <!-- 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 Reverts the change from #5235 that makes reinforced windows drop metal rods. ## Why It's Good For The Game Reinforced glass involves metal rods, this is true, but deconstructing reinforced windows gives you 100% of the reinforced glass back already. The extra metal rods are free, you can just generate infinite rods this way. No need for 'em. ## Changelog <!-- If your PR modifies aspects of the game that can be concretely observed by players or admins you should add a changelog. If your change does NOT meet this description, remove this section. Be sure to properly mark your PRs to prevent unnecessary GBP loss. You can read up on GBP and it's effects on PRs in the tgstation guides for contributors. Please note that maintainers freely reserve the right to remove and add tags should they deem it appropriate. You can attempt to finagle the system all you want, but it's best to shoot for clear communication right off the bat. --> :cl: fix: Deconstructing reinforced windows no longer gives free rods /: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. --> * Byond lists start at 1 (#6168) Genetics DNA bounds were improperly set. See line 499 for why this is a problem. This is the reason why toggling genetics powers in the admin player panel sometimes fails to toggle to on, as well as some other grievances. * fixes tables & poewrnet (#6170) see title Co-authored-by: silicons <no@you.cat> * small CI system rewrite (#6166) this fixes mapmerge hooks --------- Co-authored-by: silicons <no@you.cat> * Remaps Robotics Again (11/2023) (#6162) * Renames A Soda Brand (#6167) * what'soever (#6174) <!-- 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 makes whatsoever not autocorrect to what'soever ## Why It's Good For The Game what'soever ## Changelog <!-- If your PR modifies aspects of the game that can be concretely observed by players or admins you should add a changelog. If your change does NOT meet this description, remove this section. Be sure to properly mark your PRs to prevent unnecessary GBP loss. You can read up on GBP and it's effects on PRs in the tgstation guides for contributors. Please note that maintainers freely reserve the right to remove and add tags should they deem it appropriate. You can attempt to finagle the system all you want, but it's best to shoot for clear communication right off the bat. --> :cl: fix: autocorrect no longer corrects "whatsoever" to "what'soever" /: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. --> * downgrades pyhton to 3.9.0 (#6184) tg did it this fixes the bootstrap issue no, we shouldn't do this to fix things no, i don't care if someone wants to do it better be my guest i'm not here to do devops unless it's absolutely necessary for me to do so * Ports a large snake tail from Skyrat (#6177) * fixes chaplain alt title 'Counselor' (#6175) * Buffs Borg'Os (#6173) * KyoCola Hotfix (#6172) * adds meatsicles, made by mixing protein and ice (#6178) * makes it so you can always move through ghosts (#6180) * tgui reagent guidebook & tgui updates (#6161) Co-authored-by: silicons <no@you.cat> * Makes radiation wave decay inverse square instead of exponential (#6044) * smacks the CI suite with the if: always() (#6183) * gaia sauna window fixes (#6179) <!-- 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 <!-- Argue for the merits of your changes and how they benefit the game, especially if they are controversial and/or far reaching. If you can't actually explain WHY what you are doing will improve the game, then it probably isn't good for the game in the first place. --> ## Changelog <!-- If your PR modifies aspects of the game that can be concretely observed by players or admins you should add a changelog. If your change does NOT meet this description, remove this section. Be sure to properly mark your PRs to prevent unnecessary GBP loss. You can read up on GBP and it's effects on PRs in the tgstation guides for contributors. Please note that maintainers freely reserve the right to remove and add tags should they deem it appropriate. You can attempt to finagle the system all you want, but it's best to shoot for clear communication right off the bat. --> :cl: fix: fixed the saunas on gaia not using the right windows fix: fixed all three saunas on gaia using the same Id for tint controll /: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. --> * Adds a relay spawner that autoconnects to the station comms (#6182) <!-- 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 <!-- Argue for the merits of your changes and how they benefit the game, especially if they are controversial and/or far reaching. If you can't actually explain WHY what you are doing will improve the game, then it probably isn't good for the game in the first place. --> ## Changelog <!-- If your PR modifies aspects of the game that can be concretely observed by players or admins you should add a changelog. If your change does NOT meet this description, remove this section. Be sure to properly mark your PRs to prevent unnecessary GBP loss. You can read up on GBP and it's effects on PRs in the tgstation guides for contributors. Please note that maintainers freely reserve the right to remove and add tags should they deem it appropriate. You can attempt to finagle the system all you want, but it's best to shoot for clear communication right off the bat. --> :cl: add: Added a relay spawner that autoconnects to the station comms /: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. --> * Fixes black duffelbags not being lightweight (#6186) * stop drying racks taking more than one sheet of leather at a time (#6188) * Adds plantpeople physiologies, buffs alraune in snow and water turfs, turf slowdown fixes & additions (#6187) * Heat pump rebalance (TESTMERGE) (#6164) Co-authored-by: LordME <58342752+TheLordME@users.noreply.github.com> * Makes pronoun selection display the actual pronouns the options give you (#6194) * Adds a coffee dispenser crate to cargo (#6196) * Fixes Crab Meat Drop (#6195) * Jukebox Additions Part Two (#6190) * shark ear port from virgo (#6192) * Atlas map bugfix catchup (#6185) ## About The Pull Request Many mapfixes including but not limited to: Gravity in security prep Scrubbers/vents in security EVA Relabeling core ejection buttons in Engineering Medical tint control fixes, and glass/electrochromic doors and windows at reception Surgery now has tintable windows/doors, and a surgery sign all linked to the same button(s) Nebula Gas Tradeport has its landing zones fixed (hopefully) Backup bodycams for sec/exploration Body/helmet cameras placed into all security/exploration lockers (some only getting bodycams due to limited access to helmets) Access fix for exploration bodycams. All exploration roles can view cameras from tablets/laptops as long as they have pilot access. +more ## Why It's Good For The Game Bugfixes and QOL additions. * Reduce the amount of mobspawners in trashpiles by 50% (#6200) <!-- 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 makes it so that trashpiles flip a coin on whether or not to have a mouse spawner. <!-- 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 Honestly mice are hardly any use in game, aside from the rare character eating them, and the occasional griefer throwing tonnes of them into the bar after storing them in backpacks. Additional I dislike the constant squeeking trying to walk through maint. <!-- Argue for the merits of your changes and how they benefit the game, especially if they are controversial and/or far reaching. If you can't actually explain WHY what you are doing will improve the game, then it probably isn't good for the game in the first place. --> ## Changelog <!-- If your PR modifies aspects of the game that can be concretely observed by players or admins you should add a changelog. If your change does NOT meet this description, remove this section. Be sure to properly mark your PRs to prevent unnecessary GBP loss. You can read up on GBP and it's effects on PRs in the tgstation guides for contributors. Please note that maintainers freely reserve the right to remove and add tags should they deem it appropriate. You can attempt to finagle the system all you want, but it's best to shoot for clear communication right off the bat. --> :cl: tweak: tweaked trash piles to not always spawn mice /: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: TheKnightofAura <59945034+TheKnightofAura@users.noreply.github.com> Co-authored-by: Putnam3145 <putnam3145@gmail.com> Co-authored-by: Zandario <zandarioh@gmail.com> Co-authored-by: silicons <2003111+silicons@users.noreply.github.com> Co-authored-by: silicons <no@you.cat> Co-authored-by: AlphaM01 <33434925+AlphaM01@users.noreply.github.com> Co-authored-by: Monara <86886852+MonaraMir@users.noreply.github.com> Co-authored-by: Captain277 <agentraven16@gmail.com> Co-authored-by: BlueWildrose <57083662+BlueWildrose@users.noreply.github.com> Co-authored-by: silicons-bot <121360372+silicons-bot@users.noreply.github.com> Co-authored-by: tgstation-server <tgstation-server@users.noreply.github.com> Co-authored-by: FreeStylaLT <freestyla8@gmail.com> Co-authored-by: Shadow <shadowtail117@gmail.com> Co-authored-by: 死烏 <85062773+washikarasu@users.noreply.github.com> Co-authored-by: BlackMajor <henrydyer6@hotmail.com> Co-authored-by: Timothy Teakettle <59849408+timothyteakettle@users.noreply.github.com> Co-authored-by: yourdoom9898 <32888098+yourdoom9898@users.noreply.github.com> Co-authored-by: LordME <58342752+TheLordME@users.noreply.github.com> Co-authored-by: deathride58 <deathride58@users.noreply.github.com> Co-authored-by: SpartanKadence <113391284+SpartanKadence@users.noreply.github.com>
1 parent c9d21b2 commit 6fe3e72

File tree

1,373 files changed

+43939
-40440
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,373 files changed

+43939
-40440
lines changed

.github/workflows/ci_suite.yml

Lines changed: 69 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -10,67 +10,93 @@ on:
1010
- 'project/**'
1111
jobs:
1212
run_linters:
13-
if: "!contains(github.event.head_commit.message, '[ci skip]')"
1413
name: Run Linters
15-
runs-on: ubuntu-20.04
14+
runs-on: ubuntu-22.04
1615
concurrency:
17-
group: run_linters-${{ github.ref }}
16+
group: run_linters-${{ github.head_ref || github.run_id }}
1817
cancel-in-progress: true
1918
steps:
20-
- uses: actions/checkout@v3
21-
- name: Restore SpacemanDMM cache
19+
- name: Checkout Branch
20+
uses: actions/checkout@v3
21+
- name: Restore Bootstrap cache
2222
uses: actions/cache@v3
2323
with:
24-
path: ~/SpacemanDMM
25-
key: ${{ runner.os }}-spacemandmm
26-
27-
- name: Restore Yarn cache
24+
path: tools/bootstrap/.cache
25+
key: ${{ runner.os }}-bootstrap-${{ hashFiles('dependencies.sh', 'tools/requirements.txt') }}
26+
restore-keys: |
27+
${{ runner.os }}-bootstrap-
28+
- name: Restore Rust / Cargo cache
29+
uses: actions/cache@v3
30+
with:
31+
path: ~/.cargo
32+
key: ${{ runner.os }}-rust-
33+
- name: Restore TGUI / Yarn cache
2834
uses: actions/cache@v3
2935
with:
3036
path: tgui/.yarn/cache
3137
key: ${{ runner.os }}-yarn-${{ hashFiles('tgui/yarn.lock') }}
3238
restore-keys: |
33-
${{ runner.os }}-build-
34-
${{ runner.os }}-
35-
36-
- name: Restore Rust cache
39+
${{ runner.os }}-yarn-
40+
- name: Restore SpacemanDMM cache
3741
uses: actions/cache@v3
3842
with:
39-
path: ~/.cargo
40-
key: ${{ runner.os }}-rust
41-
restore-keys: |
42-
${{ runner.os }}-build-
43-
${{ runner.os }}-
44-
45-
- name: Install Tools
43+
path: ~/SpacemanDMM
44+
key: ${{ runner.os }}-spacemandmm-${{hashFiles('dependencies.sh')}}
45+
- name: Install Node
4646
run: |
47-
pip3 install setuptools
48-
bash tools/ci/install_node.sh
49-
bash tools/ci/install_spaceman_dmm.sh dreamchecker
50-
tools/bootstrap/python -c ''
51-
52-
- name: Run Linters
47+
tools/bootstrap/node --version
48+
- name: Install Python
49+
run: |
50+
tools/bootstrap/python --version
51+
- name: Install SpacemanDMM Suite
52+
run: |
53+
bash tools/ci/install/install_spaceman_dmm.sh dreamchecker
54+
- name: Install Ripgrep
55+
run: |
56+
cargo install ripgrep --features pcre2
57+
# - name: Install Setuptools
58+
# run: |
59+
# pip3 install setuptools
60+
- name: CI - Parse DM (dreamchecker)
5361
run: |
54-
bash tools/ci/check_filedirs.sh citadel.dme
55-
bash tools/ci/check_changelogs.sh
56-
bash tools/ci/check_grep.sh
57-
bash tools/ci/check_misc.sh
58-
tools/build/build --ci lint tgui-test
59-
tools/bootstrap/python -m dmi.test
60-
tools/bootstrap/python -m mapmerge2.dmm_test
6162
~/dreamchecker > ${GITHUB_WORKSPACE}/output-annotations.txt 2>&1
62-
# This is supposed to go after `bash tools/ci/check_misc.sh`
63-
# tools/bootstrap/python tools/validate_dme.py <citadel.dme
64-
- name: Annotate Lints
65-
uses: yogstation13/DreamAnnotate@v2
63+
- name: CI - Annotate DM (dreamchecker)
6664
if: always()
65+
uses: yogstation13/DreamAnnotate@v2
6766
with:
6867
outputFile: output-annotations.txt
68+
- name: CI - DMI Tests
69+
if: always()
70+
run: |
71+
tools/bootstrap/python -m dmi.test
72+
- name: CI - DMM Tests
73+
if: always()
74+
run: |
75+
tools/bootstrap/python -m mapmerge2.dmm_test
76+
- name: CI - TGUI
77+
if: always()
78+
run: |
79+
tools/build/build --ci lint tgui-test
80+
- name: CI - Grep (string checks)
81+
if: always()
82+
run: |
83+
tools/ci/check_grep.sh
84+
- name: CI - Changelogs
85+
if: always()
86+
run: |
87+
tools/ci/check_changelogs.sh
88+
- name: CI - DME Validation
89+
if: always()
90+
run: |
91+
tools/ci/check_filedirs.sh citadel.dme
92+
- name: CI - Misc
93+
if: always()
94+
run: |
95+
bash tools/ci/check_misc.sh
6996
7097
compile_all_maps:
71-
if: "!contains(github.event.head_commit.message, '[ci skip]')"
7298
name: Compile Maps
73-
runs-on: ubuntu-20.04
99+
runs-on: ubuntu-22.04
74100
concurrency:
75101
group: compile_all_maps-${{ github.ref }}
76102
cancel-in-progress: true
@@ -83,17 +109,16 @@ jobs:
83109
key: ${{ runner.os }}-byond
84110
- name: Compile All Maps
85111
run: |
86-
bash tools/ci/install_byond.sh
112+
bash tools/ci/install/install_byond.sh
87113
source $HOME/BYOND/byond/bin/byondsetup
88114
tools/build/build --ci dm -DCIBUILDING -DCITESTING -DALL_MAPS
89115
90116
run_all_tests:
91-
if: "!contains(github.event.head_commit.message, '[ci skip]')"
92117
name: Integration Tests
93118
concurrency:
94119
group: run_all_tests-${{ github.ref }}
95120
cancel-in-progress: true
96-
runs-on: ubuntu-20.04
121+
runs-on: ubuntu-22.04
97122
services:
98123
mysql:
99124
image: mysql:latest
@@ -119,13 +144,10 @@ jobs:
119144
# mysql -u root -proot tg_ci_prefixed < SQL/tgstation_schema_prefixed.sql
120145
- name: Install rust-g
121146
run: |
122-
sudo dpkg --add-architecture i386
123-
sudo apt update || true
124-
sudo apt install -o APT::Immediate-Configure=false libssl1.1:i386
125-
bash tools/ci/install_rust_g.sh
147+
bash tools/ci/install/install_rust_g.sh
126148
- name: Compile and run tests
127149
run: |
128-
bash tools/ci/install_byond.sh
150+
bash tools/ci/install/install_byond.sh
129151
source $HOME/BYOND/byond/bin/byondsetup
130152
tools/build/build --ci dm -DCIBUILDING -DCITESTING
131153
bash tools/ci/run_server.sh

0 commit comments

Comments
 (0)