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

Port Shadowkin #23

Open
wants to merge 57 commits into
base: master
Choose a base branch
from
Open

Port Shadowkin #23

wants to merge 57 commits into from

Conversation

Finket
Copy link
Contributor

@Finket Finket commented Nov 6, 2023

Description

Port over Shadowkin. #2
Simple-Station/Parkstation#42
This PR creates a lot of directories not yet ported to this rebase.
Many other directories which are required in the original PRs are not yet created / addressed.


Tasks

TODO SHADOWKIN PRS TO CHECK:

More todo, notes, and comments to address last (tentative):

  • Address removing SleepingComponent.WakeAction (in comments below)
  • What to do with VisibilityFlags? i.e. in Content.Server/...ShadowkinPowerSystem.DarkSwap.cs
  • Fix PlayerAttachedEvent in client systems
  • Remaining Guidebook stuff should be ported separately
  • Add shadow biome space-wizards/space-station-14#21276

I know this is a mess at the moment. Let me cook B-)



@github-actions github-actions bot added 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 Nov 6, 2023
Copy link
Contributor

github-actions bot commented Nov 6, 2023

RSI Diff Bot; head commit 65e73ff merging into 739d0bf
This PR makes changes to 1 or more RSIs. Here is a summary of all changes:

Resources/Textures/Parkstation/Interface/Actions/shadowkin_icons.rsi

State Old New Status
darkswap Added
rest Added
teleport Added

Resources/Textures/Parkstation/Interface/Alerts/shadowkin_power.rsi

State Old New Status
power0 Added
power1 Added
power2 Added
power3 Added
power4 Added
power5 Added
power6 Added
power7 Added

Resources/Textures/Parkstation/Mobs/Species/shadowkin.rsi

State Old New Status
eyes Added
full Added
head_f Added
head_m Added
l_arm Added
l_foot Added
l_hand Added
l_leg Added
r_arm Added
r_foot Added
r_hand Added
r_leg Added
torso_f Added
torso_m Added

Resources/Textures/Parkstation/Objects/Fun/Plushies/shadowkin.rsi

State Old New Status
shadowkin Added

Edit: diff updated after 65e73ff

@DEATHB4DEFEAT
Copy link
Member

:godmode:

@Finket
Copy link
Contributor Author

Finket commented Nov 7, 2023

Some small things had to be refactored for PR209 above. Wrote them and reverted for now since that PR is a draft.

@Finket
Copy link
Contributor Author

Finket commented Nov 8, 2023

Couldn't keep looking at the "Entites" directory, had to fix the typo :D

@DEATHB4DEFEAT
Copy link
Member

Couldn't keep looking at the "Entites" directory, had to fix the typo :D

Amazing

I didn't want to do a review...
@github-actions github-actions bot removed the Changes: Documentation Changes any xml or md files label Nov 8, 2023
@Finket
Copy link
Contributor Author

Finket commented Feb 22, 2024

Empathy and suffocation fixed. Major comments addressed.

@Finket
Copy link
Contributor Author

Finket commented Feb 24, 2024

Fixed so that shadowkin effectively don't need to breath, but they are still BaseMobHuman and have the Respirator component. Also removed the psionic roll chance from the inherited PotentialPsionic component. As far as I can tell, Shadowkin should be in a totally usable state now.

Copy link
Member

@DEATHB4DEFEAT DEATHB4DEFEAT left a comment

Choose a reason for hiding this comment

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

Should I move the prebase Shadowkin update here or finish it there then redo it here?

Content.Client/Chat/Managers/ChatManager.cs Outdated Show resolved Hide resolved
Content.Client/Chat/Managers/ChatManager.cs Outdated Show resolved Hide resolved
Content.Client/Chat/Managers/ChatManager.cs Outdated Show resolved Hide resolved
Resources/Prototypes/SimpleStation14/Magic/shadowkin.yml Outdated Show resolved Hide resolved
roundStart: true
prototype: MobShadowkin
sprites: MobShadowkinSprites
defaultSkinTone: "#FFFFFF"
Copy link
Member

Choose a reason for hiding this comment

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

Is there a default eye color or something similar? Would be good to avoid clueless people never getting powers.

Copy link
Member

Choose a reason for hiding this comment

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

Laki asked me about why their Shadowkin never got any powers and I realized that taking away their powers for simply having black eyes is pretty lame and is not communicated, I'll probably remove that and keep it a trait

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Would you like to do this on the next update or should I remove the eye color blackeye-ing here myself?

@DEATHB4DEFEAT
Copy link
Member

DEATHB4DEFEAT commented Mar 7, 2024

After #56 gets merged the color tint shader needs to be toggleable via the client's species vision trait option in their settings.

@github-actions github-actions bot added the Status: Merge Conflict FIX YOUR PR AAAGH label Mar 16, 2024
Copy link
Contributor

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@github-actions github-actions bot removed the Status: Merge Conflict FIX YOUR PR AAAGH label Mar 18, 2024
@github-actions github-actions bot added the Status: Merge Conflict FIX YOUR PR AAAGH label Jun 3, 2024
Copy link
Contributor

github-actions bot commented Jun 3, 2024

This pull request has conflicts, please resolve those before we can evaluate the pull request.

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: UI Changes any XAML files Changes: YML Changes any yml files Status: Merge Conflict FIX YOUR PR AAAGH Status: Needs Review Someone please review this
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants