upstream update + port of eris clothing+backpacks#21
Merged
Conversation
* Changeling-Stings * update yml * attempt failed dead * sprite and ChangelingNeurodepressantSting * Update changeling_catalog.yml * merge * update * review * review 2 * clean up, remove non-blind stings * fix stuff * lethal, cryogenic, hallucination + armblade nerf * validate deez * a * review --------- Co-authored-by: ScarKy0 <scarky0@onet.eu> Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
* relocalize these two messages * fix erroneous butcherable components pt 1 * fix argocyte butchery * redundant
* chore(guidebook): Updating uplink information - Updating reference to let players know that the code can be used on any PDA by any player if shared * Web commit
ConstructionReload
4 sequential DB queries too slow? Just do 4 at once!
Co-authored-by: PJBot <pieterjan.briers+bot@gmail.com>
* Log custom votes to database. * Add navigation property from round entity
fix slimepeople left arm sprite
Since I took staging behind the shed, for now
- fix: Mining window has the wrong parent (ShuttleWindow instead of MiningWindow).
THIS COMMIT IS REAL Co-authored-by: nomdéraisonnablementlong <you@example.com>
Why are we handrolling this shit ???
Co-authored-by: PJBot <pieterjan.briers+bot@gmail.com>
* Update README.md with new links. * Update README.md with Princess-Cheeseballs' provided links. Co-authored-by: Princess Cheeseballs <66055347+Princess-Cheeseballs@users.noreply.github.com> * Removed an extra space. Co-authored-by: Princess Cheeseballs <66055347+Princess-Cheeseballs@users.noreply.github.com> * Update actions_changelog_rss.py with the new domain. * Update stylesheet.xsl * Update SECURITY.md --------- Co-authored-by: Princess Cheeseballs <66055347+Princess-Cheeseballs@users.noreply.github.com>
* i think i got them all * minor cleanup
* moproach/spider solutions with recharge * mop mop mop roach * more straightforward moproach solution inheritance
* Adds temperature protection to scarves * YAML conventions say specific stuff is better at the bottom
* no mroe screaming * if your angry and you know it scream with action grant! *clap clap* * emote action is more generic now * use flag instead * Revert "if your angry and you know it scream with action grant! *clap clap*" This reverts commit 7c40ee48 * screaming im screaming im screaming * reversed oops
* fix * TEST!!!!!!!!!! * comment * what * im so silly * explosion!!!!! * i hate tests * those can be asserts too * i hate tests
…tem.Random warnings. (#32) * Remove all uses of System.Random * Use IRobustRandom in BinomialNumberSelector.Get * Remove remaining ToolRefinableSystem S.Random inst
Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>
remove 5 year old unused shitcode Co-authored-by: deltanedas <@deltanedas:goida.zip>
…not deletable (#44558) Fixed character slots over the MaxCharacterSlots cvar being impossible to delete directly. Also added a check that should prevent a deletion attempt being made on a slot that does not exist.
* Content fix for IPlacementManager engine change * Test after removing Requires from PR description
…ine. (#43725) Centrifuge PestKiller Creates Ethanol, Mercury, and Chlorine
Wait for sync before doing runticks.
* modern * unpredict audio * prediction't
* more modular accesibility options * renaming * whopsy! * yeah im nitpicking this too * Apply suggestions from code review Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> --------- Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
…555) make sure they have internals
admin playertab role filter
i love hotfixes
removed backpack straps
* cling * eqwewe * resprite 2 * another resprite * Revert "another resprite" This reverts commit fe61cf99835b59620c94720c1ca9e9b16e2e52c6. * cleanup - Made overlay more red - Made action part of the NightVisionComponent - Default UseDelay - Less flavorful store listing (bc its the store) - Removed unintended changes * Update changeling.yml * fix test --------- Co-authored-by: nomdéraisonnablementlong <you@example.com> Co-authored-by: ScarKy0 <scarky0@onet.eu>
…ponPass genius Please enter a commit message to explain why this merge is necessary, �`
This reverts commit 3a32a32.
MLGTASTICa
changed the title
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.
About the PR
Why / Balance
Technical details
Test plan
Media
Requirements
Breaking changes
Changelog