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

Station AI #30944

Merged
Merged

Commits on Aug 12, 2024

  1. Station AI overlay

    metalgearsloth committed Aug 12, 2024
    Configuration menu
    Copy the full SHA
    dc99cb3 View commit details
    Browse the repository at this point in the history
  2. implement

    metalgearsloth committed Aug 12, 2024
    Configuration menu
    Copy the full SHA
    be541eb View commit details
    Browse the repository at this point in the history

Commits on Aug 14, 2024

  1. Bunch of ports

    metalgearsloth committed Aug 14, 2024
    Configuration menu
    Copy the full SHA
    0bb9a18 View commit details
    Browse the repository at this point in the history

Commits on Aug 15, 2024

  1. Configuration menu
    Copy the full SHA
    f0a21a1 View commit details
    Browse the repository at this point in the history
  2. helldivers

    metalgearsloth committed Aug 15, 2024
    Configuration menu
    Copy the full SHA
    cbdfd2f View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    0a8d73f View commit details
    Browse the repository at this point in the history
  4. navmap stuff

    metalgearsloth committed Aug 15, 2024
    Configuration menu
    Copy the full SHA
    d1f89dd View commit details
    Browse the repository at this point in the history
  5. Revert "navmap stuff"

    This reverts commit d1f89dd.
    metalgearsloth committed Aug 15, 2024
    Configuration menu
    Copy the full SHA
    3c32123 View commit details
    Browse the repository at this point in the history
  6. AI wires implemented

    metalgearsloth committed Aug 15, 2024
    Configuration menu
    Copy the full SHA
    45e87a4 View commit details
    Browse the repository at this point in the history
  7. Fix examines

    metalgearsloth committed Aug 15, 2024
    Configuration menu
    Copy the full SHA
    0c5b54f View commit details
    Browse the repository at this point in the history

Commits on Aug 16, 2024

  1. Configuration menu
    Copy the full SHA
    8222fc7 View commit details
    Browse the repository at this point in the history
  2. Back to old static

    metalgearsloth committed Aug 16, 2024
    Configuration menu
    Copy the full SHA
    d7a4a69 View commit details
    Browse the repository at this point in the history

Commits on Aug 18, 2024

  1. BUI radial working

    metalgearsloth committed Aug 18, 2024
    Configuration menu
    Copy the full SHA
    951b4ee View commit details
    Browse the repository at this point in the history
  2. lots of work

    metalgearsloth committed Aug 18, 2024
    Configuration menu
    Copy the full SHA
    128530a View commit details
    Browse the repository at this point in the history
  3. Saving work

    metalgearsloth committed Aug 18, 2024
    Configuration menu
    Copy the full SHA
    31affd8 View commit details
    Browse the repository at this point in the history
  4. thanks fork

    metalgearsloth committed Aug 18, 2024
    Configuration menu
    Copy the full SHA
    173ee91 View commit details
    Browse the repository at this point in the history

Commits on Aug 19, 2024

  1. alright

    metalgearsloth committed Aug 19, 2024
    Configuration menu
    Copy the full SHA
    a817da9 View commit details
    Browse the repository at this point in the history
  2. pc

    metalgearsloth committed Aug 19, 2024
    Configuration menu
    Copy the full SHA
    df7a2b2 View commit details
    Browse the repository at this point in the history
  3. AI upload console

    metalgearsloth committed Aug 19, 2024
    Configuration menu
    Copy the full SHA
    d88accf View commit details
    Browse the repository at this point in the history

Commits on Aug 20, 2024

  1. AI upload

    metalgearsloth committed Aug 20, 2024
    Configuration menu
    Copy the full SHA
    fc57c84 View commit details
    Browse the repository at this point in the history
  2. stuff

    metalgearsloth committed Aug 20, 2024
    Configuration menu
    Copy the full SHA
    a3d03db View commit details
    Browse the repository at this point in the history

Commits on Aug 22, 2024

  1. Merge remote-tracking branch 'upstream/master' into 2024-08-12-statio…

    …n-ai
    
    # Conflicts:
    #	Content.Server/Materials/MaterialReclaimerSystem.cs
    metalgearsloth committed Aug 22, 2024
    Configuration menu
    Copy the full SHA
    e89b0fc View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    ce88a0a View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    f6ab795 View commit details
    Browse the repository at this point in the history
  4. AI actions

    metalgearsloth committed Aug 22, 2024
    Configuration menu
    Copy the full SHA
    9249980 View commit details
    Browse the repository at this point in the history

Commits on Aug 23, 2024

  1. navmap work

    metalgearsloth committed Aug 23, 2024
    Configuration menu
    Copy the full SHA
    6f63fea View commit details
    Browse the repository at this point in the history

