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

[Port] Collective mind #69

Merged
merged 29 commits into from
Nov 18, 2024
Merged

[Port] Collective mind #69

merged 29 commits into from
Nov 18, 2024

Conversation

Rinary1
Copy link
Collaborator

@Rinary1 Rinary1 commented Nov 18, 2024 •
edited
Loading

Short description

Ported collective minds.

AUTHOR OF THIS MECHANIC: space-wizards#17279 .

This port is made with the author's permission.

Why we need to add this

Media (Video/Screenshots)

Checks

  • I do not require assistance to complete the PR.
  • Before posting/requesting review of a PR, I have verified that the changes work.
  • I have added screenshots/videos of the changes, or this PR does not change in-game mechanics.
  • My changes are not licensed in any way.

Changelog

🆑 VigersRay

  • add: Added collective mind for dionas.

VigersRay and others added 29 commits May 29, 2023 21:31
@VigersRay
Init commit
62fea19
@VigersRay
okay
b8b6a72
@VigersRay
Merge remote-tracking branch 'upstream/master' into cult_of_flesh
7bfb6e7
@VigersRay
garbage
c3fb438
@VigersRay
Oh no i forgot antag roles
62f4436
@VigersRay
again forgot
a886426
@VigersRay
translation
0ff7f2b
@VigersRay
Fix collective mind
4434eb9
@VigersRay
use ChatMessageToManyFiltered
70f3516
@VigersRay
Remove not use species
1f164e0
@VigersRay
fixes for yml linter
7a39fd7
@VigersRay
remove garbage
9d68b54
@VigersRay
fuck
1632c9c
@VigersRay
remove garbage
4dbb416
@VigersRay
remove garbage
4853f0b
@VigersRay
6666
b404fa2
@VigersRay
add copyright
dc00d70
@VigersRay
tabulation
2a03d03
@VigersRay
I'm not sure
a17639e
@VigersRay
tabulation
e0fb1f6
@VigersRay
okay
4bd9b34
@VigersRay
remove garbadge
a194b3a
@VigersRay
Merge remote-tracking branch 'upstream/master' into collective_mind
abe7a97 
# Conflicts:
#	Content.Shared/Chat/ChatChannel.cs
#	Resources/Textures/Mobs/Customization/masking_helpers.rsi/meta.json
@VigersRay
garbage
7ffc2c1
@VigersRay
not
6ba24fe
@VigersRay
garbage
172fea0
@Rinary1
Merge branch 'collective_mind' of https://github.com/VigersRay/space-…
1281a52 
…station-14 into collective-mind

# Conflicts:
#	Content.Client/Chat/Managers/ChatManager.cs
#	Content.Client/Chat/Managers/IChatManager.cs
#	Content.Client/UserInterface/Systems/Chat/Controls/ChannelFilterPopup.xaml.cs
#	Content.Server/Chat/Systems/ChatSystem.cs
#	Content.Shared/Chat/ChatChannel.cs
#	Content.Shared/Chat/SharedChatSystem.cs
#	Resources/Locale/en-US/chat/managers/chat-manager.ftl
@Rinary1
fully fix
189e7e4
@Rinary1
fix
8dad165
@Rinary1
Copy link
Collaborator Author

Rinary1 commented Nov 18, 2024

Probably, need refactoring to add many collective minds to one entity, but it needs to be easy to add, without C# involvement.

@Rinary1 Rinary1 merged commit 81b428f into Starlight Nov 18, 2024
7 of 8 checks passed
@Rinary1 Rinary1 deleted the collective-mind branch November 18, 2024 18:47
github-actions bot added a commit that referenced this pull request Nov 18, 2024
@github-actions
Update changelog for PR #69 [skip ci]
738d9eb
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ss14-Starlight ss14-Starlight ss14-Starlight approved these changes

Assignees
No one assigned
Labels
Changes: UI Status: Needs Review
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@Rinary1 @ss14-Starlight @VigersRay