Upstream Sync #53
Merged
Upstream Sync #53
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
* Allow IdentityBlocker partial coverage * rename to TotalCoverage (cherry picked from commit d75f6c3db4f638e9a479fe40c8d50f0e6c137556)
(cherry picked from commit 79fa3c7db1517b21379e62db735e1139a5c8540e)
(cherry picked from commit e82964bbf44ce2e6b10c585090eec2dd0cd27237)
(cherry picked from commit 1029142740f53d1a6e8701b410f2ab63b13df4f6)
* Raise `StationPostInitEvent` broadcast * Basic variation pass handling * standardize names + rule entities * why does it work like that? * add to defaults * light break variation pass * ent spawn entry * move some stationevent utility functions to gamerule + add one for finding random tile on specified station * forgot how statistics works * powered light variation pass is good now * station tile count function * public method to ensure all solutions (for procedural use before mapinit) * move gamerulesystem utility funcs to partial * ensure all solutions before spilling in puddlesystem. for use when spilling before mapinit * trash & puddle variation passes! * oh yeah * ehh lets live a little * std * utility for game rule check based on comp * entprotoid the trash spawner oops * generalize trash variation * use added instead of started for secret rule * random cleanup * generic replacement variation system * Wall rusting variation rule * account for modifying while enumerating * use localaabb * fix test * minor tweaks * reinforced wall replacer + puddletweaker (cherry picked from commit cc24ba6a317c4bee84ffa1eda8397c255ca92be9)
(cherry picked from commit 9556c2bc04b912ff98dc42a5b53f3aea3c4df942)
Removing the embedding function (cherry picked from commit ae7c57a9a072a02f885ef5de7d8244b57555942b)
* Update game_presets.yml Added Secret Extended and Secret Greenshift. * Update game_presets.yml (cherry picked from commit c181ba4baeee9a0b7ed88926942c9bc814fdd18e)
(cherry picked from commit 2a5f5299f0ed6ecec6ccc99109788f487c7c3793)
* Add a few new speech emoted for Cry and Laugh * Remove Pouting me dumb and silly (cherry picked from commit f511f60fb42588c0a8f656b2e013d3722dd41d8d)
(cherry picked from commit 1f389d7a3916be1153c068fdaebb5d36e5c62f7a)
* Firestarter fixes - Actually networks the action. - Namespace fixes. * No networky for you (cherry picked from commit a6ea8b210db079d30823e7b4d8faa32aefa17582)
fix (cherry picked from commit 884a5441202dfbfe715460d3cea76ebf0dbcc550)
(cherry picked from commit 6e68a6ca10d84c90370c94af9e7ca14a6c8fb7b9)
… be slightly viable (#24765) * Viability!!! Removes the uplink headset as suggested, changes around TC prices to make a few things more viable * Binary 1 TC Changes the Encryption Binary Key to a simple 1, I don't think I've ever seen it be used before and 1 seems like a proper price for it (cherry picked from commit cb2985eabce286ba40974dcb365ec4668a6b7541)
(cherry picked from commit ff090878e73bab3bcc7382197a0406fa88642482)
* Remove wheelchairs Vehicle code is dogwater and wheelchairs just keeps exposing edgecases. If someone wants it brought it back they can do vehicle refactor. * Also this one * Remove vehicles * goodbye vehicles * Remove this check * sasd * Cronch * Add sprites back * jani (cherry picked from commit d2f20d8955a25a32aa5fb9b3631a41921b464cd4)
(cherry picked from commit 0b9c52dd15463319515731c0e8491fa12bb3ec18)
This would happen when they run out of fuel. (cherry picked from commit b029d05620292f4c9c793edfb2a52254f4f4d484)
* Change emagged laws to append modifiers instead of completely changing them. * Maybe fix everything not working * bugfix * Fix missing secrecy law and allow basic borgs to be emagged correctly * Localization * Actual localization * test * Test * Remove dummy debug value * Fix bad law ordering * Tweak the secrecy law * Minor law tweaks * Remove obsolete argument * Fix YAML (cherry picked from commit 27592ba898201d0b09c95f6b0958503407d01bb5)
(cherry picked from commit d061c164fa06b7b4af497771de1ee5685e5a3a38)
"why are they getting cold damage" THERE YOU GO (cherry picked from commit c25ddfd638e2c50b541e5ebf8c2eda85778f3711)
(cherry picked from commit 5f44cd92e15fa33405c4a58c2842b42799594142)
* New sprite * Contrast is key. (cherry picked from commit 08a31eae197860f7cd177808729857173c55b77c)
(cherry picked from commit 50e58ca8055a1837e258eff8e0d803f08ae104d7)
* A beer can and a wine can * fix wrong file locations Signed-off-by: c4llv07e <[email protected]> * Update drinks_cans.yml * A beer can and a wine can * Update drinks_cans.yml * A beer can and a wine can * replace sprites Signed-off-by: c4llv07e <[email protected]> * Update meta.json * Update meta.json * Update Resources/Textures/Objects/Consumable/Drinks/wine_can.rsi/meta.json * Update Resources/Textures/Objects/Consumable/Drinks/beer_can.rsi/meta.json --------- Signed-off-by: c4llv07e <[email protected]> Co-authored-by: c4llv07e <[email protected]> Co-authored-by: metalgearsloth <[email protected]> (cherry picked from commit b80b6c04b248002c8febddf8fa961a2f95451510)
* Remove yellow oxygen tank * forgor --------- Co-authored-by: metalgearsloth <[email protected]> (cherry picked from commit e5bf4979ae432266cd6e2e9ef1d91cb40dd99264)
(cherry picked from commit 1bbe1aba330f485cae7c2d24d52bdcfe148476e2)
* Buzzing moth * Update speech_emotes.yml (cherry picked from commit 507c39d4456df7536d13a91fd77074d436955624)
Fix ssd indicator (cherry picked from commit fed43f05d0e95d51e2426a80c7e8963d585c5521)
* Fix being able to punt probers to unachor them * Fix my wacky comment
signey
* refactor and add log * add api needed for objective * backport LastProfileLoaded * fix midround antag rule * evil twin spawning code * evil twin yml and stuff * m * hopefully fully rename it * fixy --------- Co-authored-by: deltanedas <@deltanedas:kde.org>
Stop actions from running on our bot
* Shoukou small patch Deletes plasma miner Deletes command cryo Replaces cryo in prison with cryo with prisoners included edition Ensures techmaints are under robotics and cryo Fixes shutters in robotics Provides medical with a singular cryo * gets rid of invalid * Update shoukou.yml --------- Co-authored-by: Velcroboy <[email protected]>
Co-authored-by: Velcroboy <>
* Everyone loves dog vision Updated to match the the harpy code * change locale name
Me when the maps
5 normality crystals
Removes invalid warning, takes care of last unowned files Signed-off-by: Debug <[email protected]>
…to upstream-sync-4
github-actions
bot
added
Status: Needs Review
deleted submarine station
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.
No description provided.