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

Refactor/wounds #13917

Closed
wants to merge 187 commits into from
Closed

Refactor/wounds #13917

wants to merge 187 commits into from

Commits on Nov 5, 2022

  1. started work on wound prototypes

    @Jezithyr
    Jezithyr committed Nov 5, 2022
    Configuration menu
    Copy the full SHA
    6b0677a View commit details
    Browse the repository at this point in the history

Commits on Nov 12, 2022

  1. implemented wound application and stacking

    @Jezithyr
    Jezithyr committed Nov 12, 2022
    Configuration menu
    Copy the full SHA
    7f57303 View commit details
    Browse the repository at this point in the history

Commits on Nov 13, 2022

  1. implemented SKIN and created Bones!

    @Jezithyr
    Jezithyr committed Nov 13, 2022
    Configuration menu
    Copy the full SHA
    bb6d320 View commit details
    Browse the repository at this point in the history

  2. implemented bone typing

    @Jezithyr
    Jezithyr committed Nov 13, 2022
    Configuration menu
    Copy the full SHA
    d095766 View commit details
    Browse the repository at this point in the history

  3. fixing a stupid with damage specifier

    @Jezithyr
    Jezithyr committed Nov 13, 2022
    Configuration menu
    Copy the full SHA
    3579d26 View commit details
    Browse the repository at this point in the history

  4. fixing some serialization fuckups and implementing per part damage caps

    @Jezithyr
    Jezithyr committed Nov 13, 2022
    Configuration menu
    Copy the full SHA
    170ac18 View commit details
    Browse the repository at this point in the history

  5. updating

    @Jezithyr
    Jezithyr committed Nov 13, 2022
    Configuration menu
    Copy the full SHA
    bdf11c4 View commit details
    Browse the repository at this point in the history

  6. interm commit

    @Jezithyr
    Jezithyr committed Nov 13, 2022
    Configuration menu
    Copy the full SHA
    854b176 View commit details
    Browse the repository at this point in the history

  7. Merge remote-tracking branch 'upstream/master' into refactor/wounds

    @Jezithyr
    Jezithyr committed Nov 13, 2022
    Configuration menu
    Copy the full SHA
    a4ba814 View commit details
    Browse the repository at this point in the history

  8. implemented wound table caching, updated wound tables to use severity

    @Jezithyr
    Jezithyr committed Nov 13, 2022
    Configuration menu
    Copy the full SHA
    f8cf84f View commit details
    Browse the repository at this point in the history

Commits on Nov 14, 2022

  1. Implemented Wounding :D

    @Jezithyr
    Jezithyr committed Nov 14, 2022
    Configuration menu
    Copy the full SHA
    c983122 View commit details
    Browse the repository at this point in the history

  2. added listener for damage

    @Jezithyr
    Jezithyr committed Nov 14, 2022
    Configuration menu
    Copy the full SHA
    31e290c View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' into refactor/wounds

    @Jezithyr
    Jezithyr committed Nov 14, 2022
    Configuration menu
    Copy the full SHA
    cbea569 View commit details
    Browse the repository at this point in the history

  4. Interm test

    @Jezithyr
    Jezithyr committed Nov 14, 2022
    Configuration menu
    Copy the full SHA
    8d19e70 View commit details
    Browse the repository at this point in the history

  5. Fix errors

    @DrSmugleaf
    DrSmugleaf committed Nov 14, 2022
    Configuration menu
    Copy the full SHA
    eb97064 View commit details
    Browse the repository at this point in the history

Commits on Nov 15, 2022

  1. Moved woundPools out of damagetype to their own prototype

    @Jezithyr
    Jezithyr committed Nov 15, 2022
    Configuration menu
    Copy the full SHA
    7629390 View commit details
    Browse the repository at this point in the history

  2. Unfuck Csproj

    @Jezithyr
    Jezithyr committed Nov 15, 2022
    Configuration menu
    Copy the full SHA
    ced971e View commit details
    Browse the repository at this point in the history

Commits on Nov 16, 2022

  1. Converted to new trauma-damage based system

    @Jezithyr
    Jezithyr committed Nov 16, 2022
    Configuration menu
    Copy the full SHA
    2db4d1e View commit details
    Browse the repository at this point in the history

  2. Merge branch 'refactor/wounds'

    @Jezithyr
    Jezithyr committed Nov 16, 2022
    Configuration menu
    Copy the full SHA
    6db19b3 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' of https://github.com/space-wizards/space-stati… 

    …on-14 into refactor/wounds
    @DrSmugleaf
    DrSmugleaf committed Nov 16, 2022
    Configuration menu
    Copy the full SHA
    6bbcccb View commit details
    Browse the repository at this point in the history

  4. Use methods from merge

    @DrSmugleaf
    DrSmugleaf committed Nov 16, 2022
    Configuration menu
    Copy the full SHA
    8476dd5 View commit details
    Browse the repository at this point in the history

  5. Cleanup

    @DrSmugleaf
    DrSmugleaf committed Nov 16, 2022
    Configuration menu
    Copy the full SHA
    5bd8295 View commit details
    Browse the repository at this point in the history

  6. Cleanup

    @DrSmugleaf
    DrSmugleaf committed Nov 16, 2022
    Configuration menu
    Copy the full SHA
    c0e8821 View commit details
    Browse the repository at this point in the history

  7. Default to traumaType if no penTraumaType

    @DrSmugleaf
    DrSmugleaf committed Nov 16, 2022
    Configuration menu
    Copy the full SHA
    5bb7447 View commit details
    Browse the repository at this point in the history

  8. Remove infected

    @DrSmugleaf
    DrSmugleaf committed Nov 16, 2022
    Configuration menu
    Copy the full SHA
    02a7376 View commit details
    Browse the repository at this point in the history

  9. Cleanup

    @DrSmugleaf
    DrSmugleaf committed Nov 16, 2022
    Configuration menu
    Copy the full SHA
    1a215cf View commit details
    Browse the repository at this point in the history

  10. Add health damage and integrity damage

    @DrSmugleaf
    DrSmugleaf committed Nov 16, 2022
    Configuration menu
    Copy the full SHA
    d87d7d7 View commit details
    Browse the repository at this point in the history

  11. Merge branch 'master' of https://github.com/space-wizards/space-stati… 

    …on-14 into refactor/wounds
    @DrSmugleaf
    DrSmugleaf committed Nov 16, 2022
    Configuration menu
    Copy the full SHA
    37962b9 View commit details
    Browse the repository at this point in the history

  12. Fix sandbox error

    @DrSmugleaf
    DrSmugleaf committed Nov 16, 2022
    Configuration menu
    Copy the full SHA
    070a1c4 View commit details
    Browse the repository at this point in the history

  13. Add test injury crack

    @DrSmugleaf
    DrSmugleaf committed Nov 16, 2022
    Configuration menu
    Copy the full SHA
    24df4b7 View commit details
    Browse the repository at this point in the history

