Skip to content

Commit

Permalink
Reworks the turbine to be an actual engine (#2585)
Browse files Browse the repository at this point in the history
## 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. -->
  • Loading branch information
SapphicOverload authored Apr 11, 2024
1 parent 206829b commit 1cd05b6
Show file tree
Hide file tree
Showing 7 changed files with 176 additions and 86 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -1482,7 +1482,7 @@
/turf/open/floor/plating,
/area/ruin/powered)
"LM" = (
/obj/machinery/power/turbine,
/obj/machinery/power/shuttle/engine/turbine,
/turf/open/floor/plating/asteroid/whitesands,
/area/overmap_encounter/planetoid/sand/explored)
"LN" = (
Expand Down
2 changes: 1 addition & 1 deletion code/game/machinery/shuttle/shuttle_engine.dm
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
var/enabled = TRUE
///How much thrust this engine generates when burned fully.
var/thrust = 0
///I don't really know what this is but it's used a lot
///Whether this engine is actively providing thrust to the ship
var/thruster_active = FALSE

/**
Expand Down
Loading

0 comments on commit 1cd05b6

Please sign in to comment.