Merge remote-tracking branch 'upstream/stable' into ed-30-04-2025-upstream-sync
# Conflicts: # Content.Client/Parallax/ParallaxControl.cs # Content.Client/UserInterface/Systems/Storage/Controls/ItemGridPiece.cs # Content.IntegrationTests/Tests/PostMapInitTest.cs # Content.Server/Chat/Managers/ChatManager.cs # Content.Server/Fluids/EntitySystems/PuddleSystem.Evaporation.cs # Content.Server/Labels/Label/LabelSystem.cs # Content.Shared/Actions/SharedActionsSystem.cs # Content.Shared/Fluids/Components/EvaporationComponent.cs # Content.Shared/Labels/EntitySystems/SharedLabelSystem.cs # README.md # Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml # Resources/Prototypes/Maps/Pools/deathmatch.yml # Resources/Prototypes/Maps/arenas.yml
This commit is contained in:
@@ -70,5 +70,5 @@
|
||||
|
||||
Slimes and spiders have no remarkable features, but will [color=cyan]infest the station[/color] from time to time regardless. Both will give chase and attack anything they see.
|
||||
- Slimes may [bold]deal extra cellular or poison damage[/bold], based upon their color. Water hurts them just as it would hurt a slime person.
|
||||
- Spiders have a venomous bite and can [bold]create webs[/bold] that are hard to move though. Webs are easily destroyed with a blade. They can also pry open airlocks.
|
||||
- Spiders have a venomous bite and can [bold]create webs[/bold] that are hard to move though. Webs are easily destroyed with a blade. They can also pry open doors, windoors, and airlocks.
|
||||
</Document>
|
||||
|
||||
@@ -26,7 +26,7 @@
|
||||
<GuideEntityEmbed Entity="BaseUplinkRadio" Caption="Uplink Implant"/>
|
||||
</Box>
|
||||
|
||||
[bold]Make sure to close your PDA uplink to prevent anyone else from seeing it.[/bold] You don't want [color=#cb0000]Security[/color] to get their hands on this premium selection of contraband!
|
||||
[bold]Make sure to close your PDA uplink to prevent anyone else from seeing it.[/bold] You don't want [color=#cb0000]Security[/color] to notice you have it and confiscate it from you!
|
||||
|
||||
Implanted uplinks are not normally accessible to other people, so they do not have any security measures. They can, however, be removed from you with an empty implanter.
|
||||
|
||||
|
||||
@@ -9,7 +9,7 @@ By researching the unique things each artifact can do, you gain Research Points,
|
||||
## Artifact Nodes
|
||||
<Box>
|
||||
<GuideEntityEmbed Entity="ComplexXenoArtifact" Caption=""/>
|
||||
<GuideEntityEmbed Entity="SimpleXenoArtifactItem" Caption=""/>
|
||||
<GuideEntityEmbed Entity="ComplexXenoArtifactItem" Caption=""/>
|
||||
</Box>
|
||||
Artifacts consist of a randomly-generated tree of nodes. These nodes have a "[color=#a4885c]depth[/color]", representing how dangerous the node is, and the number of other nodes connected to it, called "[color=#a4885c]edges[/color]",
|
||||
|
||||
|
||||
Reference in New Issue
Block a user