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

feat: zombie request #33

Open
wants to merge 17 commits into
base: main
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
1ffc6d5
reorder VaildScps to be nicer to read
blankochan Mar 16, 2025
3b42c71
fix: stop tracking .user files because they can sometimes cause unexp…
blankochan Mar 17, 2025
a62700f
fix: IndexOutOfRangeException if no scps were alive at the end of the…
blankochan Mar 17, 2025
60cae97
remove the arrow because the different font sizes make the alignment …
blankochan Mar 16, 2025
e77a49b
feat: zombies can now use .h to form a request
blankochan Mar 17, 2025
dfebdf4
fix: race condition if you died while trying to be replaced
blankochan Mar 17, 2025
ef4731f
fix: you could run .human as the server
blankochan Mar 17, 2025
df979d3
rider will not shut up about this typo
blankochan Mar 17, 2025
d376469
fix: remove redundant IsDead check
blankochan Mar 17, 2025
b04815c
fix: use [CanBeNull] instead of nullable for simplicity
blankochan Mar 17, 2025
4a74c7a
fix: IsDead instead of !IsAlive (I didnt think to check if that was t…
blankochan Mar 17, 2025
ceaddfa
fix: disable nullable to avoid warnings for possibility's that cannot be
blankochan Mar 17, 2025
529fb4a
fix: remove .human's ability to make request volunteer's and point th…
blankochan Mar 17, 2025
93639a9
fix: volunteer request wouldn't set max health and max hume (GOD I NE…
blankochan Mar 17, 2025
76c5dbe
fix: make volunteer request a separate command
blankochan Mar 17, 2025
1356e03
fix: make volunteer request a separate command
blankochan Mar 17, 2025
169f1e5
fix: this using statement didnt get commited for some reason
blankochan Mar 17, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
rider will not shut up about this typo
  • Loading branch information
blankochan committed Mar 17, 2025
commit df979d37777fca5724884b59b113ce4e21dbda00
8 changes: 4 additions & 4 deletions SillySCP/API/Features/VolunteerSystem.cs
Original file line number Diff line number Diff line change
@@ -49,7 +49,7 @@ public static class VolunteerSystem
};

/// <summary>
/// if supplied with a orginal player the <see cref="SillySCP.Handlers.VolunteerHandler"/> will treat this as a replacement
/// if supplied with an original player the <see cref="SillySCP.Handlers.VolunteerHandler"/> will treat this as a replacement
/// </summary>
#nullable enable
public static void NewVolunteer(RoleTypeId role, Player? original=null)
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
public static void NewVolunteer(RoleTypeId role, Player? original=null)
public static void NewVolunteer(RoleTypeId role, Player? original = null)

The lack of space is really irritating me 😭

@@ -63,7 +63,7 @@ public static void NewVolunteer(RoleTypeId role, Player? original=null)
Volunteers.Add(volunteer);
Timing.RunCoroutine(ChooseVolunteers(volunteer));

string annoucement = // TODO if we add support for other roles this will need to be changed to use something else
string announcement = // TODO if we add support for other roles this will need to be changed to use something else
$"{role.GetFullName()} has left the game\nPlease run .volunteer {role.GetFullName().Substring(4)} to volunteer to be the SCP";

if (role == RoleTypeId.Scp0492)
@@ -72,11 +72,11 @@ public static void NewVolunteer(RoleTypeId role, Player? original=null)
{
if (player.IsAlive) continue;

player.Broadcast(10, annoucement);
player.Broadcast(10, announcement);
}
return;
}
Map.Broadcast(10, annoucement);
Map.Broadcast(10, announcement);

VolunteerCreated.InvokeSafely(new (volunteer));
}