Upstream sync #443
Merged
Upstream sync #443
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
* added signal control to portable generators * added documentation * Discard changes to Content.Server/Radio/EntitySystems/HeadsetSystem.cs * added DeviceNetworkComponent and WirelessNetworkConnectionComponent to generator prototype * made GeneratorSignalControlComponent nicer * implemented auto-revving * added back necessary dependency * can't send do-after event manually * repeat now works with auto revving * fixed * removed vv * stopping generating when it is revving now makes it stop revving * Update Content.Shared/Power/Generator/ActiveGeneratorRevvingComponent.cs Co-authored-by: Kara <[email protected]> * used resolve instead of TryComp --------- Co-authored-by: Julian Giebel <[email protected]> Co-authored-by: Kara <[email protected]>
* Fix not finding ItemToggleComponent * Simplified
Fill level visuals for water bottle inhands
* Actual tastebuds yup * Grape Soda, can't forget them too Grape Soda, my beloved
Co-authored-by: Kevin Zheng <[email protected]>
Fixed pressing shift cancelling ghost follow
* destructible jug * destruction * Update Resources/Prototypes/Entities/Objects/Specific/chemical-containers.yml --------- Co-authored-by: metalgearsloth <[email protected]>
* Delete Resources/Maps/aspid.yml * Delete Resources/Prototypes/Maps/aspid.yml * Update default.yml * Update PostMapInitTest.cs * Update MapLoadBenchmark.cs
* packed update * smoked a new opp. his meat came off the bone
* Delete Resources/Maps/gemini.yml * Delete Resources/Prototypes/Maps/gemini.yml * Update default.yml * Update PostMapInitTest.cs * Update MapLoadBenchmark.cs
* add every * remove 2 crusher spawns
follow tag + norot
Removing the embedding function
* Update game_presets.yml Added Secret Extended and Secret Greenshift. * Update game_presets.yml
* Remove handheld crew monitor - It's supposed to be a CMO computer. - It's getting powercrept and added everywhere. * These too * And this
* Add a few new speech emoted for Cry and Laugh * Remove Pouting me dumb and silly
* Firestarter fixes - Actually networks the action. - Namespace fixes. * No networky for you
… 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
* 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
This would happen when they run out of fuel.
* 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
"why are they getting cold damage" THERE YOU GO
* New sprite * Contrast is key.
* 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]>
* Remove yellow oxygen tank * forgor --------- Co-authored-by: metalgearsloth <[email protected]>
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.