Vigers Ray
5d2cdd3f44
Merge remote-tracking branch 'space-wizards/master'
...
# Conflicts:
# Content.Client/Humanoid/HumanoidAppearanceSystem.cs
# Content.Server/Fluids/EntitySystems/PuddleSystem.cs
# Content.Server/Roles/Jobs/JobSystem.cs
# Content.Shared/Humanoid/HumanoidAppearanceComponent.cs
# Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml
# Resources/Prototypes/Entities/Mobs/Species/vox.yml
# Resources/Prototypes/Entities/Objects/Misc/paper.yml
# Resources/Prototypes/Entities/Objects/Tools/lighters.yml
# Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml
# Resources/Prototypes/Recipes/Lathes/categories.yml
# Resources/Prototypes/Recipes/Lathes/machine_boards.yml
# Resources/Prototypes/Species/vox.yml
2025-04-21 08:56:50 +03:00
Tayrtahn
bd40cb9fa5
Restore LimitedChargesComponent.MaxCharges default value to 3 ( #36778 )
2025-04-20 12:20:57 -07:00
Vigers Ray
26c3024407
фиксы апстрима
2025-04-19 02:33:41 +03:00
metalgearsloth
7d2ef2bd47
Action charges refactor ( #33993 )
...
* Action charges refactor
- Fixes the slight godmoding of baseactioncomponent.
- Gets back 1ms of server time.
* chorg
* Remove FrameUpdate
* Fixes
* More fixes
* Combine
* Fixes
* Updates
* weh
* Last fixes
* weh
* Fix naughty
* YAML fixes
* This one too
* Merge conflicts
* This thing
* Review
* Fix this as well
* Icon fix
* weh
* Review
* Review
* seamless
* Review
2025-04-18 13:45:48 +10:00
deltanedas
6ddd8761a9
emag refactor ( #15181 )
...
* limitedcharges stuff from emag
* changes except broken
* fix
* the
* move recharging to server, emag namespace -> charges
* the
* use resolve
* pro
webedit gaming
* the
* the
---------
Co-authored-by: deltanedas <@deltanedas:kde.org>
2023-04-18 22:46:00 -07:00
