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

Fixes #7667 - Object form of science ghost kills people better now #7736

Merged
merged 5 commits into from
Mar 10, 2022

Conversation

amylizzle
Copy link
Contributor

@amylizzle amylizzle commented Mar 8, 2022

About the PR

Replaces the killing action of the object version of the science ghost with one closer in function to the mob version. It now triggers death and ghostize, and drops all organs and equipment - same as mob version does.
It also displays an action bar for killing.

Why's this needed?

Fixes #7667 and also makes it easier to see that you're being killed by the transposed particle field.

Changelog

(u)Amylizzle
(+)Transposed Particle Field now warns you that it's killing you with a big flashing icon.

@keywordlabeler keywordlabeler bot added the C-Bug A bug that impacts usage of a feature label Mar 8, 2022
@github-actions github-actions bot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Mar 8, 2022
code/obj/critter/misc.dm Outdated Show resolved Hide resolved
code/obj/critter/misc.dm Outdated Show resolved Hide resolved
code/obj/critter/misc.dm Outdated Show resolved Hide resolved
@amylizzle amylizzle requested a review from Azrun March 9, 2022 13:46
@@ -1037,30 +1037,34 @@
qdel(src)

CritterAttack(mob/M)
src.attacking = 1
src.visible_message("<span class='combat'><B>The [src.name]</B> starts to envelop [M]!</span>")
if(GET_COOLDOWN(src, "envelope_attack"))
Copy link
Contributor

Choose a reason for hiding this comment

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

Nit: I think !ON_COOLDOWN() is easier to follow as it will put it on cooldown since you aren't making any subsequent decisions to determine if putting it on cooldown is necessary. But that might just be my personal preference.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

yeah, this pattern is because I was trying out some stuff with src.attacking to stop the science ghost repeatedly booping you while you were being absorbed - it didn't work out and didn't really matter anyway.

code/obj/critter/misc.dm Outdated Show resolved Hide resolved
Co-authored-by: Azrun <goadster@gmail.com>
@Azrun Azrun merged commit 223eff2 into goonstation:master Mar 10, 2022
github-actions bot pushed a commit that referenced this pull request Mar 10, 2022
@amylizzle amylizzle deleted the spooky_science_ghost_fix branch March 10, 2022 13:48
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
C-Bug A bug that impacts usage of a feature size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
3 participants