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.

Sign up for GitHub

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

Jump to bottom

Metempsychosis Returns #685

Merged
merged 56 commits into from
Feb 18, 2024
Merged

Metempsychosis Returns #685

merged 56 commits into from
Feb 18, 2024

Commits on Jan 17, 2024

  1. Metempsychosis Returns

    @VMSolidus
    VMSolidus committed Jan 17, 2024
    Configuration menu
    Copy the full SHA
    af038b0 View commit details
    Browse the repository at this point in the history

  2. Last updates

    @VMSolidus
    VMSolidus committed Jan 17, 2024
    Configuration menu
    Copy the full SHA
    85b0e47 View commit details
    Browse the repository at this point in the history

  3. Fixin the linter

    @VMSolidus
    VMSolidus committed Jan 17, 2024
    Configuration menu
    Copy the full SHA
    a982402 View commit details
    Browse the repository at this point in the history

  4. Update lathe.yml

    @VMSolidus
    VMSolidus committed Jan 17, 2024
    Configuration menu
    Copy the full SHA
    8f10d6b View commit details
    Browse the repository at this point in the history

  5. Update CloningSystem.cs

    @VMSolidus
    VMSolidus committed Jan 17, 2024
    Configuration menu
    Copy the full SHA
    a9dbde1 View commit details
    Browse the repository at this point in the history

Commits on Jan 22, 2024

  1. Merge branch 'master' into Metempsychosis

    @VMSolidus
    VMSolidus committed Jan 22, 2024
    Configuration menu
    Copy the full SHA
    ec79134 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'Metempsychosis' of https://github.com/evilexecutive/Del… 

    …ta-v-rebase into Metempsychosis
    @VMSolidus
    VMSolidus committed Jan 22, 2024
    Configuration menu
    Copy the full SHA
    556e62f View commit details
    Browse the repository at this point in the history

  3. Fixing the random name bug

    @VMSolidus
    VMSolidus committed Jan 22, 2024
    Configuration menu
    Copy the full SHA
    b88d3c3 View commit details
    Browse the repository at this point in the history

  4. Fugitive, rough but functional

    @VMSolidus
    VMSolidus committed Jan 22, 2024
    Configuration menu
    Copy the full SHA
    47586c3 View commit details
    Browse the repository at this point in the history

Commits on Jan 23, 2024

  1. Update fugitive.yml

    @VMSolidus
    VMSolidus committed Jan 23, 2024
    Configuration menu
    Copy the full SHA
    13124db View commit details
    Browse the repository at this point in the history

  2. Update humanoid.yml

    @VMSolidus
    VMSolidus committed Jan 23, 2024
    Configuration menu
    Copy the full SHA
    5af8fbd View commit details
    Browse the repository at this point in the history

  3. Checking if its the floortile

    @VMSolidus
    VMSolidus committed Jan 23, 2024
    Configuration menu
    Copy the full SHA
    51d3355 View commit details
    Browse the repository at this point in the history

  4. Guh

    @VMSolidus
    VMSolidus committed Jan 23, 2024
    Configuration menu
    Copy the full SHA
    bc98f0f View commit details
    Browse the repository at this point in the history

  5. Update EntityTest.cs

    @VMSolidus
    VMSolidus committed Jan 23, 2024
    Configuration menu
    Copy the full SHA
    82375ac View commit details
    Browse the repository at this point in the history

  6. Revert "Update EntityTest.cs" 

    This reverts commit 82375ac.
    @VMSolidus
    VMSolidus committed Jan 23, 2024
    Configuration menu
    Copy the full SHA
    924eff4 View commit details
    Browse the repository at this point in the history

  7. Revert "Guh" 

    This reverts commit bc98f0f.
    @VMSolidus
    VMSolidus committed Jan 23, 2024
    Configuration menu
    Copy the full SHA
    667b8c5 View commit details
    Browse the repository at this point in the history

  8. Revert "Checking if its the floortile" 

    This reverts commit 51d3355.
    @VMSolidus
    VMSolidus committed Jan 23, 2024
    Configuration menu
    Copy the full SHA
    8630ce0 View commit details
    Browse the repository at this point in the history

  9. Revert "Update humanoid.yml" 

    This reverts commit 5af8fbd.
    @VMSolidus
    VMSolidus committed Jan 23, 2024
    Configuration menu
    Copy the full SHA
    cb27625 View commit details
    Browse the repository at this point in the history

  10. Revert "Update fugitive.yml" 

    This reverts commit 13124db.
    @VMSolidus
    VMSolidus committed Jan 23, 2024
    Configuration menu
    Copy the full SHA
    cf1293e View commit details
    Browse the repository at this point in the history

  11. Revert "Fugitive, rough but functional" 

    This reverts commit 47586c3.
    @VMSolidus
    VMSolidus committed Jan 23, 2024
    Configuration menu
    Copy the full SHA
    a605aa4 View commit details
    Browse the repository at this point in the history

  12. Merge branch 'master' into Metempsychosis

    @VMSolidus
    VMSolidus committed Jan 23, 2024
    Configuration menu
    Copy the full SHA
    dfd76b0 View commit details
    Browse the repository at this point in the history

