mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-08-31 09:08:30 +01:00
[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
This commit is contained in:
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user