Skip to content

Commit

Permalink
adds hydrogen, ice, and combustion thrusters! (#2431)
Browse files Browse the repository at this point in the history
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull
request process. -->

## About The Pull Request
adds the following:

Hydrogen gas, gotten using hydrogen merits at designated fuel pumps
Merits, gotten from putting ice in the electrolyzer or from the Hydrogen
Exchange
Hydrogen Exchange, a machine that switches between credits and merits,
for a price.

Combustion Thrusters, which take a fuel and oxidizer mix and creates
thrust. Bad ratios waste fuel. Heaters above 1010kpa take damage and
eventually leak and explode.

<!-- Describe The Pull Request. Please be sure every change is
documented or this can delay review and even discourage maintainers from
merging your PR! -->

## Why It's Good For The Game
adding hydrogen allows for a fuel loop to be created, and combustion
thrusters add depth that plasma thrusters just don't have.

Current Oxidizers + multipliers
Oxygen 1x
Nitryl 1x
N2O 3x + cools heater gases

Current Fuels + multipliers
Hydrogen 0.5x
Plasma 1x
Tritium 3x


https://cdn.discordapp.com/attachments/837744059291533395/1167252813974356038/2023-10-26_19-00-05.mp4?ex=654d73e5&is=653afee5&hm=b83a3d48f62a76eed47965c86baa93f906db9defcad7d55293c1eb1c2e6f623b&
link to video

Big thanks to Bog Creature! I wouldn't have gotten nearly this far
without their help.

overpressure demo:
https://youtu.be/kHi6YwixPHs
hydrogen system demo:
https://youtu.be/uSetVeQDrtI?si=4AN-PotFAONM9aLI


![image](https://github.com/shiptest-ss13/Shiptest/assets/90987989/65dcc95c-eca5-485a-981c-b72e66301a65)
ore in asteroid

![image](https://github.com/shiptest-ss13/Shiptest/assets/90987989/9a03b0fe-9520-4679-8202-c80d6c667f54)
ice ore

![image](https://github.com/shiptest-ss13/Shiptest/assets/90987989/30eacab2-8f0d-4263-bfaf-e378ea0643fe)
cans!
<!-- Please add a short description of why you think these changes would
benefit the game. If you can't justify it in words, it might not be
worth adding. -->
new hydrogen machines, though merits and the hydrogen pump should get
better sprites before merge

![image](https://github.com/shiptest-ss13/Shiptest/assets/90987989/0339827c-c756-49c0-b7dc-e00e8418aeee)
orange screen to match UI

![image](https://github.com/shiptest-ss13/Shiptest/assets/90987989/9c4b1ae8-5c17-4d8f-9d67-0fde00e34508)

changed ships

![image](https://github.com/shiptest-ss13/Shiptest/assets/90987989/24242b38-92d3-4f6f-b4da-36f346513290)

![image](https://github.com/shiptest-ss13/Shiptest/assets/90987989/bbe8be05-be2f-49ab-b346-afa395569b62)

![image](https://github.com/shiptest-ss13/Shiptest/assets/90987989/a2957267-396e-48ee-91c5-856906c1a9e3)

![image](https://github.com/shiptest-ss13/Shiptest/assets/90987989/06c3e0bf-e36c-431a-9baf-585069bf8f4c)

![image](https://github.com/shiptest-ss13/Shiptest/assets/90987989/1e9110b0-a365-4234-82aa-7b60aa31cb69)

![image](https://github.com/shiptest-ss13/Shiptest/assets/90987989/4f269819-8f87-4300-94f8-c383675a7a70)

## Changelog
:cl:
add: Added Hydrogen, and Combustion Thrusters to go with!
/: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. -->

---------

Signed-off-by: HelmCrab <[email protected]>
Co-authored-by: Mark Suckerberg <[email protected]>
Co-authored-by: JimKil3 <[email protected]>
Co-authored-by: goober3 <[email protected]>
Co-authored-by: FalloutFalcon <[email protected]>
  • Loading branch information
5 people authored Jun 20, 2024
1 parent 4e9eb3d commit 80f80c4
Show file tree
Hide file tree
Showing 45 changed files with 6,959 additions and 1,943 deletions.
368 changes: 269 additions & 99 deletions _maps/outpost/hangar/indie_space_20x20.dmm

Large diffs are not rendered by default.

443 changes: 306 additions & 137 deletions _maps/outpost/hangar/indie_space_40x20.dmm

Large diffs are not rendered by default.

502 changes: 346 additions & 156 deletions _maps/outpost/hangar/indie_space_40x40.dmm

Large diffs are not rendered by default.

518 changes: 340 additions & 178 deletions _maps/outpost/hangar/indie_space_56x20.dmm

Large diffs are not rendered by default.

575 changes: 379 additions & 196 deletions _maps/outpost/hangar/indie_space_56x40.dmm

Large diffs are not rendered by default.

739 changes: 635 additions & 104 deletions _maps/outpost/hangar/nt_ice_20x20.dmm

Large diffs are not rendered by default.

885 changes: 736 additions & 149 deletions _maps/outpost/hangar/nt_ice_40x20.dmm

Large diffs are not rendered by default.

941 changes: 768 additions & 173 deletions _maps/outpost/hangar/nt_ice_40x40.dmm

Large diffs are not rendered by default.

962 changes: 792 additions & 170 deletions _maps/outpost/hangar/nt_ice_56x20.dmm

Large diffs are not rendered by default.

994 changes: 797 additions & 197 deletions _maps/outpost/hangar/nt_ice_56x40.dmm

Large diffs are not rendered by default.

35 changes: 19 additions & 16 deletions _maps/outpost/indie_space.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -182,17 +182,16 @@
/turf/open/floor/plasteel,
/area/outpost/maintenance/fore)
"bi" = (
/obj/machinery/mineral/processing_unit_console{
pixel_y = -31;
machinedir = 1;
output_dir = 1
},
/obj/structure/railing{
dir = 1
},
/obj/effect/turf_decal/corner/opaque/brown{
dir = 10
},
/obj/machinery/computer/electrolyzer_console{
pixel_y = -31;
density = 0
},
/turf/open/floor/plasteel/patterned,
/area/outpost/cargo)
"bn" = (
Expand Down Expand Up @@ -728,11 +727,10 @@
/turf/open/floor/plasteel/tech/techmaint,
/area/outpost/maintenance/fore)
"fd" = (
/obj/machinery/mineral/processing_unit{
input_dir = 8;
output_dir = 1
/obj/machinery/conveyor/inverted{
id = "outpost1";
dir = 10
},
/obj/effect/turf_decal/industrial/outline/yellow,
/turf/open/floor/plasteel/patterned/cargo_one,
/area/outpost/cargo)
"fh" = (
Expand Down Expand Up @@ -2541,6 +2539,13 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
/turf/open/floor/plasteel,
/area/outpost/hallway/central)
"rk" = (
/obj/effect/turf_decal/industrial/outline/yellow,
/obj/machinery/mineral/electrolyzer{
output_dir = 4
},
/turf/open/floor/plasteel/patterned/cargo_one,
/area/outpost/cargo)
"rm" = (
/obj/effect/turf_decal/corner/opaque/grey/full,
/obj/effect/turf_decal/corner/opaque/neutral{
Expand Down Expand Up @@ -5032,10 +5037,8 @@
},
/area/outpost/crew/bar)
"FE" = (
/obj/machinery/mineral/unloading_machine{
dir = 1
},
/obj/effect/turf_decal/industrial/outline/yellow,
/obj/machinery/mineral/electrolyzer_unloader,
/turf/open/floor/plasteel/patterned/cargo_one,
/area/outpost/cargo)
"FF" = (
Expand Down Expand Up @@ -7064,13 +7067,13 @@
/obj/structure/railing{
dir = 6
},
/obj/effect/decal/cleanable/dirt,
/obj/machinery/conveyor_switch{
id = "outpost1";
layer = 3.11;
pixel_y = 4;
pixel_x = 5
},
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plasteel/patterned,
/area/outpost/cargo)
"RU" = (
Expand Down Expand Up @@ -17438,8 +17441,8 @@ Dp
tI
tI
RO
gO
BZ
rk
bi
Uw
HD
HD
Expand Down Expand Up @@ -17562,7 +17565,7 @@ ca
ca
ca
fd
bi
BZ
Uw
HD
HD
Expand Down
18 changes: 8 additions & 10 deletions _maps/outpost/nanotrasen_ice.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -554,8 +554,8 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
dir = 4
},
/obj/structure/closet/crate,
/obj/effect/turf_decal/box,
/obj/structure/closet/crate,
/turf/open/floor/plasteel/patterned,
/area/outpost/cargo/smeltery)
"dM" = (
Expand Down Expand Up @@ -2851,10 +2851,9 @@
"td" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/industrial/hatch/yellow,
/obj/machinery/mineral/processing_unit_console{
machinedir = 8;
output_dir = 1;
pixel_x = 32
/obj/machinery/computer/electrolyzer_console{
pixel_x = 32;
density = 0
},
/turf/open/floor/plasteel/patterned,
/area/outpost/cargo/smeltery)
Expand Down Expand Up @@ -2958,8 +2957,8 @@
},
/area/outpost/exterior)
"tM" = (
/obj/machinery/mineral/unloading_machine,
/obj/effect/turf_decal/industrial/outline/yellow,
/obj/machinery/mineral/electrolyzer_unloader,
/turf/open/floor/plasteel/patterned/cargo_one,
/area/outpost/cargo/smeltery)
"tO" = (
Expand Down Expand Up @@ -6342,11 +6341,10 @@
/turf/open/floor/plasteel/patterned,
/area/outpost/crew/bathroom)
"Rg" = (
/obj/machinery/mineral/processing_unit{
output_dir = 4;
input_dir = 8
},
/obj/effect/turf_decal/industrial/outline/yellow,
/obj/machinery/mineral/electrolyzer{
output_dir = 4
},
/turf/open/floor/plasteel/dark,
/area/outpost/cargo/smeltery)
"Rh" = (
Expand Down
54 changes: 23 additions & 31 deletions _maps/shuttles/independent/independent_dwayne.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -138,11 +138,10 @@
/obj/structure/cable{
icon_state = "4-8"
},
/obj/machinery/atmospherics/components/binary/pump{
dir = 8;
name = "engine fuel pump"
},
/obj/structure/catwalk/over,
/obj/machinery/atmospherics/components/trinary/mixer{
dir = 8
},
/turf/open/floor/plating,
/area/ship/engineering)
"bW" = (
Expand Down Expand Up @@ -287,7 +286,7 @@
/turf/open/floor/plasteel/tech/techmaint,
/area/ship/engineering)
"gF" = (
/obj/machinery/power/shuttle/engine/fueled/plasma{
/obj/machinery/power/shuttle/engine/fire{
dir = 4
},
/turf/open/floor/plating/airless,
Expand Down Expand Up @@ -346,26 +345,27 @@
/turf/open/floor/plating/airless,
/area/ship/external)
"hK" = (
/obj/machinery/atmospherics/components/unary/shuttle/heater{
dir = 4
},
/obj/structure/window/reinforced{
dir = 8
},
/obj/machinery/door/window/northleft{
dir = 4;
name = "Engine Access"
},
/obj/machinery/atmospherics/components/unary/shuttle/fire_heater{
dir = 4
},
/turf/open/floor/plating,
/area/ship/engineering)
"hZ" = (
/obj/structure/cable{
icon_state = "2-8"
},
/obj/item/radio/intercom/directional/east,
/obj/machinery/atmospherics/components/unary/portables_connector{
dir = 8
},
/obj/item/radio/intercom/directional/east,
/obj/machinery/portable_atmospherics/canister/hydrogen,
/turf/open/floor/plating,
/area/ship/engineering)
"ig" = (
Expand Down Expand Up @@ -477,9 +477,10 @@
/turf/open/floor/plating/airless,
/area/ship/external)
"kQ" = (
/obj/machinery/atmospherics/components/unary/tank/toxins{
/obj/machinery/atmospherics/components/unary/portables_connector{
dir = 8
},
/obj/machinery/portable_atmospherics/canister/oxygen,
/turf/open/floor/plating,
/area/ship/engineering)
"ls" = (
Expand Down Expand Up @@ -1203,22 +1204,22 @@
/area/ship/cargo)
"CD" = (
/obj/effect/decal/cleanable/dirt/dust,
/obj/machinery/atmospherics/pipe/manifold/orange/visible{
dir = 1
/obj/machinery/atmospherics/pipe/simple/orange/visible{
dir = 10
},
/turf/open/floor/plasteel/tech/grid,
/area/ship/engineering)
"CO" = (
/obj/machinery/atmospherics/components/unary/shuttle/heater{
dir = 4
},
/obj/structure/window/reinforced{
dir = 8
},
/obj/machinery/door/window/northright{
dir = 4;
name = "Engine Access"
},
/obj/machinery/atmospherics/components/unary/shuttle/fire_heater{
dir = 4
},
/turf/open/floor/plating,
/area/ship/engineering)
"CP" = (
Expand Down Expand Up @@ -1625,16 +1626,6 @@
},
/turf/open/floor/plasteel/tech/techmaint,
/area/ship/engineering)
"Mk" = (
/obj/machinery/power/port_gen/pacman,
/obj/structure/cable/yellow{
icon_state = "0-4"
},
/obj/machinery/atmospherics/pipe/simple/orange/hidden,
/obj/item/stack/sheet/mineral/plasma/five,
/obj/effect/decal/cleanable/dirt/dust,
/turf/open/floor/plasteel/tech/grid,
/area/ship/engineering)
"Mn" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
dir = 8
Expand Down Expand Up @@ -1893,6 +1884,8 @@
/obj/structure/cable{
icon_state = "1-2"
},
/obj/structure/closet/crate/large,
/obj/machinery/portable_atmospherics/canister/hydrogen,
/turf/open/floor/plating,
/area/ship/cargo)
"QI" = (
Expand Down Expand Up @@ -2124,9 +2117,9 @@
pixel_x = 6;
pixel_y = 7
},
/obj/machinery/atmospherics/pipe/simple/orange/hidden,
/obj/machinery/light/directional/west,
/obj/item/storage/box/lights/mixed,
/obj/machinery/atmospherics/pipe/simple/orange/visible,
/turf/open/floor/plasteel/tech/grid,
/area/ship/engineering)
"WZ" = (
Expand Down Expand Up @@ -2206,12 +2199,11 @@
/turf/open/floor/plasteel/mono,
/area/ship/medical)
"YE" = (
/obj/machinery/atmospherics/components/binary/pump{
dir = 8;
name = "engine fuel pump"
},
/obj/structure/catwalk/over,
/obj/machinery/computer/helm/viewscreen/directional/north,
/obj/machinery/atmospherics/pipe/simple/orange/visible{
dir = 6
},
/turf/open/floor/plating,
/area/ship/engineering)
"YJ" = (
Expand Down Expand Up @@ -2381,7 +2373,7 @@ tq
CD
vn
WL
Mk
IF
IF
as
kf
Expand Down
Loading

0 comments on commit 80f80c4

Please sign in to comment.