Merge Upstream #58
Merged
Merge Upstream #58
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
 # 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: - fix: Fixed full glimmer float being displayed to chat by Sophia.
<!-- This is a semi-strict format, you can add/remove sections as needed but the order/format should be kept the same Remove these comments before submitting --> # Description Fixed not having enough space for longer chemicals on the ChemMaster UI. --- # 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: - fix: Fixed not having enough space for longer chemicals on the ChemMaster UI.
<!-- This is a semi-strict format, you can add/remove sections as needed but the order/format should be kept the same Remove these comments before submitting --> # Description <!-- Explain this PR in as much detail as applicable Some example prompts to consider: How might this affect the game? The codebase? What might be some alternatives to this? How/Who does this benefit/hurt [the game/codebase]? --> My bad --- # 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: - fix: Fixed IPCs being unable to cryo.
# Description This PR splits all the CVars into separate files. Unfortunately I need to hella clean this up by restoring all the CVars that are different on EE, because cherrypicking it reset everything to Wizden's Defaults (Including CVars that no longer exist on EE, and removing CVars from systems I codeown now, such as Atmos, Guns, and Melee). # Changelog No changelog because this isn't player facing. :) --------- Co-authored-by: Simon <[email protected]>
# Description This PR adds in the classic Asimov's Three Laws of Robotics as a standard lawset for Synthetics. The laws are given thus. Law 1: A robot may not injure a human being or, through inaction, allow a human being to come to harm. Law 2: A robot must obey the orders given it by human beings except where such orders would conflict with the First Law. Law 3: A robot must protect its own existence as long as such protection does not conflict with the First or Second Law. The localizations for them are intentionally left exactly-as-is from the original 3 laws written by Isaac Asimov. Yes this is totally different from "Crewsimov", yes this does actually mean an Asimov AI isn't required to obey orders given to it by a Moth. Yes this does actually mean that the AI isn't allowed to "Harm" nukies so long as it can verify that the Nukie in question is a human. Also includes this cherry-pick space-wizards/space-station-14#31040 Because this is a fix for a crash that was happening in my dev environment... # TODO <details><summary><h1>Media</h1></summary> <p>  </p> </details> # Changelog :cl: - add: Added the classic Asimov's Three Laws of Robotics to the game. - add: AI now starts with Asimov laws by default, instead of "Crewsimov". --------- Co-authored-by: Plykiya <[email protected]>
<!-- This is a semi-strict format, you can add/remove sections as needed but the order/format should be kept the same Remove these comments before submitting --> # Description <!-- Explain this PR in as much detail as applicable Some example prompts to consider: How might this affect the game? The codebase? What might be some alternatives to this? How/Who does this benefit/hurt [the game/codebase]? --> Changes how the ChemMaster works: 1. Removes the amount buttons and instead uses a textbox that resets whenever a value is entered or focus ends. 2. Shrinks the ChemMaster again. 3. Adds sorting options, including for quantity, last added, and a sort option for the (default) alphabetical order. 4. Sorting options save via the ChemMaster itself, not per-user. Video showcase: https://discord.com/channels/1218698320155906090/1218698321053356060/1330129166384894046 --- # 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: - add: Added sorting options to the ChemMaster. - add: Added the ability to input custom amounts into the ChemMaster via a textbox that resets on change. - tweak: The width of the ChemMaster UI has been lowered. - remove: Removed quantity buttons from the ChemMaster. --------- Co-authored-by: VMSolidus <[email protected]>
# Description This PR adds a new server configuration that disables the special Scream Action that all players spawn with. It's stupid, it's NRP. And you can still scream with the emote or emote wheel. If the config is set to false at roundstart, the Scream action simply won't spawn. # Changelog :cl: - tweak: The "Scream Action" no longer appears by default. It may be set in your server's configuration to spawn or not.
# Description Apparently a lot of people were extremely angry that this was defaulted false. # Changelog :cl: - tweak: Scream is once again by default on the action bar. The server configuration for removing it still exists however.
…us/Einstein-Engines into Ignore-Warnings-In-Tests
# Description It turns out that when you have a species that has 20x the blood volume of a human, letting them take a trait that makes them constantly bleed some percentage of their blood volume causes a lot of problems. Usually by FLOODING the station with blood. This PR just makes Lamia ineligible for the two blood traits, it unfortunately doesn't fix the issue of them excessively bleeding when you attack them(I actually don't fully consider it to be an issue. I have issues instead with system instances of hardcoded blood amounts). # Changelog :cl: - remove: Lamia can no longer take blood related traits, such as Blood Deficiency.
* Add mapping editor (#757) * Remove mapping actions, never again * Cleanup actions system * Jarvis, remove all references to CM14 * Fix InventoryUIController crashing when an InventoryGui is not found * Rename mapping1 to mapping * Clean up context calls * Add doc comments * Add delegate for hiding decals in the mapping screen * Jarvis mission failed * a * Add test * Fix not flushing save stream in mapping manager * change * Fix verbs * fixes * localise --------- Co-authored-by: DrSmugleaf <[email protected]> Co-authored-by: metalgearsloth <[email protected]> Co-authored-by: metalgearsloth <[email protected]> Co-authored-by: Pieter-Jan Briers <[email protected]>
The F3 coords manager is blocked if you're not an admin. This check happened even when playing a replay, where you actually aren't. There's now a check to make sure you are actually server-connected-to-game before running the logic. Also moved it to a manager because this *shouldn't be a bloody entity system in the first place*.
fixes the "missing layer" error Co-authored-by: slarticodefast <[email protected]>
…us/Einstein-Engines into Ignore-Warnings-In-Tests
I'm trying something out.
<!-- This is a semi-strict format, you can add/remove sections as needed but the order/format should be kept the same Remove these comments before submitting --> # Description Adds Cohiba Robusto cigars from SS13 for our heavy smoker HoS. --- # TODO <!-- A list of everything you have to do before this PR is "complete" You probably won't have to complete everything before merging but it's good to leave future references --> I'll think something up one day --- <!-- This is default collapsed, readers click to expand it and see all your media The PR media section can get very large at times, so this is a good way to keep it clean The title is written using HTML tags The title must be within the <summary> tags or you won't see it --> <details><summary><h1>Media</h1></summary> <p>  </p> </details> --- # 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: - add: Added Cohiba Robusto cigars - tweak: Tweaked nicotine amounts in cigars, smoke longer
…ngines into mergeupstream
|
RSI Diff Bot; head commit c80fe5c merging into 8ad954d Resources/Textures/Interface/Misc/ai_hud.rsi
Resources/Textures/Objects/Consumable/Smokeables/Cigars/case_robust.rsi
|
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.