cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2025-12-10 09:42:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] [MDB IGNORE] Shuttle engine code improvement and fixes [MDB IGNORE] (#16116)

Browse Source 
* [MDB IGNORE] Shuttle engine code improvement and fixes

* what even happened in shuttlepanel.dm

* should be the last few

Co-authored-by: John Willard <53777086+JohnFulpWillard@users.noreply.github.com>
Co-authored-by: Paxilmaniac <paxilmaniac@gmail.com>
This commit is contained in:
SkyratBot
2022-09-11 00:28:57 +02:00
committed by GitHub
parent e9107345ce
commit 7559990f20
120 changed files with 14303 additions and 14281 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
code/controllers/subsystem/shuttle.dm
View File

@@ -257,13 +257,13 @@ SUBSYSTEM_DEF(shuttle)
/datum/controller/subsystem/shuttle/proc/getShuttle(id)
for(var/obj/docking_port/mobile/M in mobile_docking_ports)
if(M.id == id)
if(M.shuttle_id == id)
return M
WARNING("couldn't find shuttle with id: [id]")
/datum/controller/subsystem/shuttle/proc/getDock(id)
for(var/obj/docking_port/stationary/S in stationary_docking_ports)
if(S.id == id)
if(S.shuttle_id == id)
return S
WARNING("couldn't find dock with id: [id]")
@@ -508,7 +508,7 @@ SUBSYSTEM_DEF(shuttle)
return DOCKING_BLOCKED
var/obj/docking_port/stationary/docked_at = shuttle_port.get_docked()
var/destination = dock_home
if(docked_at && docked_at.id == dock_home)
if(docked_at && docked_at.shuttle_id == dock_home)
destination = dock_away
if(timed)
if(shuttle_port.request(getDock(destination)))
@@ -617,7 +617,7 @@ SUBSYSTEM_DEF(shuttle)
A.contents = proposal.reserved_turfs
var/obj/docking_port/stationary/transit/new_transit_dock = new(midpoint)
new_transit_dock.reserved_area = proposal
new_transit_dock.name = "Transit for [M.id]/[M.name]"
new_transit_dock.name = "Transit for [M.shuttle_id]/[M.name]"
new_transit_dock.owner = M
new_transit_dock.assigned_area = A
@@ -924,7 +924,7 @@ SUBSYSTEM_DEF(shuttle)
var/timeleft = M.timeLeft(1)
var/list/L = list()
L["name"] = M.name
L["id"] = M.id
L["id"] = M.shuttle_id
L["timer"] = M.timer
L["timeleft"] = M.getTimerStr()
if (timeleft > 1 HOURS)
@@ -966,7 +966,7 @@ SUBSYSTEM_DEF(shuttle)
if(params["type"] == "mobile")
for(var/i in mobile_docking_ports)
var/obj/docking_port/mobile/M = i
if(M.id == params["id"])
if(M.shuttle_id == params["id"])
user.forceMove(get_turf(M))
. = TRUE
break
@@ -974,7 +974,7 @@ SUBSYSTEM_DEF(shuttle)
if("fly")
for(var/i in mobile_docking_ports)
var/obj/docking_port/mobile/M = i
if(M.id == params["id"])
if(M.shuttle_id == params["id"])
. = TRUE
M.admin_fly_shuttle(user)
break
@@ -982,7 +982,7 @@ SUBSYSTEM_DEF(shuttle)
if("fast_travel")
for(var/i in mobile_docking_ports)
var/obj/docking_port/mobile/M = i
if(M.id == params["id"] && M.timer && M.timeLeft(1) >= 50)
if(M.shuttle_id == params["id"] && M.timer && M.timeLeft(1) >= 50)
M.setTimer(50)
. = TRUE
message_admins("[key_name_admin(usr)] fast travelled [M]")