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] Fix buckled alert unbuckling not working properly #2875

Merged
merged 1 commit into from
Apr 14, 2024

Conversation

Steals-The-PRs
Copy link
Collaborator

Mirrored on Nova: NovaSector/NovaSector#1966
Original PR: tgstation/tgstation#82627

About The Pull Request

So funny thing, while trying to reproduce a different issue on the current master, I coincidentally let my local instance start without reading, latejoined on the shuttle, and I noticed it wasn't letting me unbuckle as easily.

Looking into this a bit later, it seems as if it's a line #82593 accidentally changed while moving around the /mob/living/carbon/resist_buckle() proc's flow.
https://github.com/tgstation/tgstation/blob/fe26373572e41415ec12e2b0785f0c6dc2567577/code/modules/mob/living/carbon/carbon.dm#L238-L241
While before it was

/mob/living/carbon/resist_buckle()
	if(HAS_TRAIT(src, TRAIT_RESTRAINED))
		(...)
	else
		buckled.user_unbuckle_mob(src,src)

Just changing this to buckled.user_unbuckle_mob(src, src) fixes this.

Why It's Good For The Game

Fixes buckled alert unbuckling not working properly.
Fixes #82627.

Changelog

🆑 00-Steven
fix: Clicking the buckled alert unbuckles you again.
/:cl:

* Fix buckled alert unbuckling not working properly (#82627)

## About The Pull Request

So funny thing, while trying to reproduce a different issue on the
current master, I coincidentally let my local instance start without
reading, latejoined on the shuttle, and I noticed it wasn't letting me
unbuckle as easily.

Looking into this a bit later, it seems as if it's a line #82593
accidentally changed while moving around the
`/mob/living/carbon/resist_buckle()` proc's flow.

https://github.com/tgstation/tgstation/blob/fe26373572e41415ec12e2b0785f0c6dc2567577/code/modules/mob/living/carbon/carbon.dm#L238-L241
While before it was
```dm
/mob/living/carbon/resist_buckle()
	if(HAS_TRAIT(src, TRAIT_RESTRAINED))
		(...)
	else
		buckled.user_unbuckle_mob(src,src)
```
Just changing this to `buckled.user_unbuckle_mob(src, src)` fixes this.
## Why It's Good For The Game

Fixes buckled alert unbuckling not working properly.
Fixes #82627.

## Changelog
:cl:
fix: Clicking the buckled alert unbuckles you again.
/:cl:

* Fix buckled alert unbuckling not working properly

---------

Co-authored-by: _0Steven <[email protected]>
@Iajret Iajret merged commit bbd715d into master Apr 14, 2024
26 checks passed
@Iajret Iajret deleted the upstream-mirror-1966 branch April 14, 2024 16:01
AnywayFarus added a commit that referenced this pull request Apr 14, 2024
Iajret pushed a commit that referenced this pull request Jun 6, 2024
…2875)

* Little QOL change for AI cyborg display power (#83625)

## About The Pull Request

Slightly changes the formating from ugly 1e777 numbers to neat Jules
format.
## FROM 

![image](https://github.com/tgstation/tgstation/assets/81807356/755d4e2f-feed-4aa5-afed-e3f6f410910c)
## TO 

![image](https://github.com/tgstation/tgstation/assets/81807356/1e276476-afa7-46f2-a5a2-ef2a245a4fa2)

## Why It's Good For The Game

Much prettier stat panel and easier to read

## Changelog
:cl:
qol: Cyborgs on AI statpanel now have jules energy format. 
/:cl:

* Little QOL change for AI cyborg display power

---------

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