Commits on Aug 24, 2024

  1. Fixes

    metalgearsloth committed Aug 24, 2024
    Configuration menu
    Copy the full SHA
    8536cf4 View commit details
    Browse the repository at this point in the history

Commits on Aug 25, 2024

  1. Merge remote-tracking branch 'upstream/master' into 2024-08-12-statio…

    …n-ai
    
    # Conflicts:
    #	Content.Client/Silicons/StationAi/StationAiOverlay.cs
    #	Content.Client/Silicons/StationAi/StationAiSystem.cs
    #	Content.Server/AlertLevel/AlertLevelDisplaySystem.cs
    #	Content.Server/Ame/EntitySystems/AmeControllerSystem.cs
    #	Content.Server/Anomaly/AnomalySynchronizerSystem.cs
    #	Content.Server/Anomaly/AnomalySystem.Generator.cs
    #	Content.Server/Arcade/BlockGame/BlockGameArcadeSystem.cs
    #	Content.Server/Arcade/SpaceVillainGame/SpaceVillainArcadeSystem.cs
    #	Content.Server/Atmos/Monitor/Systems/AirAlarmSystem.cs
    #	Content.Server/Atmos/Monitor/Systems/AtmosAlarmableSystem.cs
    #	Content.Server/Atmos/Monitor/Systems/AtmosMonitoringSystem.cs
    #	Content.Server/Atmos/Piping/Unary/EntitySystems/GasVentPumpSystem.cs
    #	Content.Server/Atmos/Piping/Unary/EntitySystems/GasVentScrubberSystem.cs
    #	Content.Server/Atmos/Portable/PortableScrubberSystem.cs
    #	Content.Server/Atmos/Portable/SpaceHeaterSystem.cs
    #	Content.Server/Audio/AmbientSoundSystem.cs
    #	Content.Server/Audio/Jukebox/JukeboxSystem.cs
    #	Content.Server/Bed/BedSystem.cs
    #	Content.Server/Buckle/Systems/AntiRotOnBuckleSystem.cs
    #	Content.Server/Cargo/Systems/CargoSystem.Telepad.cs
    #	Content.Server/Chemistry/EntitySystems/SolutionContainerMixerSystem.cs
    #	Content.Server/Chemistry/EntitySystems/SolutionHeaterSystem.cs
    #	Content.Server/Cloning/CloningConsoleSystem.cs
    #	Content.Server/Construction/ConstructionSystem.Computer.cs
    #	Content.Server/Construction/FlatpackSystem.cs
    #	Content.Server/DeviceNetwork/Systems/SingletonDeviceNetServerSystem.cs
    #	Content.Server/Disposal/Unit/EntitySystems/DisposalUnitSystem.cs
    #	Content.Server/Doors/Systems/AirlockSystem.cs
    #	Content.Server/Doors/Systems/DoorSystem.cs
    #	Content.Server/Doors/Systems/FirelockSystem.cs
    #	Content.Server/Fax/FaxSystem.cs
    #	Content.Server/Kitchen/EntitySystems/ReagentGrinderSystem.cs
    #	Content.Server/Lathe/LatheSystem.cs
    #	Content.Server/Light/EntitySystems/EmergencyLightSystem.cs
    #	Content.Server/Light/EntitySystems/LitOnPoweredSystem.cs
    #	Content.Server/Light/EntitySystems/PoweredLightSystem.cs
    #	Content.Server/Medical/BiomassReclaimer/BiomassReclaimerSystem.cs
    #	Content.Server/Medical/CryoPodSystem.cs
    #	Content.Server/Nutrition/EntitySystems/FatExtractorSystem.cs
    #	Content.Server/ParticleAccelerator/EntitySystems/ParticleAcceleratorSystem.ControlBox.cs
    #	Content.Server/Physics/Controllers/ConveyorController.cs
    #	Content.Server/Power/Generation/Teg/TegSystem.cs
    #	Content.Server/Power/Generator/GasPowerReceiverSystem.cs
    #	Content.Server/Radio/EntitySystems/RadioDeviceSystem.cs
    #	Content.Server/Shuttles/Systems/ShuttleConsoleSystem.cs
    #	Content.Server/Shuttles/Systems/ThrusterSystem.cs
    #	Content.Server/Singularity/EntitySystems/EmitterSystem.cs
    #	Content.Server/Sound/SpamEmitSoundRequirePowerSystem.cs
    #	Content.Server/SurveillanceCamera/Systems/SurveillanceCameraMonitorSystem.cs
    #	Content.Server/SurveillanceCamera/Systems/SurveillanceCameraRouterSystem.cs
    #	Content.Server/SurveillanceCamera/Systems/SurveillanceCameraSystem.cs
    #	Content.Server/Temperature/Systems/EntityHeaterSystem.cs
    #	Content.Server/VendingMachines/VendingMachineSystem.cs
    #	Content.Server/Wires/WiresSystem.cs
    #	Content.Server/Xenoarchaeology/Equipment/Systems/ArtifactAnalyzerSystem.cs
    #	Content.Server/Xenoarchaeology/Equipment/Systems/ArtifactCrusherSystem.cs
    #	Content.Shared/Light/EntitySystems/SlimPoweredLightSystem.cs
    #	Content.Shared/Silicons/StationAi/StationAiVisionComponent.cs
    #	Content.Shared/Silicons/StationAi/StationAiVisionSystem.cs
    #	Resources/Locale/en-US/items/toggle.ftl
    #	Resources/Prototypes/Entities/Structures/Wallmounts/surveillance_camera.yml
    metalgearsloth committed Aug 25, 2024
    Configuration menu
    Copy the full SHA
    e073883 View commit details
    Browse the repository at this point in the history
  2. first impressions

    metalgearsloth committed Aug 25, 2024
    Configuration menu
    Copy the full SHA
    b19ce4e View commit details
    Browse the repository at this point in the history
  3. a

    metalgearsloth committed Aug 25, 2024
    Configuration menu
    Copy the full SHA
    d388ae5 View commit details
    Browse the repository at this point in the history
  4. reh

    metalgearsloth committed Aug 25, 2024
    Configuration menu
    Copy the full SHA
    1ebc89d View commit details
    Browse the repository at this point in the history
  5. Revert "navmap work"

    This reverts commit 6f63fea.
    
    # Conflicts:
    #	Content.Client/Silicons/StationAi/StationAiOverlay.cs
    metalgearsloth committed Aug 25, 2024
    Configuration menu
    Copy the full SHA
    67c79e8 View commit details
    Browse the repository at this point in the history
  6. OD

    metalgearsloth committed Aug 25, 2024
    Configuration menu
    Copy the full SHA
    d61f206 View commit details
    Browse the repository at this point in the history
  7. radar

    metalgearsloth committed Aug 25, 2024
    Configuration menu
    Copy the full SHA
    f5cc305 View commit details
    Browse the repository at this point in the history
  8. weh

    metalgearsloth committed Aug 25, 2024
    Configuration menu
    Copy the full SHA
    225a694 View commit details
    Browse the repository at this point in the history
  9. Fix examines

    metalgearsloth committed Aug 25, 2024
    Configuration menu
    Copy the full SHA
    91cad40 View commit details
    Browse the repository at this point in the history
  10. scoop mine eyes

    metalgearsloth committed Aug 25, 2024
    Configuration menu
    Copy the full SHA
    99b3f0a View commit details
    Browse the repository at this point in the history
  11. Configuration menu
    Copy the full SHA
    42bcb76 View commit details
    Browse the repository at this point in the history
  12. Merge remote-tracking branch 'upstream/master' into 2024-08-12-statio…

    …n-ai
    
    # Conflicts:
    #	Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml
    metalgearsloth committed Aug 25, 2024
    Configuration menu
    Copy the full SHA
    a28fd8a View commit details
    Browse the repository at this point in the history
  13. fixes

    metalgearsloth committed Aug 25, 2024
    Configuration menu
    Copy the full SHA
    05e0a96 View commit details
    Browse the repository at this point in the history
  14. reh

    metalgearsloth committed Aug 25, 2024
    Configuration menu
    Copy the full SHA
    8b79225 View commit details
    Browse the repository at this point in the history

Commits on Aug 26, 2024

  1. Configuration menu
    Copy the full SHA
    2f1cd54 View commit details
    Browse the repository at this point in the history
  2. Optimise

    metalgearsloth committed Aug 26, 2024
    Configuration menu
    Copy the full SHA
    4c635d4 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    369216e View commit details
    Browse the repository at this point in the history

Commits on Aug 27, 2024

  1. Merge remote-tracking branch 'upstream/master' into 2024-08-12-statio…

    …n-ai
    
    # Conflicts:
    #	Resources/Locale/en-US/job/job-names.ftl
    metalgearsloth committed Aug 27, 2024
    Configuration menu
    Copy the full SHA
    b4b1a78 View commit details
    Browse the repository at this point in the history

Commits on Aug 28, 2024

  1. Fixes

    metalgearsloth committed Aug 28, 2024
    Configuration menu
    Copy the full SHA
    05839d1 View commit details
    Browse the repository at this point in the history
  2. fixes

    metalgearsloth committed Aug 28, 2024
    Configuration menu
    Copy the full SHA
    c394c76 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    c6b7c8c View commit details
    Browse the repository at this point in the history