Upstream branch sync #89
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
* Add a kit for botanists to do some limited chemistry to the NutriMax. Intended to help new botanists learn in-game about chemistry. * remove exclamation marks from names * naming fix * Rejected trademark application for 'Farmers Helper'. --------- Co-authored-by: PraxisMapper <praxismapper@gmail.com>
* Fix typo in agri-chem manual * Unremove my added newline
* Cleanup books.yml * yeah * shame
* Vox sign/N2 locker update The "vox area" sign and N2 locker sprite were both taken from /vg/station. These sprites have bad racist connotations as discussed in space-wizards/space-station-14#31840, and do not fit our server culture. The new N2 locker is not a taped on piece of trash. It now also has a blue stripe to mimic the regular O2 locker and make it more distinct from fire safety closets. The new "vox area" sign sprite follows the same style as other "area indicator" signs used throughout the blue and isn't an explicit warning sign anymore. It still has "No O2" on it to fill that role though. * emogarbage adjustments --------- Co-authored-by: EmoGarbage404 <retron404@gmail.com>
Pizza box now contains cotton pizza Co-authored-by: Ekkosangen <9094006+XyyxShard@users.noreply.github.com>
* A * B * C * D * Update TechAnomalySystem.cs * idle anim * Update meta.json * new animation
changed throngler names
…, and I am mad (#31246) * Fix logging of GetWebhook errors Yeah let's just not log the error only stack trace. * I have spent more time today cleaning up garbage than coding new shit, and I am mad Cleans up the custom vote Discord webhook code because I *happened* to lay my eyes on how completely terrible it was and immediately found an obvious bug with it. Also did basic QA because jesus christ: it more clearly reports pending votes, properly indicates cancelled votes, improves footer formatting, better error logging, all the usual shit. Requires space-wizards/RobustToolbox#5375 to avoid test failures
* Mineral Scanner * doink * review * sunday funday * review and fix bugs i think? * Update MiningOverlay.cs
Merge pull request #79 from Space-Stories/upstream
* Fix ai upload console itemslot whitelist * aw man
vox laugh not underwater
* fix shotgun sprite * fix take 2
pest events reorganized and snails spawn
* break pull at sleep * TryStopPull without user --------- Co-authored-by: YourUsername <you@example.com>
…tegories: [ HideSpawnMenu ] + self recharge removed + 1 more shot + normal recharge speed (#31235) * narrow nerf * last instance of nospawn gone * removes self recharge * 8 shots, less recharge time
* Add justice helm * backslash moment * spinny light * remove power cell from recipe
Deleting binary key Silicon supremacy!
* Update PULL_REQUEST_TEMPLATE.md * Update PULL_REQUEST_TEMPLATE.md 2 * Update PULL_REQUEST_TEMPLATE.md 3 * Update PULL_REQUEST_TEMPLATE.md 3 * Update PULL_REQUEST_TEMPLATE.md 5 * slart suggestions Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> * paste --------- Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
…#31975) resistances to directional windows
* AlmostCertainlyDoesntWork * Please work * maybe work * emptycommit * test * testest * Empty-Commit * Uplink grammar/typos fix
* Add SetEntity(Owner) so can view APC sprite in UI * bump apc version flavor text --------- Co-authored-by: TIMMY <timmytriggers@cock.li>
added stuff
Update moffra.png
Cull Sala Max Pop
make cables more visible
…ative fibers (#31886) * Adds fibers-insulative-frayed to fibers.ftl and relevant fibers-insulative-frayed components to budget insuls * +1 to the "different types of fibers in the game" info under the forensics guidebook entry (pray this is actually correct and accurate)
…on-14 into upstream # Conflicts: # .github/PULL_REQUEST_TEMPLATE.md # Resources/Textures/Objects/Storage/boxes.rsi/meta.json
* add Barratry * remove mine and turret from Ishimura --------- Co-authored-by: MetalSage <metalsage.official@gmail.com>
Merge pull request #80 from MetalSage/upstream
Виздены поменяли GameRule на метеоры, а тут стоит старый. В файлы миграции, видимо, тоже не добавили, так что я сделаю хотфикс
Co-authored-by: MetalSage <metalsage.official@gmail.com>
Co-authored-by: MetalSage <metalsage.official@gmail.com>
|
Thank you for contributing to the Space Station 14 repository. Unfortunately, it looks like you submitted your pull request from the master branch. We suggest you follow our git usage documentation You can move your current work from the master branch to another branch by doing |
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.
О PR
Почему / Баланс
Технические детали
Медиа
Changelog