mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2026-08-24 05:38:15 +01:00
[MIRROR] Relaymove Moved To Remote Views (#11914)
Co-authored-by: Will <7099514+Willburd@users.noreply.github.com>
This commit is contained in:
co-authored by
Will
parent
4d41a742cd
commit
953250b06a
@@ -270,11 +270,11 @@ GLOBAL_LIST_EMPTY(all_waypoints)
|
||||
. = TRUE
|
||||
|
||||
if("manual")
|
||||
if(check_eye(ui.user) < 0)
|
||||
if(!get_dist(ui.user, src) > 1 || ui.user.blinded || !linked)
|
||||
return FALSE
|
||||
else if(!viewing_overmap(ui.user) && linked)
|
||||
if(!viewers) viewers = list() // List must exist for pass by reference to work
|
||||
start_coordinated_remoteview(ui.user, linked, viewers)
|
||||
start_coordinated_remoteview(ui.user, linked, viewers, /datum/remote_view_config/overmap_ship_control)
|
||||
else
|
||||
ui.user.reset_perspective()
|
||||
. = TRUE
|
||||
|
||||
@@ -89,7 +89,7 @@
|
||||
switch(action)
|
||||
if("viewing")
|
||||
if(ui.user && !isAI(ui.user))
|
||||
if(check_eye(ui.user) < 0)
|
||||
if(!get_dist(ui.user, src) > 1 || ui.user.blinded || !linked)
|
||||
. = FALSE
|
||||
else if(!viewing_overmap(ui.user) && linked)
|
||||
if(!viewers) viewers = list() // List must exist for pass by reference to work
|
||||
|
||||
@@ -67,22 +67,13 @@ somewhere on that shuttle. Subtypes of these can be then used to perform ship ov
|
||||
// Management of mob view displacement. look to shift view to the ship on the overmap; unlook to shift back.
|
||||
|
||||
/obj/machinery/computer/ship/look(var/mob/user)
|
||||
apply_visual(user)
|
||||
if(linked.real_appearance)
|
||||
user.client?.images += linked.real_appearance
|
||||
user.set_machine(src)
|
||||
if(isliving(user))
|
||||
var/mob/living/L = user
|
||||
L.handle_vision()
|
||||
user.set_viewsize(world.view + extra_view)
|
||||
|
||||
/obj/machinery/computer/ship/unlook(var/mob/user)
|
||||
user.unset_machine()
|
||||
if(linked && linked.real_appearance && user.client)
|
||||
user.client.images -= linked.real_appearance
|
||||
if(isliving(user))
|
||||
var/mob/living/L = user
|
||||
L.handle_vision()
|
||||
user.set_viewsize() // reset to default
|
||||
|
||||
/obj/machinery/computer/ship/proc/viewing_overmap(mob/user)
|
||||
@@ -92,13 +83,6 @@ somewhere on that shuttle. Subtypes of these can be then used to perform ship ov
|
||||
. = ..()
|
||||
user.reset_perspective()
|
||||
|
||||
/obj/machinery/computer/ship/check_eye(var/mob/user)
|
||||
if(user.blinded || !linked)
|
||||
user.reset_perspective()
|
||||
return -1
|
||||
else
|
||||
return 0
|
||||
|
||||
/obj/machinery/computer/ship/sensors/Destroy()
|
||||
sensors = null
|
||||
. = ..()
|
||||
|
||||
Reference in New Issue
Block a user