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

Shadowkin #241

Closed
wants to merge 153 commits into from
Closed

Shadowkin #241

wants to merge 153 commits into from

Conversation

FoxxoTrystan
Copy link
Collaborator

Description

Early Merge PR: Simple-Station/Einstein-Engines#960
Shadowkin disabled for normal players and mostly testing. (At first)

Require: #223


Changelog

🆑

  • add: Shadowkins (Testing Phase)

FoxxoTrystan and others added 30 commits September 25, 2024 05:50
# Description
Grrrr, I may have forgotten to remove it as a part of #733.

Signed-off-by: Mnemotechnican <[email protected]>
# Description

Simple-Station/Einstein-Engines#794 apparently
silently deprecated the Backpack Preferences button. Selecting a
backpack preference no longer actually does anything, and instead your
backpack comes from your Loadout. This would have been fine if we were
warned about this, but because nobody merged upstream for 2 weeks after
the release of PR794, this issue went unreported.

Well now the solution is going to require adding every backpack in the
entire game to a new Backpacks tab. I've started this PR, but because
it's really late and I have Calculus classes in the morning, I won't be
able to finish it tonight. So I'm enlisting the help of a few other
people I know to PR to this PR to help get the backpacks in.

After we have backpacks in the loadout tab, and after Wizmerge, I'll
probably do a separate PR to actually remove the now useless Backpack
selection button.

This is probably for the better long term. Since this technically means
Backpack slots are no longer hardcoded to "Backpack/Duffelbag/Satchel",
and now the back slot is freeeeee to be used for anything.

<details><summary><h1>Media</h1></summary>
<p>


![image](https://github.com/user-attachments/assets/7081660f-68f0-471e-99eb-67f026b7e122)

</p>
</details>

# Changelog

:cl:
- add: Backpacks, Duffelbags, and Satchels have been added to loadouts.
- remove: The button for "Backpack Preference" has been removed.
Backpacks selection is now done via Loadouts.
- remove: The button for "Suit/Skirt Preference" has also been removed.
Suit selection is done via Loadouts.
# Description

This fixes a bug with IPCs where the button to reboot them wasn't
appearing.

<details><summary><h1>Media</h1></summary>
<p>


![image](https://github.com/user-attachments/assets/6cd8e896-916d-4021-9095-1bdf90c80715)

</p>
</details>

# Changelog

:cl:
- fix: Fixed a bug where the button to reboot IPCs wasn't appearing.
# Description

Apparently _mobThreshold.TryGetThresholdForState() fucking crashes if
you hand it a mob that doesn't have a MobStateComponent, even though it
optionally accepts no MobStateComponent at all as one of its inputs.
Easy solution for this is to just pre-emptively TryComp for the
MobStateComponent and then pass it in explicitly, but I also hate this
because TryGetThresholdForState shouldn't be crashing if you hand it a
mob without a MobStateComponent... I hate Resolve() so much for this
behavior.

# Changelog

:cl:
- fix: Fix a crash related to Luminous Entities.
# Description

This fixes a bug whereby smoking a cigarette spams your screen with the
funny "I feel as if I have been standing my entire life and I just sat
down" message. Now moodlet popups only play once when the moodlet is
obtained, rather than being constantly spammed. I have tested this
ingame to verify that it works correctly.

# Changelog

:cl:
- fix: Smoking cigarettes or drinking loto oil will no longer spam
moodlet popup messages.
# Description
Webedit ops.

The changes to those events were balanced around the fact that all
english downstreams had the glimmer changes early-merged, and were not
reverted after the said glimmer changes were dropped.

Now:
- PsionicCatGotYourTongue occurs above 400 glimmer
- FreeProber occurs above 300
- GlimmerRevenantSpawn occurs above 450 and burns a substantial amount
of glimmer, giving epistemics a chance to recover
- GlimmerMiteSpawn occurs above 250
- GlimmerRandomSentience occurs above 250

Not sure about NoosphericFry. I'm pretty sure probers no longer shoot
lightnings, but I'm still opting in to keep it as it is, above 550
glimmer.

# Changelog
:cl:
- tweak: Noospheric events should once again occur on lower glimmer
levels.

Signed-off-by: Mnemotechnican <[email protected]>
# Description
- Fixes BeingActivelyPushed not resetting when pulling stops, resulting
in entities who broke out of pulling being able to fall into trashcans
and whatnot.
- Makes it so that the puller does not receive impulse while pushing
under gravity (as it turns out, it is, in fact, annoying when you are
small)
- Increases the default continuous push duration to 5 seconds to make
pushing heavy objects easier.

<details><summary><h1>Media</h1></summary>
<p>


https://github.com/user-attachments/assets/1808fb33-b9af-41b4-bec8-138eab088565


</p>
</details>

# Changelog
:cl:
- tweak: Pushing something no longer causes your character to move, but
only if there is gravity holding you down.
- tweak: Pushing an object with Ctrl-RMB now pushes it continuously for
up to 5 seconds instead of 2.
@FoxxoTrystan FoxxoTrystan self-assigned this Oct 7, 2024
@github-actions github-actions bot added Status: Needs Review Someone please review this Changes: Audio Changes any ogg files Changes: C# Changes any cs files Changes: Documentation Changes any xml or md files Changes: Localization Changes any ftl files Changes: Sprite Changes any png or json in an RSI Changes: UI Changes any XAML files Changes: YML Changes any yml files labels Oct 7, 2024
@FoxxoTrystan FoxxoTrystan removed Changes: C# Changes any cs files Changes: Audio Changes any ogg files Changes: Documentation Changes any xml or md files Changes: Localization Changes any ftl files Changes: Sprite Changes any png or json in an RSI Changes: UI Changes any XAML files Changes: YML Changes any yml files Status: Needs Review Someone please review this labels Oct 7, 2024
Copy link
Contributor

github-actions bot commented Oct 7, 2024

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

Resources/Textures/Clothing/Back/etherealteleporter.rsi

State Old New Status
equipped-BACKPACK Added
icon Added

Resources/Textures/Clothing/Eyes/Glasses/etherealgoogles.rsi

State Old New Status
equipped-EYES Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/Clothing/OuterClothing/Misc/shadowkinrestraints.rsi

State Old New Status
equipped-OUTERCLOTHING Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/Interface/Actions/psionics.rsi

State Old New Status
shadeskip Added
telekinetic_pulse Added

Resources/Textures/Interface/Actions/shadowkin_icons.rsi

State Old New Status
darkswap Added
rest Added

@FoxxoTrystan FoxxoTrystan added Changes: C# Changes any cs files Changes: Audio Changes any ogg files Changes: Documentation Changes any xml or md files Changes: Localization Changes any ftl files Changes: UI Changes any XAML files Changes: YML Changes any yml files Changes: Sprite Changes any png or json in an RSI labels Oct 7, 2024
@FoxxoTrystan
Copy link
Collaborator Author

Will Re-Open PR with a new PR when #223 is merged.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Changes: Audio Changes any ogg files Changes: C# Changes any cs files Changes: Documentation Changes any xml or md files Changes: Localization Changes any ftl files Changes: Sprite Changes any png or json in an RSI Changes: UI Changes any XAML files Changes: YML Changes any yml files Priority: 2-Medium Needs to be resolved at some point Status: Do Not Merge Do not merge Status: Requires This requires something else to be done before being resolved
Projects
None yet
Development

Successfully merging this pull request may close these issues.

10 participants