shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #4449 from Citadel-Station-13/upstream-merge-33627

Browse Source 
[MIRROR] dock() re-organization
This commit is contained in:
LetterJay
2017-12-27 07:01:40 -06:00
committed by GitHub
parent c84a8cc9e1 e2d2c8cda0
commit a034383e15
13 changed files with 262 additions and 218 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/controllers/subsystem/shuttle.dm
+2 -2
View File
@@ -400,7 +400,7 @@ SUBSYSTEM_DEF(shuttle)
if(M.request(getDock(destination)))
return 2
else
if(M.dock(getDock(destination)) != DOCKING_SUCCESS)
if(M.initiate_docking(getDock(destination)) != DOCKING_SUCCESS)
return 2
return 0 //dock successful
@@ -415,7 +415,7 @@ SUBSYSTEM_DEF(shuttle)
if(M.request(D))
return 2
else
if(M.dock(D) != DOCKING_SUCCESS)
if(M.initiate_docking(D) != DOCKING_SUCCESS)
return 2
return 0 //dock successful