cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-26 13:37:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

More stuff at 230am...

Browse Source
This commit is contained in:
Aurorablade
2016-08-09 02:27:21 -04:00
parent 3b57ddd4b0
commit f18735b36a
3 changed files with 12 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/shuttle/shuttle.dm
+2 -8
View File
@@ -267,16 +267,10 @@
if(height-dheight > S.height-S.dheight)
return 5
//check the dock isn't occupied
var/currently_docked = S.get_docked()
// by someone other than us
if(currently_docked != src)
if(S.get_docked())
return 6
else
// This isn't an error, per se, but we can't let the shuttle code
// attempt to move us where we currently are, it will get weird.
return SHUTTLE_ALREADY_DOCKED
return 0 //0 means we can dock
return 0
//call the shuttle to destination S
/obj/docking_port/mobile/proc/request(obj/docking_port/stationary/S)
var/status = canDock(S)
code/modules/shuttle/shuttle_manipulator.dm
+9 -9
View File
@@ -85,9 +85,9 @@
var/dat = ""
dat += "<center>"
dat += "<a href='?_src_=prefs;preference=tab;tab=[SHUTTLE_MANIPULATOR_STATUS]' [current_tab == SHUTTLE_MANIPULATOR_STATUS ? "class='linkOn'" : ""]>Status</a>"
dat += "<a href='?_src_=prefs;preference=tab;tab=[SHUTTLE_MANIPULATOR_TEMPLATE]' [current_tab == SHUTTLE_MANIPULATOR_TEMPLATE ? "class='linkOn'" : ""]>Templates</a>"
dat += "<a href='?_src_=prefs;preference=tab;tab=[SHUTTLE_MANIPULATOR_MOD]' [current_tab == SHUTTLE_MANIPULATOR_MOD ? "class='linkOn'" : ""]>Modification</a>"
dat += "<a href='?src=\ref[src];[src]=tab;tab=[SHUTTLE_MANIPULATOR_STATUS]' [current_tab == SHUTTLE_MANIPULATOR_STATUS ? "class='linkOn'" : ""]>Status</a>"
dat += "<a href='?src=\ref[src];[src]=tab;tab=[SHUTTLE_MANIPULATOR_TEMPLATE]' [current_tab == SHUTTLE_MANIPULATOR_TEMPLATE ? "class='linkOn'" : ""]>Templates</a>"
dat += "<a href='?src=\ref[src];[src]=tab;tab=[SHUTTLE_MANIPULATOR_MOD]' [current_tab == SHUTTLE_MANIPULATOR_MOD ? "class='linkOn'" : ""]>Modification</a>"
dat += "</center>"
dat += "<HR>"
@@ -102,8 +102,8 @@
for(var/list/shuttle in shuttle_data["shuttles"])
dat += "<span class='line'>"
dat += "<span class='statusLabel'>[shuttle["name"]] [shuttle["id"]]: [shuttle["mode"]] [shuttle["status"]] [shuttle["timer"]] </span>"
dat += "<a href='?src=\ref[src];jump_to=[shuttle["id"]]'>Jump To</a><br>"
dat += "</span>"
dat += "<a href='?src=\ref[src];jump_to=[shuttle["id"]]'>Jump To</a>"
dat += "<br></span>"
dat += "</div>"
if(SHUTTLE_MANIPULATOR_TEMPLATE)
dat += "<div class='block'>"
@@ -112,8 +112,8 @@
dat += "<span class='statusLabel'> [shuttle["name"]] <br>[shuttle["description"]]<br> [shuttle["admin_notes"]] <br></span>"
dat += "<A href='?src=\ref[src];load=[shuttle["id"]]'>Load Template</A>"
dat += "<A href='?src=\ref[src];select_template=[shuttle["id"]]'>Select Template</A>"
dat += "<a href='?src=\ref[src];preview=[shuttle["id"]]'>Preview Template</a><br>"
dat += "</span>"
dat += "<a href='?src=\ref[src];preview=[shuttle["id"]]'>Preview Template</A>"
dat += "<br></span>"
dat += "</div>"
if(SHUTTLE_MANIPULATOR_MOD)
dat += "<div class='block'>"
@@ -121,8 +121,8 @@
dat += "<span class='line'>"
dat += "<span class='statusLabel'>[shuttle["name"]] [shuttle["id"]] <br>[shuttle["description"]]<br> [shuttle["admin_notes"]] <br> </span>"
dat += "<A href='?src=\ref[src];move=[shuttle["id"]]'>Send to port</A>"
dat += "<a href='?src=\ref[src];jump_to=[shuttle["id"]]'>Jump To</a><br>"
dat += "</span>"
dat += "<a href='?src=\ref[src];jump_to=[shuttle["id"]]'>Jump To</a>
dat += "<br></span>"
dat += "</div>"
var/datum/browser/popup = new(user, "shuttle manipulator", "Shuttle Manipulator", 500, 500)