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

Old Man Ported #62

Merged
merged 9 commits into from
Jan 4, 2025
Merged

Old Man Ported #62

merged 9 commits into from
Jan 4, 2025

Conversation

JCGWE30
Copy link
Contributor

@JCGWE30 JCGWE30 commented Sep 28, 2024

Known issue with no popup appearing if 106 attempts to create a teleport node within the pocket dimension

All sprites are placeholders

Incomplete Features

  • Escaping the pocket dimension
  • Femur breaker
  • Acceleration of the consomption process
  • Marking puddles whenever someone is taken to the pocket dimension
  • Random spawns within the pocket dimension both players and puddles

Resolves #54

Copy link
Contributor

github-actions bot commented Sep 28, 2024

RSI Diff Bot; head commit 19842fb merging into 783a509
This PR makes changes to 1 or more RSIs. Here is a summary of all changes:

Resources/Textures/_SCP/Effects/oldmanpuddle.rsi

State Old New Status
green Added
puddle Added

Resources/Textures/_SCP/Interface/Actions/oldman.rsi

State Old New Status
createnode Added
destroynode Added
oldmanicon Added
traversenode Added
traversepocket Added

Resources/Textures/_SCP/Mobs/Scps/oldman.rsi

State Old New Status
alive Added

Edit: diff updated after 19842fb

@JCGWE30 JCGWE30 marked this pull request as ready for review October 21, 2024 19:43
//Die in pocket dimension
private void OnStateChange(EntityUid uid, PocketDimensionInhabitantComponent comp, MobStateChangedEvent args)
{
if (args.NewMobState == MobState.Critical || args.NewMobState == MobState.Dead)
Copy link
Contributor

Choose a reason for hiding this comment

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

Can you early return this if statement as well to keep in line with the rest of the code?

//Dimension Setup
private void OnStartup(EntityUid owner, PocketDimensionHolderComponent comp, ComponentStartup args)
{
if (comp.pocketDimensionGrid == null)
Copy link
Contributor

Choose a reason for hiding this comment

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

could you early return? you do it in the next function. should be able to make it an if not.

@gusxyz
Copy link
Contributor

gusxyz commented Oct 30, 2024

linter aint happy 👎

@github-actions github-actions bot added the Status: Merge Conflict This PR has merge conflicts that must be fixed before merging. label Jan 3, 2025
Copy link
Contributor

github-actions bot commented Jan 3, 2025

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 This PR has merge conflicts that must be fixed before merging. label Jan 4, 2025
@JCGWE30 JCGWE30 merged commit 23ac87d into Foundation-Site-14:main Jan 4, 2025
7 checks passed
@JCGWE30 JCGWE30 deleted the oldman-port branch January 4, 2025 01:10
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.

SCP 106
2 participants