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] Fixes a bunch of small issues on various Whiteships #4142

Merged
merged 1 commit into from
Jun 30, 2024

Conversation

Steals-The-PRs
Copy link
Collaborator

Mirrored on Nova: NovaSector/NovaSector#3392
Original PR: tgstation/tgstation#84404

About The Pull Request

A lot of White ships in the game had minor issues like the camera eye being way offset in the shuttle navigation console or the ship just flying backwards through space. I also caught a few active turfs on shuttle engine plating.

Full changes
  • Fixed camera offset issues on: whiteship_birdshot.dmm, whiteship_donut.dmm, whiteship_personalshuttle.dmm, whiteship_pubby.dmm, whiteship_obelisk.dmm, whiteship_tram.dmm, whiteship_kilo.dmm, whiteship_cere.dmm

  • Fixed whiteship_pubby.dmm, whiteship_kilo.dmm flying in the wrong direction

  • Removed use of /turf/closed/wall/mineral/titanium/overspace on whiteship_birdshot.dmm: These aren't used on any other whiteship so I assume it was used incorrectly here.

  • Fixed spelling of "aggressive" in shuttle manipulator for Birdshot's Whiteship.

  • Replaced platings that were active turfs with their airless variants on: whiteship_obelisk.dmm, whiteship_personalshuttle.dmm, whiteship_kilo.dmm

  • Added an autodoc comment to x_offset and y_offset for shuttles.

  • Fixed whiteship_birdshot.dmm not being able to spawn.

Why It's Good For The Game

makes the shuttle navigation console easier to use if you can actually see the ship, also ships drifting sideways through hyperspace is funny but (probably) unintended.

Changelog

🆑 aaaa1023
fix: Fixed the camera offset for the navigation console on a handful of Whiteships.
fix: Fixed the Pubby Whiteship drifting sideways through hyperspace when in flight.
fix: Fixed the Kilo Whiteship flying backwards through hyperspace when in flight.
fix: The Birdshot Whiteship should actually be able to spawn now.
spellcheck: fixed spelling of "aggressive" in the shuttle manipulator description for the Birdshot Whiteship.
/:cl:

…ORE] (#3392)

* Fixes a bunch of small issues on various Whiteships (#84404)

## About The Pull Request
A lot of White ships in the game had minor issues like the camera eye
being way offset in the shuttle navigation console or the ship just
flying backwards through space. I also caught a few active turfs on
shuttle engine plating.


<details>
  <summary>Full changes</summary>

- Fixed camera offset issues on: whiteship_birdshot.dmm,
whiteship_donut.dmm, whiteship_personalshuttle.dmm, whiteship_pubby.dmm,
whiteship_obelisk.dmm, whiteship_tram.dmm, whiteship_kilo.dmm,
whiteship_cere.dmm

- Fixed whiteship_pubby.dmm, whiteship_kilo.dmm flying in the wrong
direction

- Removed use of /turf/closed/wall/mineral/titanium/overspace on
whiteship_birdshot.dmm: These aren't used on any other whiteship so I
assume it was used incorrectly here.

- Fixed spelling of "aggressive" in shuttle manipulator for Birdshot's
Whiteship.

- Replaced platings that were active turfs with their airless variants
on: whiteship_obelisk.dmm, whiteship_personalshuttle.dmm,
whiteship_kilo.dmm

- Added an autodoc comment to x_offset and y_offset for shuttles. 

- Fixed whiteship_birdshot.dmm not being able to spawn.

</details>


## Why It's Good For The Game
makes the shuttle navigation console easier to use if you can actually
see the ship, also ships drifting sideways through hyperspace is funny
but (probably) unintended.



## Changelog
:cl:
fix: Fixed the camera offset for the navigation console on a handful of
Whiteships.
fix: Fixed the Pubby Whiteship drifting sideways through hyperspace when
in flight.
fix: Fixed the Kilo Whiteship flying backwards through hyperspace when
in flight.
fix: The Birdshot Whiteship should actually be able to spawn now.
spellcheck: fixed spelling of "aggressive" in the shuttle manipulator
description for the Birdshot Whiteship.
/:cl:

* Fixes a bunch of small issues on various Whiteships

---------

Co-authored-by: aaaa1023 <[email protected]>
Co-authored-by: NovaBot13 <[email protected]>
@Iajret Iajret merged commit aae5770 into master Jun 30, 2024
28 checks passed
@Iajret Iajret deleted the upstream-mirror-3392 branch June 30, 2024 13:27
AnywayFarus added a commit that referenced this pull request Jun 30, 2024
Iajret pushed a commit that referenced this pull request Jul 31, 2024
… same direction as you if you're not faster than them [MDB IGNORE] (#4142)

* You no longer goofily swap with others trying to move in the same direction as you if you're not faster than them (#85379)

## About The Pull Request

Currently if you and someone else try to move in the same direction
while standing next to each other, you'll end up swapping places
endlessly which is, while extremely funny, quite frustrating at times to
deal with. This PR prevents this from happening unless you're faster
than the other person, in which case you still push through them. This
way both of you will be able to move forward without goofy ass swapping.

I also moved out the ugly logic tree into its own proc for readability's
sake, I am not piling up more code on that.

## Why It's Good For The Game

Its frustrating to deal with and doesn't make much sense logically. This
just makes sure that if both of you want to move in a certain direction,
you'll be able to do so. You can currently achieve the same effect by
enabling combat mode, so it doesn't change anything balance-wise.

## Changelog
:cl:
qol: You no longer goofily swap with others trying to move in the same
direction as you if you're not faster than them
code: Moved mobswap check logic into a separate proc and made it more
readable
/:cl:

* You no longer goofily swap with others trying to move in the same direction as you if you're not faster than them

---------

Co-authored-by: SmArtKar <[email protected]>
Co-authored-by: NovaBot13 <[email protected]>
FeenieRU pushed a commit that referenced this pull request Jul 31, 2024
… same direction as you if you're not faster than them (#4834)

* [MIRROR] You no longer goofily swap with others trying to move in the same direction as you if you're not faster than them [MDB IGNORE] (#4142)

* You no longer goofily swap with others trying to move in the same direction as you if you're not faster than them (#85379)

## About The Pull Request

Currently if you and someone else try to move in the same direction
while standing next to each other, you'll end up swapping places
endlessly which is, while extremely funny, quite frustrating at times to
deal with. This PR prevents this from happening unless you're faster
than the other person, in which case you still push through them. This
way both of you will be able to move forward without goofy ass swapping.

I also moved out the ugly logic tree into its own proc for readability's
sake, I am not piling up more code on that.

## Why It's Good For The Game

Its frustrating to deal with and doesn't make much sense logically. This
just makes sure that if both of you want to move in a certain direction,
you'll be able to do so. You can currently achieve the same effect by
enabling combat mode, so it doesn't change anything balance-wise.

## Changelog
:cl:
qol: You no longer goofily swap with others trying to move in the same
direction as you if you're not faster than them
code: Moved mobswap check logic into a separate proc and made it more
readable
/:cl:

* You no longer goofily swap with others trying to move in the same direction as you if you're not faster than them

---------

Co-authored-by: SmArtKar <[email protected]>
Co-authored-by: NovaBot13 <[email protected]>

* [MIRROR] You no longer goofily swap with others trying to move in the same direction as you if you're not faster than them

---------

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