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

[MIRROR] Clowns can no longer kill themselves with holographic eswords #2731

Merged
merged 1 commit into from
Apr 5, 2024

Conversation

Steals-The-PRs
Copy link
Collaborator

Mirrored on Nova: NovaSector/NovaSector#1799
Original PR: tgstation/tgstation#82402

About The Pull Request

Currently clowns (or any clumsy mob) can kill themselves with holographic eswords by opening and closing them repeatedly. The damage done is normal brute damage instead of stamina. This PR fixes that, and adds some extra options to the /datum/component/transforming component to adjust the amount of damage dealt to clumsy users. It also makes the damage type inherited from the parent of the component.

Why It's Good For The Game

Fixes #82398

Doesn't make sense for a supposedly harmless holographic esword to be able to hurt someone, even if they're clumsy.

Also allows for more control over the transforming component.

Changelog

🆑 Momo8289
fix: Holographic energy swords have undergone some more rigorous safety inspections, and should no longer be a danger to clumsy crew members.
/:cl:

#1799)

* Clowns can no longer kill themselves with holographic eswords (#82402)

## About The Pull Request
Currently clowns (or any clumsy mob) can kill themselves with
holographic eswords by opening and closing them repeatedly. The damage
done is normal brute damage instead of stamina. This PR fixes that, and
adds some extra options to the `/datum/component/transforming` component
to adjust the amount of damage dealt to clumsy users. It also makes the
damage type inherited from the parent of the component.
## Why It's Good For The Game
Fixes #82398

Doesn't make sense for a supposedly harmless holographic esword to be
able to hurt someone, even if they're clumsy.

Also allows for more control over the transforming component.
## Changelog
:cl:
fix: Holographic energy swords have undergone some more rigorous safety
inspections, and should no longer be a danger to clumsy crew members.
/:cl:

* Clowns can no longer kill themselves with holographic eswords

---------

Co-authored-by: Nick <[email protected]>
@Iajret Iajret merged commit c45d1d4 into master Apr 5, 2024
26 checks passed
@Iajret Iajret deleted the upstream-mirror-1799 branch April 5, 2024 13:24
AnywayFarus added a commit that referenced this pull request Apr 5, 2024
Iajret pushed a commit that referenced this pull request May 29, 2024
…g cotton into balloon alerts, and simplifies their merging code (#2731)

* Transforms the chat feedback of cutting down logs and pulling cotton into balloon alerts, and simplifies their merging code (#83494)

## About The Pull Request
Anyone that's ever played botany knows that cutting down tower cap logs
simply nukes your chat, it used to spam it with ***three*** messages for
each log that's been turned into planks.

*Not anymore!*

Now, it simply shows you a balloon alert to inform you of how many
planks you've created. Not only that, but it also cleans up the code
that was being used there, instead letting the stacks attempt to merge
on their own, rather than having their own implementation, which is what
led to cotton bundles to cause runtimes from trying to merge things
manually after accidentally having the spawned raw cotton being merged
automatically.

It also has the benefit of no longer causing the final stack of items to
move all over the place every time you cut a log, instead it stays in
place until it's full, and *only then* does a new one appear at a random
position on the tile, making it a lot less annoying when cutting logs
whilst standing on the same tile as them.

## Why It's Good For The Game
Less chat spam is *always* good. You don't *need* a live update to the
count of planks in your plank stack, you can just shift-click it to
examine it to know. Much, much neater that way.

## Changelog

:cl: GoldenAlpharex
qol: Grown logs no longer spam your chat when cut into planks, instead
displaying balloon alerts informing you of how many planks were made!
qol: Cotton and Durathread bundles no longer spam your chat either, and
display a balloon alert instead.
fix: Cotton and Durathread bundles no longer runtime when creating raw
cotton/durathread from the created stack having been merged with an
existing one.
/:cl:

* Transforms the chat feedback of cutting down logs and pulling cotton into balloon alerts, and simplifies their merging code

---------

Co-authored-by: GoldenAlpharex <[email protected]>
Co-authored-by: NovaBot13 <[email protected]>
ReezeBL pushed a commit that referenced this pull request May 31, 2024
…g cotton into balloon alerts, and simplifies their merging code (#2731) (#3545)

* Transforms the chat feedback of cutting down logs and pulling cotton into balloon alerts, and simplifies their merging code (#83494)

## About The Pull Request
Anyone that's ever played botany knows that cutting down tower cap logs
simply nukes your chat, it used to spam it with ***three*** messages for
each log that's been turned into planks.

*Not anymore!*

Now, it simply shows you a balloon alert to inform you of how many
planks you've created. Not only that, but it also cleans up the code
that was being used there, instead letting the stacks attempt to merge
on their own, rather than having their own implementation, which is what
led to cotton bundles to cause runtimes from trying to merge things
manually after accidentally having the spawned raw cotton being merged
automatically.

It also has the benefit of no longer causing the final stack of items to
move all over the place every time you cut a log, instead it stays in
place until it's full, and *only then* does a new one appear at a random
position on the tile, making it a lot less annoying when cutting logs
whilst standing on the same tile as them.

## Why It's Good For The Game
Less chat spam is *always* good. You don't *need* a live update to the
count of planks in your plank stack, you can just shift-click it to
examine it to know. Much, much neater that way.

## Changelog

:cl: GoldenAlpharex
qol: Grown logs no longer spam your chat when cut into planks, instead
displaying balloon alerts informing you of how many planks were made!
qol: Cotton and Durathread bundles no longer spam your chat either, and
display a balloon alert instead.
fix: Cotton and Durathread bundles no longer runtime when creating raw
cotton/durathread from the created stack having been merged with an
existing one.
/:cl:

* Transforms the chat feedback of cutting down logs and pulling cotton into balloon alerts, and simplifies their merging code

---------

Co-authored-by: NovaBot <[email protected]>
Co-authored-by: GoldenAlpharex <[email protected]>
Co-authored-by: NovaBot13 <[email protected]>
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.

3 participants