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] Mob attackedby / check_block refactor, plus some minor cleanup of attack_x procs #692

Merged
merged 1 commit into from
Nov 18, 2023

Conversation

Steals-The-PRs
Copy link
Collaborator

Mirrored on Skyrat: Skyrat-SS13/Skyrat-tg#25079
Original PR: tgstation/tgstation#79563

About The Pull Request

  • Deletes spec_attacked_by
  • Elements simple/basic mob attack threshold
    • There was a skeleton mob that "mimics armor" but didn't use the actual mimicing armor thing we have, so I changed that.
  • Moves check_shields down to the living level, renames it to check_block
  • Martial art blocking is now signalized (only CQC uses it anyways)
  • Cleaned up a bit of attack_x procs, but not a lot. Should have an entire PR dedicated to this .... mess.
  • Deprecates /obj/item/melee

Why It's Good For The Game

Second verse, same as the first.

  • Less bad species related procs.
  • Largely brings a lot of code in line, making combat more consistent across types.
  • Makes it a lot easier to add new code relating to blocking or taking damage.

Changelog

🆑 Melbert
refactor: Refactored another large chuck of attack code, primarily involving melee item attacks and non-human mob attacks. Report if you see anything weird
fix: Pacifists clicking on simple robots or silicons no longer causes sparks
fix: Blocked thrown batons are now properly... blocked
/:cl:

…leanup of `attack_x` procs [MDB IGNORE] (#25079)

* Mob `attackedby` / `check_block` refactor, plus some minor cleanup of `attack_x` procs

* Fix the race condition

* Modular

* Ooops

---------

Co-authored-by: MrMelbert <[email protected]>
Co-authored-by: Giz <[email protected]>
@Iajret Iajret merged commit 5955981 into master Nov 18, 2023
24 checks passed
@Iajret Iajret deleted the upstream-mirror-25079 branch November 18, 2023 20:30
AnywayFarus added a commit that referenced this pull request Nov 18, 2023
Iajret pushed a commit that referenced this pull request Jan 30, 2024
* Cult pylons won't convert floorless floors (#81171)

## About The Pull Request

Cult pylons read from our existing list of "turfs which don't count as
floor despite being open turfs" instead of having its own one, which did
not include openspace turfs.
This prevents it from "papering over" things like stairwells and sealing
people inside their base.


![image](https://github.com/tgstation/tgstation/assets/7483112/f91ad4a3-8546-4861-9098-31817ea30821)

## Why It's Good For The Game

It's not supposed to do that, and fixing it this way is futureproof to a
greater degree.

## Changelog

:cl:
fix: Cult pylons will no longer cover up "open space" (or water) with
cult floors
/:cl:

* Cult pylons won't convert floorless floors

---------

Co-authored-by: Jacquerel <[email protected]>
ReezeBL pushed a commit that referenced this pull request Jan 31, 2024
* Cult pylons won't convert floorless floors (#81171)

## About The Pull Request

Cult pylons read from our existing list of "turfs which don't count as
floor despite being open turfs" instead of having its own one, which did
not include openspace turfs.
This prevents it from "papering over" things like stairwells and sealing
people inside their base.


![image](https://github.com/tgstation/tgstation/assets/7483112/f91ad4a3-8546-4861-9098-31817ea30821)

## Why It's Good For The Game

It's not supposed to do that, and fixing it this way is futureproof to a
greater degree.

## Changelog

:cl:
fix: Cult pylons will no longer cover up "open space" (or water) with
cult floors
/:cl:

* Cult pylons won't convert floorless floors

---------

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