Commits on Jan 24, 2024

  1. Update Content.Server/Medical/Components/MedicalScannerComponent.cs 

    Co-authored-by: DEATHB4DEFEAT <[email protected]>
Signed-off-by: VMSolidus <[email protected]>
    @VMSolidus @DEATHB4DEFEAT
    VMSolidus and DEATHB4DEFEAT committed Jan 24, 2024
    Configuration menu
    Copy the full SHA
    49e704e View commit details
    Browse the repository at this point in the history

  2. Update Content.Server/Nyanotrasen/Cloning/MetempsychosisKarmaComponen… 

    …t.cs

Co-authored-by: DEATHB4DEFEAT <[email protected]>
Signed-off-by: VMSolidus <[email protected]>
    @VMSolidus @DEATHB4DEFEAT
    VMSolidus and DEATHB4DEFEAT committed Jan 24, 2024
    Configuration menu
    Copy the full SHA
    6eb6fbc View commit details
    Browse the repository at this point in the history

  3. Update Content.Server/Nyanotrasen/Cloning/MetempsychoticMachineCompon… 

    …ent.cs

Co-authored-by: DEATHB4DEFEAT <[email protected]>
Signed-off-by: VMSolidus <[email protected]>
    @VMSolidus @DEATHB4DEFEAT
    VMSolidus and DEATHB4DEFEAT committed Jan 24, 2024
    Configuration menu
    Copy the full SHA
    8dd1b91 View commit details
    Browse the repository at this point in the history

  4. Update Content.Server/Nyanotrasen/Cloning/MetempsychoticMachineSystem.cs 

    Co-authored-by: DEATHB4DEFEAT <[email protected]>
Signed-off-by: VMSolidus <[email protected]>
    @VMSolidus @DEATHB4DEFEAT
    VMSolidus and DEATHB4DEFEAT committed Jan 24, 2024
    Configuration menu
    Copy the full SHA
    62bf453 View commit details
    Browse the repository at this point in the history

  5. Update Content.Server/Nyanotrasen/Cloning/MetempsychoticMachineSystem.cs 

    Co-authored-by: DEATHB4DEFEAT <[email protected]>
Signed-off-by: VMSolidus <[email protected]>
    @VMSolidus @DEATHB4DEFEAT
    VMSolidus and DEATHB4DEFEAT committed Jan 24, 2024
    Configuration menu
    Copy the full SHA
    6c99f2e View commit details
    Browse the repository at this point in the history

  6. Update Content.Server/Nyanotrasen/Cloning/MetempsychoticMachineSystem.cs 

    Co-authored-by: DEATHB4DEFEAT <[email protected]>
Signed-off-by: VMSolidus <[email protected]>
    @VMSolidus @DEATHB4DEFEAT
    VMSolidus and DEATHB4DEFEAT committed Jan 24, 2024
    Configuration menu
    Copy the full SHA
    692eeda View commit details
    Browse the repository at this point in the history

  7. Update Resources/Prototypes/Nyanotrasen/Entities/Structures/Machines/… 

    …metempsychoticMachine.yml

