Upstream #418
Merged
Upstream #418
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
Merge SetDirty() with preview reload People were forgetting to SetDirty() when changing a property; move SetDirty() into preview reloading, since if the preview is being reloaded, some property has definitely changed anyway. Co-authored-by: Eoin Mcloughlin <[email protected]>
* centcomm name and ftlcomp * networking microopstimization * go sleep. * map names and arrivals
Fixes #29923. Co-authored-by: Eoin Mcloughlin <[email protected]>
Co-authored-by: lapatison <[email protected]> Co-authored-by: NotSoDamn <[email protected]>
* Scale text in admin player overlay Fixes #30040 * Feedback from PR - get UI scale through root window --------- Co-authored-by: Eoin Mcloughlin <[email protected]>
* WIP: first prototype * Change text slightly * Allow names to wrap * Add label for the scan mode * Remove ugly text * Readd bleeding message * Update code * Allow for the Health Analyzer UI to grow vertically
* Disable arrivals message for cryosleep late arrivals * Provide silent to PlayerSpawnCompleteEvent * Fix typo * Move message to event and into arrivals system
* Beginnings of making the breadmemes jobs easier * stuff * stuff pt. 2 * Stuff pt.3 * Stuff I forgot last time * Basic whitelist Only people that are added to the whitelist with the addwhitelist command will be able to join. I call this the "legacy" whitelist * Remove always deny condition in favor of just breaking if playtime check fails * Change default whitelist Default whitelist is now the "legacy" whitelist. * localization * Admin check * minor spelling change * Fix build * Whitelist message * Fix vars not being datafield and spelling mistakes * Minor spelling mistake * Change config for salamander * Reviews and stuff * Add summaries * Fix whitelists * Forgot to add a datafield * Fixing stuff I guess * Reuse admin remarks to reduce load when connecting. * Update log messages to be verbose instead of debug * Reviews * whoops * Explain a bit more how whitelist checking works * Apply CE's review * Append Membership to Blacklist and Whitelist conditions * Fix review comments * Uncapitalize playerConnectionWhitelist, add to ignored client prototypes * Make note count field work * Fix cvar for thingy --------- Co-authored-by: Pieter-Jan Briers <[email protected]>
Make nukie plushies a non-contraband item
"Salvage specialist" to "Salvage Specialist"; all is right with the world
…eam-sync # Conflicts: # Resources/Prototypes/Entities/Objects/Misc/books.yml
Co-authored-by: lapatison <[email protected]>
Co-authored-by: lzk <[email protected]>
…tion-14 # Conflicts: # Content.Client/Content.Client.csproj # Content.Client/Lobby/UI/Loadouts/LoadoutWindow.xaml.cs # Content.Client/Options/UI/Tabs/KeyRebindTab.xaml.cs # Content.Client/Players/PlayTimeTracking/JobRequirementsManager.cs # Content.Client/VendingMachines/UI/VendingMachineMenu.xaml # Content.Client/VendingMachines/UI/VendingMachineMenu.xaml.cs # Content.Client/VendingMachines/VendingMachineBoundUserInterface.cs # Content.IntegrationTests/Tests/Commands/SuicideCommandTests.cs # Content.IntegrationTests/Tests/PostMapInitTest.cs # Content.Server/Administration/Systems/AdminSystem.cs # Content.Server/Cargo/Systems/CargoSystem.cs # Content.Server/Chat/Managers/ChatManager.cs # Content.Server/Chemistry/EntitySystems/SolutionInjectOnEventSystem.cs # Content.Server/Connection/ConnectionManager.cs # Content.Server/Content.Server.csproj # Content.Server/Ghost/GhostSystem.cs # Content.Server/Players/PlayTimeTracking/PlayTimeTrackingSystem.cs # Content.Server/Spawners/EntitySystems/ContainerSpawnPointSystem.cs # Content.Server/VendingMachines/VendingMachineSystem.cs # Content.Shared/Administration/PlayerInfo.cs # Content.Shared/CCVar/CCVars.cs # Content.Shared/Content.Shared.csproj # Content.Shared/Damage/Systems/SlowOnDamageSystem.cs # Content.Shared/Execution/SharedExecutionSystem.cs # Content.Shared/Mind/MindComponent.cs # Content.Shared/Preferences/Loadouts/LoadoutPrototype.cs # Content.Shared/Station/SharedStationSpawningSystem.cs # Content.Shared/StatusIcon/StatusIconPrototype.cs # Content.Shared/Stunnable/SharedStunSystem.cs # Resources/Credits/GitHub.txt # Resources/Locale/ru-RU/accessories/human-hair.ftl # Resources/Locale/ru-RU/ghost/roles/ghost-role-component.ftl # Resources/Locale/ru-RU/guidebook/chemistry/statuseffects.ftl # Resources/Locale/ru-RU/job/job-names.ftl # Resources/Locale/ru-RU/nutrition/components/food-sequence.ftl # Resources/Locale/ru-RU/paper/paper-misc.ftl # Resources/Locale/ru-RU/species/species.ftl # Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/paper/manuals.ftl # Resources/Locale/ru-RU/ss14-ru/prototypes/entities/mobs/npcs/space.ftl # Resources/Locale/ru-RU/ss14-ru/prototypes/entities/mobs/player/silicon.ftl # Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/consumable/food/meat.ftl # Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/consumable/food/soup.ftl # Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/storage/filing_cabinets.ftl # Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/walls/railing.ftl # Resources/Locale/ru-RU/station-laws/laws.ftl # Resources/Locale/ru-RU/store/uplink-catalog.ftl # Resources/Locale/ru-RU/xenoarchaeology/artifact-hints.ftl # Resources/Maps/ADTMaps/ADTStations/adt_cluster.yml # Resources/Maps/ADTMaps/ADTStations/adt_origin.yml # Resources/Maps/ADTMaps/ADTStations/adt_packed.yml # Resources/Maps/ADTMaps/ADTStations/adt_saltern.yml # Resources/Maps/cog.yml # Resources/Maps/corvax_maus.yml # Resources/Maps/corvax_pilgrim.yml # Resources/Maps/corvax_tushkan.yml # Resources/Maps/origin.yml # Resources/Prototypes/ADT/Maps/ADTMaps/adt_cluster.yml # Resources/Prototypes/ADT/Maps/ADTMaps/adt_origin.yml # Resources/Prototypes/Catalog/Cargo/cargo_security.yml # Resources/Prototypes/Catalog/Fills/Lockers/heads.yml # Resources/Prototypes/Catalog/Fills/Lockers/security.yml # Resources/Prototypes/Catalog/VendingMachines/Inventories/salvage.yml # Resources/Prototypes/Corvax/Entities/Mobs/Species/vulpkanin.yml # Resources/Prototypes/Corvax/Maps/astra.yml # Resources/Prototypes/Corvax/Maps/tushkan.yml # Resources/Prototypes/Entities/Clothing/Head/hats.yml # Resources/Prototypes/Entities/Clothing/Head/misc.yml # Resources/Prototypes/Entities/Clothing/Neck/pins.yml # Resources/Prototypes/Entities/Clothing/Neck/scarfs.yml # Resources/Prototypes/Entities/Clothing/OuterClothing/base_clothingouter.yml # Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml # Resources/Prototypes/Entities/Clothing/Shoes/boots.yml # Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml # Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml # Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml # Resources/Prototypes/Entities/Mobs/NPCs/animals.yml # Resources/Prototypes/Entities/Mobs/NPCs/pets.yml # Resources/Prototypes/Entities/Mobs/NPCs/simplemob.yml # Resources/Prototypes/Entities/Mobs/NPCs/slimes.yml # Resources/Prototypes/Entities/Mobs/Player/dragon.yml # Resources/Prototypes/Entities/Mobs/Player/humanoid.yml # Resources/Prototypes/Entities/Mobs/Player/silicon.yml # Resources/Prototypes/Entities/Mobs/Species/base.yml # Resources/Prototypes/Entities/Mobs/Species/moth.yml # Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/box.yml # Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml # Resources/Prototypes/Entities/Objects/Consumable/Food/meat.yml # Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/packs.yml # Resources/Prototypes/Entities/Objects/Devices/Syndicate_Gadgets/reinforcement_teleporter.yml # Resources/Prototypes/Entities/Objects/Fun/darts.yml # Resources/Prototypes/Entities/Objects/Specific/Janitorial/soap.yml # Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml # Resources/Prototypes/Entities/Objects/Specific/chemistry-bottles.yml # Resources/Prototypes/Entities/Objects/Specific/rehydrateable.yml # Resources/Prototypes/Entities/Objects/Specific/syndicate.yml # Resources/Prototypes/Entities/Objects/Tools/crowbars.yml # Resources/Prototypes/Entities/Objects/Tools/emag.yml # Resources/Prototypes/Entities/Objects/Tools/jetpacks.yml # Resources/Prototypes/Entities/Objects/Tools/toolbox.yml # Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml # Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml # Resources/Prototypes/Entities/Objects/Weapons/Melee/knife.yml # Resources/Prototypes/Entities/Structures/Doors/Airlocks/airlocks.yml # Resources/Prototypes/Entities/Structures/Piping/Atmospherics/pipes.yml # Resources/Prototypes/Entities/Structures/Piping/Disposal/pipes.yml # Resources/Prototypes/Entities/Structures/Wallmounts/Signs/flags.yml # Resources/Prototypes/Entities/Structures/Windows/window.yml # Resources/Prototypes/GameRules/events.yml # Resources/Prototypes/Loadouts/Jobs/Engineering/station_engineer.yml # Resources/Prototypes/Loadouts/Miscellaneous/survival.yml # Resources/Prototypes/Loadouts/Miscellaneous/trinkets.yml # Resources/Prototypes/Loadouts/loadout_groups.yml # Resources/Prototypes/Maps/Pools/default.yml # Resources/Prototypes/Maps/bagel.yml # Resources/Prototypes/Maps/box.yml # Resources/Prototypes/Maps/cog.yml # Resources/Prototypes/Maps/core.yml # Resources/Prototypes/Maps/meta.yml # Resources/Prototypes/Maps/origin.yml # Resources/Prototypes/Roles/Jobs/Fun/emergencyresponseteam.yml # Resources/Prototypes/Roles/Jobs/Science/borg.yml # Resources/Prototypes/Roles/Jobs/Security/detective.yml # Resources/Prototypes/secret_weights.yml # Resources/Textures/ADT/Clothing/Belt/medical_security_belt.rsi/meta.json # Resources/Textures/ADT/Clothing/Eyes/Glasses/pink_glasses.rsi/meta.json # Resources/Textures/ADT/Clothing/Eyes/Glasses/sunmed.rsi/meta.json # Resources/Textures/ADT/Clothing/Head/Hats/beret_brigmedic.rsi/meta.json # Resources/Textures/ADT/Clothing/OuterClothing/Hardsuits/brigmedic.rsi/meta.json # Resources/Textures/ADT/Clothing/OuterClothing/Hardsuits/riotert.rsi/meta.json # Resources/Textures/ADT/Objects/Tools/rpd.rsi/meta.json # Resources/Textures/Clothing/Back/Backpacks/electropack.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/WinterCoats/coatchem.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/WinterCoats/syndicate/coatsyndiecap.rsi/meta.json # Resources/Textures/Clothing/Uniforms/Jumpskirt/clown.rsi/meta.json # Resources/Textures/Corvax/LobbyScreens/attributions.yml # Resources/Textures/Decals/Overlays/greyscale.rsi/mono.png # Resources/Textures/Objects/Materials/Mob/sharktooth.rsi/meta.json # Resources/Textures/Tiles/dark_mono.png # Resources/Textures/Tiles/steel_mono.png # Resources/Textures/Tiles/white_mono.png # Resources/keybinds.yml # Resources/migration.yml # SpaceStation14.sln
github-actions
bot
added
Changes: Sprites
|
RSI Diff Bot; head commit bd6dab6 merging into cd07891 Resources/Textures/Structures/Piping/Atmospherics/directionalfan.rsi
Resources/Textures/Corvax/Mobs/Silicon/Station_ai/mia.rsi
|
Schrodinger71
approved these changes
Sep 6, 2024
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.
Проверки
Изменения
🆑