Commits on Nov 17, 2022

  1. Roll pen chance with default type as pen type

    @DrSmugleaf
    DrSmugleaf committed Nov 17, 2022
    Configuration menu
    Copy the full SHA
    f2a286c View commit details
    Browse the repository at this point in the history

  2. removing Severity from wounds

    @Jezithyr
    Jezithyr committed Nov 17, 2022
    Configuration menu
    Copy the full SHA
    381e5c0 View commit details
    Browse the repository at this point in the history

  3. Merge remote-tracking branch 'Sanctuary-Station/refactor/wounds' into… 

    … refactor/wounds
    @Jezithyr
    Jezithyr committed Nov 17, 2022
    Configuration menu
    Copy the full SHA
    cb14fb2 View commit details
    Browse the repository at this point in the history

  4. Change TryPickInjury to get the first injury

    @DrSmugleaf
    DrSmugleaf committed Nov 17, 2022
    Configuration menu
    Copy the full SHA
    e9ac961 View commit details
    Browse the repository at this point in the history

  5. Merge remote-tracking branch 'sanctuary/refactor/wounds' into refacto… 

    …r/wounds

# Conflicts:
#	Content.Shared/Medical/Wounds/Systems/InjurySystem.cs
    @DrSmugleaf
    DrSmugleaf committed Nov 17, 2022
    Configuration menu
    Copy the full SHA
    02a0350 View commit details
    Browse the repository at this point in the history

  6. Add slash injuries, remove TraumaSpecifier, cleanup

    @DrSmugleaf
    DrSmugleaf committed Nov 17, 2022
    Configuration menu
    Copy the full SHA
    5fcc42c View commit details
    Browse the repository at this point in the history

  7. Pick random part instead of applying to all

    @DrSmugleaf
    DrSmugleaf committed Nov 17, 2022
    Configuration menu
    Copy the full SHA
    53ea81b View commit details
    Browse the repository at this point in the history

  8. Rename injury to wound

    @DrSmugleaf
    DrSmugleaf committed Nov 17, 2022
    Configuration menu
    Copy the full SHA
    33e8ae1 View commit details
    Browse the repository at this point in the history

  9. Merge branch 'master' of https://github.com/space-wizards/space-stati… 

    …on-14 into refactor/wounds
    @DrSmugleaf
    DrSmugleaf committed Nov 17, 2022
    Configuration menu
    Copy the full SHA
    c137ae9 View commit details
    Browse the repository at this point in the history

  10. Change wounds to be entities

    @DrSmugleaf
    DrSmugleaf committed Nov 17, 2022
    Configuration menu
    Copy the full SHA
    d746bb7 View commit details
    Browse the repository at this point in the history

  11. Merge branch 'master' of https://github.com/space-wizards/space-stati… 

    …on-14 into refactor/wounds
    @DrSmugleaf
    DrSmugleaf committed Nov 17, 2022
    Configuration menu
    Copy the full SHA
    2b5e05e View commit details
    Browse the repository at this point in the history

Commits on Nov 19, 2022

  1. Renamed structure to integrity 

    Removed woundPrototype
    @Jezithyr
    Jezithyr committed Nov 19, 2022
    Configuration menu
    Copy the full SHA
    6e682c2 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' of https://github.com/space-wizards/space-stati… 

    …on-14 into refactor/wounds
    @DrSmugleaf
    DrSmugleaf committed Nov 19, 2022
    Configuration menu
    Copy the full SHA
    edb048b View commit details
    Browse the repository at this point in the history

  3. Implement wound damage and woundable destruction

    @DrSmugleaf
    DrSmugleaf committed Nov 19, 2022
    Configuration menu
    Copy the full SHA
    da95faf View commit details
    Browse the repository at this point in the history

  4. Gib root parts on destroy

    @DrSmugleaf
    DrSmugleaf committed Nov 19, 2022
    Configuration menu
    Copy the full SHA
    444dfab View commit details
    Browse the repository at this point in the history

  5. Add todo for gibbing body parts

    @DrSmugleaf
    DrSmugleaf committed Nov 19, 2022
    Configuration menu
    Copy the full SHA
    9d9ab53 View commit details
    Browse the repository at this point in the history

Commits on Nov 23, 2022

  1. Fix integrity destroy check

    @DrSmugleaf
    DrSmugleaf committed Nov 23, 2022
    Configuration menu
    Copy the full SHA
    34ff0aa View commit details
    Browse the repository at this point in the history

