upstream merge take 2 #1592
Merged
upstream merge take 2 #1592
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* Add pen clicking sound * switch to OnUse and reduce distance a little
Update RespiratorSystem.cs Co-authored-by: plykiya <[email protected]>
* Change Social Anxiety ----> Stutter * Update traits.ftl --------- Co-authored-by: Plykiya <[email protected]>
* Adds hand labelers to the chemdrobe and ptech * LawDrobe too * Update cart.yml --------- Co-authored-by: plykiya <[email protected]>
* Add support for reagents in lathes * missing locale
* no texture machine * done * delete wip * bug fixes * oops * CutterMachineCircuitboard Glass: 500
* Change from obsolete method in ExplosionOverlay * Send AppearanceSystem through constructor
I expect you to die!
* Update MoverController.cs * Update a bunch of movement code to use Entity<T> * Last errors * wow, there were more errors --------- Co-authored-by: plykiya <[email protected]>
The issue is it plays the "you hug xyz" to everyone in range as well as the target client so they overlap. IDK if anything else is broken by this but this control flow is pretty bad so I wouldn't be surprised.
…ls shuttle (#30519) show the player a server message when they get booted from the arrivals shuttle
* handled check * splits Handled and TryResetDelay checks
…s (#30299) borg law 2 state laws all day
* Adds New Shoes to Sec loadouts * Remove Cowboy stuff from sec drobe(bye sheriff) + requested changed
…ypes (#28575) * add tooltips to agentid job icons * forgot to stage this * make StatusIconPrototype abstract * minor visual improvements * cleanup * use currentculture to sort job names * review
* Nitrogen survival boxes * Zero-setup workaround * clown box * cleanup and universal tanks * cleanup * more cleanup * hide loadoutgroups * remaining survival boxes * space ninja * Revert "space ninja" This reverts commit a650f417f83f5861e0001b25418e4a361927c6c6. * weh * weh * undo appearance change of syndicate survival boxes * indentation fix and missing label
* tank harness * weh * Suit Storage Whitelist * Revert "Suit Storage Whitelist" This reverts commit b1f503573c2936642a2d7627c4852153ec71ce79. * suit storage filter * vox spawn gear * weh
* Nukie species gear * antagselectionsystem autointernals * nukie vox * skrek * Remove duplicate code * skrek * EVA tank loadouts, vox ninja update * fix prototype duplication * skrek * fix summary * fixed empty startinggear error * enable vox ninjas * Comments * removed comment because startinggearprototype should not be used on antagselection aaaanyway * squish that if * Update Content.Shared/Clothing/LoadoutSystem.cs --------- Co-authored-by: metalgearsloth <[email protected]>
* Fixed potential duplicate engraved lighter steal objective * Update Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml Co-authored-by: Tayrtahn <[email protected]> * Implement pigeonpeas' suggestion * Also replaced the one if the vending machine, unsure if this vending machine is used or if vended items retain their fills, but figure can't hurt --------- Co-authored-by: Tayrtahn <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
About the PR
from july 1 to today
meteor stuff excluded
Technical details
also removed the mind stuff so the 10 different passenger names all show up as passenger in ghost warp, less confusion
a few things from before july werent merged before this for some reason so there might be things silently broken
Current Issues
Media
loadout id still works, but the mind's job is the actual job now not the flavour text
Changelog
🆑