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.

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

Gladiabot Teams #500

Merged
merged 15 commits into from
Jan 24, 2025
Merged

Gladiabot Teams #500

merged 15 commits into from
Jan 24, 2025

Conversation

Timfa2112
Copy link
Contributor

Description

Allow players to put Gladiabots in teams.
When set in a team, the Gladiabot will change colour via a new component.


Media

20250120200833.mp4
20250120200407.mp4


Changelog

🆑 Timfa, Mnemotechnician

  • tweak: Allow Gladiabots to be sorted into teams

@github-actions github-actions bot added Status: Needs Review Someone please review this Changes: C# Changes any cs files Changes: Localization Changes any ftl files Changes: Sprite Changes any png or json in an RSI Changes: YML Changes any yml files and removed Status: Needs Review Someone please review this labels Jan 21, 2025
@Floof-Station-Bot Floof-Station-Bot changed the title Gladiabot teams Gladiabot Teams Jan 21, 2025
Copy link
Contributor

github-actions bot commented Jan 21, 2025

RSI Diff Bot; head commit 8b764d4 merging into 30a347c
This PR makes changes to 1 or more RSIs. Here is a summary of all changes:

Resources/Textures/Mobs/Silicon/Bots/gladiabot.rsi

State Old New Status
GladiabotBlue Added
GladiabotGreen Added
GladiabotRed Added
GladiabotYellow Added

Edit: diff updated after 8b764d4

@Timfa2112
Copy link
Contributor Author

Timfa2112 commented Jan 21, 2025

Resolved the issues with events not reaching the client, so now everything is working as intended, it's ready for review, and if it passes it, Gladiabots are 100% done (unless we want to allow emagging them later)

Copy link
Collaborator

@Mnemotechnician Mnemotechnician left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The code looks fine, except for a few code style issues. We can probably keep the new systems in their current directories if you are planning to port this to EE.

Content.Server/NPC/Systems/NpcFactionSelectorSystem.cs Outdated Show resolved Hide resolved
Content.Server/NPC/Systems/NpcFactionSystem.cs Outdated Show resolved Hide resolved
Content.Shared/Verbs/VerbCategory.cs Outdated Show resolved Hide resolved
Copy link
Collaborator

@Mnemotechnician Mnemotechnician left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

After the last issue is resolved, should be good·

@FoxxoTrystan FoxxoTrystan merged commit 51bf7f1 into Fansana:master Jan 24, 2025
13 checks passed
Floof-Station-Bot added a commit that referenced this pull request Jan 24, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Changes: C# Changes any cs files Changes: Localization Changes any ftl files Changes: Sprite Changes any png or json in an RSI Changes: YML Changes any yml files Status: Needs Review Someone please review this
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants