Upstream #2
Open
Upstream #2
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 82b31d4040ba34a567dcf40fbcf620c5014edb27)
(cherry picked from commit 18653865817164163714e70a60ff28e14a2974cd)
(cherry picked from commit 377dfe49a7ad2a2c65cf5edfd8c0312e12f884f1)
(cherry picked from commit 1262550d91b95804d83bb3898eee77ea25251740)
(cherry picked from commit ef9785d2c95ecd645d69653bf3e75a7f7c1debd5)
(cherry picked from commit c18707038c754631c27f2d32dea91b958f4e7012)
* Fix verb sub Mapping casualty, verbs are weird. * also this (cherry picked from commit 39280652a695fd015aedf64088247f7437ef828b)
errors/test fail ops --------- Co-authored-by: metalgearsloth <[email protected]> Co-authored-by: slarticodefast <[email protected]> (cherry picked from commit 7c5c4ba53b562720202937d19ae266b9e3c74f99)
Yeets a heisentest. (cherry picked from commit 09b5c3ed9da1f6b51a866ec1e116aa12ddceecab)
# Description Making chems use Unobtainium Reagents doesn't make chemistry interesting, it makes medical gameplay boring. This PR replaces the unobtainium recipes with suitably expensive and/or complicated recipes. Have fun memorizing how to make Acetone, Ammonia and Impedrezine. # Changelog :cl: - remove: 1984'd most instances of "Unobtainium" chemistry. Chems like Necrosol that previously required normally unobtainable reagents such as Cognizine or Vestine now instead have long production chains of chems that are obtainable, but complicated to produce. Check the chemistry menu for more information. (cherry picked from commit 631ad785fc8e67b7d726acc61efcaca6eaa94dd8)
(cherry picked from commit 6616d0f6b8fd57b25ae146f247817cf5078cf3f7)
…ople who don't know. Signed-off-by: sleepyyapril <[email protected]> (cherry picked from commit c38f34f38143a53324e3cfc7a90b93a6728e0d49)
Signed-off-by: sleepyyapril <[email protected]> (cherry picked from commit 01faf4687377c09d1aa2271441314c412d364703)
(cherry picked from commit bc7f5e0028330e4ab245eed09f228753964810c6)
(cherry picked from commit 29acc7b7fa9371fcfcb2bd281f10d4bd95d2349e)
(cherry picked from commit 95fc9471b000c2c5ee8afddf27ba1f9b1980795c)
(cherry picked from commit 7a0809144a234c516289e3018cc34b6236ac8d09)
# Description This PR fills in the basics for the previously commented placeholders for "Advanced Tacsuits" and "Prototype Tacsuits", both new Arsenal researches. These both unlock recipes for manufacturing tacsuits at a Security Techfab, and are an alternative method to making them outside of buying them through Cargo. Here's a genuine reason for Epistemics to consider doing Arsenal T3. <details><summary><h1>Media</h1></summary> <p>     </p> </details> # Changelog :cl: - add: Added Advanced Tacsuits, and Prototype Tacsuits to Arsenal research. Along with them comes Security Techfab recipes for said tacsuits. (cherry picked from commit d1821a10c825415e2c400a257a7c57830f1eed19)
(cherry picked from commit 6cd57c0fcb59b26ce91ce1828e4370cd242f73f8)
# Description This PR fully replaces the "Tier 3 Tech Lockout" with a research softcap. How it works is that technologies are allowed to set a softcap contribution, meaning that they multiplicatively increase the cost of all other research by a certain amount. By default, this is done by all Tier 3 Technologies. Essentially, this means that you're no longer limited to a single research category's tier 3 selections. Instead the costs of research increase the more capstones you unlock. The current cost increase for research is displayed on the console. <details><summary><h1>Media</h1></summary> <p>  </p> </details> # Changelog :cl: - remove: Removed the "Tier 3 Tech Lockout" mechanic. You are no longer limited to 1 discipline worth of t3 research. - add: Research is now "Softcapped" by Tier 3 unlocks. Each unlocked Tier 3 technology multiplicatively increases the cost of all other research. Rushing a capstone can be quite expensive, as will be getting multiple capstones. I hope you're glad that you can build more than one prober now without guaranteeing the station will explode. (cherry picked from commit b7da1f4ff64ca3ce8c4dc4545186573174b3e89c)
(cherry picked from commit fca700ac0b890bd82d2e09f986d8f12eec93c7cb)
# Description Servers are occasionally experiencing roundstart crashes, and the logs I received concerning this crash imply that LoadoutSystem is SOMEHOW being handed a player character that doesn't actually exist. Well an easy solution I guess is to just make LoadoutSystem check if the entity *factually* exists, before attempting to apply a loadout to it. # Changelog :cl: - fix: Possibly fixed a crash related to Loadouts being applied to entities that don't exist. (cherry picked from commit 9e24c4ae3fcdd1646cfc49829dbf7073a13d364f)
(cherry picked from commit b67fd106efe5418b42c332cbbf549545d8021307)
# Description New lawset, see media.  --- # Changelog <!-- You can add an author after the `:cl:` to change the name that appears in the changelog (ex: `:cl: Death`) Leaving it blank will default to your GitHub display name This includes all available types for the changelog --> :cl: Rane - add: Added Augustine lawset as a middle ground between Asimov and Crewsimov. (cherry picked from commit 523818cd6545c07b32370ca5db79cb1c106df253)
(cherry picked from commit bb6693d5e31edb447530661e8ce74c56b26cbc22)
it's an engine update folks --------- Co-authored-by: Tobias Berger <[email protected]> (cherry picked from commit 17972522b3d93224f3f8af9d32ae6b2e10df276d)
maintainers get over here --------- Signed-off-by: sleepyyapril <[email protected]> Signed-off-by: Skubman <[email protected]> Co-authored-by: Skubman <[email protected]> (cherry picked from commit 0fa6a9067709dc77e8d967ce7af5d684185f434d)
# Description Howdy, y'all, I just wanted to give you a quick update on the ATS. I've added the proper tiny fan, add snacks, and drinks vendors, and some lighting. <details><summary><h1>Media</h1></summary> <p>   </p> </details> --- # Changelog :cl: Mike32oz - add: ATS, light post, snacks/drinks vendors. - tweak: ATS, tiny fan, convenient belt. - remove: ATS, spawn-MobBear in the Maintenance room. (cherry picked from commit f55ab5cc546a964cfdd3c308fcf8863b517389e6)
(cherry picked from commit 44d6099fdba58ec3b856e619e3b5581086de59a8)
* Sprite the actual hood, tell me what I'm missing. * Does the yaml thing, because me two weeks ago was a tired * moving the comment * Build and test will you ever be satisfied? * THE LINTER * Mono breaks robusttoolbox with his shitcode * Revert "Mono breaks robusttoolbox with his shitcode" This reverts commit 392b3eecfb10448b842758bca84ef7c4ec9be7c4. * Revert "THE LINTER" This reverts commit 3331e4d18a60e950ff6384290cc244515ced20e1. * Okay let's try this again * Mono, you press Tab too much. (cherry picked from commit b755d045d28f2e9c8ae015d62590bf3ee88ccbd2)
* Tallholads! * Small changes * Update snipers.yml * ding * conflictiskill * ConflictFixOps * ConfliuctFixOps2 * comment stuff * Adjustments * Update antimateriel.yml Signed-off-by: Avalon <[email protected]> --------- Signed-off-by: Avalon <[email protected]> Co-authored-by: deltanedas <@deltanedas:kde.org> (cherry picked from commit 92c4b9461b111b465ba2f63f8afb82c6288b1ecd)
* Add medkit slot * Add container (cherry picked from commit 470bebaa019dd164e4876b5dd4fb8a6ac12fc7dd)
* feat: Powdered drinks orderable by Logi * tweak: Lower amounts per crate * chore: fix copy-paste mistake * feat: Add HydroCo to StockTrade App * tweak: Lemon, Lime and Pineapple Juice powders now deal slight Caustic damage * i18n: Powdered watermelon juice does not include water * feat: If eating straight powdered beverage, cough and vomit * tweak: change powder tastes * tweak: Add spoons to HydroCo crates * tweak: Add HydroCo consumption notice to crates * refactor: consistent naming * refactor: BasePowderBeverage now abstract, inherit physicalDesc * refactor: mark ReagentTinBase as abstract * tweak: Rephrase HydroCo Notice * refactor: Move name and description to prototype * tweak: Juice crate now comes in one of four editions * feat: powdered tomato juice * refactor: rename reagent ftl for consistendcy * tweak: use tomato powder in crate fill * fix: copy-paste mistake * feat: hydroco trial mails * tweak: 2 soy, 2 regular milk in dairy crate * tweak: lower price for juice crate * tweak: recolor tomato powder * tweak: use one of each edition, no themed crates; plastic spoons instead of metal * feat: soy milk powder and orange juice powder in sustenance vendor * tweak: reword hydroco mail message * tweak: rearrange papers to play nicer with word-wrap * tweak: add new-line in case somebody drags the paper wider * tweak: reintroduce random tin, condense juice fill tables * refactor: amount defaults to 1 * Add Changelog Entry for Teach Lesson (#2225) * meow * meow * Update DeltaVChangelog.yml Signed-off-by: Lyndomen <[email protected]> --------- Signed-off-by: Lyndomen <[email protected]> * refactor: add missing newline * refactor: respect yaml property ordering convention * refactor: more yaml conventions --------- Signed-off-by: Lyndomen <[email protected]> Signed-off-by: DisposableCrewmember42 <[email protected]> Co-authored-by: Lyndomen <[email protected]> Co-authored-by: Milon <[email protected]> (cherry picked from commit 2a276dc36cf02deb69990fb85a49656b15a338db)
* NEW DRINKY!! * flavour is now not broken :) * AAAAAAAAAAAAAAAAAAAAAAAAAA * Milons annoyances :blunt: * "untouch" I dont like using the web interface, its also superfluous spaces Signed-off-by: Blitz <[email protected]> * Update drinks_cans.yml Signed-off-by: Blitz <[email protected]> * Update flavor-profiles.ftl Signed-off-by: Blitz <[email protected]> * Update meta.json Signed-off-by: Blitz <[email protected]> * deltanedas fix --------- Signed-off-by: Blitz <[email protected]> Co-authored-by: Milon <[email protected]> (cherry picked from commit 77ca815df34d3b1d7dc010a8901b8d668b3fe765)
meow (cherry picked from commit e7741a959af12191e2138b76a3f1f157d0d9eabd)
Added missing sprites from Frontier (cherry picked from commit 9cee3b6aa21484306874d92ce8d17fc897ba1298)
Meow (cherry picked from commit da111d969f36f514d5fb7dd8d9c4c77b45a3f4be)
Co-authored-by: Milon <[email protected]> (cherry picked from commit 800acf4d3f8ae41546844cd4e8b09c70304c9e69)
* Buff Alox * Revert "Buff Alox" This reverts commit 730825bd9458c7f35d994627799c0b04ce2a29eb. * Buff Alox fixed * Untouch (cherry picked from commit d82bfac627b53d19b60dc45e4f684c00b74b80b7)
* Frontier Port: Pretty Money * Update Resources/Prototypes/Entities/Objects/Misc/space_cash.yml Co-authored-by: Whatstone <[email protected]> Signed-off-by: Unkn0wn_Gh0st <[email protected]> * Updated 100k texture --------- Signed-off-by: Unkn0wn_Gh0st <[email protected]> Co-authored-by: Whatstone <[email protected]> (cherry picked from commit da772611f8b2b02f21f801ccf255220602e850e5)
Infer type for EntSelector.cs (cherry picked from commit e180a1b11b552ab790c59e3e5ee6ef2eeedb8bd5)
* Shaking and Stirring * Remove shake message * Switch if order a bit * Add doafter supprot for reactionmixer * Fix nullability * Timespan zero * Forgot to remove loc string * Reorganize usings * Remove unneeded usings, fix b52 needing to be shaken (cherry picked from commit 9fb1414bed67cd8ce91294e571d9a7a37773d526)
* ART * Update clown.yml * Loadout fixes, time req * loadout bgone * Fixes, moved things * fixoneoops * More fixes * CRAFTING WORKS! * Flipped slashes * UNTOUCHED! AT LAST * Fix comment * Mailladd * Webedit ops Signed-off-by: Avalon <[email protected]> * untroll indent Signed-off-by: deltanedas <[email protected]> --------- Signed-off-by: Avalon <[email protected]> Signed-off-by: deltanedas <[email protected]> Co-authored-by: deltanedas <[email protected]> (cherry picked from commit fe630d7391693b4ee6cb389f4460c064ae3e8d21)
* Added flavors * Added the flavors for real this time * Fixed the spaces * Removed xenobasher (it already existed and I missed that) * Fixed acidspit * DEFINITELY fixed acidspit --------- Signed-off-by: Aikakakah <[email protected]> (cherry picked from commit 0ce6ca206407d33dfebde300daf79bebf3ea34b2)
* add selene wings * brighten primary and secondary recolorable sprites * correct meta.json whitespace * bruh * hopefully correct for real this time (cherry picked from commit 943e4bf11a9892fbff9db7fe0419650ce5962de0)
1984 (cherry picked from commit c029d5d4b8df2fdccba92f0bc14e635b2cdb6024)
* easy * Update chefvend.yml Signed-off-by: Stop-Signs <[email protected]> --------- Signed-off-by: Stop-Signs <[email protected]> (cherry picked from commit bd196992fdd2608c3b111dc2add79f5eba4643bf)
Co-authored-by: Velcroboy <[email protected]> (cherry picked from commit 7ac1b2db1672b6a9f4e4a09ba14637056b9b8669)
* Ported * spawners * Update food_ingredients.yml Signed-off-by: Stop-Signs <[email protected]> --------- Signed-off-by: Stop-Signs <[email protected]> (cherry picked from commit b8f9b7ca0ef86d7ff6bcbb6596de1a18a8d13506)
Adds nuggie recipe (cherry picked from commit d622d8d6a14bfb17025e663b40c350d14d325af8)
Foxears-inner (cherry picked from commit 5a7c543d74030191d17c0e898446978281ea91c6)
Added binary key (cherry picked from commit 63712e66205001680561a2b6ca844cb0c6d742b8)
* The first part of this PR, "Lobby Music" * Part 2 of this PR, act 1: "Operator Plush" * WebP conversion+ Fixing some YML (cherry picked from commit 43290c65dd60ca54e11ccfd32ea6afb8691939a6)
…e contraband + minor sprite change for consistency (#32193) * adds new icon, changes binary key icon and frame, changes contraband designation * added back the regular key as admeme because it makes sense (why am I not thinking about these things) * hehe I cannot read! (cherry picked from commit e5c671b195551015c430acd3778a7bbed645e747)
* Init * uplink icon (cherry picked from commit 5d5fdbe8c57eab28aad2482418e8fb2ee58abf18)
(cherry picked from commit ebd6f8d2105c257594b82011a472d8f333edaf75)
(cherry picked from commit db087b09d29b0b45510a1e945e81741473b4bccc)
(cherry picked from commit 9448bac9cf3de6de64da3ce51f038792b95ad568)
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
Для проверки тестов
Медиа
Список
Изменения
🆑