Commits on Nov 27, 2022

  1. Implemented healthcap-based wounding 

    Also did some naming cleanup
    @Jezithyr
    Jezithyr committed Nov 27, 2022
    Configuration menu
    Copy the full SHA
    a4a8c78 View commit details
    Browse the repository at this point in the history

  2. Split WoundSystem into a partial. Converted severity to use floats

    @Jezithyr
    Jezithyr committed Nov 27, 2022
    Configuration menu
    Copy the full SHA
    8f13cbb View commit details
    Browse the repository at this point in the history

  3. implemented wound healing

    @Jezithyr
    Jezithyr committed Nov 27, 2022
    Configuration menu
    Copy the full SHA
    bbe5e9e View commit details
    Browse the repository at this point in the history

  4. Interm commit

    @Jezithyr
    Jezithyr committed Nov 27, 2022
    Configuration menu
    Copy the full SHA
    c612176 View commit details
    Browse the repository at this point in the history

  5. implement woundable healing

    @Jezithyr
    Jezithyr committed Nov 27, 2022
    Configuration menu
    Copy the full SHA
    96c37f3 View commit details
    Browse the repository at this point in the history

  6. Fix errors on adding and removing wounds

    @DrSmugleaf
    DrSmugleaf committed Nov 27, 2022
    Configuration menu
    Copy the full SHA
    58e491f View commit details
    Browse the repository at this point in the history

  7. Fixing Typo

    @Jezithyr
    Jezithyr committed Nov 27, 2022
    Configuration menu
    Copy the full SHA
    73592ab View commit details
    Browse the repository at this point in the history

  8. Merge remote-tracking branch 'sanctuary/refactor/wounds' into refacto… 

    …r/wounds

# Conflicts:
#	Content.Shared/Medical/Wounds/Systems/WoundSystem.Wounding.cs
    @DrSmugleaf
    DrSmugleaf committed Nov 27, 2022
    Configuration menu
    Copy the full SHA
    e431e20 View commit details
    Browse the repository at this point in the history

  9. Merge remote-tracking branch 'sanctuary/refactor/wounds' into refacto… 

    …r/wounds
    @DrSmugleaf
    DrSmugleaf committed Nov 27, 2022
    Configuration menu
    Copy the full SHA
    a48bb81 View commit details
    Browse the repository at this point in the history

  10. Fix for healing math

    @Jezithyr
    Jezithyr committed Nov 27, 2022
    Configuration menu
    Copy the full SHA
    04797b2 View commit details
    Browse the repository at this point in the history

  11. adjust wound application order

    @Jezithyr
    Jezithyr committed Nov 27, 2022
    Configuration menu
    Copy the full SHA
    9402037 View commit details
    Browse the repository at this point in the history

  12. Change floats with fixedpoint2

    @DrSmugleaf
    DrSmugleaf committed Nov 27, 2022
    Configuration menu
    Copy the full SHA
    0a2018f View commit details
    Browse the repository at this point in the history

  13. Merge remote-tracking branch 'sanctuary/refactor/wounds' into refacto… 

    …r/wounds

# Conflicts:
#	Content.Shared/Medical/Wounds/Systems/WoundSystem.Wounding.cs
    @DrSmugleaf
    DrSmugleaf committed Nov 27, 2022
    Configuration menu
    Copy the full SHA
    47fcfc7 View commit details
    Browse the repository at this point in the history

  14. Add component states

    @DrSmugleaf
    DrSmugleaf committed Nov 27, 2022
    Configuration menu
    Copy the full SHA
    fe42976 View commit details
    Browse the repository at this point in the history

  15. Move traumas inflicted to damage type prototype

    @DrSmugleaf
    DrSmugleaf committed Nov 27, 2022
    Configuration menu
    Copy the full SHA
    611583d View commit details
    Browse the repository at this point in the history

  16. Started creating Medical Hud

    @Jezithyr
    Jezithyr committed Nov 27, 2022
    Configuration menu
    Copy the full SHA
    9c89c03 View commit details
    Browse the repository at this point in the history

  17. Merge remote-tracking branch 'Sanctuary-Station/refactor/wounds' into… 

    … refactor/wounds
    @Jezithyr
    Jezithyr committed Nov 27, 2022
    Configuration menu
    Copy the full SHA
    a645952 View commit details
    Browse the repository at this point in the history

  18. Moved Medical status into it's own control for tabbing

    @Jezithyr
    Jezithyr committed Nov 27, 2022
    Configuration menu
    Copy the full SHA
    54490a3 View commit details
    Browse the repository at this point in the history

Commits on Dec 16, 2022

  1. Merge branch 'master' into refactor/wounds

    @Jezithyr
    Jezithyr committed Dec 16, 2022
    Configuration menu
    Copy the full SHA
    2c5de9c View commit details
    Browse the repository at this point in the history

Commits on Dec 17, 2022

  1. Implemented UI frontend for Firstaid/treatment window

    @Jezithyr
    Jezithyr committed Dec 17, 2022
    Configuration menu
    Copy the full SHA
    6638c20 View commit details
    Browse the repository at this point in the history

Commits on Dec 18, 2022

  1. started implementing medical ui menu

    @Jezithyr
    Jezithyr committed Dec 18, 2022
    Configuration menu
    Copy the full SHA
    fee488d View commit details
    Browse the repository at this point in the history

Commits on Dec 19, 2022

  1. continued implementing medial ui

    @Jezithyr
    Jezithyr committed Dec 19, 2022
    Configuration menu
    Copy the full SHA
    e819bd1 View commit details
    Browse the repository at this point in the history

  2. Created EntityFlag System. 

    This is a state machine for entities that can trigger logic (via events) when flags are added or removed from an entity.
    @Jezithyr
    Jezithyr committed Dec 19, 2022
    Configuration menu
    Copy the full SHA
    9e9f362 View commit details
    Browse the repository at this point in the history

  3. Created EntityFlag System. 

    This is a state machine for entities that can trigger logic (via events) when flags are added or removed from an entity.
    @Jezithyr
    Jezithyr committed Dec 19, 2022
    Configuration menu
    Copy the full SHA
    b5633db View commit details
    Browse the repository at this point in the history

  4. Merge remote-tracking branch 'Sanctuary-Station/refactor/wounds' into… 

    … refactor/wounds

