Continous update intergration until being merged

Also tgui fixes/updates
This commit is contained in:
Poojawa
2018-09-15 00:37:29 -05:00
parent a38922d90f
commit 1a2460ed28
12 changed files with 47 additions and 41 deletions
+1 -1
View File
@@ -6,7 +6,7 @@
var/datum/action/innate/shuttledocker_place/place_action = new
var/shuttleId = ""
var/shuttlePortId = ""
var/shuttlePortName = ""
var/shuttlePortName = "custom location"
var/list/jumpto_ports = list() //hashset of ports to jump to and ignore for collision purposes
var/obj/docking_port/stationary/my_port //the custom docking port placed by this console
var/obj/docking_port/mobile/shuttle_port //the mobile docking port of the connected shuttle
-1
View File
@@ -53,7 +53,6 @@
shuttleId = "syndicate"
lock_override = CAMERA_LOCK_STATION
shuttlePortId = "syndicate_custom"
shuttlePortName = "custom location"
jumpto_ports = list("syndicate_ne" = 1, "syndicate_nw" = 1, "syndicate_n" = 1, "syndicate_se" = 1, "syndicate_sw" = 1, "syndicate_s" = 1)
view_range = 13
x_offset = -7
-2
View File
@@ -24,7 +24,6 @@
shuttleId = "whiteship"
lock_override = NONE
shuttlePortId = "whiteship_custom"
shuttlePortName = "Custom Location"
jumpto_ports = list("whiteship_away" = 1, "whiteship_home" = 1, "whiteship_z4" = 1)
view_range = 18
x_offset = -6
@@ -36,7 +35,6 @@
desc = "Used to designate a precise transit location for the Salvage Pod."
shuttleId = "whiteship_pod"
shuttlePortId = "whiteship_pod_custom"
shuttlePortName = "Custom Location"
jumpto_ports = list("whiteship_pod_home" = 1)
view_range = 7
x_offset = -2