mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-10 10:12:45 +00:00
[MIRROR] Relaymove Moved To Remote Views (#11914)
Co-authored-by: Will <7099514+Willburd@users.noreply.github.com>
This commit is contained in:
committed by
GitHub
parent
4d41a742cd
commit
953250b06a
@@ -64,6 +64,7 @@
|
||||
icon_state = "scanner_0"
|
||||
density = TRUE
|
||||
anchored = TRUE
|
||||
flags = REMOTEVIEW_ON_ENTER
|
||||
use_power = USE_POWER_IDLE
|
||||
idle_power_usage = 50
|
||||
active_power_usage = 300
|
||||
|
||||
@@ -91,6 +91,7 @@
|
||||
density = TRUE
|
||||
anchored = TRUE
|
||||
unacidable = TRUE
|
||||
flags = REMOTEVIEW_ON_ENTER
|
||||
circuit = /obj/item/circuitboard/sleeper
|
||||
var/mob/living/carbon/human/occupant = null
|
||||
var/list/available_chemicals = list()
|
||||
|
||||
@@ -9,6 +9,7 @@
|
||||
density = TRUE
|
||||
anchored = TRUE
|
||||
unacidable = TRUE
|
||||
flags = REMOTEVIEW_ON_ENTER
|
||||
circuit = /obj/item/circuitboard/body_scanner
|
||||
use_power = USE_POWER_IDLE
|
||||
idle_power_usage = 60
|
||||
|
||||
@@ -300,11 +300,6 @@
|
||||
status = newstatus
|
||||
update_coverage()
|
||||
|
||||
/obj/machinery/camera/check_eye(mob/user)
|
||||
if(!can_use()) return -1
|
||||
if(isXRay()) return SEE_TURFS|SEE_MOBS|SEE_OBJS
|
||||
return 0
|
||||
|
||||
/obj/machinery/camera/update_icon()
|
||||
if (!status || (stat & BROKEN))
|
||||
icon_state = "[initial(icon_state)]1"
|
||||
@@ -407,7 +402,6 @@
|
||||
to_chat(user, span_warning("\The [src] is broken."))
|
||||
return
|
||||
|
||||
user.set_machine(src)
|
||||
wires.Interact(user)
|
||||
|
||||
/obj/machinery/camera/proc/add_network(var/network_name)
|
||||
|
||||
@@ -30,6 +30,7 @@
|
||||
desc = "An electronically-lockable pod for growing organic tissue."
|
||||
density = TRUE
|
||||
anchored = TRUE
|
||||
flags = REMOTEVIEW_ON_ENTER
|
||||
circuit = /obj/item/circuitboard/clonepod
|
||||
icon = 'icons/obj/cloning.dmi'
|
||||
icon_state = "pod_0"
|
||||
|
||||
@@ -7,6 +7,7 @@
|
||||
icon_state = "pod_preview"
|
||||
density = TRUE
|
||||
anchored = TRUE
|
||||
flags = REMOTEVIEW_ON_ENTER
|
||||
layer = UNDER_JUNK_LAYER
|
||||
interact_offline = 1
|
||||
|
||||
|
||||
@@ -554,10 +554,3 @@ Class Procs:
|
||||
spark_system.start()
|
||||
qdel(spark_system)
|
||||
qdel(src)
|
||||
|
||||
/datum/proc/apply_visual(mob/M)
|
||||
M.sight = 0 //Just reset their mesons and stuff so they can't use them, by default.
|
||||
return
|
||||
|
||||
/datum/proc/remove_visual(mob/M)
|
||||
return
|
||||
|
||||
@@ -3,7 +3,6 @@
|
||||
set name = ".map"
|
||||
set category = "Object"
|
||||
set src in view(1)
|
||||
usr.set_machine(src)
|
||||
if(!mapping) return
|
||||
log_game("[usr]([usr.key]) used station map L[z] in [src.loc.loc]")
|
||||
drawmap(usr)
|
||||
@@ -332,4 +331,3 @@
|
||||
qdel(O)
|
||||
|
||||
mapobjs = null
|
||||
src.unset_machine()
|
||||
|
||||
@@ -852,7 +852,7 @@ GLOBAL_LIST_EMPTY(blood_overlays_by_type)
|
||||
can_zoom = FALSE
|
||||
|
||||
if(!zoom && can_zoom)
|
||||
M.AddComponent(/datum/component/remote_view/item_zoom/allow_moving, focused_on = M, our_item = src, viewsize = viewsize, tileoffset = tileoffset, show_visible_messages = TRUE)
|
||||
M.AddComponent(/datum/component/remote_view/item_zoom, focused_on = M, vconfig_path = /datum/remote_view_config/allow_movement, our_item = src, viewsize = viewsize, tileoffset = tileoffset, show_visible_messages = TRUE)
|
||||
return
|
||||
SEND_SIGNAL(src,COMSIG_REMOTE_VIEW_CLEAR)
|
||||
|
||||
|
||||
@@ -190,8 +190,12 @@
|
||||
if(in_use)
|
||||
return
|
||||
|
||||
if(cameras.len == 1 && user.is_remote_viewing())
|
||||
user.reset_perspective()
|
||||
return
|
||||
if(!can_use_cam(user))
|
||||
return
|
||||
|
||||
if(cameras.len == 1)
|
||||
selected_camera = cameras[1]
|
||||
else
|
||||
@@ -209,7 +213,7 @@
|
||||
unpair(selected_camera)
|
||||
selected_camera = null
|
||||
return
|
||||
user.AddComponent(/datum/component/remote_view/item_zoom, focused_on = selected_camera, our_item = src, viewsize = null, tileoffset = 0, show_visible_messages = TRUE)
|
||||
user.AddComponent(/datum/component/remote_view/item_zoom, focused_on = selected_camera, vconfig_path = /datum/remote_view_config/camera_standard, our_item = src, viewsize = null, tileoffset = 0, show_visible_messages = TRUE)
|
||||
|
||||
/obj/item/bug_monitor/proc/can_use_cam(mob/user)
|
||||
if(!cameras.len)
|
||||
@@ -231,9 +235,6 @@
|
||||
if(Adjacent(user))
|
||||
. += "The time '12:00' is blinking in the corner of the screen and \the [src] looks very cheaply made."
|
||||
|
||||
/obj/machinery/camera/bug/check_eye(var/mob/user as mob)
|
||||
return 0
|
||||
|
||||
/obj/machinery/camera/bug
|
||||
network = list(NETWORK_SECURITY)
|
||||
|
||||
|
||||
@@ -281,12 +281,6 @@
|
||||
/obj/item/uav/proc/remove_master(var/mob/living/M)
|
||||
LAZYREMOVE(masters, WEAKREF(M))
|
||||
|
||||
/obj/item/uav/check_eye()
|
||||
if(state == UAV_ON)
|
||||
return 0
|
||||
else
|
||||
return -1
|
||||
|
||||
/obj/item/uav/proc/start_hover()
|
||||
if(!ion_trail.on) //We'll just use this to store if we're floating or not
|
||||
ion_trail.start()
|
||||
|
||||
Reference in New Issue
Block a user