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

Abomination Tutorial #6442

Merged
merged 11 commits into from
Jul 16, 2024
Merged

Abomination Tutorial #6442

merged 11 commits into from
Jul 16, 2024

Conversation

Zonespace27
Copy link
Contributor

@Zonespace27 Zonespace27 commented Jun 11, 2024

About the pull request

"This'll be a nice and simple 2 hour PR" - Me, 6 hours ago

image

Adds a tutorial for how to play abom. You cannot roll abom without having completed its tutorial.

Explain why it's good for the game

More tutorials are good, and encouraging players to know the basics of a decently complicated and rare xeno before playing it is a good idea.

Changelog

🆑
add: Added a tutorial for xenomorph Abominations. You must complete the tutorial before being able to roll for Abomination.
/:cl:

@Zonespace27 Zonespace27 added this to the Tutorials milestone Jun 11, 2024
@github-actions github-actions bot added the Feature Feature coder badge label Jun 11, 2024
Copy link
Contributor

@Drulikar Drulikar left a comment

Choose a reason for hiding this comment

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

3 uses of use_ability do not call parent and must. See lint annotations.

@Drulikar Drulikar marked this pull request as draft June 12, 2024 02:37
@Zonespace27 Zonespace27 marked this pull request as ready for review June 12, 2024 08:26
@Diegoflores31
Copy link
Contributor

Can there be an exception for people that already have big playtime or smth?

@Zonespace27
Copy link
Contributor Author

Can there be an exception for people that already have big playtime or smth?

It's a two minute tutorial. At the moment, I'm not interested in adding an exception for this.

code/datums/action.dm Outdated Show resolved Hide resolved
code/modules/cm_preds/yaut_bracers.dm Outdated Show resolved Hide resolved
return ..()
return ..()
Copy link
Contributor

Choose a reason for hiding this comment

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

In almost every other case, you have ensured the parent is called prior to checks that may prevent the ability from going off. Should this one be different?

@@ -149,6 +149,7 @@
predatoralien.recalculate_armor()
playsound(predatoralien, 'sound/voice/predalien_growl.ogg', 75, 0, status = 0)
apply_cooldown()
return ..()
Copy link
Contributor

Choose a reason for hiding this comment

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

In almost every other case, you have ensured the parent is called prior to checks that may prevent the ability from going off. Should this one be different?

@@ -276,8 +276,10 @@
addtimer(CALLBACK(xeno.hive, TYPE_PROC_REF(/datum/hive_status, free_respawn), xeno.client), 5 SECONDS)

xeno.gib(create_cause_data("sacrificing itself", src))
return ..()
Copy link
Contributor

Choose a reason for hiding this comment

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

In almost every other case, you have ensured the parent is called prior to checks that may prevent the ability from going off. Should this one be different?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

you have ensured the parent is called prior to checks that may prevent the ability from going off

In the case of use_ability(), that doesn't seem to be the case?

code/datums/tutorial/xenomorph/abomination.dm Outdated Show resolved Hide resolved
code/datums/tutorial/xenomorph/abomination.dm Outdated Show resolved Hide resolved
code/datums/tutorial/xenomorph/abomination.dm Outdated Show resolved Hide resolved
code/datums/tutorial/xenomorph/abomination.dm Outdated Show resolved Hide resolved
@Drulikar Drulikar marked this pull request as draft June 14, 2024 11:11
@github-actions github-actions bot added the UI deletes nanoui/html label Jun 16, 2024
Copy link
Contributor

This PR has been inactive for long enough to be automatically marked as stale. This means it is at risk of being auto closed in ~ 7 days, please address any outstanding review items and ensure your PR is finished, if these are all true and you are auto-staled anyway, you need to actively ask maintainers if your PR will be merged. Once you have done any of the previous actions then you should request a maintainer remove the stale label on your PR, to reset the stale timer. If you feel no maintainer will respond in that time, you may wish to close this PR youself, while you seek maintainer comment, as you will then be able to reopen the PR yourself

@github-actions github-actions bot added the Stale beg a maintainer to review your PR label Jun 24, 2024
@Zonespace27 Zonespace27 removed the Stale beg a maintainer to review your PR label Jul 4, 2024
Copy link
Contributor

This PR has been inactive for long enough to be automatically marked as stale. This means it is at risk of being auto closed in ~ 7 days, please address any outstanding review items and ensure your PR is finished, if these are all true and you are auto-staled anyway, you need to actively ask maintainers if your PR will be merged. Once you have done any of the previous actions then you should request a maintainer remove the stale label on your PR, to reset the stale timer. If you feel no maintainer will respond in that time, you may wish to close this PR youself, while you seek maintainer comment, as you will then be able to reopen the PR yourself

@github-actions github-actions bot added the Stale beg a maintainer to review your PR label Jul 12, 2024
@Drulikar Drulikar added Stale Exempt PR can't go stale and removed Stale beg a maintainer to review your PR labels Jul 15, 2024
@Zonespace27 Zonespace27 marked this pull request as ready for review July 15, 2024 17:53
@Drulikar Drulikar added this pull request to the merge queue Jul 16, 2024
Merged via the queue into cmss13-devs:master with commit c2266b8 Jul 16, 2024
27 checks passed
cm13-github added a commit that referenced this pull request Jul 16, 2024
github-merge-queue bot pushed a commit that referenced this pull request Jul 19, 2024
# About the pull request
Calling the parent of all actions
(#6442) caused a lot of bugs,
this fixes that.

Closes #6755
Closes #6753
Closes #6732 
Closes #6742

# Explain why it's good for the game

Bugs are bad

# Testing Photographs and Procedure
<details>
<summary>Screenshots & Videos</summary>

Tested on practically every object that has a use-in-hand functionality
with an action button.

</details>


# Changelog
:cl:
fix: Fixed a large amount of objects activating erroneous functionality
(like an armor light) when using action buttons tied to that object.
/:cl:

Co-authored-by: John Doe <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Feature Feature coder badge Stale Exempt PR can't go stale UI deletes nanoui/html
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants