From 422accbe4e9b53f075f9a76ba6293435cb3399da Mon Sep 17 00:00:00 2001 From: John Willard <53777086+JohnFulpWillard@users.noreply.github.com> Date: Wed, 5 Oct 2022 21:51:38 -0400 Subject: [PATCH] [MDB IGNORE] Shuttle engines part 2: Engines are now machines (#69793) * Makes engines machines instead of structures * Updates the maps * Fixes boards and anchoring * Removes 2 unused engine types Router was actually used a total of once, so I just replaced it with propulsion. I think cutting down on these useless engine types that make no difference in-game would be a nice first step to adding more functionalities to them. * Don't use power (since shuttles dont have) Shuttles don't have APCs, instead they just have infinite power, so I'm removing their power usage for now. I'm hoping this can be removed when unique mechanics are added to engines, because I would like them to make use of power like other machines. * re-organizes vars * deletes deleted dm file * Slightly improves cargo selling code * Renames the updatepaths * Removes in_wall engines I hate this stupid engine it sucks it's useless it's used solely for the tram it provides nothing of benefit to the server replaces them with regular engines --- .../RandomRuins/AnywhereRuins/golem_ship.dmm | 4 +- .../lavaland_surface_elephant_graveyard.dmm | 4 +- .../LavaRuins/lavaland_surface_hermit.dmm | 2 +- _maps/RandomRuins/SpaceRuins/asteroid4.dmm | 2 +- _maps/RandomRuins/SpaceRuins/bigderelict1.dmm | 8 +- .../RandomRuins/SpaceRuins/caravanambush.dmm | 16 ++-- .../SpaceRuins/crashedclownship.dmm | 4 +- _maps/RandomRuins/SpaceRuins/crashedship.dmm | 7 +- _maps/RandomRuins/SpaceRuins/derelict4.dmm | 2 +- .../RandomRuins/SpaceRuins/forgottenship.dmm | 4 +- .../SpaceRuins/hilbertresearchfacility.dmm | 60 ++++--------- .../SpaceRuins/intactemptyship.dmm | 4 +- .../RandomRuins/SpaceRuins/mechtransport.dmm | 2 +- _maps/RandomRuins/SpaceRuins/shuttlerelic.dmm | 8 +- .../SpaceRuins/whiteshipruin_box.dmm | 8 +- _maps/RandomZLevels/moonoutpost19.dmm | 6 +- _maps/RandomZLevels/research.dmm | 10 +-- _maps/RandomZLevels/snowdin.dmm | 16 ++-- _maps/map_files/CTF/cruiser.dmm | 18 ++-- _maps/map_files/generic/CentCom.dmm | 12 +-- _maps/map_files/tramstation/tramstation.dmm | 12 ++- _maps/shuttles/arrival_box.dmm | 10 +-- _maps/shuttles/arrival_delta.dmm | 4 +- _maps/shuttles/arrival_donut.dmm | 6 +- _maps/shuttles/arrival_kilo.dmm | 8 +- _maps/shuttles/arrival_pubby.dmm | 10 +-- _maps/shuttles/cargo_birdboat.dmm | 8 +- _maps/shuttles/cargo_box.dmm | 8 +- _maps/shuttles/cargo_delta.dmm | 10 +-- _maps/shuttles/cargo_kilo.dmm | 8 +- _maps/shuttles/cargo_pubby.dmm | 10 +-- _maps/shuttles/emergency_asteroid.dmm | 4 +- _maps/shuttles/emergency_bar.dmm | 4 +- _maps/shuttles/emergency_bballhooper.dmm | 4 +- _maps/shuttles/emergency_birdboat.dmm | 6 +- _maps/shuttles/emergency_box.dmm | 4 +- _maps/shuttles/emergency_casino.dmm | 4 +- _maps/shuttles/emergency_cere.dmm | 4 +- _maps/shuttles/emergency_clown.dmm | 4 +- _maps/shuttles/emergency_construction.dmm | 4 +- _maps/shuttles/emergency_cramped.dmm | 4 +- _maps/shuttles/emergency_cruise.dmm | 4 +- _maps/shuttles/emergency_delta.dmm | 4 +- _maps/shuttles/emergency_discoinferno.dmm | 4 +- _maps/shuttles/emergency_donut.dmm | 4 +- _maps/shuttles/emergency_goon.dmm | 12 +-- _maps/shuttles/emergency_kilo.dmm | 10 +-- _maps/shuttles/emergency_luxury.dmm | 4 +- _maps/shuttles/emergency_medisim.dmm | 4 +- _maps/shuttles/emergency_meta.dmm | 4 +- _maps/shuttles/emergency_meteor.dmm | 4 +- _maps/shuttles/emergency_mini.dmm | 4 +- _maps/shuttles/emergency_monastery.dmm | 26 +++--- _maps/shuttles/emergency_narnar.dmm | 4 +- _maps/shuttles/emergency_nature.dmm | 6 +- _maps/shuttles/emergency_omega.dmm | 6 +- _maps/shuttles/emergency_pod.dmm | 2 +- _maps/shuttles/emergency_pubby.dmm | 4 +- _maps/shuttles/emergency_raven.dmm | 6 +- _maps/shuttles/emergency_rollerdome.dmm | 4 +- _maps/shuttles/emergency_russiafightpit.dmm | 4 +- _maps/shuttles/emergency_scrapheap.dmm | 6 +- _maps/shuttles/emergency_supermatter.dmm | 4 +- _maps/shuttles/emergency_tram.dmm | 4 +- _maps/shuttles/emergency_wabbajack.dmm | 4 +- _maps/shuttles/escape_pod_default.dmm | 2 +- _maps/shuttles/escape_pod_large.dmm | 2 +- _maps/shuttles/ferry_base.dmm | 2 +- _maps/shuttles/ferry_fancy.dmm | 8 +- _maps/shuttles/ferry_kilo.dmm | 8 +- _maps/shuttles/ferry_lighthouse.dmm | 8 +- _maps/shuttles/ferry_meat.dmm | 2 +- _maps/shuttles/hunter_bounty.dmm | 4 +- _maps/shuttles/hunter_russian.dmm | 4 +- _maps/shuttles/hunter_space_cop.dmm | 2 +- _maps/shuttles/infiltrator_advanced.dmm | 28 +++--- _maps/shuttles/infiltrator_basic.dmm | 24 ++--- _maps/shuttles/labour_box.dmm | 4 +- _maps/shuttles/labour_delta.dmm | 4 +- _maps/shuttles/labour_generic.dmm | 4 +- _maps/shuttles/labour_kilo.dmm | 4 +- _maps/shuttles/mining_box.dmm | 4 +- _maps/shuttles/mining_common_kilo.dmm | 4 +- _maps/shuttles/mining_common_meta.dmm | 4 +- _maps/shuttles/mining_delta.dmm | 4 +- _maps/shuttles/mining_freight.dmm | 4 +- _maps/shuttles/mining_kilo.dmm | 4 +- _maps/shuttles/mining_large.dmm | 4 +- _maps/shuttles/pirate_default.dmm | 8 +- _maps/shuttles/pirate_silverscale.dmm | 22 ++--- _maps/shuttles/ruin_caravan_victim.dmm | 8 +- _maps/shuttles/ruin_pirate_cutter.dmm | 8 +- _maps/shuttles/ruin_syndicate_dropship.dmm | 8 +- .../shuttles/ruin_syndicate_fighter_shiv.dmm | 2 +- _maps/shuttles/starfury_corvette.dmm | 4 +- _maps/shuttles/starfury_fighter1.dmm | 2 +- _maps/shuttles/starfury_fighter2.dmm | 2 +- _maps/shuttles/starfury_fighter3.dmm | 2 +- _maps/shuttles/whiteship_box.dmm | 12 +-- _maps/shuttles/whiteship_cere.dmm | 4 +- _maps/shuttles/whiteship_delta.dmm | 6 +- _maps/shuttles/whiteship_donut.dmm | 12 +-- _maps/shuttles/whiteship_kilo.dmm | 14 +-- _maps/shuttles/whiteship_meta.dmm | 6 +- _maps/shuttles/whiteship_pubby.dmm | 8 +- _maps/shuttles/whiteship_tram.dmm | 16 ++-- _maps/templates/battlecruiser_starfury.dmm | 4 +- _maps/templates/medium_shuttle1.dmm | 6 +- _maps/templates/medium_shuttle2.dmm | 6 +- _maps/templates/medium_shuttle3.dmm | 16 ++-- _maps/templates/medium_shuttle4.dmm | 10 +-- _maps/templates/small_shuttle_1.dmm | 8 +- code/__DEFINES/icon_smoothing.dm | 2 +- .../machines/engine_circuitboards.dm | 17 ++++ .../{ => machines}/machine_circuitboards.dm | 0 code/game/shuttle_engines.dm | 87 +++++++------------ code/modules/cargo/packs.dm | 2 +- .../industrial_lift/tram_override_objects.dm | 2 +- code/modules/shuttle/on_move.dm | 2 +- code/modules/shuttle/shuttle.dm | 6 +- code/modules/shuttle/supply.dm | 8 +- tgstation.dme | 3 +- .../Scripts/69793_shuttle_engines.txt | 8 ++ 123 files changed, 456 insertions(+), 484 deletions(-) create mode 100644 code/game/objects/items/circuitboards/machines/engine_circuitboards.dm rename code/game/objects/items/circuitboards/{ => machines}/machine_circuitboards.dm (100%) create mode 100644 tools/UpdatePaths/Scripts/69793_shuttle_engines.txt diff --git a/_maps/RandomRuins/AnywhereRuins/golem_ship.dmm b/_maps/RandomRuins/AnywhereRuins/golem_ship.dmm index 6550f577eb1..77ba03604c9 100644 --- a/_maps/RandomRuins/AnywhereRuins/golem_ship.dmm +++ b/_maps/RandomRuins/AnywhereRuins/golem_ship.dmm @@ -45,7 +45,7 @@ /turf/open/floor/plating, /area/ruin/powered/golem_ship) "h" = ( -/obj/structure/shuttle/engine/heater{ +/obj/machinery/power/shuttle_engine/heater{ dir = 4 }, /obj/structure/window/reinforced{ @@ -54,7 +54,7 @@ /turf/open/floor/plating, /area/ruin/powered/golem_ship) "i" = ( -/obj/structure/shuttle/engine/propulsion{ +/obj/machinery/power/shuttle_engine/propulsion{ dir = 4 }, /turf/open/floor/plating, diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_elephant_graveyard.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_elephant_graveyard.dmm index 754c5e754fe..8b337ef15c1 100644 --- a/_maps/RandomRuins/LavaRuins/lavaland_surface_elephant_graveyard.dmm +++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_elephant_graveyard.dmm @@ -69,7 +69,7 @@ /turf/open/floor/mineral/titanium/purple, /area/ruin/powered/graveyard_shuttle) "bE" = ( -/obj/structure/shuttle/engine/heater, +/obj/machinery/power/shuttle_engine/heater, /obj/structure/window{ dir = 1 }, @@ -201,7 +201,7 @@ /turf/open/misc/asteroid/basalt/wasteland, /area/ruin/unpowered/elephant_graveyard) "jx" = ( -/obj/structure/shuttle/engine/propulsion, +/obj/machinery/power/shuttle_engine/propulsion, /turf/open/misc/asteroid/basalt/lava_land_surface, /area/ruin/powered/graveyard_shuttle) "jK" = ( diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_hermit.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_hermit.dmm index ffa2adc9686..49e24125657 100644 --- a/_maps/RandomRuins/LavaRuins/lavaland_surface_hermit.dmm +++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_hermit.dmm @@ -138,7 +138,7 @@ /turf/open/floor/pod/dark, /area/ruin/powered) "E" = ( -/obj/structure/shuttle/engine/propulsion/burst{ +/obj/machinery/power/shuttle_engine/propulsion/burst{ dir = 8 }, /turf/closed/wall/mineral/titanium/interior, diff --git a/_maps/RandomRuins/SpaceRuins/asteroid4.dmm b/_maps/RandomRuins/SpaceRuins/asteroid4.dmm index 0cf6e1624db..b79f648817b 100644 --- a/_maps/RandomRuins/SpaceRuins/asteroid4.dmm +++ b/_maps/RandomRuins/SpaceRuins/asteroid4.dmm @@ -60,7 +60,7 @@ /turf/open/floor/mineral/titanium/blue, /area/ruin/unpowered) "o" = ( -/obj/structure/shuttle/engine/propulsion/burst, +/obj/machinery/power/shuttle_engine/propulsion/burst, /turf/closed/wall/mineral/titanium/overspace, /area/ruin/unpowered) "p" = ( diff --git a/_maps/RandomRuins/SpaceRuins/bigderelict1.dmm b/_maps/RandomRuins/SpaceRuins/bigderelict1.dmm index 9227ba5fc15..17a4809c7c4 100644 --- a/_maps/RandomRuins/SpaceRuins/bigderelict1.dmm +++ b/_maps/RandomRuins/SpaceRuins/bigderelict1.dmm @@ -71,13 +71,13 @@ /turf/closed/wall/mineral/titanium/interior, /area/ruin/space/has_grav/derelictoutpost/dockedship) "ar" = ( -/obj/structure/shuttle/engine/propulsion/burst/right{ +/obj/machinery/power/shuttle_engine/propulsion/burst/right{ dir = 1 }, /turf/open/floor/plating, /area/ruin/space/has_grav/derelictoutpost/dockedship) "as" = ( -/obj/structure/shuttle/engine/propulsion/burst/left{ +/obj/machinery/power/shuttle_engine/propulsion/burst/left{ dir = 1 }, /turf/open/floor/plating, @@ -105,7 +105,7 @@ /obj/structure/window/reinforced{ dir = 8 }, -/obj/structure/shuttle/engine/heater{ +/obj/machinery/power/shuttle_engine/heater{ dir = 1 }, /turf/open/floor/mineral/titanium/yellow, @@ -117,7 +117,7 @@ /obj/structure/window/reinforced{ dir = 4 }, -/obj/structure/shuttle/engine/heater{ +/obj/machinery/power/shuttle_engine/heater{ dir = 1 }, /turf/open/floor/mineral/titanium/yellow, diff --git a/_maps/RandomRuins/SpaceRuins/caravanambush.dmm b/_maps/RandomRuins/SpaceRuins/caravanambush.dmm index c2b1d47e7d5..8974feb0d11 100644 --- a/_maps/RandomRuins/SpaceRuins/caravanambush.dmm +++ b/_maps/RandomRuins/SpaceRuins/caravanambush.dmm @@ -374,7 +374,7 @@ /turf/open/floor/plating/airless, /area/ruin/unpowered) "gq" = ( -/obj/structure/shuttle/engine/propulsion/burst/left{ +/obj/machinery/power/shuttle_engine/propulsion/burst/left{ dir = 8 }, /turf/open/floor/plating/airless, @@ -421,13 +421,13 @@ /turf/open/floor/iron/dark/airless, /area/shuttle/caravan/freighter3) "gP" = ( -/obj/structure/shuttle/engine/propulsion/burst{ +/obj/machinery/power/shuttle_engine/propulsion/burst{ dir = 8 }, /turf/open/floor/plating/airless, /area/shuttle/caravan/freighter3) "gQ" = ( -/obj/structure/shuttle/engine/heater{ +/obj/machinery/power/shuttle_engine/heater{ dir = 8 }, /obj/structure/window/reinforced{ @@ -605,7 +605,7 @@ /turf/open/floor/iron/airless, /area/shuttle/caravan/freighter3) "hQ" = ( -/obj/structure/shuttle/engine/propulsion/burst/left{ +/obj/machinery/power/shuttle_engine/propulsion/burst/left{ dir = 8 }, /turf/open/floor/plating/airless, @@ -735,13 +735,13 @@ /turf/open/floor/iron/airless, /area/shuttle/caravan/freighter3) "io" = ( -/obj/structure/shuttle/engine/propulsion/burst{ +/obj/machinery/power/shuttle_engine/propulsion/burst{ dir = 8 }, /turf/open/floor/plating/airless, /area/shuttle/caravan/freighter2) "ip" = ( -/obj/structure/shuttle/engine/heater{ +/obj/machinery/power/shuttle_engine/heater{ dir = 8 }, /obj/structure/window/reinforced{ @@ -1064,7 +1064,7 @@ /turf/open/floor/plating/airless, /area/shuttle/caravan/freighter2) "jV" = ( -/obj/structure/shuttle/engine/propulsion/burst/right{ +/obj/machinery/power/shuttle_engine/propulsion/burst/right{ dir = 8 }, /turf/open/floor/plating/airless, @@ -1188,7 +1188,7 @@ /turf/open/floor/plating/airless, /area/ruin/unpowered) "tH" = ( -/obj/structure/shuttle/engine/propulsion/burst{ +/obj/machinery/power/shuttle_engine/propulsion/burst{ dir = 8 }, /turf/closed/wall/mineral/plastitanium, diff --git a/_maps/RandomRuins/SpaceRuins/crashedclownship.dmm b/_maps/RandomRuins/SpaceRuins/crashedclownship.dmm index 33bc009b111..2ba1f7091ea 100644 --- a/_maps/RandomRuins/SpaceRuins/crashedclownship.dmm +++ b/_maps/RandomRuins/SpaceRuins/crashedclownship.dmm @@ -52,7 +52,7 @@ /turf/open/floor/mineral/bananium/airless, /area/ruin/unpowered) "l" = ( -/obj/structure/shuttle/engine/heater{ +/obj/machinery/power/shuttle_engine/heater{ color = "#FFFF00"; dir = 4 }, @@ -65,7 +65,7 @@ }, /area/ruin/unpowered) "m" = ( -/obj/structure/shuttle/engine/propulsion/left{ +/obj/machinery/power/shuttle_engine/propulsion/left{ color = "#FFFF00"; dir = 4 }, diff --git a/_maps/RandomRuins/SpaceRuins/crashedship.dmm b/_maps/RandomRuins/SpaceRuins/crashedship.dmm index ab70914a43d..5fd66af4996 100644 --- a/_maps/RandomRuins/SpaceRuins/crashedship.dmm +++ b/_maps/RandomRuins/SpaceRuins/crashedship.dmm @@ -344,7 +344,7 @@ /turf/open/floor/plating/airless, /area/awaymission/bmpship/aft) "oT" = ( -/obj/structure/shuttle/engine/propulsion{ +/obj/machinery/power/shuttle_engine/propulsion{ dir = 8 }, /obj/structure/lattice, @@ -383,6 +383,7 @@ /obj/machinery/porta_turret{ dir = 8; installation = /obj/item/gun/energy/lasercannon; + }, /obj/effect/mapping_helpers/atom_injector/obj_flag{ inject_flags = 1; @@ -944,7 +945,7 @@ /turf/open/floor/plating/airless, /area/awaymission/bmpship/aft) "Hb" = ( -/obj/structure/shuttle/engine/heater{ +/obj/machinery/power/shuttle_engine/heater{ dir = 8 }, /obj/structure/window/reinforced{ @@ -1166,7 +1167,7 @@ /turf/open/floor/iron/textured_edge, /area/awaymission/bmpship/aft) "NM" = ( -/obj/structure/shuttle/engine/large{ +/obj/machinery/power/shuttle_engine/large{ dir = 8 }, /turf/template_noop, diff --git a/_maps/RandomRuins/SpaceRuins/derelict4.dmm b/_maps/RandomRuins/SpaceRuins/derelict4.dmm index 874f20c7847..488a1659a52 100644 --- a/_maps/RandomRuins/SpaceRuins/derelict4.dmm +++ b/_maps/RandomRuins/SpaceRuins/derelict4.dmm @@ -40,7 +40,7 @@ /turf/open/floor/mineral/titanium/blue/airless, /area/ruin/space/has_grav) "l" = ( -/obj/structure/shuttle/engine/propulsion{ +/obj/machinery/power/shuttle_engine/propulsion{ dir = 4 }, /turf/open/floor/plating/airless, diff --git a/_maps/RandomRuins/SpaceRuins/forgottenship.dmm b/_maps/RandomRuins/SpaceRuins/forgottenship.dmm index 9498d960a21..02a314624cd 100644 --- a/_maps/RandomRuins/SpaceRuins/forgottenship.dmm +++ b/_maps/RandomRuins/SpaceRuins/forgottenship.dmm @@ -30,7 +30,7 @@ /turf/open/floor/mineral/plastitanium, /area/ruin/space/has_grav/syndicate_forgotten_ship) "af" = ( -/obj/structure/shuttle/engine/propulsion{ +/obj/machinery/power/shuttle_engine/propulsion{ dir = 8 }, /turf/template_noop, @@ -86,7 +86,7 @@ /turf/open/floor/plastic, /area/ruin/space/has_grav/syndicate_forgotten_ship) "as" = ( -/obj/structure/shuttle/engine/huge{ +/obj/machinery/power/shuttle_engine/huge{ dir = 8 }, /turf/template_noop, diff --git a/_maps/RandomRuins/SpaceRuins/hilbertresearchfacility.dmm b/_maps/RandomRuins/SpaceRuins/hilbertresearchfacility.dmm index edaacf0bbaf..4acaabb611a 100644 --- a/_maps/RandomRuins/SpaceRuins/hilbertresearchfacility.dmm +++ b/_maps/RandomRuins/SpaceRuins/hilbertresearchfacility.dmm @@ -120,7 +120,7 @@ /area/ruin/space/has_grav/powered/hilbertresearchfacility) "dA" = ( /obj/structure/grille/broken, -/obj/structure/shuttle/engine/propulsion/burst{ +/obj/machinery/power/shuttle_engine/propulsion/burst{ anchored = 0; dir = 1 }, @@ -230,20 +230,13 @@ /obj/structure/fluff/tram_rail{ dir = 1 }, -/obj/structure/window/reinforced/survival_pod{ - dir = 4 - }, -/obj/structure/window/reinforced/survival_pod{ - dir = 1 - }, -/obj/structure/shuttle/engine/propulsion/in_wall/tram{ - dir = 4; - pixel_x = 32 - }, /obj/structure/industrial_lift/tram{ icon_state = "titanium_purple" }, -/turf/open/floor/engine, +/obj/machinery/power/shuttle_engine/propulsion/tram{ + dir = 4 + }, +/turf/closed/indestructible/riveted/plastinum, /area/ruin/space/has_grav/powered/hilbertresearchfacility) "gv" = ( /obj/structure/fluff/tram_rail, @@ -998,21 +991,16 @@ /area/ruin/space/has_grav/powered/hilbertresearchfacility) "xI" = ( /obj/structure/fluff/tram_rail, -/obj/structure/window/reinforced/survival_pod{ - dir = 4 - }, -/obj/structure/window/reinforced/survival_pod, -/obj/structure/shuttle/engine/propulsion/in_wall/tram{ - dir = 4; - pixel_x = 32 - }, /obj/structure/industrial_lift/tram{ icon_state = "titanium_purple" }, -/turf/open/floor/engine, +/obj/machinery/power/shuttle_engine/propulsion/tram{ + dir = 4 + }, +/turf/closed/indestructible/riveted/plastinum, /area/ruin/space/has_grav/powered/hilbertresearchfacility) "xO" = ( -/obj/structure/shuttle/engine/propulsion/burst{ +/obj/machinery/power/shuttle_engine/propulsion/burst{ anchored = 0; dir = 8 }, @@ -1635,18 +1623,13 @@ /area/ruin/space/has_grav/powered/hilbertresearchfacility) "Jd" = ( /obj/structure/fluff/tram_rail, -/obj/structure/window/reinforced/survival_pod{ - dir = 8 - }, -/obj/structure/window/reinforced/survival_pod, -/obj/structure/shuttle/engine/propulsion/in_wall/tram{ - dir = 8; - pixel_x = -32 - }, /obj/structure/industrial_lift/tram{ icon_state = "titanium_purple" }, -/turf/open/floor/engine, +/obj/machinery/power/shuttle_engine/propulsion/tram{ + dir = 8 + }, +/turf/closed/indestructible/riveted/plastinum, /area/ruin/space/has_grav/powered/hilbertresearchfacility) "Jh" = ( /obj/structure/fluff/tram_rail/anchor, @@ -2349,20 +2332,13 @@ /obj/structure/fluff/tram_rail{ dir = 1 }, -/obj/structure/window/reinforced/survival_pod{ - dir = 8 - }, -/obj/structure/window/reinforced/survival_pod{ - dir = 1 - }, -/obj/structure/shuttle/engine/propulsion/in_wall/tram{ - dir = 8; - pixel_x = -32 - }, /obj/structure/industrial_lift/tram{ icon_state = "titanium_purple" }, -/turf/open/floor/engine, +/obj/machinery/power/shuttle_engine/propulsion/tram{ + dir = 8 + }, +/turf/closed/indestructible/riveted/plastinum, /area/ruin/space/has_grav/powered/hilbertresearchfacility) "Yv" = ( /obj/item/kirbyplants/random, diff --git a/_maps/RandomRuins/SpaceRuins/intactemptyship.dmm b/_maps/RandomRuins/SpaceRuins/intactemptyship.dmm index 870ef9fdd90..046e0bc0bec 100644 --- a/_maps/RandomRuins/SpaceRuins/intactemptyship.dmm +++ b/_maps/RandomRuins/SpaceRuins/intactemptyship.dmm @@ -18,7 +18,7 @@ }, /area/ruin/space/has_grav/powered/authorship) "e" = ( -/obj/structure/shuttle/engine/propulsion{ +/obj/machinery/power/shuttle_engine/propulsion{ dir = 8 }, /turf/template_noop, @@ -27,7 +27,7 @@ /obj/structure/window/reinforced{ dir = 4 }, -/obj/structure/shuttle/engine/heater{ +/obj/machinery/power/shuttle_engine/heater{ dir = 8 }, /turf/open/floor/plating/airless, diff --git a/_maps/RandomRuins/SpaceRuins/mechtransport.dmm b/_maps/RandomRuins/SpaceRuins/mechtransport.dmm index bcd104aace1..71409590740 100644 --- a/_maps/RandomRuins/SpaceRuins/mechtransport.dmm +++ b/_maps/RandomRuins/SpaceRuins/mechtransport.dmm @@ -181,7 +181,7 @@ /turf/template_noop, /area/ruin/space/has_grav/powered/mechtransport) "X" = ( -/obj/structure/shuttle/engine/propulsion, +/obj/machinery/power/shuttle_engine/propulsion, /turf/template_noop, /area/ruin/space/has_grav/powered/mechtransport) diff --git a/_maps/RandomRuins/SpaceRuins/shuttlerelic.dmm b/_maps/RandomRuins/SpaceRuins/shuttlerelic.dmm index ff04fe2c4eb..4905fcfd9a8 100644 --- a/_maps/RandomRuins/SpaceRuins/shuttlerelic.dmm +++ b/_maps/RandomRuins/SpaceRuins/shuttlerelic.dmm @@ -39,7 +39,7 @@ /turf/open/floor/oldshuttle, /area/ruin/powered) "j" = ( -/obj/structure/shuttle/engine/propulsion/burst{ +/obj/machinery/power/shuttle_engine/propulsion/burst{ dir = 1 }, /turf/template_noop, @@ -82,15 +82,15 @@ /turf/open/floor/oldshuttle, /area/ruin/powered) "v" = ( -/obj/structure/shuttle/engine/propulsion/burst/left, +/obj/machinery/power/shuttle_engine/propulsion/burst/left, /turf/template_noop, /area/ruin/powered) "w" = ( -/obj/structure/shuttle/engine/propulsion/burst/right, +/obj/machinery/power/shuttle_engine/propulsion/burst/right, /turf/template_noop, /area/ruin/powered) "x" = ( -/obj/structure/shuttle/engine/propulsion/burst, +/obj/machinery/power/shuttle_engine/propulsion/burst, /turf/template_noop, /area/ruin/powered) diff --git a/_maps/RandomRuins/SpaceRuins/whiteshipruin_box.dmm b/_maps/RandomRuins/SpaceRuins/whiteshipruin_box.dmm index 0cc8b6eb10b..39ec3a547d4 100644 --- a/_maps/RandomRuins/SpaceRuins/whiteshipruin_box.dmm +++ b/_maps/RandomRuins/SpaceRuins/whiteshipruin_box.dmm @@ -147,7 +147,7 @@ /turf/open/floor/mineral/titanium/white, /area/ruin/space/has_grav/whiteship/box) "uG" = ( -/obj/structure/shuttle/engine/propulsion/right{ +/obj/machinery/power/shuttle_engine/propulsion/right{ dir = 8 }, /turf/open/floor/plating/airless, @@ -186,7 +186,7 @@ /turf/open/floor/mineral/titanium/purple, /area/ruin/space/has_grav/whiteship/box) "CC" = ( -/obj/structure/shuttle/engine/propulsion{ +/obj/machinery/power/shuttle_engine/propulsion{ dir = 8 }, /turf/open/floor/plating/airless, @@ -265,7 +265,7 @@ /turf/open/floor/plating, /area/ruin/space/has_grav/whiteship/box) "VQ" = ( -/obj/structure/shuttle/engine/heater{ +/obj/machinery/power/shuttle_engine/heater{ dir = 8 }, /obj/structure/window/reinforced{ @@ -274,7 +274,7 @@ /turf/open/floor/plating/airless, /area/ruin/space/has_grav/whiteship/box) "Xp" = ( -/obj/structure/shuttle/engine/propulsion/left{ +/obj/machinery/power/shuttle_engine/propulsion/left{ dir = 8 }, /turf/open/floor/plating/airless, diff --git a/_maps/RandomZLevels/moonoutpost19.dmm b/_maps/RandomZLevels/moonoutpost19.dmm index 6eb9c054b3c..bc32182a685 100644 --- a/_maps/RandomZLevels/moonoutpost19.dmm +++ b/_maps/RandomZLevels/moonoutpost19.dmm @@ -4599,7 +4599,7 @@ /turf/open/floor/plating, /area/awaymission/moonoutpost19/arrivals) "lD" = ( -/obj/structure/shuttle/engine/heater{ +/obj/machinery/power/shuttle_engine/heater{ dir = 4 }, /obj/structure/window/reinforced{ @@ -5775,7 +5775,7 @@ }, /area/awaymission/moonoutpost19/main) "rq" = ( -/obj/structure/shuttle/engine/propulsion/burst/right{ +/obj/machinery/power/shuttle_engine/propulsion/burst/right{ dir = 4 }, /turf/open/misc/asteroid{ @@ -6381,7 +6381,7 @@ }, /area/awaymission/moonoutpost19/research) "Zx" = ( -/obj/structure/shuttle/engine/propulsion/burst/left{ +/obj/machinery/power/shuttle_engine/propulsion/burst/left{ dir = 4 }, /turf/open/misc/asteroid{ diff --git a/_maps/RandomZLevels/research.dmm b/_maps/RandomZLevels/research.dmm index fd7b9907daf..b603558a32d 100644 --- a/_maps/RandomZLevels/research.dmm +++ b/_maps/RandomZLevels/research.dmm @@ -14,7 +14,7 @@ }, /area/awaymission/research/interior/engineering) "ah" = ( -/obj/structure/shuttle/engine/propulsion/right{ +/obj/machinery/power/shuttle_engine/propulsion/right{ dir = 1 }, /turf/open/space, @@ -24,7 +24,7 @@ /turf/open/floor/plating, /area/awaymission/research/interior/engineering) "aj" = ( -/obj/structure/shuttle/engine/propulsion/left{ +/obj/machinery/power/shuttle_engine/propulsion/left{ dir = 1 }, /turf/open/space, @@ -39,7 +39,7 @@ /area/awaymission/research/interior/engineering) "am" = ( /obj/structure/window/reinforced, -/obj/structure/shuttle/engine/heater{ +/obj/machinery/power/shuttle_engine/heater{ dir = 1 }, /obj/structure/window/reinforced{ @@ -52,7 +52,7 @@ /area/awaymission/research/interior/engineering) "ao" = ( /obj/structure/window/reinforced, -/obj/structure/shuttle/engine/heater{ +/obj/machinery/power/shuttle_engine/heater{ dir = 1 }, /obj/structure/window/reinforced{ @@ -3166,7 +3166,7 @@ /turf/closed/wall/mineral/titanium, /area/awaymission/research/exterior) "mf" = ( -/obj/structure/shuttle/engine/propulsion/burst{ +/obj/machinery/power/shuttle_engine/propulsion/burst{ dir = 4 }, /turf/closed/wall/mineral/titanium/interior, diff --git a/_maps/RandomZLevels/snowdin.dmm b/_maps/RandomZLevels/snowdin.dmm index 5936e4ecee9..545e9e9c41a 100644 --- a/_maps/RandomZLevels/snowdin.dmm +++ b/_maps/RandomZLevels/snowdin.dmm @@ -2101,7 +2101,7 @@ /turf/open/floor/iron, /area/awaymission/snowdin/post/dorm) "gj" = ( -/obj/structure/shuttle/engine/propulsion/left{ +/obj/machinery/power/shuttle_engine/propulsion/left{ dir = 4 }, /obj/effect/turf_decal/stripes/line{ @@ -8041,7 +8041,7 @@ /turf/open/floor/plating, /area/awaymission/snowdin/post/minipost) "zz" = ( -/obj/structure/shuttle/engine/propulsion/right{ +/obj/machinery/power/shuttle_engine/propulsion/right{ dir = 4 }, /obj/effect/turf_decal/stripes/line{ @@ -8870,7 +8870,7 @@ /turf/open/floor/circuit/red, /area/awaymission/snowdin/cave) "CP" = ( -/obj/structure/shuttle/engine/heater{ +/obj/machinery/power/shuttle_engine/heater{ dir = 4 }, /obj/effect/turf_decal/stripes/line{ @@ -8883,7 +8883,7 @@ /turf/open/floor/plating/snowed, /area/awaymission/snowdin/cave) "CQ" = ( -/obj/structure/shuttle/engine/propulsion/left{ +/obj/machinery/power/shuttle_engine/propulsion/left{ dir = 4 }, /obj/effect/turf_decal/stripes/line{ @@ -8938,7 +8938,7 @@ /turf/open/floor/circuit/red, /area/awaymission/snowdin/cave) "Da" = ( -/obj/structure/shuttle/engine/propulsion{ +/obj/machinery/power/shuttle_engine/propulsion{ dir = 4 }, /obj/effect/turf_decal/stripes/line{ @@ -8987,7 +8987,7 @@ /turf/open/floor/iron/dark, /area/awaymission/snowdin/cave) "Dl" = ( -/obj/structure/shuttle/engine/propulsion/right{ +/obj/machinery/power/shuttle_engine/propulsion/right{ dir = 4 }, /obj/effect/turf_decal/stripes/line{ @@ -9091,7 +9091,7 @@ /turf/open/floor/plating, /area/awaymission/snowdin/cave) "DU" = ( -/obj/structure/shuttle/engine/heater{ +/obj/machinery/power/shuttle_engine/heater{ dir = 4 }, /obj/effect/turf_decal/stripes/line{ @@ -12861,7 +12861,7 @@ /turf/open/misc/asteroid/snow, /area/awaymission/snowdin/cave) "Vl" = ( -/obj/structure/shuttle/engine/propulsion{ +/obj/machinery/power/shuttle_engine/propulsion{ dir = 4 }, /obj/effect/turf_decal/stripes/line{ diff --git a/_maps/map_files/CTF/cruiser.dmm b/_maps/map_files/CTF/cruiser.dmm index 60600cc5dd2..9006e3ad9ee 100644 --- a/_maps/map_files/CTF/cruiser.dmm +++ b/_maps/map_files/CTF/cruiser.dmm @@ -39,7 +39,7 @@ dir = 4; resistance_flags = 64 }, -/obj/structure/shuttle/engine/heater{ +/obj/machinery/power/shuttle_engine/heater{ dir = 8 }, /turf/closed/indestructible/syndicate, @@ -129,7 +129,7 @@ /turf/open/floor/mineral/titanium/blue, /area/centcom/ctf) "fa" = ( -/obj/structure/shuttle/engine/huge, +/obj/machinery/power/shuttle_engine/huge, /turf/template_noop, /area/centcom/ctf) "fj" = ( @@ -219,7 +219,7 @@ dir = 1; resistance_flags = 64 }, -/obj/structure/shuttle/engine/heater, +/obj/machinery/power/shuttle_engine/heater, /turf/closed/indestructible/syndicate, /area/centcom/ctf) "lL" = ( @@ -310,13 +310,13 @@ /turf/open/floor/mineral/titanium/blue, /area/centcom/ctf) "rI" = ( -/obj/structure/shuttle/engine/propulsion{ +/obj/machinery/power/shuttle_engine/propulsion{ dir = 4 }, /turf/open/floor/plating/airless, /area/centcom/ctf) "rR" = ( -/obj/structure/shuttle/engine/large, +/obj/machinery/power/shuttle_engine/large, /turf/open/floor/plating/airless, /area/centcom/ctf) "sc" = ( @@ -544,7 +544,7 @@ dir = 8; resistance_flags = 64 }, -/obj/structure/shuttle/engine/heater{ +/obj/machinery/power/shuttle_engine/heater{ dir = 4 }, /turf/closed/indestructible/syndicate, @@ -697,7 +697,7 @@ /turf/open/floor/pod/light, /area/centcom/ctf) "KO" = ( -/obj/structure/shuttle/engine/heater, +/obj/machinery/power/shuttle_engine/heater, /obj/structure/window/reinforced{ dir = 1 }, @@ -892,7 +892,7 @@ /turf/open/floor/mineral/titanium/yellow, /area/centcom/ctf) "SS" = ( -/obj/structure/shuttle/engine/propulsion, +/obj/machinery/power/shuttle_engine/propulsion, /turf/open/floor/plating/airless, /area/centcom/ctf) "SU" = ( @@ -929,7 +929,7 @@ /turf/open/floor/mineral/titanium/purple, /area/centcom/ctf) "Wd" = ( -/obj/structure/shuttle/engine/propulsion{ +/obj/machinery/power/shuttle_engine/propulsion{ dir = 8 }, /turf/open/floor/plating/airless, diff --git a/_maps/map_files/generic/CentCom.dmm b/_maps/map_files/generic/CentCom.dmm index 3464a9b1f5a..edf528bfab3 100644 --- a/_maps/map_files/generic/CentCom.dmm +++ b/_maps/map_files/generic/CentCom.dmm @@ -11303,7 +11303,7 @@ /turf/open/floor/mineral/plastitanium/red, /area/centcom/syndicate_mothership/expansion_chemicalwarfare) "Gz" = ( -/obj/structure/shuttle/engine/heater{ +/obj/machinery/power/shuttle_engine/heater{ resistance_flags = 3 }, /obj/structure/window/reinforced{ @@ -11456,7 +11456,7 @@ /turf/open/floor/iron, /area/centcom/syndicate_mothership/control) "GX" = ( -/obj/structure/shuttle/engine/propulsion, +/obj/machinery/power/shuttle_engine/propulsion, /turf/open/space, /area/centcom/wizard_station) "GZ" = ( @@ -12609,26 +12609,26 @@ /turf/closed/wall/mineral/titanium, /area/centcom/central_command_areas/evacuation/ship) "KI" = ( -/obj/structure/shuttle/engine/propulsion/right{ +/obj/machinery/power/shuttle_engine/propulsion/right{ dir = 1 }, /turf/open/floor/plating/airless, /area/centcom/central_command_areas/evacuation/ship) "KJ" = ( -/obj/structure/shuttle/engine/propulsion{ +/obj/machinery/power/shuttle_engine/propulsion{ dir = 1 }, /turf/open/floor/plating/airless, /area/centcom/central_command_areas/evacuation/ship) "KK" = ( -/obj/structure/shuttle/engine/propulsion/left{ +/obj/machinery/power/shuttle_engine/propulsion/left{ dir = 1 }, /turf/open/floor/plating/airless, /area/centcom/central_command_areas/evacuation/ship) "KN" = ( /obj/structure/window/reinforced, -/obj/structure/shuttle/engine/heater{ +/obj/machinery/power/shuttle_engine/heater{ dir = 1 }, /turf/open/floor/plating/airless, diff --git a/_maps/map_files/tramstation/tramstation.dmm b/_maps/map_files/tramstation/tramstation.dmm index 70059bee255..f5faa2fb82d 100644 --- a/_maps/map_files/tramstation/tramstation.dmm +++ b/_maps/map_files/tramstation/tramstation.dmm @@ -33623,9 +33623,8 @@ icon_state = "plating" }, /obj/structure/tramwall/titanium, -/obj/structure/shuttle/engine/propulsion/in_wall/tram{ - dir = 4; - pixel_x = 32 +/obj/machinery/power/shuttle_engine/propulsion/tram{ + dir = 4 }, /turf/open/openspace, /area/station/hallway/primary/tram/center) @@ -41658,9 +41657,8 @@ icon_state = "plating" }, /obj/structure/tramwall/titanium, -/obj/structure/shuttle/engine/propulsion/in_wall/tram{ - dir = 8; - pixel_x = -32 +/obj/machinery/power/shuttle_engine/propulsion/tram{ + dir = 8 }, /turf/open/openspace, /area/station/hallway/primary/tram/center) @@ -63686,7 +63684,7 @@ /obj/effect/turf_decal/trimline/yellow/warning{ dir = 8 }, -/obj/structure/shuttle/engine/propulsion{ +/obj/machinery/power/shuttle_engine/propulsion{ desc = "A standard reliable bluespace engine used by many forms of shuttles. This one has the bluespace core removed."; name = "inactive propulsion engine" }, diff --git a/_maps/shuttles/arrival_box.dmm b/_maps/shuttles/arrival_box.dmm index 3451ae7cd91..260bf6d2930 100644 --- a/_maps/shuttles/arrival_box.dmm +++ b/_maps/shuttles/arrival_box.dmm @@ -52,7 +52,7 @@ /turf/open/floor/mineral/titanium/blue, /area/shuttle/arrival) "m" = ( -/obj/structure/shuttle/engine/heater{ +/obj/machinery/power/shuttle_engine/heater{ dir = 4 }, /obj/structure/window/reinforced{ @@ -61,7 +61,7 @@ /turf/open/floor/plating/airless, /area/shuttle/arrival) "n" = ( -/obj/structure/shuttle/engine/propulsion/burst/right{ +/obj/machinery/power/shuttle_engine/propulsion/burst/right{ dir = 4 }, /turf/open/floor/plating/airless, @@ -82,7 +82,7 @@ /turf/open/floor/mineral/titanium, /area/shuttle/arrival) "s" = ( -/obj/structure/shuttle/engine/propulsion{ +/obj/machinery/power/shuttle_engine/propulsion{ dir = 4 }, /turf/open/floor/plating/airless, @@ -94,7 +94,7 @@ /turf/open/floor/mineral/titanium, /area/shuttle/arrival) "u" = ( -/obj/structure/shuttle/engine/propulsion{ +/obj/machinery/power/shuttle_engine/propulsion{ dir = 4 }, /obj/docking_port/mobile/arrivals, @@ -127,7 +127,7 @@ /turf/open/floor/mineral/titanium/blue, /area/shuttle/arrival) "A" = ( -/obj/structure/shuttle/engine/propulsion/burst/left{ +/obj/machinery/power/shuttle_engine/propulsion/burst/left{ dir = 4 }, /turf/open/floor/plating/airless, diff --git a/_maps/shuttles/arrival_delta.dmm b/_maps/shuttles/arrival_delta.dmm index 5f059039534..8b735b0bb16 100644 --- a/_maps/shuttles/arrival_delta.dmm +++ b/_maps/shuttles/arrival_delta.dmm @@ -3,7 +3,7 @@ /turf/template_noop, /area/template_noop) "b" = ( -/obj/structure/shuttle/engine/propulsion{ +/obj/machinery/power/shuttle_engine/propulsion{ dir = 1 }, /obj/effect/turf_decal/stripes/line{ @@ -26,7 +26,7 @@ /area/shuttle/arrival) "e" = ( /obj/structure/window/reinforced, -/obj/structure/shuttle/engine/heater{ +/obj/machinery/power/shuttle_engine/heater{ dir = 1 }, /obj/effect/turf_decal/stripes/line{ diff --git a/_maps/shuttles/arrival_donut.dmm b/_maps/shuttles/arrival_donut.dmm index 47af40e844f..bb108d7ae13 100644 --- a/_maps/shuttles/arrival_donut.dmm +++ b/_maps/shuttles/arrival_donut.dmm @@ -6,13 +6,13 @@ /turf/closed/wall/mineral/titanium, /area/shuttle/arrival) "c" = ( -/obj/structure/shuttle/engine/propulsion{ +/obj/machinery/power/shuttle_engine/propulsion{ dir = 1 }, /turf/open/floor/plating/airless, /area/shuttle/arrival) "d" = ( -/obj/structure/shuttle/engine/heater{ +/obj/machinery/power/shuttle_engine/heater{ dir = 1 }, /obj/structure/window/reinforced, @@ -60,7 +60,7 @@ /turf/open/floor/plating, /area/shuttle/arrival) "p" = ( -/obj/structure/shuttle/engine/propulsion{ +/obj/machinery/power/shuttle_engine/propulsion{ dir = 1 }, /obj/docking_port/mobile/arrivals{ diff --git a/_maps/shuttles/arrival_kilo.dmm b/_maps/shuttles/arrival_kilo.dmm index c83fc393165..b4956b6dfb0 100644 --- a/_maps/shuttles/arrival_kilo.dmm +++ b/_maps/shuttles/arrival_kilo.dmm @@ -100,7 +100,7 @@ /turf/open/floor/mineral/titanium/white, /area/shuttle/arrival) "n" = ( -/obj/structure/shuttle/engine/propulsion/left{ +/obj/machinery/power/shuttle_engine/propulsion/left{ dir = 8 }, /obj/effect/turf_decal/stripes/line{ @@ -109,7 +109,7 @@ /turf/open/floor/plating/airless, /area/shuttle/arrival) "o" = ( -/obj/structure/shuttle/engine/heater{ +/obj/machinery/power/shuttle_engine/heater{ dir = 8 }, /obj/effect/spawner/structure/window/reinforced/shuttle, @@ -166,7 +166,7 @@ /turf/open/floor/mineral/plastitanium, /area/shuttle/arrival) "u" = ( -/obj/structure/shuttle/engine/propulsion{ +/obj/machinery/power/shuttle_engine/propulsion{ dir = 8 }, /obj/effect/turf_decal/stripes/line{ @@ -283,7 +283,7 @@ /turf/open/floor/mineral/titanium/white, /area/shuttle/arrival) "G" = ( -/obj/structure/shuttle/engine/propulsion/right{ +/obj/machinery/power/shuttle_engine/propulsion/right{ dir = 8 }, /obj/effect/turf_decal/stripes/line{ diff --git a/_maps/shuttles/arrival_pubby.dmm b/_maps/shuttles/arrival_pubby.dmm index a93ad562bb3..c4d76d3fe30 100644 --- a/_maps/shuttles/arrival_pubby.dmm +++ b/_maps/shuttles/arrival_pubby.dmm @@ -49,7 +49,7 @@ /turf/open/floor/mineral/titanium/blue, /area/shuttle/arrival) "k" = ( -/obj/structure/shuttle/engine/heater{ +/obj/machinery/power/shuttle_engine/heater{ dir = 4 }, /obj/structure/window/reinforced{ @@ -58,7 +58,7 @@ /turf/open/floor/plating/airless, /area/shuttle/arrival) "l" = ( -/obj/structure/shuttle/engine/propulsion/burst/right{ +/obj/machinery/power/shuttle_engine/propulsion/burst/right{ dir = 4 }, /turf/open/floor/plating/airless, @@ -84,7 +84,7 @@ /turf/open/floor/mineral/titanium, /area/shuttle/arrival) "p" = ( -/obj/structure/shuttle/engine/propulsion{ +/obj/machinery/power/shuttle_engine/propulsion{ dir = 4 }, /obj/docking_port/mobile/arrivals{ @@ -99,7 +99,7 @@ /turf/open/floor/mineral/titanium/blue, /area/shuttle/arrival) "r" = ( -/obj/structure/shuttle/engine/propulsion{ +/obj/machinery/power/shuttle_engine/propulsion{ dir = 4 }, /turf/open/floor/plating/airless, @@ -122,7 +122,7 @@ /turf/open/floor/mineral/titanium/blue, /area/shuttle/arrival) "v" = ( -/obj/structure/shuttle/engine/propulsion/burst/left{ +/obj/machinery/power/shuttle_engine/propulsion/burst/left{ dir = 4 }, /turf/open/floor/plating/airless, diff --git a/_maps/shuttles/cargo_birdboat.dmm b/_maps/shuttles/cargo_birdboat.dmm index 2e570809179..ab9aaaa3442 100644 --- a/_maps/shuttles/cargo_birdboat.dmm +++ b/_maps/shuttles/cargo_birdboat.dmm @@ -123,22 +123,22 @@ /obj/structure/window/reinforced{ dir = 1 }, -/obj/structure/shuttle/engine/heater, +/obj/machinery/power/shuttle_engine/heater, /turf/open/floor/plating/airless, /area/shuttle/supply) "w" = ( /turf/template_noop, /area/template_noop) "x" = ( -/obj/structure/shuttle/engine/propulsion/burst/left, +/obj/machinery/power/shuttle_engine/propulsion/burst/left, /turf/open/floor/plating/airless, /area/shuttle/supply) "y" = ( -/obj/structure/shuttle/engine/propulsion, +/obj/machinery/power/shuttle_engine/propulsion, /turf/open/floor/plating/airless, /area/shuttle/supply) "z" = ( -/obj/structure/shuttle/engine/propulsion/burst/right, +/obj/machinery/power/shuttle_engine/propulsion/burst/right, /turf/open/floor/plating/airless, /area/shuttle/supply) "A" = ( diff --git a/_maps/shuttles/cargo_box.dmm b/_maps/shuttles/cargo_box.dmm index ae746202559..93fb265f80c 100644 --- a/_maps/shuttles/cargo_box.dmm +++ b/_maps/shuttles/cargo_box.dmm @@ -63,22 +63,22 @@ /obj/structure/window/reinforced{ dir = 1 }, -/obj/structure/shuttle/engine/heater, +/obj/machinery/power/shuttle_engine/heater, /turf/open/floor/plating/airless, /area/shuttle/supply) "s" = ( /turf/template_noop, /area/template_noop) "t" = ( -/obj/structure/shuttle/engine/propulsion/burst/left, +/obj/machinery/power/shuttle_engine/propulsion/burst/left, /turf/open/floor/plating/airless, /area/shuttle/supply) "u" = ( -/obj/structure/shuttle/engine/propulsion, +/obj/machinery/power/shuttle_engine/propulsion, /turf/open/floor/plating/airless, /area/shuttle/supply) "v" = ( -/obj/structure/shuttle/engine/propulsion/burst/right, +/obj/machinery/power/shuttle_engine/propulsion/burst/right, /turf/open/floor/plating/airless, /area/shuttle/supply) "w" = ( diff --git a/_maps/shuttles/cargo_delta.dmm b/_maps/shuttles/cargo_delta.dmm index f942216aafe..334b422e150 100644 --- a/_maps/shuttles/cargo_delta.dmm +++ b/_maps/shuttles/cargo_delta.dmm @@ -177,7 +177,7 @@ /obj/structure/window/reinforced{ dir = 1 }, -/obj/structure/shuttle/engine/heater, +/obj/machinery/power/shuttle_engine/heater, /obj/effect/turf_decal/stripes/line, /turf/open/floor/plating/airless, /area/shuttle/supply) @@ -185,7 +185,7 @@ /obj/structure/window/reinforced{ dir = 1 }, -/obj/structure/shuttle/engine/heater, +/obj/machinery/power/shuttle_engine/heater, /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/stripes/line, /turf/open/floor/plating/airless, @@ -194,17 +194,17 @@ /turf/template_noop, /area/template_noop) "C" = ( -/obj/structure/shuttle/engine/propulsion/burst/left, +/obj/machinery/power/shuttle_engine/propulsion/burst/left, /obj/effect/turf_decal/stripes/line, /turf/open/floor/plating/airless, /area/shuttle/supply) "D" = ( -/obj/structure/shuttle/engine/propulsion, +/obj/machinery/power/shuttle_engine/propulsion, /obj/effect/turf_decal/stripes/line, /turf/open/floor/plating/airless, /area/shuttle/supply) "E" = ( -/obj/structure/shuttle/engine/propulsion/burst/right, +/obj/machinery/power/shuttle_engine/propulsion/burst/right, /obj/effect/turf_decal/stripes/line, /turf/open/floor/plating/airless, /area/shuttle/supply) diff --git a/_maps/shuttles/cargo_kilo.dmm b/_maps/shuttles/cargo_kilo.dmm index 5a7c0d1c63c..9e1d210d910 100644 --- a/_maps/shuttles/cargo_kilo.dmm +++ b/_maps/shuttles/cargo_kilo.dmm @@ -258,24 +258,24 @@ /area/shuttle/supply) "A" = ( /obj/effect/spawner/structure/window/reinforced/shuttle, -/obj/structure/shuttle/engine/heater, +/obj/machinery/power/shuttle_engine/heater, /turf/open/floor/plating, /area/shuttle/supply) "B" = ( /turf/template_noop, /area/template_noop) "C" = ( -/obj/structure/shuttle/engine/propulsion/burst/left, +/obj/machinery/power/shuttle_engine/propulsion/burst/left, /obj/effect/turf_decal/stripes/line, /turf/open/floor/plating/airless, /area/shuttle/supply) "D" = ( -/obj/structure/shuttle/engine/propulsion, +/obj/machinery/power/shuttle_engine/propulsion, /obj/effect/turf_decal/stripes/line, /turf/open/floor/plating/airless, /area/shuttle/supply) "E" = ( -/obj/structure/shuttle/engine/propulsion/burst/right, +/obj/machinery/power/shuttle_engine/propulsion/burst/right, /obj/effect/turf_decal/stripes/line, /turf/open/floor/plating/airless, /area/shuttle/supply) diff --git a/_maps/shuttles/cargo_pubby.dmm b/_maps/shuttles/cargo_pubby.dmm index 8e4249eb0e1..4dbfaab7e02 100644 --- a/_maps/shuttles/cargo_pubby.dmm +++ b/_maps/shuttles/cargo_pubby.dmm @@ -105,7 +105,7 @@ /obj/structure/window/reinforced{ dir = 1 }, -/obj/structure/shuttle/engine/heater, +/obj/machinery/power/shuttle_engine/heater, /obj/effect/turf_decal/stripes/line, /turf/open/floor/plating/airless, /area/shuttle/supply) @@ -113,7 +113,7 @@ /obj/structure/window/reinforced{ dir = 1 }, -/obj/structure/shuttle/engine/heater, +/obj/machinery/power/shuttle_engine/heater, /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/stripes/line, /turf/open/floor/plating/airless, @@ -122,17 +122,17 @@ /turf/template_noop, /area/template_noop) "C" = ( -/obj/structure/shuttle/engine/propulsion/burst/left, +/obj/machinery/power/shuttle_engine/propulsion/burst/left, /obj/effect/turf_decal/stripes/line, /turf/open/floor/plating/airless, /area/shuttle/supply) "D" = ( -/obj/structure/shuttle/engine/propulsion, +/obj/machinery/power/shuttle_engine/propulsion, /obj/effect/turf_decal/stripes/line, /turf/open/floor/plating/airless, /area/shuttle/supply) "E" = ( -/obj/structure/shuttle/engine/propulsion/burst/right, +/obj/machinery/power/shuttle_engine/propulsion/burst/right, /obj/effect/turf_decal/stripes/line, /turf/open/floor/plating/airless, /area/shuttle/supply) diff --git a/_maps/shuttles/emergency_asteroid.dmm b/_maps/shuttles/emergency_asteroid.dmm index 5cd79536e74..28ddaf55b5e 100644 --- a/_maps/shuttles/emergency_asteroid.dmm +++ b/_maps/shuttles/emergency_asteroid.dmm @@ -42,13 +42,13 @@ /turf/open/floor/mineral/plastitanium/red/brig, /area/shuttle/escape/brig) "am" = ( -/obj/structure/shuttle/engine/propulsion{ +/obj/machinery/power/shuttle_engine/propulsion{ dir = 8 }, /turf/open/floor/plating/airless, /area/shuttle/escape) "an" = ( -/obj/structure/shuttle/engine/heater{ +/obj/machinery/power/shuttle_engine/heater{ dir = 8 }, /turf/open/floor/plating/airless, diff --git a/_maps/shuttles/emergency_bar.dmm b/_maps/shuttles/emergency_bar.dmm index 35672cbc27d..bb9eedb3c34 100644 --- a/_maps/shuttles/emergency_bar.dmm +++ b/_maps/shuttles/emergency_bar.dmm @@ -436,11 +436,11 @@ /obj/structure/window/reinforced{ dir = 1 }, -/obj/structure/shuttle/engine/heater, +/obj/machinery/power/shuttle_engine/heater, /turf/open/floor/plating/airless, /area/shuttle/escape) "bE" = ( -/obj/structure/shuttle/engine/propulsion, +/obj/machinery/power/shuttle_engine/propulsion, /turf/open/floor/plating/airless, /area/shuttle/escape) "bG" = ( diff --git a/_maps/shuttles/emergency_bballhooper.dmm b/_maps/shuttles/emergency_bballhooper.dmm index ee39aeae4ff..2d0c19f790b 100644 --- a/_maps/shuttles/emergency_bballhooper.dmm +++ b/_maps/shuttles/emergency_bballhooper.dmm @@ -769,7 +769,7 @@ /turf/open/floor/mineral/titanium/purple, /area/shuttle/escape) "QW" = ( -/obj/structure/shuttle/engine/heater, +/obj/machinery/power/shuttle_engine/heater, /obj/structure/window/reinforced{ dir = 1 }, @@ -812,7 +812,7 @@ /turf/open/floor/iron, /area/shuttle/escape) "Tf" = ( -/obj/structure/shuttle/engine/propulsion, +/obj/machinery/power/shuttle_engine/propulsion, /turf/open/floor/plating/airless, /area/shuttle/escape) "Tg" = ( diff --git a/_maps/shuttles/emergency_birdboat.dmm b/_maps/shuttles/emergency_birdboat.dmm index 8c0a55a41b9..33317e88660 100644 --- a/_maps/shuttles/emergency_birdboat.dmm +++ b/_maps/shuttles/emergency_birdboat.dmm @@ -31,7 +31,7 @@ /turf/open/floor/mineral/titanium/white, /area/shuttle/escape) "ag" = ( -/obj/structure/shuttle/engine/propulsion/right{ +/obj/machinery/power/shuttle_engine/propulsion/right{ dir = 4 }, /turf/open/floor/plating/airless, @@ -71,7 +71,7 @@ /turf/open/floor/mineral/titanium/white, /area/shuttle/escape) "ap" = ( -/obj/structure/shuttle/engine/propulsion{ +/obj/machinery/power/shuttle_engine/propulsion{ dir = 4 }, /turf/open/floor/plating/airless, @@ -99,7 +99,7 @@ /turf/open/floor/mineral/plastitanium/red/brig, /area/shuttle/escape/brig) "au" = ( -/obj/structure/shuttle/engine/propulsion/left{ +/obj/machinery/power/shuttle_engine/propulsion/left{ dir = 4 }, /turf/open/floor/plating/airless, diff --git a/_maps/shuttles/emergency_box.dmm b/_maps/shuttles/emergency_box.dmm index 49c721a4f52..dae8056a248 100644 --- a/_maps/shuttles/emergency_box.dmm +++ b/_maps/shuttles/emergency_box.dmm @@ -267,14 +267,14 @@ /obj/structure/window/reinforced{ dir = 1 }, -/obj/structure/shuttle/engine/heater, +/obj/machinery/power/shuttle_engine/heater, /turf/open/floor/plating/airless, /area/shuttle/escape) "bj" = ( /turf/closed/wall/mineral/titanium/nodiagonal, /area/shuttle/escape) "bk" = ( -/obj/structure/shuttle/engine/propulsion, +/obj/machinery/power/shuttle_engine/propulsion, /turf/open/floor/plating/airless, /area/shuttle/escape) "bl" = ( diff --git a/_maps/shuttles/emergency_casino.dmm b/_maps/shuttles/emergency_casino.dmm index 26d221e93a0..f44345f0309 100644 --- a/_maps/shuttles/emergency_casino.dmm +++ b/_maps/shuttles/emergency_casino.dmm @@ -1000,7 +1000,7 @@ /turf/open/floor/iron, /area/shuttle/escape) "Dv" = ( -/obj/structure/shuttle/engine/heater{ +/obj/machinery/power/shuttle_engine/heater{ dir = 8 }, /obj/structure/window/reinforced/plasma{ @@ -1144,7 +1144,7 @@ /turf/open/floor/carpet/green, /area/shuttle/escape) "Ih" = ( -/obj/structure/shuttle/engine/propulsion{ +/obj/machinery/power/shuttle_engine/propulsion{ dir = 8 }, /turf/open/floor/plating/airless, diff --git a/_maps/shuttles/emergency_cere.dmm b/_maps/shuttles/emergency_cere.dmm index a26125ce258..d83c49cf090 100644 --- a/_maps/shuttles/emergency_cere.dmm +++ b/_maps/shuttles/emergency_cere.dmm @@ -1102,11 +1102,11 @@ /obj/structure/window/reinforced{ dir = 1 }, -/obj/structure/shuttle/engine/heater, +/obj/machinery/power/shuttle_engine/heater, /turf/open/floor/plating/airless, /area/shuttle/escape) "dz" = ( -/obj/structure/shuttle/engine/propulsion, +/obj/machinery/power/shuttle_engine/propulsion, /turf/open/floor/plating/airless, /area/shuttle/escape) "dA" = ( diff --git a/_maps/shuttles/emergency_clown.dmm b/_maps/shuttles/emergency_clown.dmm index dc1b73bc98c..76ada61f3e7 100644 --- a/_maps/shuttles/emergency_clown.dmm +++ b/_maps/shuttles/emergency_clown.dmm @@ -279,11 +279,11 @@ /obj/structure/window/reinforced{ dir = 1 }, -/obj/structure/shuttle/engine/heater, +/obj/machinery/power/shuttle_engine/heater, /turf/open/floor/plating/airless, /area/shuttle/escape) "bg" = ( -/obj/structure/shuttle/engine/propulsion, +/obj/machinery/power/shuttle_engine/propulsion, /turf/open/floor/plating/airless, /area/shuttle/escape) "kT" = ( diff --git a/_maps/shuttles/emergency_construction.dmm b/_maps/shuttles/emergency_construction.dmm index d10bf9711fa..f1c667b49f4 100644 --- a/_maps/shuttles/emergency_construction.dmm +++ b/_maps/shuttles/emergency_construction.dmm @@ -3,7 +3,7 @@ /turf/template_noop, /area/template_noop) "b" = ( -/obj/structure/shuttle/engine/propulsion{ +/obj/machinery/power/shuttle_engine/propulsion{ dir = 1 }, /obj/effect/turf_decal/stripes/line{ @@ -16,7 +16,7 @@ /area/shuttle/escape) "d" = ( /obj/structure/window/reinforced, -/obj/structure/shuttle/engine/heater{ +/obj/machinery/power/shuttle_engine/heater{ dir = 1 }, /obj/effect/turf_decal/stripes/line{ diff --git a/_maps/shuttles/emergency_cramped.dmm b/_maps/shuttles/emergency_cramped.dmm index fd490228810..a2c9c04037e 100644 --- a/_maps/shuttles/emergency_cramped.dmm +++ b/_maps/shuttles/emergency_cramped.dmm @@ -112,11 +112,11 @@ /obj/structure/window/reinforced{ dir = 1 }, -/obj/structure/shuttle/engine/heater, +/obj/machinery/power/shuttle_engine/heater, /turf/open/floor/plating/airless, /area/shuttle/escape) "u" = ( -/obj/structure/shuttle/engine/propulsion, +/obj/machinery/power/shuttle_engine/propulsion, /turf/open/floor/plating/airless, /area/shuttle/escape) "v" = ( diff --git a/_maps/shuttles/emergency_cruise.dmm b/_maps/shuttles/emergency_cruise.dmm index 59e0a812312..6ff3ffa2450 100644 --- a/_maps/shuttles/emergency_cruise.dmm +++ b/_maps/shuttles/emergency_cruise.dmm @@ -59,7 +59,7 @@ /turf/open/floor/iron/white, /area/shuttle/escape) "dR" = ( -/obj/structure/shuttle/engine/heater, +/obj/machinery/power/shuttle_engine/heater, /turf/closed/wall/mineral/titanium/nodiagonal, /area/shuttle/escape) "eb" = ( @@ -391,7 +391,7 @@ /turf/open/floor/iron/white, /area/shuttle/escape) "sW" = ( -/obj/structure/shuttle/engine/huge, +/obj/machinery/power/shuttle_engine/huge, /turf/open/floor/plating/airless, /area/shuttle/escape) "tx" = ( diff --git a/_maps/shuttles/emergency_delta.dmm b/_maps/shuttles/emergency_delta.dmm index 9b3400a0bf3..ecc20f4d367 100644 --- a/_maps/shuttles/emergency_delta.dmm +++ b/_maps/shuttles/emergency_delta.dmm @@ -3,7 +3,7 @@ /turf/template_noop, /area/template_noop) "ab" = ( -/obj/structure/shuttle/engine/propulsion{ +/obj/machinery/power/shuttle_engine/propulsion{ dir = 1 }, /obj/effect/turf_decal/stripes/line{ @@ -16,7 +16,7 @@ /area/shuttle/escape) "ad" = ( /obj/structure/window/reinforced, -/obj/structure/shuttle/engine/heater{ +/obj/machinery/power/shuttle_engine/heater{ dir = 1 }, /obj/effect/turf_decal/stripes/line{ diff --git a/_maps/shuttles/emergency_discoinferno.dmm b/_maps/shuttles/emergency_discoinferno.dmm index 93675c150e2..4f9afeeba6d 100644 --- a/_maps/shuttles/emergency_discoinferno.dmm +++ b/_maps/shuttles/emergency_discoinferno.dmm @@ -198,14 +198,14 @@ /turf/open/floor/wood, /area/shuttle/escape) "M" = ( -/obj/structure/shuttle/engine/heater, +/obj/machinery/power/shuttle_engine/heater, /obj/structure/window/reinforced/plasma{ dir = 1 }, /turf/open/floor/plating/airless, /area/shuttle/escape) "N" = ( -/obj/structure/shuttle/engine/propulsion, +/obj/machinery/power/shuttle_engine/propulsion, /turf/open/floor/plating/airless, /area/shuttle/escape) "O" = ( diff --git a/_maps/shuttles/emergency_donut.dmm b/_maps/shuttles/emergency_donut.dmm index 0073c27abc8..a122e8f95e5 100644 --- a/_maps/shuttles/emergency_donut.dmm +++ b/_maps/shuttles/emergency_donut.dmm @@ -449,11 +449,11 @@ /obj/structure/window/reinforced{ dir = 1 }, -/obj/structure/shuttle/engine/heater, +/obj/machinery/power/shuttle_engine/heater, /turf/open/floor/plating/airless, /area/shuttle/escape) "bt" = ( -/obj/structure/shuttle/engine/propulsion, +/obj/machinery/power/shuttle_engine/propulsion, /turf/open/floor/plating/airless, /area/shuttle/escape) "bS" = ( diff --git a/_maps/shuttles/emergency_goon.dmm b/_maps/shuttles/emergency_goon.dmm index ab20aba5e9c..396d324e2b4 100644 --- a/_maps/shuttles/emergency_goon.dmm +++ b/_maps/shuttles/emergency_goon.dmm @@ -3,13 +3,13 @@ /turf/template_noop, /area/template_noop) "b" = ( -/obj/structure/shuttle/engine/propulsion{ +/obj/machinery/power/shuttle_engine/propulsion{ dir = 4 }, /turf/open/floor/plating, /area/shuttle/escape) "c" = ( -/obj/structure/shuttle/engine/heater{ +/obj/machinery/power/shuttle_engine/heater{ dir = 8 }, /obj/structure/window/reinforced{ @@ -70,7 +70,7 @@ /turf/open/floor/mineral/titanium/blue, /area/shuttle/escape) "p" = ( -/obj/structure/shuttle/engine/heater{ +/obj/machinery/power/shuttle_engine/heater{ dir = 8 }, /obj/structure/window/reinforced{ @@ -223,7 +223,7 @@ /turf/open/floor/mineral/titanium, /area/shuttle/escape) "W" = ( -/obj/structure/shuttle/engine/propulsion{ +/obj/machinery/power/shuttle_engine/propulsion{ dir = 4 }, /obj/structure/window/reinforced{ @@ -232,14 +232,14 @@ /turf/open/floor/plating, /area/shuttle/escape) "X" = ( -/obj/structure/shuttle/engine/propulsion{ +/obj/machinery/power/shuttle_engine/propulsion{ dir = 4 }, /obj/structure/window/reinforced, /turf/open/floor/plating, /area/shuttle/escape) "Y" = ( -/obj/structure/shuttle/engine/heater{ +/obj/machinery/power/shuttle_engine/heater{ dir = 8 }, /obj/structure/window/reinforced, diff --git a/_maps/shuttles/emergency_kilo.dmm b/_maps/shuttles/emergency_kilo.dmm index ee21ecb9b8d..921f9744ed0 100644 --- a/_maps/shuttles/emergency_kilo.dmm +++ b/_maps/shuttles/emergency_kilo.dmm @@ -507,7 +507,7 @@ /area/shuttle/escape) "cK" = ( /obj/effect/spawner/structure/window/reinforced/shuttle, -/obj/structure/shuttle/engine/heater, +/obj/machinery/power/shuttle_engine/heater, /turf/open/floor/plating, /area/shuttle/escape) "cL" = ( @@ -534,7 +534,7 @@ /turf/closed/wall/mineral/plastitanium, /area/shuttle/escape) "cT" = ( -/obj/structure/shuttle/engine/propulsion, +/obj/machinery/power/shuttle_engine/propulsion, /obj/effect/turf_decal/stripes/line, /turf/open/floor/plating/airless, /area/shuttle/escape) @@ -596,7 +596,7 @@ /turf/open/floor/iron/dark, /area/shuttle/escape) "dc" = ( -/obj/structure/shuttle/engine/heater, +/obj/machinery/power/shuttle_engine/heater, /obj/structure/window/reinforced{ dir = 1 }, @@ -606,12 +606,12 @@ /turf/open/floor/plating/airless, /area/shuttle/escape) "dd" = ( -/obj/structure/shuttle/engine/propulsion/left, +/obj/machinery/power/shuttle_engine/propulsion/left, /obj/effect/turf_decal/stripes/line, /turf/open/floor/plating/airless, /area/shuttle/escape) "de" = ( -/obj/structure/shuttle/engine/propulsion/right, +/obj/machinery/power/shuttle_engine/propulsion/right, /obj/effect/turf_decal/stripes/line, /turf/open/floor/plating/airless, /area/shuttle/escape) diff --git a/_maps/shuttles/emergency_luxury.dmm b/_maps/shuttles/emergency_luxury.dmm index 6f6fc679b06..0b14d02a2b7 100644 --- a/_maps/shuttles/emergency_luxury.dmm +++ b/_maps/shuttles/emergency_luxury.dmm @@ -77,13 +77,13 @@ /turf/open/floor/iron, /area/shuttle/escape/luxury) "ar" = ( -/obj/structure/shuttle/engine/propulsion{ +/obj/machinery/power/shuttle_engine/propulsion{ dir = 8 }, /turf/open/floor/plating/airless, /area/shuttle/escape/luxury) "as" = ( -/obj/structure/shuttle/engine/heater{ +/obj/machinery/power/shuttle_engine/heater{ dir = 8 }, /obj/structure/window/reinforced{ diff --git a/_maps/shuttles/emergency_medisim.dmm b/_maps/shuttles/emergency_medisim.dmm index f6c335c84d7..b57a558879a 100644 --- a/_maps/shuttles/emergency_medisim.dmm +++ b/_maps/shuttles/emergency_medisim.dmm @@ -622,7 +622,7 @@ /turf/open/misc/grass, /area/shuttle/escape/simulation) "Ck" = ( -/obj/structure/shuttle/engine/propulsion{ +/obj/machinery/power/shuttle_engine/propulsion{ dir = 8 }, /turf/open/floor/plating, @@ -680,7 +680,7 @@ /turf/open/floor/mineral/titanium, /area/shuttle/escape) "CY" = ( -/obj/structure/shuttle/engine/heater{ +/obj/machinery/power/shuttle_engine/heater{ dir = 8 }, /turf/open/floor/plating, diff --git a/_maps/shuttles/emergency_meta.dmm b/_maps/shuttles/emergency_meta.dmm index 0ef71b8e4bf..e192e60c478 100644 --- a/_maps/shuttles/emergency_meta.dmm +++ b/_maps/shuttles/emergency_meta.dmm @@ -156,13 +156,13 @@ /turf/open/floor/mineral/titanium/blue, /area/shuttle/escape) "au" = ( -/obj/structure/shuttle/engine/propulsion{ +/obj/machinery/power/shuttle_engine/propulsion{ dir = 8 }, /turf/open/floor/plating/airless, /area/shuttle/escape) "av" = ( -/obj/structure/shuttle/engine/heater{ +/obj/machinery/power/shuttle_engine/heater{ dir = 8 }, /obj/structure/window/reinforced{ diff --git a/_maps/shuttles/emergency_meteor.dmm b/_maps/shuttles/emergency_meteor.dmm index 1c40712f9e0..326a31b8d41 100644 --- a/_maps/shuttles/emergency_meteor.dmm +++ b/_maps/shuttles/emergency_meteor.dmm @@ -50,11 +50,11 @@ /obj/structure/window/reinforced{ dir = 1 }, -/obj/structure/shuttle/engine/heater, +/obj/machinery/power/shuttle_engine/heater, /turf/open/floor/plating/airless, /area/shuttle/escape/meteor) "n" = ( -/obj/structure/shuttle/engine/propulsion, +/obj/machinery/power/shuttle_engine/propulsion, /turf/open/floor/plating/airless, /area/shuttle/escape/meteor) "u" = ( diff --git a/_maps/shuttles/emergency_mini.dmm b/_maps/shuttles/emergency_mini.dmm index 91c0c2101fc..d728dd1885a 100644 --- a/_maps/shuttles/emergency_mini.dmm +++ b/_maps/shuttles/emergency_mini.dmm @@ -6,13 +6,13 @@ /turf/closed/wall/mineral/titanium, /area/shuttle/escape) "c" = ( -/obj/structure/shuttle/engine/propulsion{ +/obj/machinery/power/shuttle_engine/propulsion{ dir = 1 }, /turf/open/floor/plating/airless, /area/shuttle/escape) "d" = ( -/obj/structure/shuttle/engine/heater{ +/obj/machinery/power/shuttle_engine/heater{ dir = 1 }, /obj/structure/window/reinforced, diff --git a/_maps/shuttles/emergency_monastery.dmm b/_maps/shuttles/emergency_monastery.dmm index b91d493e4e5..b2d59f2625d 100644 --- a/_maps/shuttles/emergency_monastery.dmm +++ b/_maps/shuttles/emergency_monastery.dmm @@ -149,14 +149,14 @@ /turf/open/floor/iron/dark, /area/shuttle/escape) "bv" = ( -/obj/structure/shuttle/engine/propulsion, +/obj/machinery/power/shuttle_engine/propulsion, /obj/structure/window/reinforced{ dir = 8 }, /turf/open/floor/plating, /area/shuttle/escape) "bx" = ( -/obj/structure/shuttle/engine/propulsion, +/obj/machinery/power/shuttle_engine/propulsion, /obj/structure/window/reinforced{ dir = 8; layer = 2.9 @@ -172,7 +172,7 @@ /turf/open/floor/iron/dark, /area/shuttle/escape) "bC" = ( -/obj/structure/shuttle/engine/heater, +/obj/machinery/power/shuttle_engine/heater, /obj/structure/window/reinforced{ dir = 4; layer = 2.9 @@ -470,7 +470,7 @@ /turf/open/space/basic, /area/shuttle/escape) "hC" = ( -/obj/structure/shuttle/engine/propulsion, +/obj/machinery/power/shuttle_engine/propulsion, /obj/structure/window/reinforced{ dir = 4; layer = 2.9 @@ -683,7 +683,7 @@ /turf/open/floor/iron/dark, /area/shuttle/escape) "jt" = ( -/obj/structure/shuttle/engine/heater, +/obj/machinery/power/shuttle_engine/heater, /obj/structure/window/reinforced{ dir = 1 }, @@ -697,7 +697,7 @@ /turf/open/floor/iron/dark, /area/shuttle/escape) "jG" = ( -/obj/structure/shuttle/engine/heater, +/obj/machinery/power/shuttle_engine/heater, /obj/structure/window/reinforced{ dir = 4 }, @@ -1088,7 +1088,7 @@ /turf/open/floor/plating, /area/shuttle/escape) "pr" = ( -/obj/structure/shuttle/engine/heater, +/obj/machinery/power/shuttle_engine/heater, /obj/structure/window/reinforced{ dir = 8 }, @@ -2842,7 +2842,7 @@ /turf/open/floor/carpet, /area/shuttle/escape) "Nb" = ( -/obj/structure/shuttle/engine/propulsion, +/obj/machinery/power/shuttle_engine/propulsion, /obj/structure/window/reinforced{ dir = 4; layer = 2.9 @@ -3008,7 +3008,7 @@ /turf/open/floor/mineral/plastitanium/red/brig, /area/shuttle/escape/brig) "Pb" = ( -/obj/structure/shuttle/engine/heater, +/obj/machinery/power/shuttle_engine/heater, /obj/structure/window/reinforced{ dir = 1 }, @@ -3433,7 +3433,7 @@ /turf/open/floor/iron/dark, /area/shuttle/escape) "Tc" = ( -/obj/structure/shuttle/engine/heater, +/obj/machinery/power/shuttle_engine/heater, /turf/open/floor/plating, /area/shuttle/escape) "Tf" = ( @@ -3512,7 +3512,7 @@ /turf/open/floor/iron/dark, /area/shuttle/escape) "Ua" = ( -/obj/structure/shuttle/engine/heater, +/obj/machinery/power/shuttle_engine/heater, /obj/structure/window/reinforced{ dir = 1 }, @@ -3634,7 +3634,7 @@ /turf/open/floor/iron/dark, /area/shuttle/escape) "VE" = ( -/obj/structure/shuttle/engine/propulsion, +/obj/machinery/power/shuttle_engine/propulsion, /turf/open/floor/plating, /area/shuttle/escape) "VF" = ( @@ -3865,7 +3865,7 @@ /turf/open/floor/carpet, /area/shuttle/escape) "Ye" = ( -/obj/structure/shuttle/engine/propulsion, +/obj/machinery/power/shuttle_engine/propulsion, /obj/structure/window/reinforced{ dir = 4 }, diff --git a/_maps/shuttles/emergency_narnar.dmm b/_maps/shuttles/emergency_narnar.dmm index ec5d26d3bd8..3f10b239f62 100644 --- a/_maps/shuttles/emergency_narnar.dmm +++ b/_maps/shuttles/emergency_narnar.dmm @@ -240,11 +240,11 @@ /obj/structure/window/reinforced{ dir = 1 }, -/obj/structure/shuttle/engine/heater, +/obj/machinery/power/shuttle_engine/heater, /turf/open/floor/plating/airless, /area/shuttle/escape) "V" = ( -/obj/structure/shuttle/engine/propulsion, +/obj/machinery/power/shuttle_engine/propulsion, /turf/open/floor/plating/airless, /area/shuttle/escape) "X" = ( diff --git a/_maps/shuttles/emergency_nature.dmm b/_maps/shuttles/emergency_nature.dmm index 2a86182fa87..4eb258c55e6 100644 --- a/_maps/shuttles/emergency_nature.dmm +++ b/_maps/shuttles/emergency_nature.dmm @@ -185,7 +185,7 @@ /turf/open/floor/grass, /area/shuttle/escape) "gu" = ( -/obj/structure/shuttle/engine/propulsion, +/obj/machinery/power/shuttle_engine/propulsion, /turf/open/floor/plating/airless, /area/shuttle/escape) "gx" = ( @@ -844,7 +844,7 @@ /turf/open/floor/iron/white, /area/shuttle/escape) "GV" = ( -/obj/structure/shuttle/engine/huge, +/obj/machinery/power/shuttle_engine/huge, /turf/open/floor/plating/airless, /area/shuttle/escape) "He" = ( @@ -906,7 +906,7 @@ /turf/open/floor/plating, /area/shuttle/escape) "Jw" = ( -/obj/structure/shuttle/engine/heater, +/obj/machinery/power/shuttle_engine/heater, /obj/structure/window/reinforced{ dir = 1 }, diff --git a/_maps/shuttles/emergency_omega.dmm b/_maps/shuttles/emergency_omega.dmm index ec645e0e836..72d47d23422 100644 --- a/_maps/shuttles/emergency_omega.dmm +++ b/_maps/shuttles/emergency_omega.dmm @@ -497,7 +497,7 @@ /obj/structure/window/reinforced{ dir = 1 }, -/obj/structure/shuttle/engine/heater, +/obj/machinery/power/shuttle_engine/heater, /obj/effect/turf_decal/stripes/line, /turf/open/floor/plating/airless, /area/shuttle/escape) @@ -505,7 +505,7 @@ /obj/structure/window/reinforced{ dir = 1 }, -/obj/structure/shuttle/engine/heater, +/obj/machinery/power/shuttle_engine/heater, /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/stripes/line, /turf/open/floor/plating/airless, @@ -514,7 +514,7 @@ /turf/template_noop, /area/template_noop) "bv" = ( -/obj/structure/shuttle/engine/propulsion, +/obj/machinery/power/shuttle_engine/propulsion, /obj/effect/turf_decal/stripes/line, /turf/open/floor/plating/airless, /area/shuttle/escape) diff --git a/_maps/shuttles/emergency_pod.dmm b/_maps/shuttles/emergency_pod.dmm index 5724b136bc2..d6a9ff7c5a7 100644 --- a/_maps/shuttles/emergency_pod.dmm +++ b/_maps/shuttles/emergency_pod.dmm @@ -1,6 +1,6 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE "a" = ( -/obj/structure/shuttle/engine/propulsion{ +/obj/machinery/power/shuttle_engine/propulsion{ dir = 8 }, /turf/closed/wall/mineral/titanium, diff --git a/_maps/shuttles/emergency_pubby.dmm b/_maps/shuttles/emergency_pubby.dmm index 4db06d5eccb..cb1be4c4bea 100644 --- a/_maps/shuttles/emergency_pubby.dmm +++ b/_maps/shuttles/emergency_pubby.dmm @@ -461,7 +461,7 @@ /turf/open/floor/iron/white, /area/shuttle/escape) "bc" = ( -/obj/structure/shuttle/engine/propulsion, +/obj/machinery/power/shuttle_engine/propulsion, /turf/open/floor/plating/airless, /area/shuttle/escape) "bd" = ( @@ -637,7 +637,7 @@ /turf/open/floor/mineral/plastitanium/red/brig, /area/shuttle/escape/brig) "bE" = ( -/obj/structure/shuttle/engine/heater, +/obj/machinery/power/shuttle_engine/heater, /obj/structure/window/reinforced/plasma/plastitanium, /turf/open/floor/plating, /area/shuttle/escape) diff --git a/_maps/shuttles/emergency_raven.dmm b/_maps/shuttles/emergency_raven.dmm index 003535bca3b..c88b86ae9ff 100644 --- a/_maps/shuttles/emergency_raven.dmm +++ b/_maps/shuttles/emergency_raven.dmm @@ -2033,7 +2033,7 @@ /turf/closed/wall/mineral/plastitanium, /area/shuttle/escape) "ek" = ( -/obj/structure/shuttle/engine/heater, +/obj/machinery/power/shuttle_engine/heater, /obj/structure/window/reinforced{ dir = 1 }, @@ -2043,11 +2043,11 @@ /turf/open/floor/plating/airless, /area/shuttle/escape) "em" = ( -/obj/structure/shuttle/engine/propulsion, +/obj/machinery/power/shuttle_engine/propulsion, /turf/open/floor/plating/airless, /area/shuttle/escape) "en" = ( -/obj/structure/shuttle/engine/large, +/obj/machinery/power/shuttle_engine/large, /turf/open/floor/plating/airless, /area/shuttle/escape) "eo" = ( diff --git a/_maps/shuttles/emergency_rollerdome.dmm b/_maps/shuttles/emergency_rollerdome.dmm index 80921fe5b3c..a85a7ff5735 100644 --- a/_maps/shuttles/emergency_rollerdome.dmm +++ b/_maps/shuttles/emergency_rollerdome.dmm @@ -100,7 +100,7 @@ /turf/open/floor/wood, /area/shuttle/escape) "od" = ( -/obj/structure/shuttle/engine/propulsion, +/obj/machinery/power/shuttle_engine/propulsion, /turf/open/floor/plating/airless, /area/shuttle/escape) "pa" = ( @@ -234,7 +234,7 @@ /turf/open/floor/wood, /area/shuttle/escape) "KJ" = ( -/obj/structure/shuttle/engine/heater, +/obj/machinery/power/shuttle_engine/heater, /obj/structure/window/reinforced/spawner/north, /turf/open/floor/plating/airless, /area/shuttle/escape) diff --git a/_maps/shuttles/emergency_russiafightpit.dmm b/_maps/shuttles/emergency_russiafightpit.dmm index e0c0a2b5a5a..24370ca6a54 100644 --- a/_maps/shuttles/emergency_russiafightpit.dmm +++ b/_maps/shuttles/emergency_russiafightpit.dmm @@ -492,11 +492,11 @@ /obj/structure/window/reinforced{ dir = 1 }, -/obj/structure/shuttle/engine/heater, +/obj/machinery/power/shuttle_engine/heater, /turf/open/floor/plating/airless, /area/shuttle/escape) "bL" = ( -/obj/structure/shuttle/engine/propulsion, +/obj/machinery/power/shuttle_engine/propulsion, /turf/open/floor/plating/airless, /area/shuttle/escape) "bM" = ( diff --git a/_maps/shuttles/emergency_scrapheap.dmm b/_maps/shuttles/emergency_scrapheap.dmm index 8d261094922..5fd14db3fdc 100644 --- a/_maps/shuttles/emergency_scrapheap.dmm +++ b/_maps/shuttles/emergency_scrapheap.dmm @@ -360,21 +360,21 @@ /obj/structure/window/reinforced{ dir = 1 }, -/obj/structure/shuttle/engine/heater, +/obj/machinery/power/shuttle_engine/heater, /turf/open/floor/plating/airless, /area/shuttle/escape) "bm" = ( /obj/structure/window/reinforced{ dir = 1 }, -/obj/structure/shuttle/engine/heater, +/obj/machinery/power/shuttle_engine/heater, /obj/structure/window/reinforced{ dir = 4 }, /turf/open/floor/plating/airless, /area/shuttle/escape) "bn" = ( -/obj/structure/shuttle/engine/propulsion, +/obj/machinery/power/shuttle_engine/propulsion, /turf/open/floor/plating/airless, /area/shuttle/escape) "bo" = ( diff --git a/_maps/shuttles/emergency_supermatter.dmm b/_maps/shuttles/emergency_supermatter.dmm index 05e4d018cff..f0c790575a9 100644 --- a/_maps/shuttles/emergency_supermatter.dmm +++ b/_maps/shuttles/emergency_supermatter.dmm @@ -228,7 +228,7 @@ /turf/open/floor/plating/airless, /area/shuttle/escape) "bc" = ( -/obj/structure/shuttle/engine/heater, +/obj/machinery/power/shuttle_engine/heater, /turf/open/floor/plating/airless, /area/shuttle/escape) "bd" = ( @@ -238,7 +238,7 @@ /turf/open/floor/plating/airless, /area/shuttle/escape) "be" = ( -/obj/structure/shuttle/engine/propulsion, +/obj/machinery/power/shuttle_engine/propulsion, /turf/open/floor/plating/airless, /area/shuttle/escape) "bf" = ( diff --git a/_maps/shuttles/emergency_tram.dmm b/_maps/shuttles/emergency_tram.dmm index 2cad8282cb6..f7e75da092a 100644 --- a/_maps/shuttles/emergency_tram.dmm +++ b/_maps/shuttles/emergency_tram.dmm @@ -359,11 +359,11 @@ /obj/structure/window/reinforced{ dir = 1 }, -/obj/structure/shuttle/engine/heater, +/obj/machinery/power/shuttle_engine/heater, /turf/open/floor/plating/airless, /area/shuttle/escape) "bi" = ( -/obj/structure/shuttle/engine/propulsion, +/obj/machinery/power/shuttle_engine/propulsion, /turf/open/floor/plating/airless, /area/shuttle/escape) "bj" = ( diff --git a/_maps/shuttles/emergency_wabbajack.dmm b/_maps/shuttles/emergency_wabbajack.dmm index 9acda13e59c..d2de01445c2 100644 --- a/_maps/shuttles/emergency_wabbajack.dmm +++ b/_maps/shuttles/emergency_wabbajack.dmm @@ -272,11 +272,11 @@ /turf/open/lava/smooth/airless, /area/shuttle/escape) "bf" = ( -/obj/structure/shuttle/engine/heater, +/obj/machinery/power/shuttle_engine/heater, /turf/open/lava/smooth/airless, /area/shuttle/escape) "bg" = ( -/obj/structure/shuttle/engine/propulsion, +/obj/machinery/power/shuttle_engine/propulsion, /turf/open/floor/plating/airless, /area/shuttle/escape) "bi" = ( diff --git a/_maps/shuttles/escape_pod_default.dmm b/_maps/shuttles/escape_pod_default.dmm index 12a097b0299..ee44e77c162 100644 --- a/_maps/shuttles/escape_pod_default.dmm +++ b/_maps/shuttles/escape_pod_default.dmm @@ -37,7 +37,7 @@ /turf/open/floor/mineral/titanium/blue, /area/shuttle/pod_1) "Z" = ( -/obj/structure/shuttle/engine/propulsion/burst, +/obj/machinery/power/shuttle_engine/propulsion/burst, /turf/closed/wall/mineral/titanium, /area/shuttle/pod_1) diff --git a/_maps/shuttles/escape_pod_large.dmm b/_maps/shuttles/escape_pod_large.dmm index 716487130fc..cfec22bcf0c 100644 --- a/_maps/shuttles/escape_pod_large.dmm +++ b/_maps/shuttles/escape_pod_large.dmm @@ -72,7 +72,7 @@ /turf/template_noop, /area/template_noop) "Z" = ( -/obj/structure/shuttle/engine/propulsion/burst, +/obj/machinery/power/shuttle_engine/propulsion/burst, /turf/closed/wall/mineral/titanium, /area/shuttle/pod_1) diff --git a/_maps/shuttles/ferry_base.dmm b/_maps/shuttles/ferry_base.dmm index cc44e839e2e..111361e7e32 100644 --- a/_maps/shuttles/ferry_base.dmm +++ b/_maps/shuttles/ferry_base.dmm @@ -3,7 +3,7 @@ /turf/template_noop, /area/template_noop) "b" = ( -/obj/structure/shuttle/engine/propulsion{ +/obj/machinery/power/shuttle_engine/propulsion{ dir = 4 }, /turf/closed/wall/mineral/titanium, diff --git a/_maps/shuttles/ferry_fancy.dmm b/_maps/shuttles/ferry_fancy.dmm index 76b4a2114a9..21caf1c7631 100644 --- a/_maps/shuttles/ferry_fancy.dmm +++ b/_maps/shuttles/ferry_fancy.dmm @@ -14,13 +14,13 @@ /turf/open/floor/pod/dark, /area/shuttle/transport) "e" = ( -/obj/structure/shuttle/engine/propulsion/left{ +/obj/machinery/power/shuttle_engine/propulsion/left{ dir = 8 }, /turf/open/floor/plating/airless, /area/shuttle/transport) "f" = ( -/obj/structure/shuttle/engine/heater{ +/obj/machinery/power/shuttle_engine/heater{ dir = 8 }, /obj/structure/window/reinforced, @@ -38,7 +38,7 @@ /turf/open/floor/pod/light, /area/shuttle/transport) "j" = ( -/obj/structure/shuttle/engine/heater{ +/obj/machinery/power/shuttle_engine/heater{ dir = 8 }, /obj/structure/window/reinforced{ @@ -74,7 +74,7 @@ /turf/open/floor/pod/light, /area/shuttle/transport) "o" = ( -/obj/structure/shuttle/engine/heater{ +/obj/machinery/power/shuttle_engine/heater{ dir = 8 }, /obj/structure/window/reinforced{ diff --git a/_maps/shuttles/ferry_kilo.dmm b/_maps/shuttles/ferry_kilo.dmm index 47f6a7f9ce1..c69a540d6f2 100644 --- a/_maps/shuttles/ferry_kilo.dmm +++ b/_maps/shuttles/ferry_kilo.dmm @@ -31,7 +31,7 @@ /turf/closed/wall/mineral/titanium, /area/shuttle/transport) "h" = ( -/obj/structure/shuttle/engine/propulsion/left{ +/obj/machinery/power/shuttle_engine/propulsion/left{ dir = 8 }, /obj/effect/turf_decal/stripes/line{ @@ -40,7 +40,7 @@ /turf/open/floor/plating/airless, /area/shuttle/transport) "i" = ( -/obj/structure/shuttle/engine/heater{ +/obj/machinery/power/shuttle_engine/heater{ dir = 8 }, /obj/effect/spawner/structure/window/reinforced/shuttle, @@ -91,7 +91,7 @@ /turf/open/floor/mineral/plastitanium, /area/shuttle/transport) "p" = ( -/obj/structure/shuttle/engine/propulsion{ +/obj/machinery/power/shuttle_engine/propulsion{ dir = 8 }, /obj/effect/turf_decal/stripes/line{ @@ -160,7 +160,7 @@ /turf/open/floor/mineral/plastitanium, /area/shuttle/transport) "u" = ( -/obj/structure/shuttle/engine/propulsion/right{ +/obj/machinery/power/shuttle_engine/propulsion/right{ dir = 8 }, /obj/effect/turf_decal/stripes/line{ diff --git a/_maps/shuttles/ferry_lighthouse.dmm b/_maps/shuttles/ferry_lighthouse.dmm index 35c4407568c..77bf9ffe7d6 100644 --- a/_maps/shuttles/ferry_lighthouse.dmm +++ b/_maps/shuttles/ferry_lighthouse.dmm @@ -3,13 +3,13 @@ /turf/template_noop, /area/template_noop) "ab" = ( -/obj/structure/shuttle/engine/propulsion/left{ +/obj/machinery/power/shuttle_engine/propulsion/left{ dir = 4 }, /turf/open/floor/plating/airless, /area/shuttle/transport) "ac" = ( -/obj/structure/shuttle/engine/heater{ +/obj/machinery/power/shuttle_engine/heater{ dir = 8 }, /turf/open/floor/plating/airless, @@ -259,11 +259,11 @@ /turf/open/floor/plating/airless, /area/shuttle/transport) "bi" = ( -/obj/structure/shuttle/engine/heater, +/obj/machinery/power/shuttle_engine/heater, /turf/open/floor/plating/airless, /area/shuttle/transport) "bj" = ( -/obj/structure/shuttle/engine/propulsion/right, +/obj/machinery/power/shuttle_engine/propulsion/right, /turf/open/floor/plating/airless, /area/shuttle/transport) diff --git a/_maps/shuttles/ferry_meat.dmm b/_maps/shuttles/ferry_meat.dmm index 543cc393977..e9a73eaa082 100644 --- a/_maps/shuttles/ferry_meat.dmm +++ b/_maps/shuttles/ferry_meat.dmm @@ -3,7 +3,7 @@ /turf/template_noop, /area/template_noop) "b" = ( -/obj/structure/shuttle/engine/propulsion{ +/obj/machinery/power/shuttle_engine/propulsion{ dir = 4 }, /turf/closed/wall/mineral/titanium, diff --git a/_maps/shuttles/hunter_bounty.dmm b/_maps/shuttles/hunter_bounty.dmm index 0b53877e1d9..ae3db0bd64b 100644 --- a/_maps/shuttles/hunter_bounty.dmm +++ b/_maps/shuttles/hunter_bounty.dmm @@ -17,7 +17,7 @@ /turf/open/floor/plating, /area/shuttle/hunter) "e" = ( -/obj/structure/shuttle/engine/propulsion{ +/obj/machinery/power/shuttle_engine/propulsion{ dir = 8 }, /turf/open/floor/plating/airless, @@ -75,7 +75,7 @@ /turf/open/floor/pod/light, /area/shuttle/hunter) "q" = ( -/obj/structure/shuttle/engine/heater{ +/obj/machinery/power/shuttle_engine/heater{ dir = 8 }, /obj/structure/window/reinforced{ diff --git a/_maps/shuttles/hunter_russian.dmm b/_maps/shuttles/hunter_russian.dmm index 7125eeb3bdc..fe938795c89 100644 --- a/_maps/shuttles/hunter_russian.dmm +++ b/_maps/shuttles/hunter_russian.dmm @@ -76,7 +76,7 @@ /turf/open/floor/mineral/plastitanium/red, /area/shuttle/hunter/russian) "eL" = ( -/obj/structure/shuttle/engine/propulsion{ +/obj/machinery/power/shuttle_engine/propulsion{ dir = 8 }, /turf/open/floor/plating/airless, @@ -401,7 +401,7 @@ /turf/open/floor/pod/dark, /area/shuttle/hunter/russian) "EK" = ( -/obj/structure/shuttle/engine/heater{ +/obj/machinery/power/shuttle_engine/heater{ dir = 8 }, /obj/structure/window/reinforced/survival_pod{ diff --git a/_maps/shuttles/hunter_space_cop.dmm b/_maps/shuttles/hunter_space_cop.dmm index 732f7c84534..9ce6aa90158 100644 --- a/_maps/shuttles/hunter_space_cop.dmm +++ b/_maps/shuttles/hunter_space_cop.dmm @@ -91,7 +91,7 @@ /turf/open/floor/mineral/titanium/blue, /area/shuttle/hunter) "hB" = ( -/obj/structure/shuttle/engine/propulsion{ +/obj/machinery/power/shuttle_engine/propulsion{ dir = 8 }, /turf/closed/wall/mineral/titanium, diff --git a/_maps/shuttles/infiltrator_advanced.dmm b/_maps/shuttles/infiltrator_advanced.dmm index 75c171015d2..b093c695da8 100644 --- a/_maps/shuttles/infiltrator_advanced.dmm +++ b/_maps/shuttles/infiltrator_advanced.dmm @@ -615,7 +615,7 @@ /turf/open/floor/mineral/plastitanium/red, /area/shuttle/syndicate/airlock) "bn" = ( -/obj/structure/shuttle/engine/heater, +/obj/machinery/power/shuttle_engine/heater, /turf/closed/wall/r_wall/syndicate, /area/shuttle/syndicate/medical) "bo" = ( @@ -703,7 +703,7 @@ /turf/open/floor/mineral/plastitanium/red, /area/shuttle/syndicate/airlock) "bw" = ( -/obj/structure/shuttle/engine/propulsion, +/obj/machinery/power/shuttle_engine/propulsion, /obj/effect/turf_decal/stripes/box, /obj/effect/turf_decal/stripes/box, /turf/open/floor/plating, @@ -766,7 +766,7 @@ /turf/closed/wall/r_wall/syndicate, /area/shuttle/syndicate/armory) "bF" = ( -/obj/structure/shuttle/engine/propulsion, +/obj/machinery/power/shuttle_engine/propulsion, /obj/effect/turf_decal/stripes/box, /obj/effect/turf_decal/stripes/box, /turf/open/floor/plating, @@ -1185,11 +1185,11 @@ /area/shuttle/syndicate/medical) "cx" = ( /obj/effect/spawner/structure/window/reinforced/plasma/plastitanium, -/obj/structure/shuttle/engine/heater, +/obj/machinery/power/shuttle_engine/heater, /turf/open/floor/plating, /area/shuttle/syndicate/medical) "cy" = ( -/obj/structure/shuttle/engine/propulsion, +/obj/machinery/power/shuttle_engine/propulsion, /obj/effect/turf_decal/stripes/line, /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -1225,7 +1225,7 @@ /turf/closed/wall/r_wall/syndicate, /area/shuttle/syndicate/medical) "cD" = ( -/obj/structure/shuttle/engine/large, +/obj/machinery/power/shuttle_engine/large, /obj/effect/turf_decal/stripes/line{ dir = 10 }, @@ -1239,16 +1239,16 @@ /turf/closed/wall/mineral/plastitanium/nodiagonal, /area/shuttle/syndicate/armory) "cG" = ( -/obj/structure/shuttle/engine/heater, +/obj/machinery/power/shuttle_engine/heater, /turf/closed/wall/r_wall/syndicate, /area/shuttle/syndicate/armory) "cH" = ( /obj/effect/spawner/structure/window/reinforced/plasma/plastitanium, -/obj/structure/shuttle/engine/heater, +/obj/machinery/power/shuttle_engine/heater, /turf/open/floor/plating, /area/shuttle/syndicate/armory) "cI" = ( -/obj/structure/shuttle/engine/large, +/obj/machinery/power/shuttle_engine/large, /obj/effect/turf_decal/stripes/line, /turf/open/floor/plating, /area/shuttle/syndicate/hallway) @@ -1265,20 +1265,20 @@ /turf/closed/wall/r_wall/syndicate, /area/shuttle/syndicate/armory) "cL" = ( -/obj/structure/shuttle/engine/large, +/obj/machinery/power/shuttle_engine/large, /turf/open/floor/plating, /area/shuttle/syndicate/medical) "cM" = ( -/obj/structure/shuttle/engine/heater, +/obj/machinery/power/shuttle_engine/heater, /turf/closed/wall/r_wall/syndicate, /area/shuttle/syndicate/hallway) "cN" = ( /obj/effect/spawner/structure/window/reinforced/plasma/plastitanium, -/obj/structure/shuttle/engine/heater, +/obj/machinery/power/shuttle_engine/heater, /turf/open/floor/plating, /area/shuttle/syndicate/hallway) "cO" = ( -/obj/structure/shuttle/engine/propulsion, +/obj/machinery/power/shuttle_engine/propulsion, /obj/effect/turf_decal/stripes/line, /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -1302,7 +1302,7 @@ /turf/open/floor/plating, /area/shuttle/syndicate/armory) "cS" = ( -/obj/structure/shuttle/engine/large, +/obj/machinery/power/shuttle_engine/large, /turf/open/floor/plating, /area/shuttle/syndicate/armory) "cT" = ( diff --git a/_maps/shuttles/infiltrator_basic.dmm b/_maps/shuttles/infiltrator_basic.dmm index 6e445bea6ab..4aba416a7a0 100644 --- a/_maps/shuttles/infiltrator_basic.dmm +++ b/_maps/shuttles/infiltrator_basic.dmm @@ -542,7 +542,7 @@ /turf/open/floor/iron/white, /area/shuttle/syndicate/medical) "cr" = ( -/obj/structure/shuttle/engine/heater, +/obj/machinery/power/shuttle_engine/heater, /obj/effect/turf_decal/stripes/line, /obj/structure/window/reinforced/survival_pod{ dir = 1 @@ -560,7 +560,7 @@ /turf/open/floor/circuit/red, /area/shuttle/syndicate/engineering) "cu" = ( -/obj/structure/shuttle/engine/heater, +/obj/machinery/power/shuttle_engine/heater, /obj/effect/turf_decal/stripes/line, /obj/structure/window/reinforced/survival_pod{ dir = 1 @@ -568,22 +568,22 @@ /turf/open/floor/plating/airless, /area/shuttle/syndicate/medical) "cv" = ( -/obj/structure/shuttle/engine/propulsion/left, +/obj/machinery/power/shuttle_engine/propulsion/left, /obj/effect/turf_decal/stripes/line, /turf/open/floor/plating/airless, /area/shuttle/syndicate/hallway) "cw" = ( -/obj/structure/shuttle/engine/propulsion, +/obj/machinery/power/shuttle_engine/propulsion, /obj/effect/turf_decal/stripes/line, /turf/open/floor/plating/airless, /area/shuttle/syndicate/hallway) "cx" = ( -/obj/structure/shuttle/engine/propulsion/right, +/obj/machinery/power/shuttle_engine/propulsion/right, /obj/effect/turf_decal/stripes/line, /turf/open/floor/plating/airless, /area/shuttle/syndicate/hallway) "cy" = ( -/obj/structure/shuttle/engine/heater, +/obj/machinery/power/shuttle_engine/heater, /obj/effect/turf_decal/stripes/line, /obj/structure/window/reinforced/survival_pod{ dir = 1 @@ -591,32 +591,32 @@ /turf/open/floor/plating/airless, /area/shuttle/syndicate/engineering) "cz" = ( -/obj/structure/shuttle/engine/propulsion/left, +/obj/machinery/power/shuttle_engine/propulsion/left, /obj/effect/turf_decal/stripes/line, /turf/open/floor/plating/airless, /area/shuttle/syndicate/medical) "cA" = ( -/obj/structure/shuttle/engine/propulsion, +/obj/machinery/power/shuttle_engine/propulsion, /obj/effect/turf_decal/stripes/line, /turf/open/floor/plating/airless, /area/shuttle/syndicate/medical) "cB" = ( -/obj/structure/shuttle/engine/propulsion/right, +/obj/machinery/power/shuttle_engine/propulsion/right, /obj/effect/turf_decal/stripes/line, /turf/open/floor/plating/airless, /area/shuttle/syndicate/medical) "cE" = ( -/obj/structure/shuttle/engine/propulsion/left, +/obj/machinery/power/shuttle_engine/propulsion/left, /obj/effect/turf_decal/stripes/line, /turf/open/floor/plating/airless, /area/shuttle/syndicate/engineering) "cF" = ( -/obj/structure/shuttle/engine/propulsion, +/obj/machinery/power/shuttle_engine/propulsion, /obj/effect/turf_decal/stripes/line, /turf/open/floor/plating/airless, /area/shuttle/syndicate/engineering) "cG" = ( -/obj/structure/shuttle/engine/propulsion/right, +/obj/machinery/power/shuttle_engine/propulsion/right, /obj/effect/turf_decal/stripes/line, /turf/open/floor/plating/airless, /area/shuttle/syndicate/engineering) diff --git a/_maps/shuttles/labour_box.dmm b/_maps/shuttles/labour_box.dmm index 3d15af318b9..67a51952254 100644 --- a/_maps/shuttles/labour_box.dmm +++ b/_maps/shuttles/labour_box.dmm @@ -106,7 +106,7 @@ /turf/open/floor/plating, /area/shuttle/labor) "r" = ( -/obj/structure/shuttle/engine/heater, +/obj/machinery/power/shuttle_engine/heater, /obj/structure/window/reinforced{ dir = 1; layer = 2.9 @@ -114,7 +114,7 @@ /turf/open/floor/plating/airless, /area/shuttle/labor) "s" = ( -/obj/structure/shuttle/engine/propulsion, +/obj/machinery/power/shuttle_engine/propulsion, /turf/open/floor/plating/airless, /area/shuttle/labor) "W" = ( diff --git a/_maps/shuttles/labour_delta.dmm b/_maps/shuttles/labour_delta.dmm index 5d48f97cfbe..f47217c9a9a 100644 --- a/_maps/shuttles/labour_delta.dmm +++ b/_maps/shuttles/labour_delta.dmm @@ -244,7 +244,7 @@ /turf/open/floor/plating, /area/shuttle/labor) "x" = ( -/obj/structure/shuttle/engine/heater, +/obj/machinery/power/shuttle_engine/heater, /obj/structure/window/reinforced{ dir = 1; layer = 2.9 @@ -253,7 +253,7 @@ /turf/open/floor/plating/airless, /area/shuttle/labor) "y" = ( -/obj/structure/shuttle/engine/propulsion, +/obj/machinery/power/shuttle_engine/propulsion, /obj/effect/turf_decal/stripes/line, /turf/open/floor/plating/airless, /area/shuttle/labor) diff --git a/_maps/shuttles/labour_generic.dmm b/_maps/shuttles/labour_generic.dmm index 0ba38c89e65..734f449cab0 100644 --- a/_maps/shuttles/labour_generic.dmm +++ b/_maps/shuttles/labour_generic.dmm @@ -101,7 +101,7 @@ /turf/open/floor/mineral/titanium, /area/shuttle/labor) "r" = ( -/obj/structure/shuttle/engine/heater, +/obj/machinery/power/shuttle_engine/heater, /obj/structure/window/reinforced{ dir = 1; layer = 2.9 @@ -109,7 +109,7 @@ /turf/open/floor/plating/airless, /area/shuttle/labor) "s" = ( -/obj/structure/shuttle/engine/propulsion, +/obj/machinery/power/shuttle_engine/propulsion, /turf/open/floor/plating/airless, /area/shuttle/labor) "W" = ( diff --git a/_maps/shuttles/labour_kilo.dmm b/_maps/shuttles/labour_kilo.dmm index d65c45bb844..95f56ea596a 100644 --- a/_maps/shuttles/labour_kilo.dmm +++ b/_maps/shuttles/labour_kilo.dmm @@ -237,14 +237,14 @@ /area/shuttle/labor) "w" = ( /obj/effect/spawner/structure/window/reinforced/shuttle, -/obj/structure/shuttle/engine/heater, +/obj/machinery/power/shuttle_engine/heater, /turf/open/floor/plating, /area/shuttle/labor) "x" = ( /turf/closed/wall/mineral/plastitanium, /area/shuttle/labor) "y" = ( -/obj/structure/shuttle/engine/propulsion, +/obj/machinery/power/shuttle_engine/propulsion, /turf/open/floor/plating/airless, /area/shuttle/labor) diff --git a/_maps/shuttles/mining_box.dmm b/_maps/shuttles/mining_box.dmm index 8c4b4406043..8ccc067ee9c 100644 --- a/_maps/shuttles/mining_box.dmm +++ b/_maps/shuttles/mining_box.dmm @@ -47,7 +47,7 @@ /turf/open/floor/mineral/titanium/blue, /area/shuttle/mining) "j" = ( -/obj/structure/shuttle/engine/heater, +/obj/machinery/power/shuttle_engine/heater, /obj/structure/window/reinforced{ dir = 1; layer = 2.9 @@ -65,7 +65,7 @@ /turf/open/floor/mineral/titanium/blue, /area/shuttle/mining) "l" = ( -/obj/structure/shuttle/engine/propulsion/burst, +/obj/machinery/power/shuttle_engine/propulsion/burst, /turf/open/floor/plating/airless, /area/shuttle/mining) "Q" = ( diff --git a/_maps/shuttles/mining_common_kilo.dmm b/_maps/shuttles/mining_common_kilo.dmm index e92f8f24432..461ecfd78a7 100644 --- a/_maps/shuttles/mining_common_kilo.dmm +++ b/_maps/shuttles/mining_common_kilo.dmm @@ -109,7 +109,7 @@ /area/shuttle/mining) "p" = ( /obj/effect/spawner/structure/window/reinforced/shuttle, -/obj/structure/shuttle/engine/heater, +/obj/machinery/power/shuttle_engine/heater, /turf/open/floor/plating, /area/shuttle/mining) "q" = ( @@ -122,7 +122,7 @@ /turf/closed/wall/mineral/titanium, /area/shuttle/mining) "s" = ( -/obj/structure/shuttle/engine/propulsion/burst, +/obj/machinery/power/shuttle_engine/propulsion/burst, /turf/open/floor/plating/airless, /area/shuttle/mining) diff --git a/_maps/shuttles/mining_common_meta.dmm b/_maps/shuttles/mining_common_meta.dmm index 7865abfd127..31be10e4d6a 100644 --- a/_maps/shuttles/mining_common_meta.dmm +++ b/_maps/shuttles/mining_common_meta.dmm @@ -47,7 +47,7 @@ /turf/open/floor/mineral/titanium/blue, /area/shuttle/mining) "j" = ( -/obj/structure/shuttle/engine/heater, +/obj/machinery/power/shuttle_engine/heater, /obj/structure/window/reinforced{ dir = 1; layer = 2.9 @@ -65,7 +65,7 @@ /turf/open/floor/mineral/titanium/blue, /area/shuttle/mining) "l" = ( -/obj/structure/shuttle/engine/propulsion/burst, +/obj/machinery/power/shuttle_engine/propulsion/burst, /turf/open/floor/plating/airless, /area/shuttle/mining) "Q" = ( diff --git a/_maps/shuttles/mining_delta.dmm b/_maps/shuttles/mining_delta.dmm index 45575e6db00..a4f4ea8ba41 100644 --- a/_maps/shuttles/mining_delta.dmm +++ b/_maps/shuttles/mining_delta.dmm @@ -211,7 +211,7 @@ /turf/open/floor/iron, /area/shuttle/mining) "r" = ( -/obj/structure/shuttle/engine/heater, +/obj/machinery/power/shuttle_engine/heater, /obj/structure/window/reinforced{ dir = 4 }, @@ -232,7 +232,7 @@ /turf/open/floor/iron, /area/shuttle/mining) "t" = ( -/obj/structure/shuttle/engine/propulsion/burst, +/obj/machinery/power/shuttle_engine/propulsion/burst, /obj/structure/window/reinforced{ dir = 1; layer = 2.9 diff --git a/_maps/shuttles/mining_freight.dmm b/_maps/shuttles/mining_freight.dmm index 03d9b4ddd50..7c5650db8b2 100644 --- a/_maps/shuttles/mining_freight.dmm +++ b/_maps/shuttles/mining_freight.dmm @@ -107,7 +107,7 @@ /area/shuttle/mining) "p" = ( /obj/effect/spawner/structure/window/reinforced/shuttle, -/obj/structure/shuttle/engine/heater, +/obj/machinery/power/shuttle_engine/heater, /turf/open/floor/plating, /area/template_noop) "q" = ( @@ -120,7 +120,7 @@ /turf/closed/wall/mineral/titanium, /area/shuttle/mining) "s" = ( -/obj/structure/shuttle/engine/propulsion/burst, +/obj/machinery/power/shuttle_engine/propulsion/burst, /turf/open/floor/plating/airless, /area/shuttle/mining) diff --git a/_maps/shuttles/mining_kilo.dmm b/_maps/shuttles/mining_kilo.dmm index 929fb6c16a6..fa0752a503f 100644 --- a/_maps/shuttles/mining_kilo.dmm +++ b/_maps/shuttles/mining_kilo.dmm @@ -246,7 +246,7 @@ /area/shuttle/mining/large) "D" = ( /obj/effect/spawner/structure/window/reinforced/shuttle, -/obj/structure/shuttle/engine/heater, +/obj/machinery/power/shuttle_engine/heater, /turf/open/floor/plating, /area/shuttle/mining/large) "E" = ( @@ -255,7 +255,7 @@ /turf/open/floor/mineral/plastitanium, /area/shuttle/mining/large) "F" = ( -/obj/structure/shuttle/engine/propulsion, +/obj/machinery/power/shuttle_engine/propulsion, /turf/open/floor/plating/airless, /area/shuttle/mining/large) "G" = ( diff --git a/_maps/shuttles/mining_large.dmm b/_maps/shuttles/mining_large.dmm index 701f80a73af..4aa1977458b 100644 --- a/_maps/shuttles/mining_large.dmm +++ b/_maps/shuttles/mining_large.dmm @@ -419,7 +419,7 @@ /turf/closed/wall/mineral/titanium, /area/shuttle/mining/large) "G" = ( -/obj/structure/shuttle/engine/heater, +/obj/machinery/power/shuttle_engine/heater, /obj/structure/window/reinforced{ dir = 1; layer = 2.9 @@ -432,7 +432,7 @@ /turf/open/floor/plating, /area/shuttle/mining/large) "I" = ( -/obj/structure/shuttle/engine/propulsion, +/obj/machinery/power/shuttle_engine/propulsion, /turf/open/floor/plating/airless, /area/shuttle/mining/large) "J" = ( diff --git a/_maps/shuttles/pirate_default.dmm b/_maps/shuttles/pirate_default.dmm index 5c6e536613c..797eae6b692 100644 --- a/_maps/shuttles/pirate_default.dmm +++ b/_maps/shuttles/pirate_default.dmm @@ -333,7 +333,7 @@ /turf/open/floor/plating, /area/shuttle/pirate) "aH" = ( -/obj/structure/shuttle/engine/propulsion/left, +/obj/machinery/power/shuttle_engine/propulsion/left, /turf/open/floor/plating/airless, /area/shuttle/pirate) "aI" = ( @@ -354,7 +354,7 @@ /turf/open/floor/plating, /area/shuttle/pirate) "aK" = ( -/obj/structure/shuttle/engine/propulsion, +/obj/machinery/power/shuttle_engine/propulsion, /turf/open/floor/plating/airless, /area/shuttle/pirate) "aL" = ( @@ -792,11 +792,11 @@ dir = 1; pixel_y = 1 }, -/obj/structure/shuttle/engine/heater, +/obj/machinery/power/shuttle_engine/heater, /turf/open/floor/plating/airless, /area/shuttle/pirate) "er" = ( -/obj/structure/shuttle/engine/propulsion/right, +/obj/machinery/power/shuttle_engine/propulsion/right, /turf/open/floor/plating/airless, /area/shuttle/pirate) "et" = ( diff --git a/_maps/shuttles/pirate_silverscale.dmm b/_maps/shuttles/pirate_silverscale.dmm index 14763a30676..cdc8d842712 100644 --- a/_maps/shuttles/pirate_silverscale.dmm +++ b/_maps/shuttles/pirate_silverscale.dmm @@ -108,14 +108,14 @@ /area/shuttle/pirate) "em" = ( /obj/effect/spawner/structure/window/reinforced/shuttle, -/obj/structure/shuttle/engine/heater{ +/obj/machinery/power/shuttle_engine/heater{ dir = 4 }, /obj/effect/turf_decal/trimline/yellow/warning, /turf/open/floor/plating/airless, /area/shuttle/pirate) "eK" = ( -/obj/structure/shuttle/engine/router, +/obj/machinery/power/shuttle_engine/propulsion, /turf/open/floor/plating/airless, /area/shuttle/pirate) "eU" = ( @@ -175,7 +175,7 @@ /area/shuttle/pirate) "hF" = ( /obj/effect/spawner/structure/window/reinforced/shuttle, -/obj/structure/shuttle/engine/heater{ +/obj/machinery/power/shuttle_engine/heater{ dir = 4 }, /obj/effect/turf_decal/trimline/yellow/warning{ @@ -258,7 +258,7 @@ /turf/open/floor/plating/airless, /area/shuttle/pirate) "mz" = ( -/obj/structure/shuttle/engine/propulsion{ +/obj/machinery/power/shuttle_engine/propulsion{ dir = 4 }, /obj/effect/turf_decal/trimline/yellow/warning{ @@ -273,7 +273,7 @@ /turf/open/floor/carpet/royalblack, /area/shuttle/pirate) "nm" = ( -/obj/structure/shuttle/engine/propulsion{ +/obj/machinery/power/shuttle_engine/propulsion{ dir = 4 }, /obj/effect/turf_decal/trimline/yellow/warning{ @@ -293,7 +293,7 @@ /area/shuttle/pirate) "nK" = ( /obj/effect/spawner/structure/window/reinforced/shuttle, -/obj/structure/shuttle/engine/heater{ +/obj/machinery/power/shuttle_engine/heater{ dir = 8 }, /obj/effect/turf_decal/trimline/yellow/warning{ @@ -354,7 +354,7 @@ /turf/open/floor/carpet/royalblack, /area/shuttle/pirate) "vw" = ( -/obj/structure/shuttle/engine/propulsion{ +/obj/machinery/power/shuttle_engine/propulsion{ dir = 8 }, /obj/effect/turf_decal/trimline/yellow/warning{ @@ -490,7 +490,7 @@ /area/shuttle/pirate) "AE" = ( /obj/effect/spawner/structure/window/reinforced/shuttle, -/obj/structure/shuttle/engine/heater{ +/obj/machinery/power/shuttle_engine/heater{ dir = 8 }, /obj/effect/turf_decal/trimline/yellow/warning, @@ -703,7 +703,7 @@ }, /area/shuttle/pirate) "Mu" = ( -/obj/structure/shuttle/engine/propulsion{ +/obj/machinery/power/shuttle_engine/propulsion{ dir = 8 }, /turf/open/floor/plating/airless, @@ -918,7 +918,7 @@ /turf/open/floor/iron/dark/textured, /area/shuttle/pirate) "UJ" = ( -/obj/structure/shuttle/engine/propulsion{ +/obj/machinery/power/shuttle_engine/propulsion{ dir = 8 }, /obj/effect/turf_decal/trimline/yellow/warning{ @@ -932,7 +932,7 @@ /turf/open/floor/iron/dark, /area/shuttle/pirate) "Ww" = ( -/obj/structure/shuttle/engine/heater{ +/obj/machinery/power/shuttle_engine/heater{ dir = 8 }, /turf/open/floor/plating/airless, diff --git a/_maps/shuttles/ruin_caravan_victim.dmm b/_maps/shuttles/ruin_caravan_victim.dmm index 3f7de51f042..e573596c372 100644 --- a/_maps/shuttles/ruin_caravan_victim.dmm +++ b/_maps/shuttles/ruin_caravan_victim.dmm @@ -252,7 +252,7 @@ /turf/open/floor/plating, /area/shuttle/caravan/freighter1) "mo" = ( -/obj/structure/shuttle/engine/heater{ +/obj/machinery/power/shuttle_engine/heater{ dir = 8 }, /obj/structure/window/reinforced{ @@ -428,7 +428,7 @@ /turf/open/floor/plating/airless, /area/shuttle/caravan/freighter1) "vt" = ( -/obj/structure/shuttle/engine/propulsion/burst{ +/obj/machinery/power/shuttle_engine/propulsion/burst{ dir = 8 }, /turf/open/floor/plating/airless, @@ -732,13 +732,13 @@ }, /area/shuttle/caravan/freighter1) "KC" = ( -/obj/structure/shuttle/engine/propulsion/burst/right{ +/obj/machinery/power/shuttle_engine/propulsion/burst/right{ dir = 8 }, /turf/open/floor/plating/airless, /area/shuttle/caravan/freighter1) "KX" = ( -/obj/structure/shuttle/engine/propulsion/burst/left{ +/obj/machinery/power/shuttle_engine/propulsion/burst/left{ dir = 8 }, /turf/open/floor/plating/airless, diff --git a/_maps/shuttles/ruin_pirate_cutter.dmm b/_maps/shuttles/ruin_pirate_cutter.dmm index 34050606922..ffc74b121ca 100644 --- a/_maps/shuttles/ruin_pirate_cutter.dmm +++ b/_maps/shuttles/ruin_pirate_cutter.dmm @@ -142,7 +142,7 @@ /turf/open/floor/plating, /area/shuttle/caravan/pirate) "jU" = ( -/obj/structure/shuttle/engine/propulsion/burst{ +/obj/machinery/power/shuttle_engine/propulsion/burst{ dir = 8 }, /turf/open/floor/plating/airless, @@ -634,7 +634,7 @@ /turf/open/floor/iron/dark, /area/shuttle/caravan/pirate) "HD" = ( -/obj/structure/shuttle/engine/heater{ +/obj/machinery/power/shuttle_engine/heater{ dir = 8 }, /obj/structure/window/reinforced{ @@ -724,7 +724,7 @@ /turf/open/floor/iron/dark, /area/shuttle/caravan/pirate) "Nx" = ( -/obj/structure/shuttle/engine/propulsion/burst/right{ +/obj/machinery/power/shuttle_engine/propulsion/burst/right{ dir = 8 }, /turf/open/floor/plating/airless, @@ -745,7 +745,7 @@ /turf/closed/wall/mineral/plastitanium/nodiagonal, /area/shuttle/caravan/pirate) "Pn" = ( -/obj/structure/shuttle/engine/propulsion/burst/left{ +/obj/machinery/power/shuttle_engine/propulsion/burst/left{ dir = 8 }, /turf/open/floor/plating/airless, diff --git a/_maps/shuttles/ruin_syndicate_dropship.dmm b/_maps/shuttles/ruin_syndicate_dropship.dmm index 2d16c19f4db..31e6f0103a8 100644 --- a/_maps/shuttles/ruin_syndicate_dropship.dmm +++ b/_maps/shuttles/ruin_syndicate_dropship.dmm @@ -35,7 +35,7 @@ /turf/open/floor/plating, /area/shuttle/caravan/syndicate3) "dZ" = ( -/obj/structure/shuttle/engine/propulsion/burst{ +/obj/machinery/power/shuttle_engine/propulsion/burst{ dir = 8 }, /turf/open/floor/plating/airless, @@ -98,7 +98,7 @@ /turf/open/floor/iron/dark, /area/shuttle/caravan/syndicate3) "mJ" = ( -/obj/structure/shuttle/engine/propulsion/burst/left{ +/obj/machinery/power/shuttle_engine/propulsion/burst/left{ dir = 8 }, /turf/open/floor/plating/airless, @@ -204,13 +204,13 @@ /turf/open/floor/iron/dark, /area/shuttle/caravan/syndicate3) "vQ" = ( -/obj/structure/shuttle/engine/propulsion/burst/right{ +/obj/machinery/power/shuttle_engine/propulsion/burst/right{ dir = 8 }, /turf/open/floor/plating/airless, /area/shuttle/caravan/syndicate3) "wH" = ( -/obj/structure/shuttle/engine/heater{ +/obj/machinery/power/shuttle_engine/heater{ dir = 8 }, /obj/structure/window/reinforced{ diff --git a/_maps/shuttles/ruin_syndicate_fighter_shiv.dmm b/_maps/shuttles/ruin_syndicate_fighter_shiv.dmm index 9449390bcb3..0055cd77b0b 100644 --- a/_maps/shuttles/ruin_syndicate_fighter_shiv.dmm +++ b/_maps/shuttles/ruin_syndicate_fighter_shiv.dmm @@ -96,7 +96,7 @@ /turf/open/floor/plating, /area/shuttle/caravan/syndicate1) "YP" = ( -/obj/structure/shuttle/engine/propulsion/burst{ +/obj/machinery/power/shuttle_engine/propulsion/burst{ dir = 8 }, /turf/closed/wall/mineral/plastitanium, diff --git a/_maps/shuttles/starfury_corvette.dmm b/_maps/shuttles/starfury_corvette.dmm index e411c7fecc3..d46935bb8b7 100644 --- a/_maps/shuttles/starfury_corvette.dmm +++ b/_maps/shuttles/starfury_corvette.dmm @@ -152,7 +152,7 @@ /turf/open/floor/mineral/plastitanium, /area/shuttle/sbc_corvette) "at" = ( -/obj/structure/shuttle/engine/heater{ +/obj/machinery/power/shuttle_engine/heater{ dir = 8 }, /obj/structure/window/reinforced/survival_pod{ @@ -225,7 +225,7 @@ /turf/open/floor/mineral/plastitanium/red, /area/shuttle/sbc_corvette) "aC" = ( -/obj/structure/shuttle/engine/propulsion/burst{ +/obj/machinery/power/shuttle_engine/propulsion/burst{ dir = 8 }, /turf/open/floor/plating/airless, diff --git a/_maps/shuttles/starfury_fighter1.dmm b/_maps/shuttles/starfury_fighter1.dmm index 1674a2cb543..e3696a9d0af 100644 --- a/_maps/shuttles/starfury_fighter1.dmm +++ b/_maps/shuttles/starfury_fighter1.dmm @@ -23,7 +23,7 @@ /turf/open/floor/mineral/plastitanium, /area/shuttle/sbc_fighter1) "q" = ( -/obj/structure/shuttle/engine/propulsion/burst, +/obj/machinery/power/shuttle_engine/propulsion/burst, /turf/closed/wall/mineral/plastitanium/nodiagonal, /area/shuttle/sbc_fighter1) "r" = ( diff --git a/_maps/shuttles/starfury_fighter2.dmm b/_maps/shuttles/starfury_fighter2.dmm index e56b9a8aa12..ca43280bb8b 100644 --- a/_maps/shuttles/starfury_fighter2.dmm +++ b/_maps/shuttles/starfury_fighter2.dmm @@ -36,7 +36,7 @@ /turf/open/floor/mineral/plastitanium, /area/shuttle/sbc_fighter2) "q" = ( -/obj/structure/shuttle/engine/propulsion/burst, +/obj/machinery/power/shuttle_engine/propulsion/burst, /turf/closed/wall/mineral/plastitanium/nodiagonal, /area/shuttle/sbc_fighter2) "r" = ( diff --git a/_maps/shuttles/starfury_fighter3.dmm b/_maps/shuttles/starfury_fighter3.dmm index 19b33dd6e48..96f13ef364c 100644 --- a/_maps/shuttles/starfury_fighter3.dmm +++ b/_maps/shuttles/starfury_fighter3.dmm @@ -22,7 +22,7 @@ /turf/open/floor/mineral/plastitanium, /area/shuttle/sbc_fighter3) "g" = ( -/obj/structure/shuttle/engine/propulsion/burst, +/obj/machinery/power/shuttle_engine/propulsion/burst, /turf/closed/wall/mineral/plastitanium/nodiagonal, /area/shuttle/sbc_fighter3) "n" = ( diff --git a/_maps/shuttles/whiteship_box.dmm b/_maps/shuttles/whiteship_box.dmm index 83c4fee5f02..3a1c58e35fe 100644 --- a/_maps/shuttles/whiteship_box.dmm +++ b/_maps/shuttles/whiteship_box.dmm @@ -79,13 +79,13 @@ /turf/open/floor/iron, /area/shuttle/abandoned/crew) "ar" = ( -/obj/structure/shuttle/engine/propulsion{ +/obj/machinery/power/shuttle_engine/propulsion{ dir = 8 }, /turf/closed/wall/mineral/titanium, /area/shuttle/abandoned/engine) "as" = ( -/obj/structure/shuttle/engine/heater{ +/obj/machinery/power/shuttle_engine/heater{ dir = 8 }, /turf/closed/wall/mineral/titanium/nodiagonal, @@ -1769,7 +1769,7 @@ /turf/open/floor/iron/white, /area/shuttle/abandoned/medbay) "hV" = ( -/obj/structure/shuttle/engine/propulsion/right{ +/obj/machinery/power/shuttle_engine/propulsion/right{ dir = 8 }, /turf/closed/wall/mineral/titanium/nodiagonal, @@ -1810,7 +1810,7 @@ /turf/open/floor/iron, /area/shuttle/abandoned/crew) "vk" = ( -/obj/structure/shuttle/engine/propulsion/left{ +/obj/machinery/power/shuttle_engine/propulsion/left{ dir = 8 }, /turf/closed/wall/mineral/titanium, @@ -1850,7 +1850,7 @@ /turf/open/floor/iron/dark, /area/shuttle/abandoned/crew) "JU" = ( -/obj/structure/shuttle/engine/propulsion/right{ +/obj/machinery/power/shuttle_engine/propulsion/right{ dir = 8 }, /turf/closed/wall/mineral/titanium, @@ -1874,7 +1874,7 @@ /turf/open/floor/iron/dark, /area/shuttle/abandoned/crew) "Tw" = ( -/obj/structure/shuttle/engine/propulsion/left{ +/obj/machinery/power/shuttle_engine/propulsion/left{ dir = 8 }, /turf/closed/wall/mineral/titanium/nodiagonal, diff --git a/_maps/shuttles/whiteship_cere.dmm b/_maps/shuttles/whiteship_cere.dmm index 1ad442d98af..9593721fa1f 100644 --- a/_maps/shuttles/whiteship_cere.dmm +++ b/_maps/shuttles/whiteship_cere.dmm @@ -23,7 +23,7 @@ /turf/open/floor/plating, /area/shuttle/abandoned) "ad" = ( -/obj/structure/shuttle/engine/propulsion{ +/obj/machinery/power/shuttle_engine/propulsion{ dir = 1 }, /turf/open/floor/plating/airless, @@ -56,7 +56,7 @@ /turf/open/floor/mineral/titanium/yellow, /area/shuttle/abandoned) "aj" = ( -/obj/structure/shuttle/engine/heater{ +/obj/machinery/power/shuttle_engine/heater{ dir = 1 }, /obj/structure/window/reinforced, diff --git a/_maps/shuttles/whiteship_delta.dmm b/_maps/shuttles/whiteship_delta.dmm index 7d0c7c5641e..f410a1d8747 100644 --- a/_maps/shuttles/whiteship_delta.dmm +++ b/_maps/shuttles/whiteship_delta.dmm @@ -211,7 +211,7 @@ /turf/closed/wall/mineral/titanium, /area/shuttle/abandoned/bar) "ay" = ( -/obj/structure/shuttle/engine/propulsion/left{ +/obj/machinery/power/shuttle_engine/propulsion/left{ dir = 8 }, /turf/open/floor/plating/airless, @@ -220,7 +220,7 @@ /obj/structure/window/reinforced{ dir = 4 }, -/obj/structure/shuttle/engine/heater{ +/obj/machinery/power/shuttle_engine/heater{ dir = 8 }, /turf/open/floor/plating/airless, @@ -334,7 +334,7 @@ /turf/open/floor/iron/dark, /area/shuttle/abandoned/bar) "aM" = ( -/obj/structure/shuttle/engine/propulsion/right{ +/obj/machinery/power/shuttle_engine/propulsion/right{ dir = 8 }, /turf/open/floor/plating/airless, diff --git a/_maps/shuttles/whiteship_donut.dmm b/_maps/shuttles/whiteship_donut.dmm index 976f84b97aa..73bba3c2a7f 100644 --- a/_maps/shuttles/whiteship_donut.dmm +++ b/_maps/shuttles/whiteship_donut.dmm @@ -64,13 +64,13 @@ /turf/template_noop, /area/shuttle/abandoned) "am" = ( -/obj/structure/shuttle/engine/propulsion/right{ +/obj/machinery/power/shuttle_engine/propulsion/right{ dir = 1 }, /turf/open/floor/plating/airless, /area/shuttle/abandoned) "an" = ( -/obj/structure/shuttle/engine/propulsion/left{ +/obj/machinery/power/shuttle_engine/propulsion/left{ dir = 1 }, /turf/open/floor/plating/airless, @@ -90,7 +90,7 @@ /turf/template_noop, /area/shuttle/abandoned) "ar" = ( -/obj/structure/shuttle/engine/heater{ +/obj/machinery/power/shuttle_engine/heater{ dir = 1 }, /obj/structure/window/reinforced, @@ -286,7 +286,7 @@ /turf/open/floor/plating/airless, /area/shuttle/abandoned) "aX" = ( -/obj/structure/shuttle/engine/heater, +/obj/machinery/power/shuttle_engine/heater, /obj/structure/window/reinforced{ dir = 1; layer = 2.9 @@ -344,11 +344,11 @@ /turf/open/floor/iron/airless, /area/shuttle/abandoned) "be" = ( -/obj/structure/shuttle/engine/propulsion/left, +/obj/machinery/power/shuttle_engine/propulsion/left, /turf/open/floor/plating/airless, /area/shuttle/abandoned) "bf" = ( -/obj/structure/shuttle/engine/propulsion/right, +/obj/machinery/power/shuttle_engine/propulsion/right, /turf/open/floor/plating/airless, /area/shuttle/abandoned) "bg" = ( diff --git a/_maps/shuttles/whiteship_kilo.dmm b/_maps/shuttles/whiteship_kilo.dmm index 9e59a53ee30..754ce7c830b 100644 --- a/_maps/shuttles/whiteship_kilo.dmm +++ b/_maps/shuttles/whiteship_kilo.dmm @@ -205,7 +205,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/obj/structure/shuttle/engine/propulsion/left{ +/obj/machinery/power/shuttle_engine/propulsion/left{ dir = 8 }, /turf/open/floor/plating, @@ -332,7 +332,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/obj/structure/shuttle/engine/propulsion{ +/obj/machinery/power/shuttle_engine/propulsion{ dir = 8 }, /turf/open/floor/plating, @@ -360,7 +360,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/obj/structure/shuttle/engine/propulsion/right{ +/obj/machinery/power/shuttle_engine/propulsion/right{ dir = 8 }, /turf/open/floor/plating, @@ -421,7 +421,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/obj/structure/shuttle/engine/propulsion/right{ +/obj/machinery/power/shuttle_engine/propulsion/right{ dir = 8 }, /turf/open/floor/plating, @@ -872,7 +872,7 @@ /turf/open/floor/mineral/titanium/tiled/yellow, /area/shuttle/abandoned/engine) "MI" = ( -/obj/structure/shuttle/engine/heater{ +/obj/machinery/power/shuttle_engine/heater{ dir = 8 }, /obj/structure/window/reinforced{ @@ -915,7 +915,7 @@ /turf/open/floor/bamboo, /area/shuttle/abandoned/bar) "OZ" = ( -/obj/structure/shuttle/engine/heater{ +/obj/machinery/power/shuttle_engine/heater{ dir = 8 }, /obj/structure/window/reinforced{ @@ -943,7 +943,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/obj/structure/shuttle/engine/propulsion/left{ +/obj/machinery/power/shuttle_engine/propulsion/left{ dir = 8 }, /turf/open/floor/plating, diff --git a/_maps/shuttles/whiteship_meta.dmm b/_maps/shuttles/whiteship_meta.dmm index 754e4626eb2..f98d246c01e 100644 --- a/_maps/shuttles/whiteship_meta.dmm +++ b/_maps/shuttles/whiteship_meta.dmm @@ -165,7 +165,7 @@ /turf/open/floor/plating, /area/shuttle/abandoned/crew) "ax" = ( -/obj/structure/shuttle/engine/propulsion/left{ +/obj/machinery/power/shuttle_engine/propulsion/left{ dir = 8 }, /turf/open/floor/plating/airless, @@ -174,7 +174,7 @@ /obj/structure/window/reinforced{ dir = 4 }, -/obj/structure/shuttle/engine/heater{ +/obj/machinery/power/shuttle_engine/heater{ dir = 8 }, /turf/open/floor/plating/airless, @@ -258,7 +258,7 @@ /turf/open/floor/plating, /area/shuttle/abandoned/crew) "aL" = ( -/obj/structure/shuttle/engine/propulsion/right{ +/obj/machinery/power/shuttle_engine/propulsion/right{ dir = 8 }, /turf/open/floor/plating/airless, diff --git a/_maps/shuttles/whiteship_pubby.dmm b/_maps/shuttles/whiteship_pubby.dmm index dda8e986dbc..6d6d1635219 100644 --- a/_maps/shuttles/whiteship_pubby.dmm +++ b/_maps/shuttles/whiteship_pubby.dmm @@ -6,7 +6,7 @@ /turf/closed/wall/mineral/titanium, /area/shuttle/abandoned) "c" = ( -/obj/structure/shuttle/engine/propulsion/burst{ +/obj/machinery/power/shuttle_engine/propulsion/burst{ dir = 1 }, /turf/closed/wall/mineral/titanium, @@ -24,7 +24,7 @@ /turf/open/floor/iron, /area/shuttle/abandoned) "g" = ( -/obj/structure/shuttle/engine/propulsion/burst{ +/obj/machinery/power/shuttle_engine/propulsion/burst{ dir = 8 }, /turf/closed/wall/mineral/titanium, @@ -59,7 +59,7 @@ /turf/open/floor/plating/abductor, /area/shuttle/abandoned) "k" = ( -/obj/structure/shuttle/engine/propulsion/burst{ +/obj/machinery/power/shuttle_engine/propulsion/burst{ dir = 4 }, /turf/closed/wall/mineral/titanium, @@ -123,7 +123,7 @@ /turf/open/floor/plating/abductor, /area/shuttle/abandoned) "s" = ( -/obj/structure/shuttle/engine/propulsion/burst, +/obj/machinery/power/shuttle_engine/propulsion/burst, /turf/closed/wall/mineral/titanium, /area/shuttle/abandoned) diff --git a/_maps/shuttles/whiteship_tram.dmm b/_maps/shuttles/whiteship_tram.dmm index e4c542b131e..9e35940ed7d 100644 --- a/_maps/shuttles/whiteship_tram.dmm +++ b/_maps/shuttles/whiteship_tram.dmm @@ -144,7 +144,7 @@ /turf/open/floor/plating/airless, /area/shuttle/abandoned/engine) "au" = ( -/obj/structure/shuttle/engine/propulsion{ +/obj/machinery/power/shuttle_engine/propulsion{ dir = 1 }, /obj/effect/turf_decal/stripes/line{ @@ -153,7 +153,7 @@ /turf/open/floor/plating/airless, /area/shuttle/abandoned/cargo) "av" = ( -/obj/structure/shuttle/engine/propulsion{ +/obj/machinery/power/shuttle_engine/propulsion{ dir = 1 }, /obj/effect/turf_decal/stripes/line{ @@ -252,7 +252,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/structure/shuttle/engine/propulsion{ +/obj/machinery/power/shuttle_engine/propulsion{ dir = 1 }, /turf/open/floor/plating/airless, @@ -304,7 +304,7 @@ /turf/open/floor/pod, /area/shuttle/abandoned/cargo) "aX" = ( -/obj/structure/shuttle/engine/propulsion{ +/obj/machinery/power/shuttle_engine/propulsion{ dir = 1 }, /obj/effect/turf_decal/stripes/line{ @@ -374,7 +374,7 @@ /turf/open/floor/mineral/titanium/blue/airless, /area/shuttle/abandoned/cargo) "bj" = ( -/obj/structure/shuttle/engine/propulsion{ +/obj/machinery/power/shuttle_engine/propulsion{ dir = 1 }, /obj/effect/turf_decal/stripes/line{ @@ -621,7 +621,7 @@ /turf/open/floor/iron/smooth_large, /area/shuttle/abandoned/engine) "bS" = ( -/obj/structure/shuttle/engine/heater{ +/obj/machinery/power/shuttle_engine/heater{ dir = 1 }, /obj/structure/window/reinforced/plasma/spawner, @@ -669,7 +669,7 @@ /turf/open/floor/iron/smooth_large, /area/shuttle/abandoned/engine) "ce" = ( -/obj/structure/shuttle/engine/heater{ +/obj/machinery/power/shuttle_engine/heater{ dir = 1 }, /obj/structure/window/reinforced/plasma/spawner, @@ -1078,7 +1078,7 @@ /turf/open/floor/mineral/titanium/white/airless, /area/shuttle/abandoned/cargo) "fh" = ( -/obj/structure/shuttle/engine/heater{ +/obj/machinery/power/shuttle_engine/heater{ dir = 1 }, /obj/structure/window/reinforced/plasma/spawner, diff --git a/_maps/templates/battlecruiser_starfury.dmm b/_maps/templates/battlecruiser_starfury.dmm index 08a0261aacf..7cc415445bc 100644 --- a/_maps/templates/battlecruiser_starfury.dmm +++ b/_maps/templates/battlecruiser_starfury.dmm @@ -3974,11 +3974,11 @@ /turf/open/floor/plating, /area/shuttle/sbc_starfury) "mO" = ( -/obj/structure/shuttle/engine/huge, +/obj/machinery/power/shuttle_engine/huge, /turf/open/floor/plating, /area/shuttle/sbc_starfury) "mP" = ( -/obj/structure/shuttle/engine/large, +/obj/machinery/power/shuttle_engine/large, /turf/open/floor/plating, /area/shuttle/sbc_starfury) "mY" = ( diff --git a/_maps/templates/medium_shuttle1.dmm b/_maps/templates/medium_shuttle1.dmm index 10d135d57a3..87e89367a48 100644 --- a/_maps/templates/medium_shuttle1.dmm +++ b/_maps/templates/medium_shuttle1.dmm @@ -3,13 +3,13 @@ /turf/template_noop, /area/template_noop) "b" = ( -/obj/structure/shuttle/engine/propulsion/burst/left{ +/obj/machinery/power/shuttle_engine/propulsion/burst/left{ dir = 8 }, /turf/template_noop, /area/ruin/powered/shuttle/medium_1) "c" = ( -/obj/structure/shuttle/engine/heater{ +/obj/machinery/power/shuttle_engine/heater{ dir = 8 }, /obj/structure/window/reinforced{ @@ -66,7 +66,7 @@ /turf/open/floor/plating, /area/ruin/powered/shuttle/medium_1) "w" = ( -/obj/structure/shuttle/engine/propulsion/burst/right{ +/obj/machinery/power/shuttle_engine/propulsion/burst/right{ dir = 8 }, /turf/template_noop, diff --git a/_maps/templates/medium_shuttle2.dmm b/_maps/templates/medium_shuttle2.dmm index ad9392ef000..88223823a2a 100644 --- a/_maps/templates/medium_shuttle2.dmm +++ b/_maps/templates/medium_shuttle2.dmm @@ -3,13 +3,13 @@ /turf/template_noop, /area/template_noop) "b" = ( -/obj/structure/shuttle/engine/propulsion/burst/left{ +/obj/machinery/power/shuttle_engine/propulsion/burst/left{ dir = 8 }, /turf/template_noop, /area/ruin/powered/shuttle/medium_2) "c" = ( -/obj/structure/shuttle/engine/heater{ +/obj/machinery/power/shuttle_engine/heater{ dir = 8 }, /obj/structure/window/reinforced{ @@ -21,7 +21,7 @@ /turf/closed/wall/mineral/plastitanium, /area/ruin/powered/shuttle/medium_2) "f" = ( -/obj/structure/shuttle/engine/propulsion/burst/right{ +/obj/machinery/power/shuttle_engine/propulsion/burst/right{ dir = 8 }, /turf/template_noop, diff --git a/_maps/templates/medium_shuttle3.dmm b/_maps/templates/medium_shuttle3.dmm index ba97d8af144..e1f1079d9d2 100644 --- a/_maps/templates/medium_shuttle3.dmm +++ b/_maps/templates/medium_shuttle3.dmm @@ -3,7 +3,7 @@ /turf/template_noop, /area/template_noop) "b" = ( -/obj/structure/shuttle/engine/propulsion{ +/obj/machinery/power/shuttle_engine/propulsion{ dir = 1 }, /turf/template_noop, @@ -12,7 +12,7 @@ /turf/closed/wall/mineral/plastitanium, /area/ruin/powered/shuttle/medium_3) "d" = ( -/obj/structure/shuttle/engine/heater{ +/obj/machinery/power/shuttle_engine/heater{ dir = 1 }, /turf/open/floor/plating/airless, @@ -35,13 +35,13 @@ /turf/open/floor/plating, /area/ruin/powered/shuttle/medium_3) "n" = ( -/obj/structure/shuttle/engine/propulsion{ +/obj/machinery/power/shuttle_engine/propulsion{ dir = 8 }, /turf/template_noop, /area/ruin/powered/shuttle/medium_3) "o" = ( -/obj/structure/shuttle/engine/heater{ +/obj/machinery/power/shuttle_engine/heater{ dir = 8 }, /turf/open/floor/plating/airless, @@ -51,13 +51,13 @@ /turf/open/floor/iron, /area/ruin/powered/shuttle/medium_3) "q" = ( -/obj/structure/shuttle/engine/heater{ +/obj/machinery/power/shuttle_engine/heater{ dir = 4 }, /turf/open/floor/plating/airless, /area/ruin/powered/shuttle/medium_3) "r" = ( -/obj/structure/shuttle/engine/propulsion{ +/obj/machinery/power/shuttle_engine/propulsion{ dir = 4 }, /turf/template_noop, @@ -85,11 +85,11 @@ /turf/open/floor/iron/dark, /area/ruin/powered/shuttle/medium_3) "E" = ( -/obj/structure/shuttle/engine/heater, +/obj/machinery/power/shuttle_engine/heater, /turf/open/floor/plating/airless, /area/ruin/powered/shuttle/medium_3) "F" = ( -/obj/structure/shuttle/engine/propulsion, +/obj/machinery/power/shuttle_engine/propulsion, /turf/template_noop, /area/ruin/powered/shuttle/medium_3) "G" = ( diff --git a/_maps/templates/medium_shuttle4.dmm b/_maps/templates/medium_shuttle4.dmm index 73f2928f5a9..0071a71a1e9 100644 --- a/_maps/templates/medium_shuttle4.dmm +++ b/_maps/templates/medium_shuttle4.dmm @@ -37,7 +37,7 @@ /turf/open/floor/oldshuttle, /area/ruin/powered/shuttle/medium_4) "j" = ( -/obj/structure/shuttle/engine/propulsion/burst{ +/obj/machinery/power/shuttle_engine/propulsion/burst{ dir = 1 }, /turf/template_noop, @@ -62,19 +62,19 @@ /turf/open/floor/oldshuttle, /area/ruin/powered/shuttle/medium_4) "t" = ( -/obj/structure/shuttle/engine/propulsion/burst/left, +/obj/machinery/power/shuttle_engine/propulsion/burst/left, /turf/template_noop, /area/ruin/powered/shuttle/medium_4) "u" = ( -/obj/structure/shuttle/engine/propulsion/burst/right, +/obj/machinery/power/shuttle_engine/propulsion/burst/right, /turf/template_noop, /area/ruin/powered/shuttle/medium_4) "v" = ( -/obj/structure/shuttle/engine/propulsion/burst/right, +/obj/machinery/power/shuttle_engine/propulsion/burst/right, /turf/open/misc/asteroid/basalt/lava_land_surface, /area/ruin/powered/shuttle/medium_4) "w" = ( -/obj/structure/shuttle/engine/propulsion/burst, +/obj/machinery/power/shuttle_engine/propulsion/burst, /turf/template_noop, /area/ruin/powered/shuttle/medium_4) diff --git a/_maps/templates/small_shuttle_1.dmm b/_maps/templates/small_shuttle_1.dmm index aa2d8b5687f..a8a7ab9b7df 100644 --- a/_maps/templates/small_shuttle_1.dmm +++ b/_maps/templates/small_shuttle_1.dmm @@ -38,19 +38,19 @@ /turf/open/floor/mineral/titanium/blue, /area/template_noop) "n" = ( -/obj/structure/shuttle/engine/heater, +/obj/machinery/power/shuttle_engine/heater, /turf/open/floor/plating/airless, /area/template_noop) "p" = ( -/obj/structure/shuttle/engine/propulsion/left, +/obj/machinery/power/shuttle_engine/propulsion/left, /turf/open/floor/plating/airless, /area/template_noop) "q" = ( -/obj/structure/shuttle/engine/propulsion, +/obj/machinery/power/shuttle_engine/propulsion, /turf/open/floor/plating/airless, /area/template_noop) "r" = ( -/obj/structure/shuttle/engine/propulsion/right, +/obj/machinery/power/shuttle_engine/propulsion/right, /turf/open/floor/plating/airless, /area/template_noop) diff --git a/code/__DEFINES/icon_smoothing.dm b/code/__DEFINES/icon_smoothing.dm index 5f00ece724c..fa3c853163d 100644 --- a/code/__DEFINES/icon_smoothing.dm +++ b/code/__DEFINES/icon_smoothing.dm @@ -155,7 +155,7 @@ DEFINE_BITFIELD(smoothing_flags, list( #define SMOOTH_GROUP_HEDGE_FLUFF S_OBJ(65) ///obj/structure/hedge -#define SMOOTH_GROUP_SHUTTLE_PARTS S_OBJ(66) ///obj/structure/window/reinforced/shuttle, /obj/structure/window/reinforced/plasma/plastitanium, /turf/closed/indestructible/opsglass, /obj/structure/shuttle +#define SMOOTH_GROUP_SHUTTLE_PARTS S_OBJ(66) ///obj/structure/window/reinforced/shuttle, /obj/structure/window/reinforced/plasma/plastitanium, /turf/closed/indestructible/opsglass, /obj/machinery/power/shuttle_engine #define SMOOTH_GROUP_CLEANABLE_DIRT S_OBJ(67) ///obj/effect/decal/cleanable/dirt diff --git a/code/game/objects/items/circuitboards/machines/engine_circuitboards.dm b/code/game/objects/items/circuitboards/machines/engine_circuitboards.dm new file mode 100644 index 00000000000..ffdf7ed98c1 --- /dev/null +++ b/code/game/objects/items/circuitboards/machines/engine_circuitboards.dm @@ -0,0 +1,17 @@ +/obj/item/circuitboard/machine/engine + name = "Shuttle Engine" + greyscale_colors = CIRCUIT_COLOR_ENGINEERING + build_path = /obj/machinery/power/shuttle_engine + needs_anchored = FALSE + req_components = list( + /obj/item/stock_parts/capacitor = 2, + /obj/item/stock_parts/micro_laser = 2, + ) + +/obj/item/circuitboard/machine/engine/heater + name = "Shuttle Engine Heater" + build_path = /obj/machinery/power/shuttle_engine/heater + +/obj/item/circuitboard/machine/engine/propulsion + name = "Shuttle Engine Propulsion" + build_path = /obj/machinery/power/shuttle_engine/propulsion diff --git a/code/game/objects/items/circuitboards/machine_circuitboards.dm b/code/game/objects/items/circuitboards/machines/machine_circuitboards.dm similarity index 100% rename from code/game/objects/items/circuitboards/machine_circuitboards.dm rename to code/game/objects/items/circuitboards/machines/machine_circuitboards.dm diff --git a/code/game/shuttle_engines.dm b/code/game/shuttle_engines.dm index e3f5fe68419..dea2a12ec67 100644 --- a/code/game/shuttle_engines.dm +++ b/code/game/shuttle_engines.dm @@ -4,20 +4,19 @@ ///How long it takes to weld/unweld an engine in place. #define ENGINE_WELDTIME (20 SECONDS) -/obj/structure/shuttle - name = "shuttle" +/obj/machinery/power/shuttle_engine + name = "engine" + desc = "A bluespace engine used to make shuttles move." icon = 'icons/turf/shuttle.dmi' resistance_flags = LAVA_PROOF | FIRE_PROOF | ACID_PROOF smoothing_groups = list(SMOOTH_GROUP_SHUTTLE_PARTS) - max_integrity = 500 armor = list(MELEE = 100, BULLET = 10, LASER = 10, ENERGY = 0, BOMB = 0, BIO = 0, FIRE = 50, ACID = 70) //default + ignores melee can_atmos_pass = ATMOS_PASS_DENSITY - -/obj/structure/shuttle/engine - name = "engine" - desc = "A bluespace engine used to make shuttles move." + max_integrity = 500 density = TRUE anchored = TRUE + use_power = NO_POWER_USE + circuit = /obj/item/circuitboard/machine/engine ///How well the engine affects the ship's speed. var/engine_power = 1 @@ -27,7 +26,7 @@ ///The mobile ship we are connected to. var/datum/weakref/connected_ship_ref -/obj/structure/shuttle/engine/connect_to_shuttle(mapload, obj/docking_port/mobile/port, obj/docking_port/stationary/dock) +/obj/machinery/power/shuttle_engine/connect_to_shuttle(mapload, obj/docking_port/mobile/port, obj/docking_port/stationary/dock) . = ..() if(!port) return FALSE @@ -37,7 +36,7 @@ if(mapload) port.initial_engine_power += engine_power -/obj/structure/shuttle/engine/Destroy() +/obj/machinery/power/shuttle_engine/Destroy() if(engine_state == ENGINE_WELDED) alter_engine_power(-engine_power) unsync_ship() @@ -46,7 +45,7 @@ /** * Called on destroy and when we need to unsync an engine from their ship. */ -/obj/structure/shuttle/engine/proc/unsync_ship() +/obj/machinery/power/shuttle_engine/proc/unsync_ship() var/obj/docking_port/mobile/port = connected_ship_ref?.resolve() if(port) port.engine_list -= src @@ -54,14 +53,14 @@ connected_ship_ref = null //Ugh this is a lot of copypasta from emitters, welding need some boilerplate reduction -/obj/structure/shuttle/engine/can_be_unfasten_wrench(mob/user, silent) +/obj/machinery/power/shuttle_engine/can_be_unfasten_wrench(mob/user, silent) if(engine_state == ENGINE_WELDED) if(!silent) to_chat(user, span_warning("[src] is welded to the floor!")) return FAILED_UNFASTEN return ..() -/obj/structure/shuttle/engine/default_unfasten_wrench(mob/user, obj/item/tool, time = 20) +/obj/machinery/power/shuttle_engine/default_unfasten_wrench(mob/user, obj/item/tool, time = 20) . = ..() if(. == SUCCESSFUL_UNFASTEN) if(anchored) @@ -71,12 +70,12 @@ unsync_ship() //not part of the ship anymore engine_state = ENGINE_UNWRENCHED -/obj/structure/shuttle/engine/wrench_act(mob/living/user, obj/item/tool) +/obj/machinery/power/shuttle_engine/wrench_act(mob/living/user, obj/item/tool) . = ..() default_unfasten_wrench(user, tool) return TOOL_ACT_TOOLTYPE_SUCCESS -/obj/structure/shuttle/engine/welder_act(mob/living/user, obj/item/tool) +/obj/machinery/power/shuttle_engine/welder_act(mob/living/user, obj/item/tool) . = ..() switch(engine_state) if(ENGINE_UNWRENCHED) @@ -109,101 +108,73 @@ return TRUE //Propagates the change to the shuttle. -/obj/structure/shuttle/engine/proc/alter_engine_power(mod) +/obj/machinery/power/shuttle_engine/proc/alter_engine_power(mod) if(!mod) return var/obj/docking_port/mobile/port = connected_ship_ref?.resolve() if(port) port.alter_engines(mod) -/obj/structure/shuttle/engine/heater +/obj/machinery/power/shuttle_engine/heater name = "engine heater" - icon_state = "heater" desc = "Directs energy into compressed particles in order to power engines." + icon_state = "heater" + circuit = /obj/item/circuitboard/machine/engine/heater engine_power = 0 // todo make these into 2x1 parts -/obj/structure/shuttle/engine/platform - name = "engine platform" - icon_state = "platform" - desc = "A platform for engine components." - engine_power = 0 - -/obj/structure/shuttle/engine/propulsion +/obj/machinery/power/shuttle_engine/propulsion name = "propulsion engine" icon_state = "propulsion" desc = "A standard reliable bluespace engine used by many forms of shuttles." + circuit = /obj/item/circuitboard/machine/engine/propulsion opacity = TRUE -/obj/structure/shuttle/engine/propulsion/in_wall - name = "in-wall propulsion engine" - icon_state = "propulsion_w" - density = FALSE - opacity = FALSE - smoothing_groups = list() - -/obj/structure/shuttle/engine/propulsion/left +/obj/machinery/power/shuttle_engine/propulsion/left name = "left propulsion engine" icon_state = "propulsion_l" -/obj/structure/shuttle/engine/propulsion/right +/obj/machinery/power/shuttle_engine/propulsion/right name = "right propulsion engine" icon_state = "propulsion_r" -/obj/structure/shuttle/engine/propulsion/burst +/obj/machinery/power/shuttle_engine/propulsion/burst name = "burst engine" desc = "An engine that releases a large bluespace burst to propel it." -/obj/structure/shuttle/engine/propulsion/burst/cargo +/obj/machinery/power/shuttle_engine/propulsion/burst/cargo engine_state = ENGINE_UNWRENCHED anchored = FALSE -/obj/structure/shuttle/engine/propulsion/burst/left +/obj/machinery/power/shuttle_engine/propulsion/burst/left name = "left burst engine" icon_state = "burst_l" -/obj/structure/shuttle/engine/propulsion/burst/right +/obj/machinery/power/shuttle_engine/propulsion/burst/right name = "right burst engine" icon_state = "burst_r" -/obj/structure/shuttle/engine/router - name = "engine router" - icon_state = "router" - desc = "Redirects around energized particles in engine structures." - -/obj/structure/shuttle/engine/large +/obj/machinery/power/shuttle_engine/large name = "engine" icon = 'icons/obj/2x2.dmi' icon_state = "large_engine" desc = "A very large bluespace engine used to propel very large ships." + circuit = null opacity = TRUE bound_width = 64 bound_height = 64 appearance_flags = LONG_GLIDE -/obj/structure/shuttle/engine/large/in_wall - name = "in-wall engine" - icon_state = "large_engine_w" - density = FALSE - opacity = FALSE - smoothing_groups = list() - -/obj/structure/shuttle/engine/huge +/obj/machinery/power/shuttle_engine/huge name = "engine" icon = 'icons/obj/3x3.dmi' icon_state = "huge_engine" desc = "An extremely large bluespace engine used to propel extremely large ships." + circuit = null opacity = TRUE bound_width = 96 bound_height = 96 appearance_flags = LONG_GLIDE -/obj/structure/shuttle/engine/huge/in_wall - name = "in-wall engine" - icon_state = "huge_engine_w" - density = FALSE - opacity = FALSE - smoothing_groups = list() - #undef ENGINE_UNWRENCHED #undef ENGINE_WRENCHED #undef ENGINE_WELDED diff --git a/code/modules/cargo/packs.dm b/code/modules/cargo/packs.dm index 27c99083b60..a25ff222d5c 100644 --- a/code/modules/cargo/packs.dm +++ b/code/modules/cargo/packs.dm @@ -668,7 +668,7 @@ cost = CARGO_CRATE_VALUE * 6 access = ACCESS_CE access_view = ACCESS_CE - contains = list(/obj/structure/shuttle/engine/propulsion/burst/cargo) + contains = list(/obj/machinery/power/shuttle_engine/propulsion/burst/cargo) crate_name = "shuttle engine crate" crate_type = /obj/structure/closet/crate/secure/engineering special = TRUE diff --git a/code/modules/industrial_lift/tram_override_objects.dm b/code/modules/industrial_lift/tram_override_objects.dm index 7a348295a2d..339979c293a 100644 --- a/code/modules/industrial_lift/tram_override_objects.dm +++ b/code/modules/industrial_lift/tram_override_objects.dm @@ -18,7 +18,7 @@ . = ..() RemoveElement(/datum/element/atmos_sensitive, mapload) -/obj/structure/shuttle/engine/propulsion/in_wall/tram +/obj/machinery/power/shuttle_engine/propulsion/tram //if this has opacity, then every movement of the tram causes lighting updates //DO NOT put something on the tram roundstart that has opacity, it WILL overload SSlighting opacity = FALSE diff --git a/code/modules/shuttle/on_move.dm b/code/modules/shuttle/on_move.dm index b4628c9d439..e777d6bea08 100644 --- a/code/modules/shuttle/on_move.dm +++ b/code/modules/shuttle/on_move.dm @@ -328,7 +328,7 @@ All ShuttleMove procs go here Connect_cable(TRUE) propagate_if_no_network() -/obj/structure/shuttle/beforeShuttleMove(turf/newT, rotation, move_mode, obj/docking_port/mobile/moving_dock) +/obj/machinery/power/shuttle_engine/beforeShuttleMove(turf/newT, rotation, move_mode, obj/docking_port/mobile/moving_dock) . = ..() if(. & MOVE_AREA) . |= MOVE_CONTENTS diff --git a/code/modules/shuttle/shuttle.dm b/code/modules/shuttle/shuttle.dm index cf83f3aa46f..0bfb742378b 100644 --- a/code/modules/shuttle/shuttle.dm +++ b/code/modules/shuttle/shuttle.dm @@ -382,8 +382,8 @@ ///List of all areas our shuttle holds. var/list/shuttle_areas = list() - ///List of all engines connected to the shuttle. - var/list/obj/structure/shuttle/engine/engine_list = list() + ///List of all currently used engines that propels us. + var/list/obj/machinery/power/shuttle_engine/engine_list = list() ///How fast the shuttle should be, taking engine thrust into account. var/engine_coeff = 1 @@ -973,7 +973,7 @@ source = distant_source else var/closest_dist = 10000 - for(var/obj/structure/shuttle/engine/engines as anything in engine_list) + for(var/obj/machinery/power/shuttle_engine/engines as anything in engine_list) var/dist_near = get_dist(zlevel_mobs, engines) if(dist_near < closest_dist) source = engines diff --git a/code/modules/shuttle/supply.dm b/code/modules/shuttle/supply.dm index 166ae110e5e..c4334faf088 100644 --- a/code/modules/shuttle/supply.dm +++ b/code/modules/shuttle/supply.dm @@ -223,13 +223,13 @@ GLOBAL_LIST_INIT(blacklisted_cargo_types, typecacheof(list( var/datum/export_report/ex = new - for(var/place in shuttle_areas) - var/area/shuttle/shuttle_area = place + for(var/area/shuttle/shuttle_area as anything in shuttle_areas) for(var/atom/movable/AM in shuttle_area) if(iscameramob(AM)) continue - if(!AM.anchored) - export_item_and_contents(AM, export_categories , dry_run = FALSE, external_report = ex) + if(AM.anchored) + continue + export_item_and_contents(AM, export_categories, dry_run = FALSE, external_report = ex) if(ex.exported_atoms) ex.exported_atoms += "." //ugh diff --git a/tgstation.dme b/tgstation.dme index ed205b712fb..7cad5724766 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -1659,7 +1659,8 @@ #include "code\game\objects\items\AI_modules\zeroth.dm" #include "code\game\objects\items\circuitboards\circuitboard.dm" #include "code\game\objects\items\circuitboards\computer_circuitboards.dm" -#include "code\game\objects\items\circuitboards\machine_circuitboards.dm" +#include "code\game\objects\items\circuitboards\machines\engine_circuitboards.dm" +#include "code\game\objects\items\circuitboards\machines\machine_circuitboards.dm" #include "code\game\objects\items\devices\aicard.dm" #include "code\game\objects\items\devices\anomaly_neutralizer.dm" #include "code\game\objects\items\devices\beacon.dm" diff --git a/tools/UpdatePaths/Scripts/69793_shuttle_engines.txt b/tools/UpdatePaths/Scripts/69793_shuttle_engines.txt new file mode 100644 index 00000000000..436cfa0c630 --- /dev/null +++ b/tools/UpdatePaths/Scripts/69793_shuttle_engines.txt @@ -0,0 +1,8 @@ +/obj/structure/shuttle/engine/@SUBTYPES : /obj/machinery/power/shuttle_engine/@SUBTYPES{@OLD} +/obj/structure/shuttle : @DELETE + +/obj/structure/shuttle/engine/platform : /obj/machinery/power/shuttle_engine/propulsion{@OLD} +/obj/machinery/power/shuttle_engine/platform : /obj/machinery/power/shuttle_engine/propulsion{@OLD} + +/obj/structure/shuttle/engine/router : /obj/machinery/power/shuttle_engine/propulsion{@OLD} +/obj/machinery/power/shuttle_engine/router : /obj/machinery/power/shuttle_engine/propulsion{@OLD}