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

Yautja Gear Recovery Changes #3455

Merged
merged 21 commits into from
Jul 24, 2023

Conversation

realforest2001
Copy link
Member

@realforest2001 realforest2001 commented May 28, 2023

About the pull request

Makes pred gear recovery more dynamic and less blood thirsty.

Explain why it's good for the game

Testing Photographs and Procedure

Screenshots & Videos

Put screenshots and videos here with an empty line between the screenshots and the <details> tags.

Changelog

🆑
add: Adds a plasma breaching charge that detonates a plasma wave stunning those opposite it.
add: Adds the name of the tracked item to the Yautja gear tracker.
add: Added an alternate mode for the Plasma Pistol and moved the incendiary property to it.
add: Added MINIMAP_FLAG_ALL to Yautja globe map.
/:cl:

@github-actions github-actions bot added the Feature Feature coder badge label May 28, 2023
code/game/objects/items.dm Outdated Show resolved Hide resolved
code/game/objects/items/explosives/plastic.dm Outdated Show resolved Hide resolved
code/game/objects/items/explosives/plastic.dm Outdated Show resolved Hide resolved
code/modules/cm_preds/smartdisc.dm Outdated Show resolved Hide resolved
code/modules/cm_preds/yaut_bracers.dm Outdated Show resolved Hide resolved
code/modules/cm_preds/yaut_items.dm Outdated Show resolved Hide resolved
code/modules/cm_preds/yaut_items.dm Outdated Show resolved Hide resolved
code/modules/cm_preds/yaut_weapons.dm Outdated Show resolved Hide resolved
code/modules/cm_preds/yaut_weapons.dm Outdated Show resolved Hide resolved
code/modules/cm_preds/yaut_weapons.dm Outdated Show resolved Hide resolved
code/game/objects/items.dm Outdated Show resolved Hide resolved
code/game/objects/items/explosives/plastic.dm Outdated Show resolved Hide resolved
code/game/objects/items/explosives/plastic.dm Outdated Show resolved Hide resolved
code/modules/cm_preds/yaut_shield.dm Outdated Show resolved Hide resolved
code/modules/cm_preds/yaut_weapons.dm Outdated Show resolved Hide resolved
@harryob harryob marked this pull request as draft June 4, 2023 11:24
@realforest2001 realforest2001 marked this pull request as ready for review June 9, 2023 21:53
@github-actions
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 18, 2023
Copy link
Member

@morrowwolf morrowwolf left a comment

Choose a reason for hiding this comment

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

Let's move the dissolving gel to another PR because it needs some work (like probably a component to handle it).

Otherwise:

Any uses of "usr" need to be changed.

Sleep()'s should be changed to use timers of some sort. In the case of plastic.dm line 370 just use a global callback for cell_explosion().

All the "\the"'s should be removed.

@morrowwolf morrowwolf marked this pull request as draft June 18, 2023 13:00
@realforest2001 realforest2001 removed the Stale beg a maintainer to review your PR label Jun 18, 2023
@github-actions
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 26, 2023
@realforest2001 realforest2001 marked this pull request as ready for review June 28, 2023 15:26
@BeagleGaming1
Copy link
Contributor

The changelog is out of date since you removed the gel btw

@morrowwolf morrowwolf added the Sprites Remove the soul from the game. label Jul 19, 2023
@cm13-github cm13-github removed the Merge Conflict PR can't be merged because it touched too much code label Jul 19, 2023
code/modules/cm_preds/yaut_weapons.dm Show resolved Hide resolved
code/modules/cm_preds/yaut_weapons.dm Outdated Show resolved Hide resolved
code/modules/cm_preds/yaut_shield.dm Outdated Show resolved Hide resolved
code/game/objects/items/explosives/plastic.dm Outdated Show resolved Hide resolved
@morrowwolf morrowwolf marked this pull request as draft July 19, 2023 05:10
@cm13-github cm13-github added the Merge Conflict PR can't be merged because it touched too much code label Jul 19, 2023
@cm13-github cm13-github removed the Merge Conflict PR can't be merged because it touched too much code label Jul 19, 2023
@realforest2001 realforest2001 marked this pull request as ready for review July 19, 2023 14:11
code/game/objects/items/explosives/plastic.dm Outdated Show resolved Hide resolved
code/game/objects/items/explosives/plastic.dm Outdated Show resolved Hide resolved
code/game/objects/items/explosives/plastic.dm Outdated Show resolved Hide resolved
code/modules/projectiles/ammo_datums.dm Outdated Show resolved Hide resolved
code/modules/projectiles/ammo_datums.dm Outdated Show resolved Hide resolved
code/modules/projectiles/ammo_datums.dm Outdated Show resolved Hide resolved
@harryob harryob marked this pull request as draft July 24, 2023 17:08
@realforest2001 realforest2001 marked this pull request as ready for review July 24, 2023 17:45
@harryob harryob enabled auto-merge July 24, 2023 17:51
@harryob harryob added this pull request to the merge queue Jul 24, 2023
Merged via the queue into cmss13-devs:master with commit cb855f8 Jul 24, 2023
github-actions bot added a commit that referenced this pull request Jul 24, 2023
cm13-github added a commit that referenced this pull request Jul 24, 2023
@realforest2001 realforest2001 deleted the forest/pred/recovery branch July 24, 2023 19:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Feature Feature coder badge Sprites Remove the soul from the game.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants