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

Upstream 15.10.2024 #132

Merged
merged 30 commits into from
Oct 15, 2024
Merged

Upstream 15.10.2024 #132

merged 30 commits into from
Oct 15, 2024

Conversation

doublechest0
Copy link
Contributor

О PR

Почему / Баланс

Технические детали

Медиа

  • Я добавил к этому PR скриншоты/видео, демонстрирующие его изменения в игре, или этот PR не требует демонстрации в игре

Changelog

SlamBamActionman and others added 30 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
* it removes warns ig

* Quick fix

---------

Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
* Added checks to not target AIs and people in containers

* made the change to use IsEntityInContainer. Much Better!

* returned old Mindquerry and removed wrong use of admin logger

* guard statment

* removed unnecessery refs and fixed position swap

* Minor change

---------

Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
* Init

* added jani and medical

* + sci and service modules

* + syndi modules

* fixing up

* geiger counter stuff
…os (#32799)

add: EVA helmets to perma, disposals bin atmos
* does work?

* fix

* shrunk organs to normal size of small

* made brains and liver look better

* made stomach slightly less bright

* unique sprite for diona lungs + inhands

* unique sprite for vox lungs + inhands
* rearranged existing arcade rewards for clarity and added more

* removed tesla toy

* removed plushie throngler

* removed singularity toy, readded tesla toy

* removed tesla toy again :(

* Readded accidentally removed PlushieRainbowLizard
nitrogen to engi tank dispenser
@doublechest0 doublechest0 merged commit 6f59aa6 into master Oct 15, 2024
8 of 12 checks passed
Copy link
Contributor

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

Resources/Textures/Mobs/Species/Human/organs.rsi

State Old New Status
brain-inhand-left Modified
brain-inhand-right Modified
eyeballs-inhand-left Added
eyeballs-inhand-right Added
heart-inhand-left Added
heart-inhand-right Added
kidneys-inhand-left Added
kidneys-inhand-right Added
liver-inhand-left Added
liver-inhand-right Added
lungs-inhand-left Added
lungs-inhand-right Added
stomach-inhand-left Added
stomach-inhand-right Added

Resources/Textures/Mobs/Species/Slime/organs.rsi

State Old New Status
brain-inhand-left Modified
brain-inhand-right Modified
lungs-inhand-left Added
lungs-inhand-right Added

Resources/Textures/Interface/Actions/actions_borg.rsi

State Old New Status
adv-cleaning-module Added
adv-diagnosis-module Added
adv-tools-module Added
anomaly-module Added
appraisal-module Added
cleaning-module Added
clowning-module Added
construction-module Added
defib-module Added
diagnosis-module Added
extinguisher-module Added
gardening-module Added
geiger-module Added
gps-module Added
grappling-module Added
harvesting-module Added
light-replacer-module Added
mining-module Added
musical-module Added
no-action Added
node-scanner-module Added
rcd-module Added
service-module Added
syndicate-esword-module Added
syndicate-l6c-module Added
syndicate-martyr-module Added
syndicate-operative-module Added
syndicate-weapon-module Added
tool-module Added
treatment-module Added
wire-module Added

Resources/Textures/Mobs/Species/Arachnid/organs.rsi

State Old New Status
eyeballs-inhand-left Added
eyeballs-inhand-right Added
heart-inhand-left Added
heart-inhand-right Added
stomach-inhand-left Added
stomach-inhand-right Added

Resources/Textures/Mobs/Species/Diona/organs.rsi

State Old New Status
brain-inhand-left Added
brain-inhand-right Added
lungs-inhand-left Added
lungs-inhand-right Added
lungs Added
stomach-inhand-left Added
stomach-inhand-right Added

Resources/Textures/Mobs/Species/Vox/organs.rsi

State Old New Status
lung-l Added
lung-r Added
lungs-inhand-left Added
lungs-inhand-right Added

Resources/Textures/Structures/Wallmounts/posters.rsi

State Old New Status
poster52_legit Added

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.