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.

Sign up for GitHub

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

Jump to bottom

Shadowkin #960

Merged
merged 91 commits into from
Oct 20, 2024
Merged

Shadowkin #960

merged 91 commits into from
Oct 20, 2024

Conversation

FoxxoTrystan
Copy link
Member

@FoxxoTrystan FoxxoTrystan commented Sep 25, 2024 •
edited
Loading

Description

Port Shadowkin from Parkstation: Simple-Station/Parkstation#42

TODO

  • Specie Base
  • Mar Language / Empathy
  • Shadowkin Powers
  • Tiny TODO Application
  • Specie .yml fix
  • Sounds Mono Fix
  • EtherealLight
  • ethereal goggles
  • Shadowkin restraints
  • Bluespace Crystal (Kicks Ethernal Ent back to realspace)

Media

image
image
image

Changelog

🆑

  • add: Added a new species, Shadowkin!

@FoxxoTrystan FoxxoTrystan added Priority: 3-Medium Needs to be resolved at some point Size: 2-Large For large issues/PRs Status: Needs Refactor Needs some system to be redone Type: Port Brings something to here from another codebase Type: Respace Moving something from an old namespace labels Sep 25, 2024
@github-actions github-actions bot added 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: YML Changes any yml files labels Sep 25, 2024
@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Sep 25, 2024 •
edited
Loading

RSI Diff Bot; head commit 39f9fe3 merging into e8f7c11
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/shadowkin_icons.rsi

State Old New Status
darkswap Added
rest Added
shadeskip Added

Resources/Textures/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/Mobs/Customization/Shadowkin/ears.rsi

State Old New Status
shadowkin Added
shadowkin_stripes Added

Resources/Textures/Mobs/Customization/Shadowkin/tails32x32.rsi

State Old New Status
shadowkin_medium Added
shadowkin_shorter Added

Resources/Textures/Mobs/Customization/Shadowkin/tails64x32.rsi

State Old New Status
shadowkin Added
shadowkin_big Added
shadowkin_big_fluff Added

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

State Old New Status
appendix Added
brain Added
core Added
ears Added
eyes Added
heart Added
kidneys Added
liver Added
lungs Added
stomach Added
tongue Added

Resources/Textures/Mobs/Species/Shadowkin/parts.rsi

State Old New Status
eyes Added
full-nomarkings 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/Objects/Fun/toys.rsi

State Old New Status
shadowkin Added

Edit: diff updated after 39f9fe3

@FoxxoTrystan FoxxoTrystan removed the Status: Needs Refactor Needs some system to be redone label Sep 25, 2024
@DEATHB4DEFEAT
Copy link
Member

Did you only port PR 42?

@github-actions github-actions bot added the Changes: C# Changes any cs files label Sep 25, 2024
@FoxxoTrystan
Copy link
Member Author

Did you only port PR 42?

Again i did not port any powers, this is just base to work as i hear your working on a remake of the powers.

Do you wish me to port them?

@VMSolidus
Copy link
Member

I am actually going to deny this PR until a compromise can be made on redesigning their Ethereal state, such that non-blackeye shadowkin can be Antag & Command Eligible, this includes Nukies.

Review the PR again:

  • There a CVar regarding Ethereal State.
  • Non-Blackeyes cannot be: Security, Command, Psioner or Antags jobs (They are also not randomly selected in humanoid)
    (Tho this is editable easly for servers owners)

This Comment feels strange as these settings were already added.

Flip these around, the default state should not be:

Can walk through walls
Can't be antags or command

The default state should be

Can't walk through walls
Can be antags or command

@FoxxoTrystan
Copy link
Member Author

Ehhh... okay?

@github-actions GitHub Actions
Copy link
Contributor

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

@github-actions github-actions bot added the Status: Merge Conflict FIX YOUR PR AAAGH label Oct 12, 2024
@FoxxoTrystan
Merge branch 'master' into ShadowKin
4904636 
Signed-off-by: FoxxoTrystan <45297731+FoxxoTrystan@users.noreply.github.com>
@github-actions github-actions bot removed the Status: Merge Conflict FIX YOUR PR AAAGH label Oct 14, 2024
@FoxxoTrystan FoxxoTrystan removed the Status: Do Not Merge Do not merge label Oct 14, 2024
@FoxxoTrystan
Copy link
Member Author

And boom, all done!

Know little bugs that im mostly gona fix in later patches:
• FireStack/Collision still occur during Ethereal.
• You can get shocked by grills while in Ethereal.
• You still get radiation damage while in Ethereal, (Tho i think im gona keep it as a "Feature")

@github-actions GitHub Actions
Copy link
Contributor

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

@github-actions github-actions bot added the Status: Merge Conflict FIX YOUR PR AAAGH label Oct 14, 2024
@github-actions GitHub Actions
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 Oct 15, 2024
@FoxxoTrystan FoxxoTrystan added the Status: Do Not Merge Do not merge label Oct 15, 2024
@FoxxoTrystan FoxxoTrystan mentioned this pull request Oct 15, 2024
Merged
@FoxxoTrystan FoxxoTrystan removed the Status: Do Not Merge Do not merge label Oct 17, 2024
@VMSolidus VMSolidus merged commit 2059f59 into Simple-Station:master Oct 20, 2024
14 checks passed
VMSolidus pushed a commit to VMSolidus/Einstein-Engines that referenced this pull request Oct 20, 2024
@SimpleStation14
Automatic Changelog Update (Simple-Station#960)
d2da70e
DangerRevolution
DangerRevolution reviewed Oct 21, 2024
View reviewed changes
Resources/Locale/en-US/language/languages.ftl
Comment on lines +64 to +65
language-Marish-name = Marish
language-Marish-description = An Language that can be used to speak in Empathy, Sharing eachother emotions with only one word, Shadowkins speaks this language with ease, tho its is nearly impossible to replicate it or learn it.
Copy link
Contributor

Choose a reason for hiding this comment

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

I understand Trystan's first language isn't English but two native English speakers (at least) reviewed and approved this PR.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@DangerRevolution DangerRevolution DangerRevolution left review comments

@VMSolidus VMSolidus VMSolidus approved these changes

@Peptide90 Peptide90 Peptide90 approved these changes

@stellar-novas stellar-novas stellar-novas approved these changes

@DEATHB4DEFEAT DEATHB4DEFEAT Awaiting requested review from DEATHB4DEFEAT

@Pspritechologist Pspritechologist Awaiting requested review from Pspritechologist

@OldDanceJacket OldDanceJacket Awaiting requested review from OldDanceJacket

@NotScoutieBoi NotScoutieBoi Awaiting requested review from NotScoutieBoi

@Mnemotechnician Mnemotechnician Awaiting requested review from Mnemotechnician

Assignees

@FoxxoTrystan FoxxoTrystan

@DEATHB4DEFEAT DEATHB4DEFEAT

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: YML Changes any yml files Priority: 3-Medium Needs to be resolved at some point Size: 2-Large For large issues/PRs Status: Needs Review Someone please review this Type: Port Brings something to here from another codebase Type: Respace Moving something from an old namespace Type: Rework Large changes to a system, like a mix between the Balancing, Codebase, and Respace labels
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
8 participants
@FoxxoTrystan @DEATHB4DEFEAT @v0idRift @VMSolidus @Mnemotechnician @Peptide90 @DangerRevolution @stellar-novas