Co-authored-by: DEATHB4DEFEAT <[email protected]>
Signed-off-by: VMSolidus <[email protected]>
    @VMSolidus @DEATHB4DEFEAT
    VMSolidus and DEATHB4DEFEAT committed Jan 24, 2024
    Configuration menu
    Copy the full SHA
    b9c61ab View commit details
    Browse the repository at this point in the history

  8. Update Resources/Prototypes/Nyanotrasen/Research/biochemical.yml.yml 

    Co-authored-by: DEATHB4DEFEAT <[email protected]>
Signed-off-by: VMSolidus <[email protected]>
    @VMSolidus @DEATHB4DEFEAT
    VMSolidus and DEATHB4DEFEAT committed Jan 24, 2024
    Configuration menu
    Copy the full SHA
    4974308 View commit details
    Browse the repository at this point in the history

  9. Update Resources/Textures/Nyanotrasen/Structures/Machines/metempsycho… 

    …tic.rsi/meta.json

Co-authored-by: DEATHB4DEFEAT <[email protected]>
Signed-off-by: VMSolidus <[email protected]>
    @VMSolidus @DEATHB4DEFEAT
    VMSolidus and DEATHB4DEFEAT committed Jan 24, 2024
    Configuration menu
    Copy the full SHA
    f98a4f8 View commit details
    Browse the repository at this point in the history

  10. Update CloningSystem.cs 

    Signed-off-by: VMSolidus <[email protected]>
    @VMSolidus
    VMSolidus committed Jan 24, 2024
    Configuration menu
    Copy the full SHA
    7d9b75e View commit details
    Browse the repository at this point in the history

  11. Update CloningSystem.cs

    @VMSolidus
    VMSolidus committed Jan 24, 2024
    Configuration menu
    Copy the full SHA
    26a5217 View commit details
    Browse the repository at this point in the history

Commits on Jan 28, 2024

  1. Merge branch 'master' into Metempsychosis 

    Signed-off-by: VMSolidus <[email protected]>
    @VMSolidus
    VMSolidus committed Jan 28, 2024
    Configuration menu
    Copy the full SHA
    b0e21ca View commit details
    Browse the repository at this point in the history

  2. Update Content.Server/Nyanotrasen/Cloning/MetempsychoticMachineSystem.cs 

    Co-authored-by: DEATHB4DEFEAT <[email protected]>
Signed-off-by: VMSolidus <[email protected]>
    @VMSolidus @DEATHB4DEFEAT
    VMSolidus and DEATHB4DEFEAT committed Jan 28, 2024
    Configuration menu
    Copy the full SHA
    dae42fc View commit details
    Browse the repository at this point in the history

  3. Update MetempsychoticMachineSystem.cs

    @VMSolidus
    VMSolidus committed Jan 28, 2024
    Configuration menu
    Copy the full SHA
    2d75497 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'Metempsychosis' of https://github.com/evilexecutive/Del… 

    …ta-v-rebase into Metempsychosis
    @VMSolidus
    VMSolidus committed Jan 28, 2024
    Configuration menu
    Copy the full SHA
    1868e8a View commit details
    Browse the repository at this point in the history

  5. Merge branch 'master' into Metempsychosis

    @VMSolidus
    VMSolidus committed Jan 28, 2024
    Configuration menu
    Copy the full SHA
    5cf580e View commit details
    Browse the repository at this point in the history

  6. Cleaning up some of the Metem code

    @VMSolidus
    VMSolidus committed Jan 28, 2024
    Configuration menu
    Copy the full SHA
    a793dbe View commit details
    Browse the repository at this point in the history

  7. Update CloningConsoleSystem.cs 

    reordering for less merge conflict

Signed-off-by: VMSolidus <[email protected]>
    @VMSolidus
    VMSolidus committed Jan 28, 2024
    Configuration menu
    Copy the full SHA
    1d36641 View commit details
    Browse the repository at this point in the history

  8. Reordering usings for less merge conflicts 

    Signed-off-by: VMSolidus <[email protected]>
    @VMSolidus
    VMSolidus committed Jan 28, 2024
    Configuration menu
    Copy the full SHA
    a5a2df7 View commit details
    Browse the repository at this point in the history

  9. Update HumanoidAppearanceComponent.cs 

    Signed-off-by: VMSolidus <[email protected]>
    @VMSolidus
    VMSolidus committed Jan 28, 2024
    Configuration menu
    Copy the full SHA
    384fb60 View commit details
    Browse the repository at this point in the history

  10. Update CloningSystem.cs 

    Signed-off-by: VMSolidus <[email protected]>
    @VMSolidus
    VMSolidus committed Jan 28, 2024
    Configuration menu
    Copy the full SHA
    ed2abac View commit details
    Browse the repository at this point in the history

  11. Merge branch 'master' into Metempsychosis

    @VMSolidus
    VMSolidus committed Jan 28, 2024
    Configuration menu
    Copy the full SHA
    cb5ebb1 View commit details
    Browse the repository at this point in the history