# Conflicts:
#	Content.Shared/EntityFlags/Systems/EntityFlagSystem.cs
    @Jezithyr
    Jezithyr committed Dec 19, 2022
    Configuration menu
    Copy the full SHA
    cc3fd8c View commit details
    Browse the repository at this point in the history

  5. a

    @Jezithyr
    Jezithyr committed Dec 19, 2022
    Configuration menu
    Copy the full SHA
    8b37ad7 View commit details
    Browse the repository at this point in the history

  6. Removed entity flags and setup MentalState

    @Jezithyr
    Jezithyr committed Dec 19, 2022
    Configuration menu
    Copy the full SHA
    a783236 View commit details
    Browse the repository at this point in the history

Commits on Dec 20, 2022

  1. Cleaned up obsolete properties from MobStateComponent

    @Jezithyr
    Jezithyr committed Dec 20, 2022
    Configuration menu
    Copy the full SHA
    6e83733 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into refactor/mobstate

    @Jezithyr
    Jezithyr committed Dec 20, 2022
    Configuration menu
    Copy the full SHA
    5ec15ea View commit details
    Browse the repository at this point in the history

  3. interm commit

    @Jezithyr
    Jezithyr committed Dec 20, 2022
    Configuration menu
    Copy the full SHA
    edc327a View commit details
    Browse the repository at this point in the history

  4. Converted MobState to use ticketing system

    @Jezithyr
    Jezithyr committed Dec 20, 2022
    Configuration menu
    Copy the full SHA
    d5cb986 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'master' into refactor/mobstate

    @Jezithyr
    Jezithyr committed Dec 20, 2022
    Configuration menu
    Copy the full SHA
    c30c2cf View commit details
    Browse the repository at this point in the history

Commits on Dec 26, 2022

  1. Fixing some errors with mobstatecomp

    @Jezithyr
    Jezithyr committed Dec 26, 2022
    Configuration menu
    Copy the full SHA
    9f37025 View commit details
    Browse the repository at this point in the history

Commits on Jan 7, 2023

  1. Converted old systems to use new mobstate system

    @Jezithyr
    Jezithyr committed Jan 7, 2023
    Configuration menu
    Copy the full SHA
    b674bd8 View commit details
    Browse the repository at this point in the history

  2. Removed clientside and serverside mobstate, renamed sharedMobstate to… 

    … mobstate. Cleaned up mobstate namespaces
    @Jezithyr
    Jezithyr committed Jan 7, 2023
    Configuration menu
    Copy the full SHA
    30220fd View commit details
    Browse the repository at this point in the history

  3. updating mobstate namespaces fixing compile errors

    @Jezithyr
    Jezithyr committed Jan 7, 2023
    Configuration menu
    Copy the full SHA
    4f9022d View commit details
    Browse the repository at this point in the history

Commits on Jan 8, 2023

  1. converted mobstate in yaml to mobthresholds

    @Jezithyr
    Jezithyr committed Jan 8, 2023
    Configuration menu
    Copy the full SHA
    b40f889 View commit details
    Browse the repository at this point in the history

  2. fixed rev

    @Jezithyr
    Jezithyr committed Jan 8, 2023
    Configuration menu
    Copy the full SHA
    3de1b9e View commit details
    Browse the repository at this point in the history

Commits on Jan 9, 2023

  1. Namespace and file folder cleanup

    @Jezithyr
    Jezithyr committed Jan 9, 2023
    Configuration menu
    Copy the full SHA
    3967bc1 View commit details
    Browse the repository at this point in the history

  2. Converted mob event to use broadcast

    @Jezithyr
    Jezithyr committed Jan 9, 2023
    Configuration menu
    Copy the full SHA
    c651d31 View commit details
    Browse the repository at this point in the history

  3. Fixing some a typo with mobstate logic and cleaning up damage overlay… 

    … file
    @Jezithyr
    Jezithyr committed Jan 9, 2023
    Configuration menu
    Copy the full SHA
    e3cda29 View commit details
    Browse the repository at this point in the history

  4. Merge remote-tracking branch 'origin/master' into refactor/mobstate 

    # Conflicts:
#	Content.Server/Cargo/Systems/PricingSystem.cs
#	Content.Server/Dragon/DragonSystem.cs
#	Content.Server/GameTicking/GameTicker.GamePreset.cs
#	Content.Server/GameTicking/Rules/ZombieRuleSystem.cs
#	Content.Server/Mind/Mind.cs
#	Content.Server/Revenant/EntitySystems/RevenantSystem.Abilities.cs
    @Jezithyr
    Jezithyr committed Jan 9, 2023
    Configuration menu
    Copy the full SHA
    68088ae View commit details
    Browse the repository at this point in the history

  5. Fixing merge conflicts

    @Jezithyr
    Jezithyr committed Jan 9, 2023
    Configuration menu
    Copy the full SHA
    c9bdac9 View commit details
    Browse the repository at this point in the history

  6. Mobstate actually works

    @Jezithyr
    Jezithyr committed Jan 9, 2023
    Configuration menu
    Copy the full SHA
    7ce1fca View commit details
    Browse the repository at this point in the history

  7. Fixed damage overlay

    @Jezithyr
    Jezithyr committed Jan 9, 2023
    Configuration menu
    Copy the full SHA
    f29aa1a View commit details
    Browse the repository at this point in the history

  8. Fix entering the old state instead of new

    @DrSmugleaf
    DrSmugleaf committed Jan 9, 2023
    Configuration menu
    Copy the full SHA
    a116fe6 View commit details
    Browse the repository at this point in the history

  9. Fix checking for Asphyxiation instead of Airloss

    @DrSmugleaf
    DrSmugleaf committed Jan 9, 2023
    Configuration menu
    Copy the full SHA
    e6ab93b View commit details
    Browse the repository at this point in the history

  10. Fix usages of MobState

    @DrSmugleaf
    DrSmugleaf committed Jan 9, 2023
    Configuration menu
    Copy the full SHA
    f853e18 View commit details
    Browse the repository at this point in the history

  11. Fix not clearing crit and brute overlays

    @DrSmugleaf
    DrSmugleaf committed Jan 9, 2023
    Configuration menu
    Copy the full SHA
    3f4f74b View commit details
    Browse the repository at this point in the history

