Commit graph

5 commits

Author SHA1 Message Date
VigersRay
c8e9b7bbf4 Merge remote-tracking branch 'refs/remotes/wizards/master'
# Conflicts:
#	Content.Server/GameTicking/GameTicker.Spawning.cs
#	Content.Server/Players/PlayTimeTracking/PlayTimeTrackingSystem.cs
#	Content.Server/Roles/RoleSystem.cs
#	Content.Server/Silicons/Laws/SiliconLawSystem.cs
#	Content.Server/Station/Systems/StationSpawningSystem.cs
#	Resources/Prototypes/Entities/Objects/Fun/pai.yml
#	Resources/Prototypes/GameRules/midround.yml
#	RobustToolbox
2024-10-10 19:09:17 +03:00
Errant
93c7bdc134
Mind Role Entities (#31318)
* Mind Role Entities wip

* headrev count fix

* silicon stuff, cleanup

* exclusive antag config, cleanup

* jobroleadd overwerite

* logging stuff

* MindHasRole cleanup, admin log stuff

* last second cleanup

* ocd

* minor cleanup

* remove createdTime datafield

* now actually using the event replacement I made for role time tracking

* weh
2024-10-10 10:48:56 +02:00
VigersRay
f4081b90fe Исправил отсутсвие целей на убийства у агентов. 2024-07-25 00:48:02 +03:00
VigersRay
ed452581ce Целью на убийство для антагониста может быть только экипаж основной станции 2024-07-12 06:16:42 +03:00
deltanedas
f7711edbe3
Objectives ecs rework (#19967)
Co-authored-by: deltanedas <@deltanedas:kde.org>
2023-09-16 16:18:10 +10:00