Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update Submodule #83

Closed
wants to merge 2 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
66 changes: 33 additions & 33 deletions Resources/Prototypes/Entities/Objects/Specific/Mail/Items/paper.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
- type: entity
id: PaperMailNFPowerTool
name: Hazard Fraught advertisement
categories: [ HideSpawnMenu ]
categories: [ hideSpawnMenu ]
suffix: "power tool ad, formatted"
parent: Paper
components:
Expand All @@ -19,7 +19,7 @@

- type: entity
id: PaperMailNFVagueThreat1
categories: [ HideSpawnMenu ]
categories: [ hideSpawnMenu ]
suffix: "vague mail threat 1, formatted"
parent: Paper
components:
Expand All @@ -32,7 +32,7 @@

- type: entity
id: PaperMailNFVagueThreat2
categories: [ HideSpawnMenu ]
categories: [ hideSpawnMenu ]
suffix: "vague mail threat 2, formatted"
parent: Paper
components:
Expand All @@ -43,7 +43,7 @@

- type: entity
id: PaperMailNFVagueThreat3
categories: [ HideSpawnMenu ]
categories: [ hideSpawnMenu ]
suffix: "vague mail threat 3, formatted"
parent: Paper
components:
Expand All @@ -54,7 +54,7 @@

- type: entity
id: PaperMailNFVagueThreat4
categories: [ HideSpawnMenu ]
categories: [ hideSpawnMenu ]
suffix: "vague mail threat 4, formatted"
parent: Paper
components:
Expand All @@ -65,7 +65,7 @@

- type: entity
id: PaperMailNFVagueThreat5
categories: [ HideSpawnMenu ]
categories: [ hideSpawnMenu ]
suffix: "vague mail threat 5, formatted"
parent: Paper
components:
Expand All @@ -76,7 +76,7 @@

- type: entity
id: PaperMailNFVagueThreat6
categories: [ HideSpawnMenu ]
categories: [ hideSpawnMenu ]
suffix: "vague mail threat 6, formatted"
parent: Paper
components:
Expand All @@ -90,7 +90,7 @@

- type: entity
id: PaperMailNFVagueThreat7
categories: [ HideSpawnMenu ]
categories: [ hideSpawnMenu ]
suffix: "vague mail threat 7, formatted"
parent: Paper
components:
Expand All @@ -101,7 +101,7 @@

- type: entity
id: PaperMailNFVagueThreat8
categories: [ HideSpawnMenu ]
categories: [ hideSpawnMenu ]
suffix: "vague mail threat 8, formatted"
parent: Paper
components:
Expand All @@ -116,7 +116,7 @@

- type: entity
id: PaperMailNFVagueThreat9
categories: [ HideSpawnMenu ]
categories: [ hideSpawnMenu ]
suffix: "vague mail threat 9, formatted"
parent: Paper
components:
Expand All @@ -127,7 +127,7 @@

- type: entity
id: PaperMailNFVagueThreat10
categories: [ HideSpawnMenu ]
categories: [ hideSpawnMenu ]
suffix: "vague mail threat 10, formatted"
parent: Paper
components:
Expand All @@ -141,7 +141,7 @@

- type: entity
id: PaperMailNFVagueThreat11
categories: [ HideSpawnMenu ]
categories: [ hideSpawnMenu ]
suffix: "vague mail threat 11, formatted"
parent: Paper
components:
Expand All @@ -155,7 +155,7 @@

- type: entity
id: PaperMailNFVagueThreat12
categories: [ HideSpawnMenu ]
categories: [ hideSpawnMenu ]
suffix: "vague mail threat 12, formatted"
parent: Paper
components:
Expand All @@ -170,7 +170,7 @@
- type: entity
id: PaperMailNFPwrGameAd
name: pwr game advertisement
categories: [ HideSpawnMenu ]
categories: [ hideSpawnMenu ]
suffix: "pwr game ad"
parent: Paper
components:
Expand All @@ -184,7 +184,7 @@
- type: entity
id: PaperMailNFRedBoolAd
name: red bool advertisement
categories: [ HideSpawnMenu ]
categories: [ hideSpawnMenu ]
suffix: "red bool ad"
parent: Paper
components:
Expand All @@ -200,7 +200,7 @@
- type: entity
id: PaperMailNFSpaceColaAd
name: space cola advertisement
categories: [ HideSpawnMenu ]
categories: [ hideSpawnMenu ]
suffix: "space cola ad"
parent: Paper
components:
Expand All @@ -214,7 +214,7 @@
- type: entity
id: PaperMailNFSpaceMountainWindAd
name: space mountain wind advertisement
categories: [ HideSpawnMenu ]
categories: [ hideSpawnMenu ]
suffix: "space mountain wind ad"
parent: Paper
components:
Expand All @@ -228,7 +228,7 @@
- type: entity
id: PaperMailNFSpaceUpAd
name: space up advertisement
categories: [ HideSpawnMenu ]
categories: [ hideSpawnMenu ]
suffix: "space up ad"
parent: Paper
components:
Expand All @@ -245,7 +245,7 @@

- type: entity
id: PaperMailNTSoapAd1
categories: [ HideSpawnMenu ]
categories: [ hideSpawnMenu ]
suffix: "soap ad 1"
parent: Paper
components:
Expand All @@ -267,7 +267,7 @@

- type: entity
id: PaperMailNTSoapAd2
categories: [ HideSpawnMenu ]
categories: [ hideSpawnMenu ]
suffix: "soap ad 2" #DeltaV - Edited to not be addressed to Frontier Citizens, localized
parent: Paper
components:
Expand All @@ -285,7 +285,7 @@

- type: entity
id: PaperMailNTConscript
categories: [ HideSpawnMenu ]
categories: [ hideSpawnMenu ]
suffix: "conscript"
parent: Paper
components:
Expand All @@ -299,7 +299,7 @@

- type: entity
id: PaperMailNTMusket
categories: [ HideSpawnMenu ]
categories: [ hideSpawnMenu ]
suffix: "musket"
parent: Paper
components:
Expand All @@ -311,8 +311,8 @@

- type: entity
id: PaperMailNFPaperPusherAd
categories: [ HideSpawnMenu ]
suffix: "paper pusher"
categories: [ hideSpawnMenu ]
suffix: "paper pusher"
parent: Paper
components:
- type: Paper
Expand All @@ -330,13 +330,13 @@
- type: entity
id: PaperMailNFPetBedAssemblyManual
name: pet bed assembly manual
categories: [ HideSpawnMenu ]
categories: [ hideSpawnMenu ]
suffix: "pet bed assembly manual"
parent: Paper
components:
- type: Paper
content: |2

[head=1]HÖGANÄS[/head]

[italic](There is a black and white picture of a pet bed on the first page.)[/italic]
Expand All @@ -347,7 +347,7 @@

- type: entity
id: PaperMailNTBoxer
categories: [ HideSpawnMenu ]
categories: [ hideSpawnMenu ]
suffix: "boxer"
parent: Paper
components:
Expand All @@ -362,7 +362,7 @@
# Placeholder for an arm-on-use, flashbang fakeout pipebomb
- type: entity
id: PaperMailNFPipebombIntern
categories: [ HideSpawnMenu ]
categories: [ hideSpawnMenu ]
suffix: "pipe bomb intern"
parent: Paper
components:
Expand All @@ -381,7 +381,7 @@
- type: entity
id: PaperMailNFAntivirus
name: Snortin Antivirus invoice
categories: [ HideSpawnMenu ]
categories: [ hideSpawnMenu ]
suffix: "antivirus ad"
parent: Paper
components:
Expand All @@ -402,7 +402,7 @@

- type: entity
id: PaperMailNFEMPPreparedness
categories: [ HideSpawnMenu ]
categories: [ hideSpawnMenu ]
name: EMP preparedness response form
suffix: "emp preparedness" #DeltaV - Replaces mention of SR with HoS
parent: Paper
Expand All @@ -423,7 +423,7 @@

- type: entity
id: PaperMailNFBuildABuddy
categories: [ HideSpawnMenu ]
categories: [ hideSpawnMenu ]
name: Build-a-Buddy adoption letter
suffix: "build-a-buddy" #DeltaV- Body text changed, because Goblins Aren't Real
parent: Paper
Expand All @@ -435,7 +435,7 @@
stampedName: Chief Friendship Officer
- stampedColor: '#333333FF'
stampedName: Cuts-With-Scalpel
# stampType: Signature #DeltaV - Not compatible with our signatures code stuff apparently.
# stampType: Signature #DeltaV - Not compatible with our signatures code stuff apparently.
content: |2

[head=1]Note of Adoption[/head]
Expand All @@ -452,7 +452,7 @@

