Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/space-wizards/space-stati…
Browse files Browse the repository at this point in the history 
…on-14 into 2024earlyjanuarysync
  • Loading branch information
@deathride58
deathride58 committed Jan 12, 2024
2 parents cf153cd + 4585589 commit 4d3bc80
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 1 deletion.
10 changes: 10 additions & 0 deletions Resources/Prototypes/XenoArch/Effects/normal_effects.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -664,3 +664,13 @@
maxSpawns: 1
spawns:
- id: Singularity

- type: artifactEffect
id: EffectTesla
targetDepth: 10
effectHint: artifact-effect-hint-destruction
components:
- type: SpawnArtifact
maxSpawns: 1
spawns:
- id: TeslaEnergyBall
2 changes: 1 addition & 1 deletion RobustToolbox
Submodule RobustToolbox updated 12 files
+1 −1 MSBuild/Robust.Engine.Version.props
+16 −0 RELEASE-NOTES.md
+0 −2 Robust.Client/GameController/GameController.Standalone.cs
+0 −2 Robust.Server/Program.cs
+5 −6 Robust.Shared/Containers/SharedContainerSystem.cs
+93 −0 Robust.Shared/GameObjects/Components/UserInterface/BoundUserInterfaceRegisterExt.cs
+10 −0 Robust.Shared/GameObjects/Components/UserInterface/PlayerBoundUserInterface.cs
+4 −0 Robust.Shared/GameObjects/Components/UserInterface/ServerBoundUserInterfaceMessage.cs
+26 −0 Robust.Shared/GameObjects/EntitySystem.Subscriptions.cs
+14 −21 Robust.Shared/GameObjects/Systems/EntityLookupSystem.cs
+7 −0 Robust.Shared/GameObjects/Systems/SharedUserInterfaceSystem.cs
+0 −42 Robust.Shared/Utility/GlibcBug.cs

0 comments on commit 4d3bc80

Please sign in to comment.