Commits on Feb 2, 2024

  1. Apply suggestions from code review 

    Co-authored-by: DEATHB4DEFEAT <[email protected]>
Signed-off-by: VMSolidus <[email protected]>
    @VMSolidus @DEATHB4DEFEAT
    VMSolidus and DEATHB4DEFEAT committed Feb 2, 2024
    Configuration menu
    Copy the full SHA
    c5fd613 View commit details
    Browse the repository at this point in the history

  2. Update CloningConsoleSystem.cs 

    Somehow this got removed during cleanup

Signed-off-by: VMSolidus <[email protected]>
    @VMSolidus
    VMSolidus committed Feb 2, 2024
    Configuration menu
    Copy the full SHA
    688ab0b View commit details
    Browse the repository at this point in the history

  3. Update CloningConsoleSystem.cs 

    Signed-off-by: VMSolidus <[email protected]>
    @VMSolidus
    VMSolidus committed Feb 2, 2024
    Configuration menu
    Copy the full SHA
    32b7245 View commit details
    Browse the repository at this point in the history

  4. Update CloningSystem.cs 

    I put it back in the wrong file...

Signed-off-by: VMSolidus <[email protected]>
    @VMSolidus
    VMSolidus committed Feb 2, 2024
    Configuration menu
    Copy the full SHA
    2596e70 View commit details
    Browse the repository at this point in the history

  5. Update CloningConsoleSystem.cs 

    Signed-off-by: VMSolidus <[email protected]>
    @VMSolidus
    VMSolidus committed Feb 2, 2024
    Configuration menu
    Copy the full SHA
    0b4aa61 View commit details
    Browse the repository at this point in the history

Commits on Feb 8, 2024

  1. Apply suggestions from code review 

    Co-authored-by: DEATHB4DEFEAT <[email protected]>
Signed-off-by: VMSolidus <[email protected]>
    @VMSolidus @DEATHB4DEFEAT
    VMSolidus and DEATHB4DEFEAT committed Feb 8, 2024
    Configuration menu
    Copy the full SHA
    177bd5c View commit details
    Browse the repository at this point in the history

Commits on Feb 9, 2024

  1. Requested changes but need assistance with test fail

    @VMSolidus
    VMSolidus committed Feb 9, 2024
    Configuration menu
    Copy the full SHA
    0a67fae View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into Metempsychosis

    @VMSolidus
    VMSolidus committed Feb 9, 2024
    Configuration menu
    Copy the full SHA
    63ad078 View commit details
    Browse the repository at this point in the history

  3. biochem is gone apparently

    @VMSolidus
    VMSolidus committed Feb 9, 2024
    Configuration menu
    Copy the full SHA
    27b8ac8 View commit details
    Browse the repository at this point in the history

  4. Update experimental.yml 

    Signed-off-by: VMSolidus <[email protected]>
    @VMSolidus
    VMSolidus committed Feb 9, 2024
    Configuration menu
    Copy the full SHA
    eaa031e View commit details
    Browse the repository at this point in the history

  5. Update MetempsychosisTest.cs

    @VMSolidus
    VMSolidus committed Feb 9, 2024
    Configuration menu
    Copy the full SHA
    f8a306b View commit details
    Browse the repository at this point in the history

  6. Update CloningSystem.cs

    @VMSolidus
    VMSolidus committed Feb 9, 2024
    Configuration menu
    Copy the full SHA
    448e4dc View commit details
    Browse the repository at this point in the history

Commits on Feb 13, 2024

  1. Merge branch 'master' into Metempsychosis 

    Signed-off-by: VMSolidus <[email protected]>
    @VMSolidus
    VMSolidus committed Feb 13, 2024
    Configuration menu
    Copy the full SHA
    e73f454 View commit details
    Browse the repository at this point in the history