mirror of
https://github.com/VOREStation/VOREStation.git
synced 2026-08-26 05:27:39 +01:00
Merge branch 'master' of github.com:Kashargul/VOREStation into usr-to-user-up-to-player_effects
This commit is contained in:
@@ -49,7 +49,6 @@
|
||||
// Skills
|
||||
//
|
||||
/obj/machinery/computer/ship
|
||||
var/core_skill = /datum/skill/devices //The skill used for skill checks for this machine (mostly so subtypes can use different skills).
|
||||
var/ai_control = TRUE //VOREStation Edit
|
||||
|
||||
//
|
||||
|
||||
@@ -20,7 +20,6 @@ GLOBAL_LIST_EMPTY(all_waypoints)
|
||||
icon_screen = "helm"
|
||||
light_color = "#7faaff"
|
||||
circuit = /obj/item/circuitboard/helm
|
||||
core_skill = /datum/skill/pilot
|
||||
var/autopilot = 0
|
||||
var/autopilot_disabled = TRUE
|
||||
var/list/known_sectors = list()
|
||||
@@ -77,13 +76,10 @@ GLOBAL_LIST_EMPTY(all_waypoints)
|
||||
// All other cases, move toward direction
|
||||
else if(speed + acceleration <= speedlimit)
|
||||
linked.accelerate(direction, accellimit)
|
||||
linked.operator_skill = null//if this is on you can't dodge meteors
|
||||
return
|
||||
|
||||
/obj/machinery/computer/ship/helm/relaymove(var/mob/user, direction)
|
||||
if(viewing_overmap(user) && linked)
|
||||
if(prob(user.skill_fail_chance(/datum/skill/pilot, 50, linked.skill_needed, factor = 1)))
|
||||
direction = turn(direction,pick(90,-90))
|
||||
linked.relaymove(user, direction, accellimit)
|
||||
return 1
|
||||
|
||||
@@ -253,9 +249,7 @@ GLOBAL_LIST_EMPTY(all_waypoints)
|
||||
|
||||
if("move")
|
||||
var/ndir = text2num(params["dir"])
|
||||
if(prob(ui.user.skill_fail_chance(/datum/skill/pilot, 50, linked.skill_needed, factor = 1)))
|
||||
ndir = turn(ndir,pick(90,-90))
|
||||
linked.relaymove(ui.user, ndir, accellimit)
|
||||
linked.relaymove(usr, ndir, accellimit)
|
||||
. = TRUE
|
||||
|
||||
if("brake")
|
||||
|
||||
@@ -34,9 +34,6 @@
|
||||
to_chat(ui.user, span_warning("Unable to establish link with the shuttle."))
|
||||
return TRUE
|
||||
|
||||
if(ismob(ui.user))
|
||||
shuttle.operator_skill = ui.user.get_skill_value(/datum/skill/pilot)
|
||||
|
||||
switch(action)
|
||||
if("pick")
|
||||
var/list/possible_d = shuttle.get_possible_destinations()
|
||||
|
||||
Reference in New Issue
Block a user