- type: entity
id: PaperMailNFSpaceLaw
categories: [ HideSpawnMenu ]
categories: [ hideSpawnMenu ]
suffix: "space-law" #DeltaV- edited contents to be from the Delta Sector instead of the Frontier
parent: Paper
components:
Expand Down
2 changes: 1 addition & 1 deletion RobustToolbox
Submodule RobustToolbox updated 76 files
+1 −1 MSBuild/Robust.Engine.Version.props
+63 −0 RELEASE-NOTES.md
+4 −1 Resources/EnginePrototypes/Audio/audio_entities.yml
+45 −1 Robust.Analyzers/DataDefinitionAnalyzer.cs
+68 −4 Robust.Analyzers/DataDefinitionFixer.cs
+5 −0 Robust.Analyzers/Robust.Analyzers.csproj
+23 −54 Robust.Client/Audio/AudioSystem.cs
+2 −2 Robust.Client/Debugging/DebugPhysicsSystem.cs
+1 −1 Robust.Client/GameObjects/EntitySystems/ContainerSystem.cs
+1 −1 Robust.Client/GameObjects/EntitySystems/DebugLightTreeSystem.cs
+1 −1 Robust.Client/GameObjects/EntitySystems/GridChunkBoundsDebugSystem.cs
+23 −9 Robust.Client/GameStates/ClientGameStateManager.cs
+16 −20 Robust.Client/GameStates/GameStateProcessor.cs
+1 −1 Robust.Client/GameStates/IClientGameStateManager.cs
+3 −3 Robust.Client/GameStates/IGameStateProcessor.cs
+1 −1 Robust.Client/GameStates/NetInterpOverlay.cs
+7 −14 Robust.Client/Graphics/ClientEye/EyeManager.cs
+11 −7 Robust.Client/Graphics/ClientEye/IEyeManager.cs
+6 −3 Robust.Client/Graphics/Clyde/Clyde.HLR.cs
+1 −1 Robust.Client/Graphics/Clyde/Clyde.Textures.cs
+4 −4 Robust.Client/Placement/Modes/AlignSnapgridCenter.cs
+6 −6 Robust.Client/Placement/PlacementManager.cs
+3 −2 Robust.Client/Placement/PlacementMode.cs
+1 −1 Robust.Client/Placement/PlacementOverlay.cs
+31 −8 Robust.Client/Replays/Loading/ReplayLoadManager.Checkpoints.cs
+2 −2 Robust.Client/Replays/Loading/ReplayLoadManager.Implicit.cs
+2 −0 Robust.Client/Replays/Loading/ReplayLoadManager.cs
+2 −2 Robust.Client/Replays/Playback/ReplayPlaybackManager.Time.cs
+2 −2 Robust.Client/Replays/Playback/ReplayPlaybackManager.cs
+3 −1 Robust.Client/UserInterface/Controls/LineEdit.cs
+1 −0 Robust.Roslyn.Shared/Diagnostics.cs
+10 −8 Robust.Serialization.Generator/Generator.cs
+31 −19 Robust.Server/Audio/AudioSystem.cs
+4 −2 Robust.Server/GameStates/PvsSystem.GetStates.cs
+1 −7 Robust.Server/Placement/PlacementManager.cs
+3 −0 Robust.Server/Robust.Server.csproj
+1 −1 Robust.Server/ServerStatus/WatchdogApi.cs
+2 −0 Robust.Server/run_server.bat
+2 −2 Robust.Server/server_config.toml
+2 −0 Robust.Shared/Audio/Components/AudioComponent.cs
+40 −6 Robust.Shared/Audio/Systems/SharedAudioSystem.cs
+8 −3 Robust.Shared/CVars.cs
+122 −49 Robust.Shared/Configuration/ConfigurationManager.cs
+21 −1 Robust.Shared/Configuration/IConfigurationManager.cs
+13 −8 Robust.Shared/Containers/BaseContainer.cs
+1 −10 Robust.Shared/Containers/Container.cs
+1 −3 Robust.Shared/Containers/ContainerManagerComponent.cs
+1 −10 Robust.Shared/Containers/ContainerSlot.cs
+140 −31 Robust.Shared/Containers/SharedContainerSystem.cs
+42 −29 Robust.Shared/GameObjects/ComponentState.cs
+13 −2 Robust.Shared/GameObjects/Components/Transform/TransformComponent.cs
+8 −3 Robust.Shared/GameObjects/Components/UserInterface/UserInterfaceComponent.cs
+2 −4 Robust.Shared/GameObjects/EntityManager.Components.cs
+1 −1 Robust.Shared/GameObjects/EntityManager.cs
+3 −4 Robust.Shared/GameObjects/EntityState.cs
+1 −1 Robust.Shared/GameObjects/IEntityManager.Components.cs
+8 −3 Robust.Shared/GameObjects/Systems/SharedGridTraversalSystem.cs
+40 −29 Robust.Shared/GameObjects/Systems/SharedMapSystem.Grid.cs
+2 −1 Robust.Shared/GameObjects/Systems/SharedTransformSystem.Component.cs
+128 −29 Robust.Shared/GameObjects/Systems/SharedTransformSystem.Coordinates.cs
+5 −2 Robust.Shared/GameObjects/Systems/SharedTransformSystem.cs
+41 −34 Robust.Shared/GameObjects/Systems/SharedUserInterfaceSystem.cs
+2 −0 Robust.Shared/GameStates/ComponentStateEvents.cs
+28 −29 Robust.Shared/Map/Components/MapGridComponent.cs
+22 −96 Robust.Shared/Map/EntityCoordinates.cs
+1 −1 Robust.Shared/Network/AuthManager.cs
+1 −1 Robust.Shared/Physics/Systems/SharedBroadphaseSystem.cs
+2 −2 Robust.Shared/Prototypes/EntityPrototype.cs
+1 −2 Robust.Shared/Serialization/Manager/Definition/DataDefinition.cs
+12 −0 Robust.Shared/Serialization/Manager/Definition/DataDefinitionUtility.cs
+45 −14 Robust.Shared/Threading/ParallelManager.cs
+58 −10 Robust.Shared/Utility/FormattedMessage.MarkupParser.cs
+69 −10 Robust.Shared/Utility/FormattedMessage.cs
+6 −6 Robust.UnitTesting/Client/GameObjects/Components/TransformComponentTests.cs
+1 −1 Robust.UnitTesting/Shared/GameObjects/EntityState_Tests.cs
+1 −1 Robust.UnitTesting/Shared/GameState/NoSharedReferencesTest.cs
Loading