Commits on Jan 10, 2023

  1. Fix the dumb

    @Jezithyr
    Jezithyr committed Jan 10, 2023
    Configuration menu
    Copy the full SHA
    8bcbbf3 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'refactor/mobstate' into refactor/wounds

    @Jezithyr
    Jezithyr committed Jan 10, 2023
    Configuration menu
    Copy the full SHA
    df0f5b9 View commit details
    Browse the repository at this point in the history

  3. Fixing a sus dependency

    @Jezithyr
    Jezithyr committed Jan 10, 2023
    Configuration menu
    Copy the full SHA
    3d62cf2 View commit details
    Browse the repository at this point in the history

  4. Fix tests and reformat

    @DrSmugleaf
    DrSmugleaf committed Jan 10, 2023
    Configuration menu
    Copy the full SHA
    3f1cbe4 View commit details
    Browse the repository at this point in the history

  5. Reset RobustToolbox

    @DrSmugleaf
    DrSmugleaf committed Jan 10, 2023
    Configuration menu
    Copy the full SHA
    2595687 View commit details
    Browse the repository at this point in the history

  6. Merge branch 'master' of https://github.com/space-wizards/space-stati… 

    …on-14 into refactor/mobstate
    @DrSmugleaf
    DrSmugleaf committed Jan 10, 2023
    Configuration menu
    Copy the full SHA
    6caebba View commit details
    Browse the repository at this point in the history

  7. Replace ticketing with an event

    @DrSmugleaf
    DrSmugleaf committed Jan 10, 2023
    Configuration menu
    Copy the full SHA
    508f449 View commit details
    Browse the repository at this point in the history

  8. Converting MentalState System to Consciousness System

    @Jezithyr
    Jezithyr committed Jan 10, 2023
    Configuration menu
    Copy the full SHA
    27bb73f View commit details
    Browse the repository at this point in the history

  9. Implement get/handle state for ConsciousnessComponent

    @DrSmugleaf
    DrSmugleaf committed Jan 10, 2023
    Configuration menu
    Copy the full SHA
    6e40715 View commit details
    Browse the repository at this point in the history

  10. Merge branch 'refactor/mobstate' into refactor/wounds

    @Jezithyr
    Jezithyr committed Jan 10, 2023
    Configuration menu
    Copy the full SHA
    1e179af View commit details
    Browse the repository at this point in the history

  11. Setup consciousness affecting mobstate

    @Jezithyr
    Jezithyr committed Jan 10, 2023
    Configuration menu
    Copy the full SHA
    3a6e0ed View commit details
    Browse the repository at this point in the history

  12. Cleanup/simplification of consciousness update event

    @Jezithyr
    Jezithyr committed Jan 10, 2023
    Configuration menu
    Copy the full SHA
    51f3cee View commit details
    Browse the repository at this point in the history

  13. Adjusted ComponentUpdate pattern for Consciousness

    @Jezithyr
    Jezithyr committed Jan 10, 2023
    Configuration menu
    Copy the full SHA
    812b9c0 View commit details
    Browse the repository at this point in the history

  14. Fixing double resolve

    @Jezithyr
    Jezithyr committed Jan 10, 2023
    Configuration menu
    Copy the full SHA
    227278e View commit details
    Browse the repository at this point in the history

  15. Implemented circulation

    @Jezithyr
    Jezithyr committed Jan 10, 2023
    Configuration menu
    Copy the full SHA
    b679a81 View commit details
    Browse the repository at this point in the history

Commits on Jan 11, 2023

  1. V 0.5 Circulation system

    @Jezithyr
    Jezithyr committed Jan 11, 2023
    Configuration menu
    Copy the full SHA
    df6cf6b View commit details
    Browse the repository at this point in the history

  2. renaming for clarity

    @Jezithyr
    Jezithyr committed Jan 11, 2023
    Configuration menu
    Copy the full SHA
    22dc816 View commit details
    Browse the repository at this point in the history

  3. Fixed some typos added a relay for circulation ticks to circulationVe… 

    …ssels
    @Jezithyr
    Jezithyr committed Jan 11, 2023
    Configuration menu
    Copy the full SHA
    ee8d8b6 View commit details
    Browse the repository at this point in the history

  4. Implemented networking

    @Jezithyr
    Jezithyr committed Jan 11, 2023
    Configuration menu
    Copy the full SHA
    97d8485 View commit details
    Browse the repository at this point in the history

Commits on Jan 12, 2023

  1. Deleting respiration and circulation

    @Jezithyr
    Jezithyr committed Jan 12, 2023
    Configuration menu
    Copy the full SHA
    c83c2ce View commit details
    Browse the repository at this point in the history

Commits on Jan 14, 2023

  1. Merge branch 'master' into refactor/wounds

    @Jezithyr
    Jezithyr committed Jan 14, 2023
    Configuration menu
    Copy the full SHA
    832d1bc View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into refactor/wounds

    @Jezithyr
    Jezithyr committed Jan 14, 2023
    Configuration menu
    Copy the full SHA
    3fe1012 View commit details
    Browse the repository at this point in the history

Commits on Jan 15, 2023

  1. Merge branch 'master' into refactor/wounds

    @Jezithyr
    Jezithyr committed Jan 15, 2023
    Configuration menu
    Copy the full SHA
    bdf2f28 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into refactor/wounds

    @Jezithyr
    Jezithyr committed Jan 15, 2023
    Configuration menu
    Copy the full SHA
    d1bb2b1 View commit details
    Browse the repository at this point in the history

