Vigers Ray
|
af38039aab
|
Merge remote-tracking branch 'space-wizards/master'
# Conflicts:
# Content.Client/Actions/ActionsSystem.cs
# Content.Shared/Actions/ActionContainerSystem.cs
# Content.Shared/Actions/Components/TargetActionComponent.cs
# Content.Shared/Actions/EntityTargetActionComponent.cs
# Content.Shared/Bed/SharedBedSystem.cs
# Content.Shared/Bed/Sleep/SleepingSystem.cs
# Resources/Prototypes/Actions/types.yml
# Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml
|
2025-05-29 10:45:58 +03:00 |
|
deltanedas
|
b3825dce97
|
action refactor proper ecs edition (#27422)
|
2025-05-28 15:52:11 -04:00 |
|
Vigers Ray
|
99a2aa9c4d
|
Merge remote-tracking branch 'space-wizards/master'
# Conflicts:
# Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml
# Resources/Prototypes/ai_factions.yml
# Resources/Textures/Clothing/Head/Hardsuits/paramedhelm.rsi/meta.json
# Resources/Textures/Clothing/Head/Helmets/paramedhelm.rsi/icon.png
# Resources/Textures/Clothing/Head/Helmets/paramedhelm.rsi/inhand-left.png
# Resources/Textures/Clothing/Head/Helmets/paramedhelm.rsi/inhand-right.png
# Resources/Textures/Clothing/OuterClothing/Hardsuits/paramed.rsi/meta.json
|
2025-02-14 00:55:00 +03:00 |
|
ActiveMammmoth
|
9fad86342f
|
Wizard Staff of Animation (#34649)
|
2025-02-12 23:46:02 -05:00 |
|
VigersRay
|
6f858567f2
|
фиксы апстрима
|
2024-08-14 20:30:52 +03:00 |
|
Vigers Ray
|
4ee05b0350
|
Продвинутые борги (#247)
* Ну типа всё
* InnateItemSystem и фичи для пИИ
|
2024-07-27 10:23:34 +03:00 |
|
ShadowCommander
|
b94b52396e
|
Add doc comments to target action components (#29982)
|
2024-07-13 14:04:53 +10:00 |
|
metalgearsloth
|
5a0fc68be2
|
Content update for NetEntities (#18935)
|
2023-09-11 09:42:41 +10:00 |
|
DrSmugleaf
|
c71f97e3a2
|
Refactor actions to be entities with components (#19900)
|
2023-09-08 18:16:05 -07:00 |
|