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
aa38c32b65
upstream
2024-09-16 12:40:23 +03:00
poeMota
9a51d37d02
Add ERT time stats ( #31629 )
...
* add jobs for ghost roles
* add job to ToggleableGhostRole
* typo
---------
Co-authored-by: Mota <belochuc@gmail.com>
2024-09-02 10:32:49 +05:00
VigersRay
ff29e78e72
Merge remote-tracking branch 'refs/remotes/wizards/master'
...
# Conflicts:
# Content.Client/Administration/UI/Tabs/PlayerTab/PlayerTab.xaml.cs
# Content.Client/Chat/Managers/ChatManager.cs
# Content.Server/Administration/Systems/AdminSystem.cs
# Content.Server/Chat/Managers/ChatManager.cs
# Content.Server/Ghost/Roles/GhostRoleSystem.cs
# Content.Server/Zombies/ZombieSystem.Transform.cs
# Content.Shared/Administration/PlayerInfo.cs
2024-08-15 22:54:40 +03:00
Errant
40b9fd4ea3
Namespace cleanup around Mind Roles ( #30965 )
...
* namespaces
* Comment does not need a semicolon
---------
Co-authored-by: Vasilis <vascreeper@yahoo.com>
2024-08-15 20:26:57 +02:00
VigersRay
67c8ba2471
Merge remote-tracking branch 'refs/remotes/wizards/master'
...
# Conflicts:
# Content.Client/Administration/UI/Tabs/ObjectsTab/ObjectsTab.xaml.cs
# Content.Client/Administration/UI/Tabs/ObjectsTab/ObjectsTabEntry.xaml
# Content.Client/Administration/UI/Tabs/ObjectsTab/ObjectsTabEntry.xaml.cs
# Content.IntegrationTests/Tests/PostMapInitTest.cs
# Content.Server/Chat/Systems/ChatSystem.cs
# Content.Server/Clothing/Components/GloveHeatResistanceComponent.cs
# Content.Server/Light/EntitySystems/PoweredLightSystem.cs
# Content.Server/Medical/HealthAnalyzerSystem.cs
# Content.Server/Medical/SuitSensors/SuitSensorComponent.cs
# Content.Server/StationEvents/Events/MeteorSwarmSystem.cs
# Content.Server/StationEvents/Events/StationEventSystem.cs
# Content.Shared/Actions/SharedActionsSystem.cs
# Content.Shared/Interaction/SharedInteractionSystem.cs
# Resources/Prototypes/AlertLevels/alert_levels.yml
# Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
# Resources/Prototypes/Catalog/Fills/Lockers/misc.yml
# Resources/Prototypes/Catalog/VendingMachines/Inventories/engivend.yml
# Resources/Prototypes/Datasets/Names/fortunes.yml
# Resources/Prototypes/Datasets/ion_storm.yml
# Resources/Prototypes/Entities/Clothing/Neck/mantles.yml
# Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml
# Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml
# Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml
# Resources/Prototypes/Entities/Objects/Fun/pai.yml
# Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml
# Resources/Prototypes/Entities/Objects/Specific/Medical/handheld_crew_monitor.yml
# Resources/Prototypes/Entities/Structures/Machines/lathe.yml
# Resources/Prototypes/GameRules/events.yml
# Resources/Prototypes/Loadouts/Jobs/Science/research_director.yml
# Resources/Prototypes/Recipes/Lathes/clothing.yml
# Resources/Prototypes/game_presets.yml
# Resources/Prototypes/secret_weights.yml
# Resources/ServerInfo/Guidebook/Engineering/Singularity.xml
# Resources/Textures/Clothing/Head/Helmets/security.rsi/equipped-HELMET-vox.png
# Resources/Textures/Clothing/Head/Helmets/security.rsi/equipped-HELMET.png
# Resources/Textures/Clothing/Head/Helmets/security.rsi/icon.png
# Resources/Textures/Clothing/Head/Helmets/security.rsi/inhand-left.png
# Resources/Textures/Clothing/Head/Helmets/security.rsi/inhand-right.png
# Resources/Textures/Clothing/Head/Helmets/security.rsi/meta.json
# Resources/Textures/Clothing/Mask/ert.rsi/meta.json
# Resources/Textures/Clothing/Mask/joy.rsi/meta.json
# Resources/Textures/Clothing/Mask/squadron.rsi/meta.json
# Resources/Textures/Clothing/Neck/Cloaks/cmo.rsi/equipped-NECK.png
# Resources/Textures/Clothing/Neck/Cloaks/cmo.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Armor/security.rsi/equipped-OUTERCLOTHING.png
# Resources/Textures/Clothing/OuterClothing/Armor/security.rsi/icon.png
# Resources/Textures/Clothing/OuterClothing/Armor/security.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Hardsuits/medical.rsi/inhand-left.png
# Resources/Textures/Clothing/OuterClothing/Hardsuits/medical.rsi/inhand-right.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/hos_alt.rsi/equipped-INNERCLOTHING.png
# Resources/Textures/Objects/Specific/Hydroponics/aloe.rsi/produce.png
# Resources/Textures/Objects/Specific/Hydroponics/apple.rsi/produce.png
# Resources/Textures/Objects/Specific/Hydroponics/cannabis.rsi/produce.png
# Resources/Textures/Objects/Tools/crowbar.rsi/meta.json
# Resources/Textures/Objects/Tools/crowbar.rsi/red-icon.png
# Resources/Textures/Objects/Tools/crowbar.rsi/red-storage.png
# Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/base.png
# Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/broken.png
# Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/burned.png
# Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/empty.png
# Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/glow.png
# Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/meta.json
# Resources/migration.yml
2024-08-14 19:55:44 +03:00
Errant
9de922adba
development build ghostrole lottery changes ( #30980 )
...
debug ghostrole lottery changes
2024-08-14 11:57:09 +10:00
VigersRay
d2c1a1df88
Merge remote-tracking branch 'refs/remotes/wizards/master'
...
# Conflicts:
# Content.Client/Administration/UI/Tabs/ObjectsTab/ObjectsTab.xaml.cs
# Content.Client/Power/PowerMonitoringWindow.xaml.cs
# Content.Client/SurveillanceCamera/UI/SurveillanceCameraMonitorBoundUi.cs
# Content.Client/VoiceMask/VoiceMaskBoundUserInterface.cs
# Content.Client/VoiceMask/VoiceMaskNameChangeWindow.xaml.cs
# Content.IntegrationTests/Tests/GameRules/NukeOpsTest.cs
# Content.IntegrationTests/Tests/PostMapInitTest.cs
# Content.Server/GameTicking/GameTicker.RoundFlow.cs
# Content.Server/Ghost/Roles/GhostRoleSystem.cs
# Content.Server/Players/PlayTimeTracking/PlayTimeTrackingSystem.cs
# Content.Server/Station/Systems/StationJobsSystem.Roundstart.cs
# Resources/Prototypes/Entities/Objects/Devices/Syndicate_Gadgets/reinforcement_teleporter.yml
# Resources/ServerInfo/Guidebook/Mobs/SlimePerson.xml
# Resources/Textures/Structures/Walls/mining.rsi/meta.json
2024-07-22 04:16:05 +03:00
Plykiya
aded74a88a
Syndicate Reinforcement Specializations: Medic, Spy, Thief ( #29853 )
...
* Syndicate thief, spy, medic
* Fixes description for nukies
* update description for uplink
* Implement the radial menu
* forgot these were necessary to push lol
---------
Co-authored-by: plykiya <plykiya@protonmail.com>
2024-07-21 20:32:25 +10:00
VigersRay
5fed5ad979
Куча разного говна которое давно должно было в билде.
2024-07-15 01:22:56 +03:00
metalgearsloth
03f0257ae9
Revert "Picking a ghostrole as an admin will now deadmin you. ( #29790 )" ( #29901 )
...
This reverts commit 1a50760e67
2024-07-11 17:04:10 +10:00
MFMessage
1a50760e67
Picking a ghostrole as an admin will now deadmin you. ( #29790 )
...
* @forcibly deadmins you
* Added checks for AdminDeadminOnJoin
2024-07-11 15:53:14 +10:00
VigersRay
8420fd6ad2
Редизайн лобби 2
2024-07-05 10:22:18 +03:00
VigersRay
06dcab6a05
Фиксы спонсорки
2024-07-01 17:24:00 +03:00
Kara
993eef1e7c
Resolve 'EntitySystem.Get<T>()' is obsolete in content ( #27936 )
...
* PROJECT 0 WARNINGS: Resolve `'EntitySystem.Get<T>()' is obsolete` in content
* pass entman
* dog ass test
* webeditor
2024-05-12 20:34:52 -04:00
Kara
1596e04d0f
Resolve all non-obsoleting warnings in content ( #27934 )
...
* Resolve all non-obsoleting warnings in content
* Update ClientGameTicker.cs
* Update SkeletonAccentSystem.cs
* Update BwoinkSystem.cs
2024-05-11 20:13:58 -07:00
no
630a7a78ed
Add ghost role raffles ( #26629 )
...
* Add ghost role raffles
* GRR: Fix dialogue sizing, fix merge
* GRR: Add raffle deciders (winner picker)
* GRR: Make settings prototype based with option to override
* GRR: Use Raffles folder and namespace
* GRR: DataFieldify and TimeSpanify
* GRR: Don't actually DataFieldify HashSet<ICommonSession>s
* GRR: add GetGhostRoleCount() + docs
* update engine on branch
* Ghost role raffles: docs, fix window size, cleanup, etc
* GRR: Admin UI
* GRR: Admin UI: Display initial/max/ext of selected raffle settings proto
* GRR: Make a ton of roles raffled
2024-05-06 18:48:16 -07:00
Mr. 27
50fb91bd18
monkey reinforcement teleporters can now select between kobold or monkey with a verb ( #25982 )
...
* inital
* Update animals.yml
* Update animals.yml
* Update Content.Server/Ghost/Roles/Components/GhostRoleMobSpawnerComponent.cs
Co-authored-by: Tayrtahn <tayrtahn@gmail.com>
* Update Content.Server/Ghost/Roles/Components/GhostRoleMobSpawnerComponent.cs
Co-authored-by: Tayrtahn <tayrtahn@gmail.com>
* Update Content.Server/Ghost/Roles/Components/GhostRoleMobSpawnerComponent.cs
Co-authored-by: Tayrtahn <tayrtahn@gmail.com>
* Update Content.Server/Ghost/Roles/Components/GhostRoleMobSpawnerComponent.cs
Co-authored-by: Tayrtahn <tayrtahn@gmail.com>
* Update Content.Server/Ghost/Roles/Components/GhostRoleMobSpawnerComponent.cs
Co-authored-by: Tayrtahn <tayrtahn@gmail.com>
* selecting different role will change the description and name
* fix name
* gargh
* the review
Hello
* e
---------
Co-authored-by: Tayrtahn <tayrtahn@gmail.com>
2024-04-26 15:06:43 +02:00
Leon Friedrich
cb8f145975
Fix GhostRoleComponent performing randomization on ComponentInit ( #26466 )
...
* Fix ghostrole ComponentInit
* A
* a
2024-03-27 00:31:26 -04:00
LordCarve
05a2e6b3a2
Obsolete refactor - ConnectedClient to Channel ( #24409 )
2024-01-23 09:14:13 +11:00
Leon Friedrich
e685cb626b
Un-revert IPlayerManager refactor ( #21244 )
2023-10-28 09:59:53 +11:00
metalgearsloth
a2bbda43cc
Revert "Update submodule to 172.0.0 ( #21222 )" ( #21225 )
2023-10-24 21:55:20 +11:00
Leon Friedrich
7ba0ea2926
IPlayerManager refactor ( #21215 )
2023-10-24 20:19:08 +11:00
DrSmugleaf
f560f88eb5
Remove 700 usages of Component.Owner ( #21100 )
2023-10-19 12:34:31 -07:00
Kara
7dd20f7af1
Kill ComponentExt ( #20907 )
2023-10-11 20:19:46 +11:00
deltanedas
4fbebb6917
Roundstart antag role restrictions revival ( #20108 )
...
Co-authored-by: Ray <vigersray@gmail.com>
Co-authored-by: deltanedas <@deltanedas:kde.org>
2023-09-20 17:54:53 +10:00
metalgearsloth
3c0439167a
Fix makeghostrole eui ( #19998 )
2023-09-11 14:31:45 +10:00
DrSmugleaf
3f3ba6ac62
Move minds, roles, jobs and objectives to shared ( #19679 )
2023-08-30 21:46:11 -07:00
DrSmugleaf
15c0211fb2
Refactor minds to be entities with components, make roles components ( #19591 )
...
Co-authored-by: ShadowCommander <10494922+ShadowCommander@users.noreply.github.com>
Co-authored-by: DrSmugleaf <DrSmugleaf@users.noreply.github.com>
2023-08-28 16:53:24 -07:00
metalgearsloth
0b542098db
Remove ghost compref ( #19478 )
2023-08-25 18:50:46 +10:00
Leon Friedrich
9fc4fc6ac2
Fix some Mind ECS bugs ( #17480 )
2023-06-20 14:29:26 +10:00
ShadowCommander
dd7032a860
Mind ECS ( #16826 )
2023-06-19 04:33:19 +10:00
metalgearsloth
56c10b503c
Don't show paused ghosts in window ( #17188 )
2023-06-10 22:24:34 +10:00
DrSmugleaf
9146374e39
Remove ghost role component references ( #15262 )
2023-04-12 23:32:14 +10:00
Leon Friedrich
4d71b1b81e
Revert "Mind ecs" ( #14881 )
2023-03-27 08:24:00 +11:00
ShadowCommander
bfc4da9377
Mind ecs ( #14412 )
2023-03-26 14:31:13 -04:00
Jezithyr
eeb5b17b34
Mobstate Refactor ( #13389 )
...
Refactors mobstate and moves mob health thresholds to their own component
Co-authored-by: DrSmugleaf <drsmugleaf@gmail.com>
2023-01-13 16:57:10 -08:00
Kara
c9d9d09e19
Ghost role probability ( #9752 )
...
* Ghost role probability
* give it to regular ticks/bears too
2022-07-15 15:20:37 +10:00
metalgearsloth
a2a5df1990
Damage masks ( #9402 )
2022-07-06 17:58:14 +10:00
wrexbe
1e0babbd50
Make AdminLogsSystem an IoC manager ( #8492 )
...
* Make log not entity system
* Fixes
2022-05-28 23:41:17 -07:00
wrexbe
bc68ac96dd
Cleanup the namespaces ( #8132 )
2022-05-13 17:59:03 +10:00
ike709
a9c18acd35
Remove misc Startup/Shutdown overrides ( #8113 )
...
Co-authored-by: ike709 <ike709@github.com>
2022-05-12 21:11:50 +10:00
Alex Evgrashin
bf89483e09
Grouped ghost roles and jump button ( #7300 )
2022-04-02 15:06:29 -07:00
mirrorcult
ec4d4688c7
Seal/abstract/virtual everything ( #6739 )
2022-02-16 18:23:23 +11:00
metalgearsloth
ec9550c2e0
Make any mind added remove ghost role ( #6127 )
2022-01-12 18:25:05 +11:00
metalgearsloth
6f7cd29fb5
Fix ghost role exceptions ( #6106 )
2022-01-11 14:12:19 +11:00
ShadowCommander
951a810fad
Log GhostRole takeovers ( #6089 )
...
* Log GhostRole takeovers
* Remove entity word
2022-01-09 19:54:36 -06:00
ShadowCommander
cd865b9aaa
Remove crit and dead mobs from GhostRole list ( #5992 )
2022-01-01 23:00:21 -07:00
ShadowCommander
81607d0327
Reregister ghost role when player ghosts while alive ( #5956 )
...
* Reregister ghost role when player ghosts while alive
* Add ReregisterOnGhost property
2022-01-01 17:48:45 +01:00
