fish-station/Content.Server/Anomaly
VigersRay 9328f4d9cb Merge remote-tracking branch 'refs/remotes/wizards/master'
# Conflicts:
#	Content.Client/Lobby/UI/Loadouts/LoadoutWindow.xaml.cs
#	Content.Server/Connection/ConnectionManager.cs
#	Content.Server/GameTicking/GameTicker.Spawning.cs
#	Content.Server/Shuttles/Systems/ArrivalsSystem.cs
#	Content.Server/Shuttles/Systems/DockingSystem.Shuttle.cs
#	Content.Server/Shuttles/Systems/EmergencyShuttleSystem.cs
#	Content.Server/Station/Systems/StationSpawningSystem.cs
#	Content.Shared/Chat/SharedChatSystem.cs
#	Content.Shared/UserInterface/ActivatableUIComponent.cs
#	Resources/Prototypes/Datasets/Names/ai.yml
#	Resources/Prototypes/Datasets/adjectives.yml
#	Resources/Prototypes/Datasets/verbs.yml
#	Resources/Prototypes/Entities/Clothing/Shoes/boots.yml
#	Resources/Prototypes/Entities/Clothing/Shoes/specific.yml
#	Resources/Prototypes/Entities/Mobs/NPCs/revenant.yml
#	Resources/Prototypes/Entities/Objects/Specific/Robotics/mmi.yml
#	Resources/Prototypes/Entities/Stations/base.yml
#	Resources/Prototypes/Entities/Structures/Machines/lathe.yml
#	Resources/Prototypes/Maps/bagel.yml
#	Resources/Prototypes/Roles/Jobs/Science/borg.yml
#	Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml
#	Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/equipped-HELMET.png
#	Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/icon.png
#	Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/meta.json
#	Resources/Textures/Interface/Misc/job_icons.rsi/meta.json
#	Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json
#	Resources/Textures/Structures/Wallmounts/barsign.rsi/officerbeersky.png
#	Resources/Textures/Structures/Wallmounts/signs.rsi/anomaly.png
#	Resources/Textures/Structures/Wallmounts/signs.rsi/meta.json
#	SpaceStation14.sln
2024-08-28 19:12:01 +03:00
..
Components Anomalies behaviours (#24683) 2024-04-01 19:29:13 +11:00
Effects Fix bluespace anomaly teleporting borg brains and PAIs in container slots (#30744) 2024-08-17 00:58:23 -04:00
AnomalySynchronizerSystem.cs Merge remote-tracking branch 'refs/remotes/wizards/master' 2024-08-28 19:12:01 +03:00
AnomalySystem.Commands.cs Content update for NetEntities (#18935) 2023-09-11 09:42:41 +10:00
AnomalySystem.cs Small anomaly behavior fix (#28290) 2024-05-27 17:52:56 -07:00
AnomalySystem.Generator.cs Power stuff (#31314) 2024-08-25 22:18:42 +10:00
AnomalySystem.Scanner.cs Replaced some AddMarkups with AddMarkupOrThrow (#30632) 2024-08-11 13:06:33 +10:00
AnomalySystem.Vessel.cs Use new ComponentPauseGenerator (#25183) 2024-02-26 14:36:19 +11:00