mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-10 18:22:39 +00:00
Enabled multi-z nanomap in nanoui on power monitor, sec camera, and armos computers.
This commit is contained in:
@@ -35,7 +35,6 @@
|
|||||||
return viewflag
|
return viewflag
|
||||||
|
|
||||||
/obj/machinery/computer/security/ui_interact(mob/user, ui_key = "main", datum/nanoui/ui = null, force_open = 1)
|
/obj/machinery/computer/security/ui_interact(mob/user, ui_key = "main", datum/nanoui/ui = null, force_open = 1)
|
||||||
if(src.z > 6) return
|
|
||||||
if(stat & (NOPOWER|BROKEN)) return
|
if(stat & (NOPOWER|BROKEN)) return
|
||||||
if(user.stat) return
|
if(user.stat) return
|
||||||
|
|
||||||
@@ -48,6 +47,7 @@
|
|||||||
data["cameras"] = camera_repository.cameras_in_network(current_network)
|
data["cameras"] = camera_repository.cameras_in_network(current_network)
|
||||||
if(current_camera)
|
if(current_camera)
|
||||||
switch_to_camera(user, current_camera)
|
switch_to_camera(user, current_camera)
|
||||||
|
data["station_levels"] = using_map.station_levels
|
||||||
|
|
||||||
ui = nanomanager.try_update_ui(user, src, ui_key, ui, data, force_open)
|
ui = nanomanager.try_update_ui(user, src, ui_key, ui, data, force_open)
|
||||||
if (!ui)
|
if (!ui)
|
||||||
|
|||||||
@@ -25,6 +25,7 @@
|
|||||||
data["all_sensors"] = sensors
|
data["all_sensors"] = sensors
|
||||||
if(focus)
|
if(focus)
|
||||||
data["focus"] = focus.return_reading_data()
|
data["focus"] = focus.return_reading_data()
|
||||||
|
data["station_levels"] = using_map.station_levels
|
||||||
|
|
||||||
ui = nanomanager.try_update_ui(user, src, ui_key, ui, data, force_open)
|
ui = nanomanager.try_update_ui(user, src, ui_key, ui, data, force_open)
|
||||||
if (!ui)
|
if (!ui)
|
||||||
|
|||||||
@@ -3,12 +3,14 @@ Title: Atmos Control Console (Map Header)
|
|||||||
Used In File(s): \code\modules\nano\modules\atmos_control.dm
|
Used In File(s): \code\modules\nano\modules\atmos_control.dm
|
||||||
-->
|
-->
|
||||||
{{:helper.link('Show List', 'script', {'showMap' : 0})}}
|
{{:helper.link('Show List', 'script', {'showMap' : 0})}}
|
||||||
|
{{if data.station_levels.length > 1}}
|
||||||
<div style="float: right;">
|
<div style="float: right;">
|
||||||
<span style="float: left;">Z Level: </span>
|
<span style="float: left;">Z Level: </span>
|
||||||
{{for data.station_levels }}
|
{{for data.station_levels }}
|
||||||
{{:helper.link(value, null, {'mapZLevel' : value}) }}
|
{{:helper.link(value, null, {'mapZLevel' : value}) }}
|
||||||
{{/for}}
|
{{/for}}
|
||||||
</div>
|
</div>
|
||||||
|
{{/if}}
|
||||||
<div style="float: right; width: 240px;">
|
<div style="float: right; width: 240px;">
|
||||||
<span style="float: left;">Zoom Level: </span>
|
<span style="float: left;">Zoom Level: </span>
|
||||||
<div unselectable="on" class="link zoomLink" data-zoom-level="4">x1.0</div>
|
<div unselectable="on" class="link zoomLink" data-zoom-level="4">x1.0</div>
|
||||||
|
|||||||
@@ -4,6 +4,14 @@ Used In File(s): \code\modules\nano\modules\power_monitor.dm
|
|||||||
-->
|
-->
|
||||||
{{:helper.link('Show Network Information', 'script', {'showMap' : 0})}}
|
{{:helper.link('Show Network Information', 'script', {'showMap' : 0})}}
|
||||||
{{if data.focus}}<span>Sensor selected: {{:data.focus.name}}</span>{{/if}}
|
{{if data.focus}}<span>Sensor selected: {{:data.focus.name}}</span>{{/if}}
|
||||||
|
{{if data.station_levels.length > 1}}
|
||||||
|
<div style="float: right;">
|
||||||
|
<span style="float: left;">Z Level: </span>
|
||||||
|
{{for data.station_levels }}
|
||||||
|
{{:helper.link(value, null, {'mapZLevel' : value}) }}
|
||||||
|
{{/for}}
|
||||||
|
</div>
|
||||||
|
{{/if}}
|
||||||
<div style="float: right; width: 240px;">
|
<div style="float: right; width: 240px;">
|
||||||
<span style="float: left;">Zoom Level: </span>
|
<span style="float: left;">Zoom Level: </span>
|
||||||
<div unselectable="on" class="link zoomLink" data-zoom-level="4">x1.0</div>
|
<div unselectable="on" class="link zoomLink" data-zoom-level="4">x1.0</div>
|
||||||
|
|||||||
@@ -3,7 +3,7 @@ Title: Security Camera Console (Map content)
|
|||||||
Used In File(s): \code\game\machinery\computer\camera.dm
|
Used In File(s): \code\game\machinery\computer\camera.dm
|
||||||
-->
|
-->
|
||||||
{{for data.cameras}}
|
{{for data.cameras}}
|
||||||
{{if value.z == 1}}
|
{{if value.z == config.mapZLevel}}
|
||||||
<div class="mapIcon mapIcon16" style="left: {{:(value.x)}}px; bottom: {{:(value.y - 14.75)}}px;">
|
<div class="mapIcon mapIcon16" style="left: {{:(value.x)}}px; bottom: {{:(value.y - 14.75)}}px;">
|
||||||
{{if data.current && value.name == data.current.name}}
|
{{if data.current && value.name == data.current.name}}
|
||||||
{{:helper.link("#", '', {'switch_camera' : value.camera}, 'selected')}}
|
{{:helper.link("#", '', {'switch_camera' : value.camera}, 'selected')}}
|
||||||
|
|||||||
@@ -14,6 +14,14 @@ Used In File(s): \code\game\machinery\computer\camera.dm
|
|||||||
{{/if}}
|
{{/if}}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
{{if data.station_levels.length > 1}}
|
||||||
|
<div style="float: right;">
|
||||||
|
<span style="float: left;">Z Level: </span>
|
||||||
|
{{for data.station_levels }}
|
||||||
|
{{:helper.link(value, null, {'mapZLevel' : value}) }}
|
||||||
|
{{/for}}
|
||||||
|
</div>
|
||||||
|
{{/if}}
|
||||||
<div style="float: right; width: 240px;">
|
<div style="float: right; width: 240px;">
|
||||||
<span style="float: left;">Zoom Level: </span>
|
<span style="float: left;">Zoom Level: </span>
|
||||||
<div unselectable="on" class="link zoomLink" data-zoom-level="4">x1.0</div>
|
<div unselectable="on" class="link zoomLink" data-zoom-level="4">x1.0</div>
|
||||||
|
|||||||
Reference in New Issue
Block a user