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

апстрим 14/10/2024 #131

Closed
wants to merge 18 commits into from
Closed

Conversation

pheenty
Copy link
Contributor

@pheenty pheenty commented Oct 14, 2024

Ради вот этого - space-wizards/space-station-14#32792

По конфликтам - отклонил space-wizards/space-station-14#32253 и добавил копирайт от space-wizards/space-station-14#32736

SlamBamActionman and others added 18 commits October 13, 2024 22:25
Co-authored-by: PJBot <pieterjan.briers+bot@gmail.com>
* Fix some rounds failing to end due to mind roles

Fixes #32791

This is caused by ShowRoundEndScoreboard running into a bug trying to display antags: some player is showing up as antag with MindIsAntagonist(), but has no antag roles listed in MindGetAllRoleInfo().

This was caused by one of the roles of the player having the Antag boolean set, but having no AntagPrototype set.

The responsible mind role appeared to be MindRoleSubvertedSilicon which is missing a set for the SubvertedSilicon antag prototype.

I also added resilience to the round-end code to make it so that an exception showing the scoreboard (and sending the Discord message) would not cause the round end logic to completely abort from an exception.

I am planning to add an integration test to cover this bug (no prototype in mind roles), but I'll leave that for not-the-immediate-hotfix.

* At least one maintainer approved this tiny PR without reading it, not naming names.
* rainbow weh

* plushie loot table

* arcade loot pool

* remove from plushie crate

* fuk
* Add role prototype validation test

* Rejig GetPrototypesWithComponent

* More tests n stuff
This code was a mess. Now it's less of a mess and user UserDbDataManager now.

Fixes the following bugs:

* If you connect to a server, restart your client, connect again in the same round, you role bans would not be visible in the client.
* If you role ban somebody who is not connected to the server, then they connect within the round, they will only have the recently-applied ban.

Likely fixes #24781, #27282
Updated to reflect the RecyclerVisualLayers no longer having a forward reverse or off visual effect.
* Format job requirements as hours and minutes

* Use TimeSpan.ToString for playtime instead of custom method

* wehflicts

---------

Co-authored-by: jmcb <joelsgp@protonmail.com>
Remove inaccurate admin log when switching held item
Copy link
Contributor

RSI Diff Bot; head commit eca8f81 merging into 827aa20
This PR makes changes to 1 or more RSIs. Here is a summary of all changes:

Resources/Textures/Structures/Wallmounts/posters.rsi

State Old New Status
poster52_legit Added

@pheenty pheenty deleted the upstream branch October 16, 2024 03:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.