Commits on Jan 16, 2023

  1. Merge remote-tracking branch 'Sanctuary-Station/master' into refactor… 

    …/wounds
    @Jezithyr
    Jezithyr committed Jan 16, 2023
    Configuration menu
    Copy the full SHA
    116b88f View commit details
    Browse the repository at this point in the history

  2. Implemented medical conditions 

    Added helper for converting a percentage to alert severity
    @Jezithyr
    Jezithyr committed Jan 16, 2023
    Configuration menu
    Copy the full SHA
    4bd0411 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' into refactor/wounds

    @Jezithyr
    Jezithyr committed Jan 16, 2023
    Configuration menu
    Copy the full SHA
    bc6b3c7 View commit details
    Browse the repository at this point in the history

Commits on Jan 22, 2023

  1. Merge branch 'master' into refactor/wounds

    @Jezithyr
    Jezithyr committed Jan 22, 2023
    Configuration menu
    Copy the full SHA
    74beba2 View commit details
    Browse the repository at this point in the history

Commits on Jan 27, 2023

  1. Merge branch 'master' into refactor/wounds

    @Jezithyr
    Jezithyr committed Jan 27, 2023
    Configuration menu
    Copy the full SHA
    8835bc3 View commit details
    Browse the repository at this point in the history

  2. Implemented support for multiple condition groups on a single medical… 

    … condition
    @Jezithyr
    Jezithyr committed Jan 27, 2023
    Configuration menu
    Copy the full SHA
    071adb6 View commit details
    Browse the repository at this point in the history

  3. Reverted conditions having multiple groups

    @Jezithyr
    Jezithyr committed Jan 27, 2023
    Configuration menu
    Copy the full SHA
    a661bba View commit details
    Browse the repository at this point in the history

Commits on Jan 28, 2023

  1. Created pain system + setup test wounds

    @Jezithyr
    Jezithyr committed Jan 28, 2023
    Configuration menu
    Copy the full SHA
    9144bcd View commit details
    Browse the repository at this point in the history

  2. File Cleanup, Implemented wound event relays to root bodies

    @Jezithyr
    Jezithyr committed Jan 28, 2023
    Configuration menu
    Copy the full SHA
    5341102 View commit details
    Browse the repository at this point in the history

Commits on Jan 29, 2023

  1. Removing generalized pain system

    @Jezithyr
    Jezithyr committed Jan 29, 2023
    Configuration menu
    Copy the full SHA
    667bd58 View commit details
    Browse the repository at this point in the history

Commits on Feb 3, 2023

  1. Wounding cleanup

    @Jezithyr
    Jezithyr committed Feb 3, 2023
    Configuration menu
    Copy the full SHA
    1724582 View commit details
    Browse the repository at this point in the history

Commits on Feb 4, 2023

  1. Remove skin and bone code

    @DrSmugleaf
    DrSmugleaf committed Feb 4, 2023
    Configuration menu
    Copy the full SHA
    3a4ef82 View commit details
    Browse the repository at this point in the history

  2. Rename medical conditions to symptoms

    @DrSmugleaf
    DrSmugleaf committed Feb 4, 2023
    Configuration menu
    Copy the full SHA
    fe3d8fe View commit details
    Browse the repository at this point in the history

  3. Fix naming for passOutThreshold

    @DrSmugleaf
    DrSmugleaf committed Feb 4, 2023
    Configuration menu
    Copy the full SHA
    3ddb940 View commit details
    Browse the repository at this point in the history

  4. Finish renaming to symptoms, fix removing symptoms

    @DrSmugleaf
    DrSmugleaf committed Feb 4, 2023
    Configuration menu
    Copy the full SHA
    cfee65d View commit details
    Browse the repository at this point in the history

  5. Merge branch 'master' of https://github.com/space-wizards/space-stati… 

    …on-14 into refactor/wounds
    @DrSmugleaf
    DrSmugleaf committed Feb 4, 2023
    Configuration menu
    Copy the full SHA
    19af7bd View commit details
    Browse the repository at this point in the history

  6. Add missing custom type serializer to symptom group symptom

    @DrSmugleaf
    DrSmugleaf committed Feb 4, 2023
    Configuration menu
    Copy the full SHA
    7b9eb15 View commit details
    Browse the repository at this point in the history

  7. Remove description and group from symptom component

    @DrSmugleaf
    DrSmugleaf committed Feb 4, 2023
    Configuration menu
    Copy the full SHA
    eb3d032 View commit details
    Browse the repository at this point in the history

Commits on Feb 5, 2023

  1. Cleanup wound prototypes

    @DrSmugleaf
    DrSmugleaf committed Feb 5, 2023
    Configuration menu
    Copy the full SHA
    4da443b View commit details
    Browse the repository at this point in the history

  2. Remove symptoms

    @DrSmugleaf
    DrSmugleaf committed Feb 5, 2023
    Configuration menu
    Copy the full SHA
    7500ce7 View commit details
    Browse the repository at this point in the history

  3. Rename TraumaGroups to Traumas

    @DrSmugleaf
    DrSmugleaf committed Feb 5, 2023
    Configuration menu
    Copy the full SHA
    3959096 View commit details
    Browse the repository at this point in the history

Commits on Feb 6, 2023

  1. removing unimplemented functionality

    @Jezithyr
    Jezithyr committed Feb 6, 2023
    Configuration menu
    Copy the full SHA
    b11b5fd View commit details
    Browse the repository at this point in the history

  2. Re-added pain, implemented start of WoundProtos

    @Jezithyr
    Jezithyr committed Feb 6, 2023
    Configuration menu
    Copy the full SHA
    1546868 View commit details
    Browse the repository at this point in the history

