Upstream 27.07 #35
Merged
Upstream 27.07 #35
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
Co-authored-by: PJBot <pieterjan.briers+bot@gmail.com>
* say goodbye to no-snout lizards * remove snout from plague doctor hat HideLayerClothing component
* Update MainMenu.cs to use ISawmill * Update * Error
EntityUid 0 problem fix
* File scoped namespace * Format file * Fix param name in doc comment * Reflow doc comment --------- Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
* Update AccessLevelControl.xaml.cs to use ISawmill * Update * Silly me * Update
rgbeeeeeeee
Make grappling gun clumsy proof
* recording commit * Remove debugging/recording content
* refactor * dutypo
* Prevent virtual item storage and popups * fix typo * add comment
added petting borgs, adjusted interactions
Co-authored-by: deltanedas <@deltanedas:kde.org>
#29987 did an oopsie This broke the ID computer, station records, and maybe some others too.
…ated systems (#30072) Fix some Markup related obsolete warnings in Research and Anomaly related systems
* addgamerule command processes only valid rules * Update * English moment
Remove the uses of AllObjectives
Revert "Change wristwatch meta description (#30036)" This reverts commit 919b3ac.
* Fix replayghost spawn * missed a spot
vox naming conventions
…ishers again (#30371) ugh Co-authored-by: Avery Dobbins <avery.dobbins@gmail.com>
* Fix zombie uncuffing * PlaceNextTo() and rename vars
Specifically if a grid splits under the cvar size it doesn't get a label. This also stops stuff like shuttles splitting in half creating new entries for the new grids. Splitting code leaves the largest grid as the existing one so this will always prefer to keep it large (but if there's multiple splits it won't adjust).
Added Security Clown Mask available from hacked SecDrobes.
updoot!
Update accordia atmos systems
More thieves Co-authored-by: plykiya <plykiya@protonmail.com>
include whitelist locating in baby jail deny message
fix ninja not showing in round ned Co-authored-by: deltanedas <@deltanedas:kde.org>
…on-14 into upstream # Conflicts: # .github/PULL_REQUEST_TEMPLATE.md # Content.Client/Communications/UI/CommunicationsConsoleMenu.xaml.cs # Content.Client/Radio/Ui/IntercomBoundUserInterface.cs # Content.Client/Research/UI/DiskConsoleBoundUserInterface.cs # Content.Client/Research/UI/ResearchClientBoundUserInterface.cs # Content.Client/Research/UI/ResearchConsoleBoundUserInterface.cs # Content.Client/VoiceMask/VoiceMaskBoundUserInterface.cs # Content.Client/VoiceMask/VoiceMaskNameChangeWindow.xaml.cs # Content.Client/Weapons/Ranged/Systems/GunSystem.cs # Content.IntegrationTests/Tests/GameRules/NukeOpsTest.cs # Content.Server/Connection/ConnectionManager.cs # Content.Server/Ghost/Roles/GhostRoleSystem.cs # Content.Server/Players/PlayTimeTracking/PlayTimeTrackingSystem.cs # Content.Server/Pointing/EntitySystems/PointingSystem.cs # Content.Server/Shuttles/Systems/ShuttleSystem.GridFill.cs # Content.Shared/Beeper/Systems/ProximityBeeperSystem.cs # Content.Shared/Clothing/ClothingSpeedModifierSystem.cs # Content.Shared/Hands/EntitySystems/SharedHandsSystem.Drop.cs # Content.Shared/Movement/Pulling/Systems/PullingSystem.cs # Content.Shared/Ninja/Components/StunProviderComponent.cs # Content.Shared/Preferences/HumanoidCharacterProfile.cs # Content.Shared/Standing/StandingStateSystem.cs # Resources/Changelog/Changelog.yml # Resources/Locale/en-US/mass-media/news-ui.ftl # Resources/Maps/Shuttles/emergency_cluster.yml # Resources/Maps/marathon.yml # Resources/Maps/oasis.yml # Resources/Prototypes/Catalog/Bounties/bounties.yml # Resources/Prototypes/Catalog/Fills/Lockers/heads.yml # Resources/Prototypes/Catalog/Fills/Lockers/security.yml # Resources/Prototypes/Datasets/ion_storm.yml # Resources/Prototypes/Entities/Clothing/Head/misc.yml # Resources/Prototypes/Entities/Clothing/Neck/base_clothingneck.yml # Resources/Prototypes/Entities/Clothing/OuterClothing/suits.yml # Resources/Prototypes/Entities/Effects/shuttle.yml # Resources/Prototypes/Entities/Markers/Spawners/ghost_roles.yml # Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml # Resources/Prototypes/Entities/Mobs/Cyborgs/borg_chassis.yml # Resources/Prototypes/Entities/Mobs/Species/skeleton.yml # Resources/Prototypes/Entities/Mobs/Species/vox.yml # Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/pie.yml # Resources/Prototypes/Entities/Objects/Devices/wristwatch.yml # Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml # Resources/Prototypes/GameRules/events.yml # Resources/ServerInfo/Guidebook/Science/Technologies.xml # Resources/Textures/Clothing/Hands/Gloves/Color/yellow.rsi/meta.json # Resources/Textures/Clothing/Head/Hardhats/blue.rsi/icon.png # Resources/Textures/Clothing/Head/Hardhats/blue.rsi/light-icon.png # Resources/Textures/Clothing/Head/Hardhats/orange.rsi/icon.png # Resources/Textures/Clothing/Head/Hardhats/orange.rsi/light-icon.png # Resources/Textures/Clothing/Head/Hardhats/red.rsi/icon.png # Resources/Textures/Clothing/Head/Hardhats/red.rsi/light-icon.png # Resources/Textures/Clothing/Head/Hardhats/white.rsi/icon.png # Resources/Textures/Clothing/Head/Hardhats/white.rsi/light-icon.png # Resources/Textures/Clothing/Head/Hardhats/yellow.rsi/icon.png # Resources/Textures/Clothing/Head/Hardhats/yellow.rsi/light-icon.png # Resources/Textures/Clothing/Head/Hoods/rad.rsi/meta.json # Resources/Textures/Clothing/Head/Misc/pumpkin.rsi/meta.json # Resources/Textures/Clothing/Shoes/Boots/combatboots.rsi/meta.json # Resources/Textures/Objects/Weapons/Melee/fireaxeflaming.rsi/icon.png # Resources/Textures/Structures/Wallmounts/intercom.rsi/base.png # Resources/Textures/Structures/Wallmounts/intercom.rsi/broadcasting.png # Resources/Textures/Structures/Wallmounts/intercom.rsi/build.png # Resources/Textures/Structures/Wallmounts/intercom.rsi/speaker.png # Resources/Textures/Structures/Wallmounts/intercom.rsi/unshaded.png # Resources/Textures/Structures/Wallmounts/signs.rsi/chemistry1.png # Resources/Textures/Structures/Wallmounts/signs.rsi/chemistry2.png # Resources/Textures/Structures/Wallmounts/signs.rsi/court.png # Resources/Textures/Structures/Wallmounts/signs.rsi/deathsposal.png # Resources/Textures/Structures/Wallmounts/signs.rsi/doors.png # Resources/Textures/Structures/Wallmounts/signs.rsi/examroom.png # Resources/Textures/Structures/Wallmounts/signs.rsi/hydro1.png # Resources/Textures/Structures/Wallmounts/signs.rsi/hydro2.png # Resources/Textures/Structures/Wallmounts/signs.rsi/hydro3.png # Resources/Textures/Structures/Wallmounts/signs.rsi/janitor.png # Resources/Textures/Structures/Wallmounts/signs.rsi/law.png # Resources/Textures/Structures/Wallmounts/signs.rsi/meta.json # Resources/Textures/Structures/Wallmounts/signs.rsi/psychology.png # Resources/Textures/Structures/Wallmounts/signs.rsi/science1.png # Resources/Textures/Structures/Wallmounts/signs.rsi/science2.png # Resources/Textures/Structures/Wallmounts/signs.rsi/space.png # Resources/Textures/Structures/Wallmounts/signs.rsi/xenobio.png # Resources/Textures/Structures/Wallmounts/signs.rsi/xenobio2.png # Resources/migration.yml
added 2 commits
August 1, 2024 00:08
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.