Skip to content

Commit

Permalink
Makes indies, inteq and SRM use combustion thrusters instead of plasm…
Browse files Browse the repository at this point in the history
…as. (#4080)

<!-- 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
Alongside replacing the thrusters I also:
- **Kilo, Mudskipper, Talos, Elder** - replaced plasma canisters with
fuel canisters.
- **Riggs, Colossus** - replaced plasma pressure tanks with fuel
canisters (~~as for Riggs- I couldn't really find the room to add fuel
mixers, though it should get them I think - will think a bit more about
it~~ yeah I dunno)
- **Shetland** - I went a little overboard and made the TEG run on a
hydrogen/oxygen mix, from which the thrusters feed. Should work about
the same though. I hope so anyways.

Also rotates the AACs on all of the above cuz idk, I'm touching them
already, might as well do it.
Also does like really minor Kilo fixes that were annoying me for a
while. (removes a wall decal, rotates beds)

<!-- 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
I've been told by @Apogee-dev that plasmas should be only used on NT
ships. This fixes that.

<!-- 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. -->

## Changelog

:cl:
tweak: Kilo, Mudskipper, Riggs, Shetland, Colossus, Talos and Elder now
use combustion thrusters instead of plasma thrusters.
tweak: Shetland's TEG now runs on hydrogen instead of plasma.
fix: Rotated the AACs on all of the above ships.
/: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
Sadhorizon authored Feb 26, 2025
1 parent 32ebe36 commit 887cab5
Show file tree
Hide file tree
Showing 10 changed files with 129 additions and 137 deletions.
38 changes: 20 additions & 18 deletions _maps/shuttles/independent/independent_kilo.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -6,25 +6,25 @@
/turf/closed/wall/r_wall,
/area/ship/cargo)
"ak" = (
/obj/machinery/power/shuttle/engine/fueled/plasma,
/obj/machinery/power/shuttle/engine/fire,
/turf/open/floor/engine/hull,
/area/ship/engineering)
"am" = (
/obj/machinery/autolathe,
/turf/open/floor/plasteel/patterned/grid,
/area/ship/cargo)
"ar" = (
/obj/machinery/atmospherics/components/unary/shuttle/heater,
/obj/machinery/atmospherics/components/unary/shuttle/fire_heater,
/obj/effect/turf_decal/industrial/warning{
dir = 4
},
/obj/structure/window/reinforced{
dir = 8
},
/obj/machinery/door/poddoor{
dir = 4;
id = "kilothrusters"
},
/obj/structure/window/reinforced{
dir = 8
},
/turf/open/floor/plating,
/area/ship/engineering)
"av" = (
Expand Down Expand Up @@ -336,7 +336,7 @@
/turf/open/floor/plating,
/area/ship/engineering)
"cb" = (
/obj/machinery/portable_atmospherics/canister/toxins,
/obj/machinery/portable_atmospherics/canister/fuel,
/obj/effect/turf_decal/box,
/obj/effect/decal/cleanable/dirt/dust,
/turf/open/floor/plasteel/tech,
Expand Down Expand Up @@ -479,9 +479,7 @@
/obj/structure/chair/handrail{
dir = 1
},
/obj/machinery/advanced_airlock_controller{
pixel_y = -21
},
/obj/machinery/advanced_airlock_controller/directional/south,
/obj/machinery/power/apc/auto_name/directional/west,
/obj/structure/cable/pink{
icon_state = "0-9"
Expand Down Expand Up @@ -658,10 +656,6 @@
},
/turf/open/floor/plating,
/area/ship/engineering)
"fu" = (
/obj/effect/turf_decal/corner/opaque/black/mono,
/turf/closed/wall/r_wall/yesdiag,
/area/ship/cargo)
"fv" = (
/obj/structure/cable/cyan{
icon_state = "1-10"
Expand Down Expand Up @@ -928,8 +922,12 @@
/turf/open/floor/plasteel/tech/grid,
/area/ship/cargo)
"mz" = (
/obj/structure/bed,
/obj/effect/spawner/random/bedsheet,
/obj/structure/bed{
dir = 4
},
/obj/effect/spawner/random/bedsheet{
dir = 4
},
/obj/machinery/light_switch{
pixel_x = 7;
pixel_y = 20
Expand Down Expand Up @@ -1828,11 +1826,15 @@
/turf/open/floor/plating/airless,
/area/ship/crew)
"Tn" = (
/obj/structure/bed,
/obj/structure/bed{
dir = 4
},
/obj/structure/cable/pink{
icon_state = "1-6"
},
/obj/effect/spawner/random/bedsheet,
/obj/effect/spawner/random/bedsheet{
dir = 4
},
/obj/machinery/light/directional/west,
/turf/open/floor/carpet,
/area/ship/crew/dorm)
Expand Down Expand Up @@ -2264,7 +2266,7 @@ Vq
"}
(14,1,1) = {"
aa
fu
Nq
ac
Ud
bX
Expand Down
20 changes: 7 additions & 13 deletions _maps/shuttles/independent/independent_mudskipper.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -476,9 +476,7 @@
/turf/closed/wall/r_wall/rust,
/area/ship/hallway/central)
"lj" = (
/obj/machinery/power/shuttle/engine/fueled/plasma{
dir = 4
},
/obj/machinery/power/shuttle/engine/fire,
/turf/open/floor/engine/hull,
/area/ship/engineering/engine)
"mt" = (
Expand Down Expand Up @@ -1109,23 +1107,21 @@
/obj/machinery/atmospherics/components/unary/portables_connector{
dir = 1
},
/obj/machinery/portable_atmospherics/canister/toxins,
/obj/machinery/portable_atmospherics/canister/fuel,
/turf/open/floor/plasteel/tech,
/area/ship/engineering/engine)
"zx" = (
/obj/machinery/atmospherics/components/unary/shuttle/heater{
dir = 4
},
/obj/machinery/atmospherics/components/unary/shuttle/fire_heater,
/obj/effect/turf_decal/industrial/warning{
dir = 4
},
/obj/structure/window/reinforced{
dir = 8
},
/obj/machinery/door/poddoor{
dir = 4;
id = "mudskipper_engine"
},
/obj/structure/window/reinforced{
dir = 8
},
/turf/open/floor/plating,
/area/ship/engineering/engine)
"zR" = (
Expand Down Expand Up @@ -1222,9 +1218,7 @@
/turf/open/floor/plasteel/tech/grid,
/area/ship/cargo)
"BA" = (
/obj/machinery/advanced_airlock_controller{
pixel_y = 24
},
/obj/machinery/advanced_airlock_controller/directional/north,
/obj/structure/chair/handrail,
/obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/layer4{
dir = 8
Expand Down
24 changes: 12 additions & 12 deletions _maps/shuttles/independent/independent_rigger.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -765,7 +765,7 @@
/turf/open/floor/plasteel/tech,
/area/ship/engineering/engine)
"jy" = (
/obj/machinery/atmospherics/components/unary/shuttle/heater{
/obj/machinery/atmospherics/components/unary/shuttle/fire_heater{
dir = 1
},
/obj/structure/window/reinforced/spawner,
Expand Down Expand Up @@ -1086,9 +1086,7 @@
/obj/machinery/atmospherics/components/unary/vent_pump/siphon/layer4{
dir = 1
},
/obj/machinery/advanced_airlock_controller{
pixel_x = -25
},
/obj/machinery/advanced_airlock_controller/directional/west,
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
dir = 5
},
Expand Down Expand Up @@ -1734,7 +1732,7 @@
/turf/open/floor/plating,
/area/ship/maintenance/fore)
"wg" = (
/obj/machinery/atmospherics/components/unary/shuttle/heater{
/obj/machinery/atmospherics/components/unary/shuttle/fire_heater{
dir = 1
},
/obj/structure/window/reinforced/spawner{
Expand Down Expand Up @@ -1797,7 +1795,7 @@
/turf/open/floor/plating,
/area/ship/engineering/atmospherics)
"wB" = (
/obj/machinery/power/shuttle/engine/fueled/plasma{
/obj/machinery/power/shuttle/engine/fire{
dir = 1
},
/turf/open/floor/plating,
Expand Down Expand Up @@ -2371,7 +2369,7 @@
/turf/closed/wall/mineral/plastitanium,
/area/ship/crew/cryo)
"Cw" = (
/obj/machinery/power/shuttle/engine/fueled/plasma{
/obj/machinery/power/shuttle/engine/fire{
dir = 1
},
/turf/open/floor/plating,
Expand Down Expand Up @@ -2534,10 +2532,11 @@
/turf/open/floor/plasteel/tech,
/area/ship/engineering)
"Er" = (
/obj/machinery/atmospherics/components/unary/tank/toxins{
/obj/effect/turf_decal/industrial/hatch/yellow,
/obj/machinery/atmospherics/components/unary/portables_connector{
dir = 8
},
/obj/effect/turf_decal/industrial/hatch/yellow,
/obj/machinery/portable_atmospherics/canister/fuel,
/turf/open/floor/plating,
/area/ship/maintenance/port)
"EB" = (
Expand Down Expand Up @@ -2910,11 +2909,12 @@
/turf/open/floor/plasteel/dark,
/area/ship/crew/cryo)
"HW" = (
/obj/machinery/atmospherics/components/unary/tank/toxins{
dir = 4
},
/obj/effect/turf_decal/industrial/hatch/yellow,
/obj/machinery/airalarm/directional/west,
/obj/machinery/atmospherics/components/unary/portables_connector{
dir = 4
},
/obj/machinery/portable_atmospherics/canister/fuel,
/turf/open/floor/plating,
/area/ship/maintenance/starboard)
"Ic" = (
Expand Down
Loading

0 comments on commit 887cab5

Please sign in to comment.