Commits on Feb 18, 2023

  1. Adding Pain to bodyparts

    @Jezithyr
    Jezithyr committed Feb 18, 2023
    Configuration menu
    Copy the full SHA
    5c463b2 View commit details
    Browse the repository at this point in the history

  2. Splitting pain out of bodypart

    @Jezithyr
    Jezithyr committed Feb 18, 2023
    Configuration menu
    Copy the full SHA
    4994e6e View commit details
    Browse the repository at this point in the history

Commits on Mar 6, 2023

  1. adding pain system

    @Jezithyr
    Jezithyr committed Mar 6, 2023
    Configuration menu
    Copy the full SHA
    6c0f627 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'SS14/master' into refactor/wounds

    @Jezithyr
    Jezithyr committed Mar 6, 2023
    Configuration menu
    Copy the full SHA
    64096ea View commit details
    Browse the repository at this point in the history

  3. update rt to latest

    @Jezithyr
    Jezithyr committed Mar 6, 2023
    Configuration menu
    Copy the full SHA
    f1b25dd View commit details
    Browse the repository at this point in the history

  4. Fixing some analyzer errors

    @Jezithyr
    Jezithyr committed Mar 6, 2023
    Configuration menu
    Copy the full SHA
    2372218 View commit details
    Browse the repository at this point in the history

  5. Rewrote Consciousness to not be ass to work with

    @Jezithyr
    Jezithyr committed Mar 6, 2023
    Configuration menu
    Copy the full SHA
    4d8e5a4 View commit details
    Browse the repository at this point in the history

  6. Implemented pain system

    @Jezithyr
    Jezithyr committed Mar 6, 2023
    Configuration menu
    Copy the full SHA
    aa03044 View commit details
    Browse the repository at this point in the history

Commits on Mar 12, 2023

  1. Optimized pain system (removed the thresholds because we already have… 

    … thresholds on consciousness)
    @Jezithyr
    Jezithyr committed Mar 12, 2023
    Configuration menu
    Copy the full SHA
    03d80c1 View commit details
    Browse the repository at this point in the history

Commits on Mar 13, 2023

  1. implemented consciousness damage (again)

    @Jezithyr
    Jezithyr committed Mar 13, 2023
    Configuration menu
    Copy the full SHA
    be26a82 View commit details
    Browse the repository at this point in the history

Commits on Mar 18, 2023

  1. Merge remote-tracking branch 'SS14/master' into refactor/wounds 

    merging master
    @Jezithyr
    Jezithyr committed Mar 18, 2023
    Configuration menu
    Copy the full SHA
    18b5e6b View commit details
    Browse the repository at this point in the history

Commits on Mar 19, 2023

  1. Moved Bleeding to medical folder 

    Implemented bleeding to wounds
    @Jezithyr
    Jezithyr committed Mar 19, 2023
    Configuration menu
    Copy the full SHA
    428f791 View commit details
    Browse the repository at this point in the history

  2. Implemented wound rejuvenation

    @Jezithyr
    Jezithyr committed Mar 19, 2023
    Configuration menu
    Copy the full SHA
    c382789 View commit details
    Browse the repository at this point in the history

  3. Formatting cleanup

    @Jezithyr
    Jezithyr committed Mar 19, 2023
    Configuration menu
    Copy the full SHA
    bbaab0d View commit details
    Browse the repository at this point in the history

Commits on Mar 28, 2023

  1. add null checks

    @deltanedas
    deltanedas authored Mar 28, 2023
    Configuration menu
    Copy the full SHA
    612714b View commit details
    Browse the repository at this point in the history

Commits on Mar 30, 2023

  1. null check for attaching

    @deltanedas
    deltanedas authored Mar 30, 2023
    Configuration menu
    Copy the full SHA
    c729b06 View commit details
    Browse the repository at this point in the history

Commits on Apr 1, 2023

  1. Started work on treatment system, cleaned up woundable a bit

    @Jezithyr
    Jezithyr committed Apr 1, 2023
    Configuration menu
    Copy the full SHA
    73eb593 View commit details
    Browse the repository at this point in the history

  2. started implementing treatments

    @Jezithyr
    Jezithyr committed Apr 1, 2023
    Configuration menu
    Copy the full SHA
    32c3efb View commit details
    Browse the repository at this point in the history

  3. adding treatment system

    @Jezithyr
    Jezithyr committed Apr 1, 2023
    Configuration menu
    Copy the full SHA
    df09f6c View commit details
    Browse the repository at this point in the history

Commits on Apr 6, 2023

  1. Merge remote-tracking branch 'SS14/master' into refactor/wounds

    @Jezithyr
    Jezithyr committed Apr 6, 2023
    Configuration menu
    Copy the full SHA
    4ebd2eb View commit details
    Browse the repository at this point in the history

Commits on Apr 8, 2023

  1. fixing merge conflicts by deleting files what could go wrong!

    @Jezithyr
    Jezithyr committed Apr 8, 2023
    Configuration menu
    Copy the full SHA
    f5d29d2 View commit details
    Browse the repository at this point in the history

Commits on Apr 10, 2023

  1. Implemented debug wound list command

    @Jezithyr
    Jezithyr committed Apr 10, 2023
    Configuration menu
    Copy the full SHA
    371a705 View commit details
    Browse the repository at this point in the history

Commits on Apr 14, 2023

  1. Merge branch 'master' of https://github.com/space-wizards/space-stati… 

    …on-14 into refactor/wounds
    @DrSmugleaf
    DrSmugleaf committed Apr 14, 2023
    Configuration menu
    Copy the full SHA
    b99c3f9 View commit details
    Browse the repository at this point in the history

  2. Cleanup treatments

    @DrSmugleaf
    DrSmugleaf committed Apr 14, 2023
    Configuration menu
    Copy the full SHA
    1897dc9 View commit details
    Browse the repository at this point in the history

  3. Auto network cleanup

    @DrSmugleaf
    DrSmugleaf committed Apr 14, 2023
    Configuration menu
    Copy the full SHA
    34b3dc4 View commit details
    Browse the repository at this point in the history

  4. Merge fixes

    @DrSmugleaf
    DrSmugleaf committed Apr 14, 2023
    Configuration menu
    Copy the full SHA
    78120ab View commit details
    Browse the repository at this point in the history

  5. Merge fixes

    @DrSmugleaf
    DrSmugleaf committed Apr 14, 2023
    Configuration menu
    Copy the full SHA
    0301151 View commit details
    Browse the repository at this point in the history

  6. Woundable, wound and trauma inflicter auto comp states

    @DrSmugleaf
    DrSmugleaf committed Apr 14, 2023
    Configuration menu
    Copy the full SHA
    a4cb6f4 View commit details
    Browse the repository at this point in the history

  7. Implement bleed treatments

    @DrSmugleaf
    DrSmugleaf committed Apr 14, 2023
    Configuration menu
    Copy the full SHA
    93ae307 View commit details
    Browse the repository at this point in the history

  8. Implement treatments

    @DrSmugleaf
    DrSmugleaf committed Apr 14, 2023
    Configuration menu
    Copy the full SHA
    93cdb29 View commit details
    Browse the repository at this point in the history

Commits on Apr 16, 2023

  1. Fixed missing partial keyword for autogenerated components

    @DrSmugleaf
    DrSmugleaf committed Apr 16, 2023
    Configuration menu
    Copy the full SHA
    fb480c0 View commit details
    Browse the repository at this point in the history

  2. Port MaterialCloth healing

    @DrSmugleaf
    DrSmugleaf committed Apr 16, 2023
    Configuration menu
    Copy the full SHA
    c203e8c View commit details
    Browse the repository at this point in the history

  3. Updating woundmed prototypes

    @Jezithyr
    Jezithyr committed Apr 16, 2023
    Configuration menu
    Copy the full SHA
    5bb6c95 View commit details
    Browse the repository at this point in the history

  4. Merge remote-tracking branch 'origin/refactor/wounds' into refactor/w… 

    …ounds
    @Jezithyr
    Jezithyr committed Apr 16, 2023
    Configuration menu
    Copy the full SHA
    ca3f05b View commit details
    Browse the repository at this point in the history

  5. Fix startup errors

    @DrSmugleaf
    DrSmugleaf committed Apr 16, 2023
    Configuration menu
    Copy the full SHA
    7c5f5a1 View commit details
    Browse the repository at this point in the history

Commits on Apr 25, 2023

  1. started consciousness rewrite to use modifier stacks

    @Jezithyr
    Jezithyr committed Apr 25, 2023
    Configuration menu
    Copy the full SHA
    0303967 View commit details
    Browse the repository at this point in the history

  2. Finished Consciousness rewrite. A lot simpler (Less math \o/)

    @Jezithyr
    Jezithyr committed Apr 25, 2023
    Configuration menu
    Copy the full SHA
    465e703 View commit details
    Browse the repository at this point in the history

  3. Added support for modifier categories. (to allow more than 1 modifier… 

    … from the same owner)
    @Jezithyr
    Jezithyr committed Apr 25, 2023
    Configuration menu
    Copy the full SHA
    87a95b1 View commit details
    Browse the repository at this point in the history

Commits on May 11, 2023

  1. Merge pull request #2 from deltanedas/patch-3 

    add null checks to server droppart
    @Jezithyr
    Jezithyr authored May 11, 2023
    Configuration menu
    Copy the full SHA
    b708fe0 View commit details
    Browse the repository at this point in the history

Commits on May 20, 2023

  1. Merge remote-tracking branch 'upstream/master' into refactor/wounds 

    # Conflicts:
#	Content.Server/Body/Components/StomachComponent.cs
#	Content.Server/Disease/Cures/DiseaseReagentCure.cs
#	Content.Server/Disease/Effects/DiseaseAdjustReagent.cs
#	Content.Server/Medical/Bloodstream/Systems/BloodstreamSystem.cs
#	Content.Server/Medical/HealingSystem.cs
#	Content.Server/Weapons/Melee/MeleeWeaponSystem.cs
#	Resources/Prototypes/Entities/Objects/Materials/materials.yml
#	Resources/Prototypes/Entities/Objects/Specific/Medical/healing.yml
    @metalgearsloth
    metalgearsloth committed May 20, 2023
    Configuration menu
    Copy the full SHA
    21d33ef View commit details
    Browse the repository at this point in the history

  2. weh

    @metalgearsloth
    metalgearsloth committed May 20, 2023
    Configuration menu
    Copy the full SHA
    424469a View commit details
    Browse the repository at this point in the history

  3. consciousness

    @metalgearsloth
    metalgearsloth committed May 20, 2023
    Configuration menu
    Copy the full SHA
    b33e635 View commit details
    Browse the repository at this point in the history

Commits on Jun 23, 2023

  1. Merge remote-tracking branch 'upstream/master' into refactor/wounds 

    # Conflicts:
#	Content.Server/Chemistry/ReagentEffects/ChemCleanBoodstream.cs
#	Content.Server/Medical/Bloodstream/Components/BloodstreamComponent.cs
#	Content.Server/Medical/Components/HealingComponent.cs
#	Content.Server/Weapons/Melee/MeleeWeaponSystem.cs
#	Pow3r/Program.UI.cs
#	Resources/Prototypes/Body/Parts/human.yml
#	Resources/Prototypes/Entities/Objects/Materials/materials.yml
#	Resources/Prototypes/Entities/Objects/Specific/Medical/healing.yml
    @metalgearsloth
    metalgearsloth committed Jun 23, 2023
    Configuration menu
    Copy the full SHA
    e55524a View commit details
    Browse the repository at this point in the history

Commits on Jun 24, 2023

  1. weh

    @metalgearsloth
    metalgearsloth committed Jun 24, 2023
    Configuration menu
    Copy the full SHA
    f7b389e View commit details
    Browse the repository at this point in the history