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] Gunpoint now blocks bumps, adds examine text and can be broken by shoving #607

Merged
merged 1 commit into from
Nov 13, 2023

Conversation

Steals-The-PRs
Copy link
Collaborator

Mirrored on Skyrat: Skyrat-SS13/Skyrat-tg#24976
Original PR: tgstation/tgstation#79564

About The Pull Request

Lesser version of tgstation/tgstation#75226

Changes a few things with bumping which could lead to cheesing a charged shot if the shooter has an ally to bump the target. Also adds examine text to know what's happening.
Also shoving now can be used to break gunpoint, since having immovable mobs can be troublesome in some situations

Why It's Good For The Game

Grabs from the target no longer counter gunpoint;
Accidental or cheesy bumps are removed;
Shoves and pulls can be used in a teamplay to break gunpoint

Changelog

🆑 larentoun
qol: Gunpoint: Examining the target will show who is holding them at gunpoint
qol: Gunpoint: Examining the shooter will show who they are holding at gunpoint
balance: Gunpoint: If the target tries to grab, they will trigger the shot
balance: Gunpoint: If the target or the shooter are shoved, it will cancel the gunpoint
balance: Gunpoint: If the target is pulled, it will cancel the gunpoint
balance: Both the target and the shooter can't be bumped anymore to avoid cheesing charged shot or removing the gunpoint by just moving around
fix: Clicking the alert button of the shooter will now correctly remove gunpoint
/:cl:

…en by shoving [MDB IGNORE] (#24976)

* Gunpoint now blocks bumps, adds examine text and can be broken by shoving (#79564)

## About The Pull Request
Lesser version of tgstation/tgstation#75226

Changes a few things with bumping which could lead to cheesing a charged
shot if the shooter has an ally to bump the target. Also adds examine
text to know what's happening.
Also shoving now can be used to break gunpoint, since having immovable
mobs can be troublesome in some situations

## Why It's Good For The Game
Grabs from the target no longer counter gunpoint;
Accidental or cheesy bumps are removed;
Shoves and pulls can be used in a teamplay to break gunpoint

## Changelog
:cl:
qol: Gunpoint: Examining the target will show who is holding them at
gunpoint
qol: Gunpoint: Examining the shooter will show who they are holding at
gunpoint
balance: Gunpoint: If the target tries to grab, they will trigger the
shot
balance: Gunpoint: If the target or the shooter are shoved, it will
cancel the gunpoint
balance: Gunpoint: If the target is pulled, it will cancel the gunpoint
balance: Both the target and the shooter can't be bumped anymore to
avoid cheesing charged shot or removing the gunpoint by just moving
around
fix: Clicking the alert button of the shooter will now correctly remove
gunpoint
/:cl:

---------

Co-authored-by: Ghom <42542238+Ghommie@ users.noreply.github.com>

* Gunpoint now blocks bumps, adds examine text and can be broken by shoving

---------

Co-authored-by: larentoun <[email protected]>
Co-authored-by: Ghom <42542238+Ghommie@ users.noreply.github.com>
@Iajret Iajret merged commit f12d1d9 into master Nov 13, 2023
24 checks passed
@Iajret Iajret deleted the upstream-mirror-24976 branch November 13, 2023 18:46
AnywayFarus added a commit that referenced this pull request Nov 13, 2023
Iajret pushed a commit that referenced this pull request Jan 25, 2024
* Moves Hardcore Random logging from Admin.log to Game.log (#81066)

<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull
request process. -->

## About The Pull Request
I moved the bit that says:
ADMIN: guy started hardcore random with cancer, for a score of 2
into game.log

<!-- Describe The Pull Request. Please be sure every change is
documented or this can delay review and even discourage maintainers from
merging your PR! -->

## Why It's Good For The Game
I don't see why this wound up in Admin.log. Doesn't contain any admin
info, relate to actions done by admins, etc.
<!-- Argue for the merits of your changes and how they benefit the game,
especially if they are controversial and/or far reaching. If you can't
actually explain WHY what you are doing will improve the game, then it
probably isn't good for the game in the first place. -->

## Changelog

<!-- If your PR modifies aspects of the game that can be concretely
observed by players or admins you should add a changelog. If your change
does NOT meet this description, remove this section. Be sure to properly
mark your PRs to prevent unnecessary GBP loss. You can read up on GBP
and it's effects on PRs in the tgstation guides for contributors. Please
note that maintainers freely reserve the right to remove and add tags
should they deem it appropriate. You can attempt to finagle the system
all you want, but it's best to shoot for clear communication right off
the bat. -->


<!-- Both 🆑's are required for the changelog to work! You can put
your name to the right of the first 🆑 if you want to overwrite your
GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the
icon ingame) and delete the unneeded ones. Despite some of the tags,
changelogs should generally represent how a player might be affected by
the changes rather than a summary of the PR's contents. -->

* Moves Hardcore Random logging from Admin.log to Game.log

---------

Co-authored-by: Pink <[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