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

Reworks the turbine to be an actual engine #2585

Merged
merged 10 commits into from
Apr 11, 2024

Conversation

SapphicOverload
Copy link
Contributor

@SapphicOverload SapphicOverload commented Dec 13, 2023

About The Pull Request

This PR allows the turbine to provide thrust like a real engine while it's running (equivalent to around 4 plasma thrusters while running at maximum power) and fixes a few things like being able to make power from nothing and disconnecting when docking or undocking.

Also updates the sprites to make it nicer to look at.

260364787-c289bee8-8389-48de-a6da-29b305bed64d
Sprites are from BeeStation/BeeStation-Hornet#7634, by PestoVerde322 and PacifistDalek

Why It's Good For The Game

For how much worse and less efficient the turbine is at power generation compared to the TEG, I thought it deserved a secondary use to make it more interesting. This also allows for the possibility of a new ship that uses one (or more!) as its main engine, which would be cool.

Also turbines violating the laws of thermodynamics to make power from nowhere is maybe bad or something.

Changelog

🆑 sapphicoverload, PestoVerde322, PacifistDalek
add: turbines now provide thrust for ships
tweak: turbines respect conservation of energy instead of moving gas around for free
tweak: turbine control console now shows the internal pressure of the turbine
code: refactored how gas flows through the turbine
fix: fixed turbines making free energy from nowhere at low RPM
fix: fixed turbines forcing air into the output turf when it's blocked
fix: fixed turbines not updating air at the input and output turfs
fix: fixed turbines disconnecting when docking and undocking
imageadd: new turbine sprites
/:cl:

@SapphicOverload SapphicOverload requested a review from a team as a code owner December 13, 2023 21:28
@github-actions github-actions bot added DME Edit Sprites A bikeshed full of soulless bikes. TGUI Code change Watch something violently break. labels Dec 13, 2023
@SapphicOverload SapphicOverload requested a review from a team as a code owner December 13, 2023 21:31
@github-actions github-actions bot added the Map Change Tile placing is hard. Thank you for your service. label Dec 13, 2023
Copy link
Contributor

@ToasterBiome ToasterBiome left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good. Wait, this isn't my repo.

@Apogee-dev
Copy link
Contributor

I'm rubbing my dirty little mapper paws together criminally at the thought of mapping with this thing

Copy link
Member

@rye-rice rye-rice left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

new turbine is good
Fun fact: the old turbine sprite is from 2004!
image

@github-actions github-actions bot added the Merge Conflict Use Git Hooks, you're welcome. label Jan 9, 2024
Copy link
Contributor

github-actions bot commented Jan 9, 2024

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@github-actions github-actions bot removed the Merge Conflict Use Git Hooks, you're welcome. label Jan 11, 2024
@Latentish
Copy link
Member

Turbine with a real sprite is cursed as all hell and I love it.

Copy link
Member

@MarkSuckerberg MarkSuckerberg left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

seems good. needs a testmerge though of course
one day I hope all engines require this much thought

@thgvr
Copy link
Member

thgvr commented Mar 12, 2024

@tmtmtl30 review?

@MarkSuckerberg MarkSuckerberg added this pull request to the merge queue Mar 27, 2024
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks Mar 27, 2024
@Gorionus Gorionus mentioned this pull request Mar 27, 2024
@thgvr thgvr added this pull request to the merge queue Apr 11, 2024
@thgvr
Copy link
Member

thgvr commented Apr 11, 2024

I didn't notice this failed to merge so LGTM

Merged via the queue into shiptest-ss13:master with commit 1cd05b6 Apr 11, 2024
14 checks passed
MysticalFaceLesS pushed a commit to CeladonSS13/Shiptest that referenced this pull request Apr 12, 2024
## About The Pull Request

This PR allows the turbine to provide thrust like a real engine while
it's running (equivalent to around 4 plasma thrusters while running at
maximum power) and fixes a few things like being able to make power from
nothing and disconnecting when docking or undocking.

Also updates the sprites to make it nicer to look at.


![260364787-c289bee8-8389-48de-a6da-29b305bed64d](https://github.com/shiptest-ss13/Shiptest/assets/93578146/5d8a1d2b-0771-4267-859d-900a8a7d62c9)
Sprites are from BeeStation/BeeStation-Hornet#7634, by PestoVerde322 and
PacifistDalek

## Why It's Good For The Game

For how much worse and less efficient the turbine is at power generation
compared to the TEG, I thought it deserved a secondary use to make it
more interesting. This also allows for the possibility of a new ship
that uses one (or more!) as its main engine, which would be cool.

Also turbines violating the laws of thermodynamics to make power from
nowhere is maybe bad or something.

## Changelog

:cl: sapphicoverload, PestoVerde322, PacifistDalek
add: turbines now provide thrust for ships
tweak: turbines respect conservation of energy instead of moving gas
around for free
tweak: turbine control console now shows the internal pressure of the
turbine
code: refactored how gas flows through the turbine
fix: fixed turbines making free energy from nowhere at low RPM
fix: fixed turbines forcing air into the output turf when it's blocked
fix: fixed turbines not updating air at the input and output turfs
fix: fixed turbines disconnecting when docking and undocking
imageadd: new turbine sprites
/:cl:

<!-- Both :cl:'s are required for the changelog to work! You can put
your name to the right of the first :cl: 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. -->
MysticalFaceLesS pushed a commit to CeladonSS13/Shiptest that referenced this pull request Apr 15, 2024
## About The Pull Request

This PR allows the turbine to provide thrust like a real engine while
it's running (equivalent to around 4 plasma thrusters while running at
maximum power) and fixes a few things like being able to make power from
nothing and disconnecting when docking or undocking.

Also updates the sprites to make it nicer to look at.


![260364787-c289bee8-8389-48de-a6da-29b305bed64d](https://github.com/shiptest-ss13/Shiptest/assets/93578146/5d8a1d2b-0771-4267-859d-900a8a7d62c9)
Sprites are from BeeStation/BeeStation-Hornet#7634, by PestoVerde322 and
PacifistDalek

## Why It's Good For The Game

For how much worse and less efficient the turbine is at power generation
compared to the TEG, I thought it deserved a secondary use to make it
more interesting. This also allows for the possibility of a new ship
that uses one (or more!) as its main engine, which would be cool.

Also turbines violating the laws of thermodynamics to make power from
nowhere is maybe bad or something.

## Changelog

:cl: sapphicoverload, PestoVerde322, PacifistDalek
add: turbines now provide thrust for ships
tweak: turbines respect conservation of energy instead of moving gas
around for free
tweak: turbine control console now shows the internal pressure of the
turbine
code: refactored how gas flows through the turbine
fix: fixed turbines making free energy from nowhere at low RPM
fix: fixed turbines forcing air into the output turf when it's blocked
fix: fixed turbines not updating air at the input and output turfs
fix: fixed turbines disconnecting when docking and undocking
imageadd: new turbine sprites
/:cl:

<!-- Both :cl:'s are required for the changelog to work! You can put
your name to the right of the first :cl: 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. -->
@SapphicOverload SapphicOverload deleted the turbine-update branch April 20, 2024 06:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Code change Watch something violently break. DME Edit Map Change Tile placing is hard. Thank you for your service. Sprites A bikeshed full of soulless bikes. TGUI
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants