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] Adds a proper skeletal rack subtype #2030

Merged
merged 1 commit into from
Feb 19, 2024
Merged

Conversation

Steals-The-PRs
Copy link
Collaborator

Mirrored on Nova: NovaSector/NovaSector#1012
Original PR: tgstation/tgstation#81484

About The Pull Request

This is mapped in a few places and I thought it would be better to have a subtype of rack to use rather than varediting the icon and state.

Why It's Good For The Game

The less varedited icons the better imo, it's way easier to ensure icons aren't fucked up this way and easier to fix too.

Changelog

No player-facing changes.

* Adds a proper skeletal rack subtype (#81484)

## About The Pull Request

This is mapped in a few places and I thought it would be better to have
a subtype of rack to use rather than varediting the icon and state.

## Why It's Good For The Game

The less varedited icons the better imo, it's way easier to ensure icons
aren't fucked up this way and easier to fix too.

## Changelog

No player-facing changes.

* Adds a proper skeletal rack subtype

---------

Co-authored-by: John Willard <[email protected]>
@Iajret Iajret merged commit e0a8a8a into master Feb 19, 2024
24 checks passed
@Iajret Iajret deleted the upstream-mirror-1012 branch February 20, 2024 09:25
Iajret pushed a commit that referenced this pull request Apr 17, 2024
…l on attacking non-mobs (2 year old bug) (#2030)

* Yeets `ATTACK_QDELETED`, fixes welding torches not using fuel on attacking non-mobs (2 year old bug)  (#82694)

## About The Pull Request

- Deletes `ATTACK_QDELETED`
- May have been necessary in the past but it's pointless now. All it
does is clutter the attack chain. Perish.

- Fixes welders not using fuel on attacking non-mobs
- #65762 "fixed" welders consuming fuel on clicking turfs by adding an
`isliving` check and not an `ismovable` check?


## Changelog

:cl: Melbert
fix: Blobs may rejoice, welding torches now consume fuel when attacking
objects again after two years.
/:cl:

* Yeets `ATTACK_QDELETED`, fixes welding torches not using fuel on attacking non-mobs (2 year old bug)

* Electric welders are hot too now. Starting fires is definitely in their wheelhouse

---------

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