This repository has been archived by the owner on Oct 25, 2023. It is now read-only.
Merge Nyano up to 20/07 #91
Merged
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
(cherry picked from commit 9797a0d)
(cherry picked from commit 9c1c7ca)
* Update gloves.yml * Update Resources/Prototypes/Entities/Clothing/Hands/gloves.yml Co-authored-by: keronshb <54602815+keronshb@users.noreply.github.com> --------- Co-authored-by: keronshb <54602815+keronshb@users.noreply.github.com> (cherry picked from commit acf102b)
* Fix tag steps double counting entities * oauhg (cherry picked from commit 78adc99)
(cherry picked from commit ea767b7)
(cherry picked from commit f9f8bb2)
(cherry picked from commit 910c2da)
(cherry picked from commit 9fc4fc6)
Co-authored-by: deltanedas <@deltanedas:kde.org> (cherry picked from commit 763f604)
(cherry picked from commit a01f26d)
* Fix renamestation command not working * Console completions for station commands (cherry picked from commit 50c278b)
(cherry picked from commit c1a971f)
(cherry picked from commit c130c1e)
(cherry picked from commit 1dde5f3)
(cherry picked from commit 6485dba)
Back in 2019, throw was set to Ctrl+Click so canFocus was set to true. It wasn't removed when the hotkey changed from left click to Q. (cherry picked from commit 7f203be)
(cherry picked from commit 3fa99b8)
(cherry picked from commit f14f09c)
(cherry picked from commit 9849737)
(cherry picked from commit a23a7fe)
(cherry picked from commit 501bc4b)
(cherry picked from commit 26e5249)
(cherry picked from commit 878a684)
(cherry picked from commit 74df2a3)
(cherry picked from commit 12a44bf)
(cherry picked from commit 17254ec)
(cherry picked from commit 4bd6f92)
* Update janitor.yml * Update Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml Co-authored-by: Chief-Engineer <119664036+Chief-Engineer@users.noreply.github.com> * Update janitor.yml friction gaming * tweak cart friction * Update Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml * comment --------- Co-authored-by: Chief-Engineer <119664036+Chief-Engineer@users.noreply.github.com> (cherry picked from commit 9792116)
(cherry picked from commit 12c1385)
…ing (#16115) * Space sections fractionally slower (1 sec, exponential) - ExplosivelyDepressurize reduces air pressure by about 20% each pass, sets to vacuum below 20 kPa - Causes some issues with AdjacentBits on airlock close * Introduced constants for Spacing in atmospherics * Limit space wind allowed during spacing to 1000 kPa per tile/sec - Less tile ripping per tick - Tiles rip based on wind - Robustness checks * Slowed down the spacing a bit * Slowed down the spacing a bit more * Better dynamics about high pressure air escaping, - Reduce air temperature (due to decompression) during spacing - Make some water vapor for flavor * Limit temperature loss to >8 Deg.C. No Water vapor (cherry picked from commit 28bec85)
Replace with pallets and sale console.
(cherry picked from commit eb7ebe6)
(cherry picked from commit e9d3d86)
* change * Update attributions.yml (cherry picked from commit 1bce3f7)
Cherrypick 2023-07-16
adds a catwalk and revamps the lava area
Co-authored-by: Jeff <velcroboy333@hotmail.com>
This reverts commit ae03910. There are issues with this commit affecting users of Visual Studio Code.
* initial "working" commit * decent rendering * clean up texture a bit * looking better * i love ui 😄 * Start bookkeeping * Glimmer graph just worksTM * okay, clipping works * calculate your own damn formatting instead of making the server do it * name constants, add interval buttons * wtf, interval buttons work I guess * add sync button * seperate out cartridge RSI * adjust server namespaces * seperate out client namespaces * do loc * woops, placeholder value * cleanup * final cleanup after testing * magil review and fix
Changes her name to Sophia too.
* Adds Skub Klub * Update timing and design --------- Co-authored-by: Jeff <velcroboy333@hotmail.com>
* judas purge pt 1 * fix lid purge * further purge * purge skub * weh purge * gar purge * gachi purge * spare the lizard plushie
* get some basics thrown in * add event * glimmer reading topic completed * replace speech sounds * add more topics * add a bunch of responses * add responses for a bunch of morphotypes * new line * fix minor grammar inconsistency --------- Co-authored-by: Vordenburg <114301317+Vordenburg@users.noreply.github.com>
…nto merge-nyano-20/07
github-actions
bot
added
Changes: Map
DeltaV-Bot
pushed a commit
that referenced
this pull request
Jul 20, 2023
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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
I broke stuff, hopefully its fixed now
Changelog
🆑