cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 10:12:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Enabled multi-z nanomap in nanoui on power monitor, sec camera, and armos computers.

Browse Source
This commit is contained in:
Leshana
2017-05-17 00:58:21 -04:00
parent b89897e8a2
commit fbb1a75438
6 changed files with 22 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/game/machinery/computer/camera.dm
View File

@@ -35,7 +35,6 @@
return viewflag
/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(user.stat) return
@@ -48,6 +47,7 @@
data["cameras"] = camera_repository.cameras_in_network(current_network)
if(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)
if (!ui)

1
code/modules/nano/modules/power_monitor.dm
View File

@@ -25,6 +25,7 @@
data["all_sensors"] = sensors
if(focus)
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)
if (!ui)

4
nano/templates/atmos_control_map_header.tmpl
View File

@@ -3,12 +3,14 @@ Title: Atmos Control Console (Map Header)
Used In File(s): \code\modules\nano\modules\atmos_control.dm
-->
{{:helper.link('Show List', 'script', {'showMap' : 0})}}
{{if data.station_levels.length > 1}}
<div style="float: right;">
<span style="float: left;">Z Level:&nbsp;</span>
{{for data.station_levels }}
{{:helper.link(value, null, {'mapZLevel' : value}) }}
{{:helper.link(value, null, {'mapZLevel' : value}) }}
{{/for}}
</div>
{{/if}}
<div style="float: right; width: 240px;">
<span style="float: left;">Zoom Level:&nbsp;</span>
<div unselectable="on" class="link zoomLink" data-zoom-level="4">x1.0</div>

8
nano/templates/power_monitor_map_header.tmpl
View File

@@ -4,6 +4,14 @@ Used In File(s): \code\modules\nano\modules\power_monitor.dm
-->
{{:helper.link('Show Network Information', 'script', {'showMap' : 0})}}
{{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:&nbsp;</span>
{{for data.station_levels }}
{{:helper.link(value, null, {'mapZLevel' : value}) }}
{{/for}}
</div>
{{/if}}
<div style="float: right; width: 240px;">
<span style="float: left;">Zoom Level:&nbsp;</span>
<div unselectable="on" class="link zoomLink" data-zoom-level="4">x1.0</div>

2
nano/templates/sec_camera_map_content.tmpl
View File

@@ -3,7 +3,7 @@ Title: Security Camera Console (Map content)
Used In File(s): \code\game\machinery\computer\camera.dm
-->
{{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;">
{{if data.current && value.name == data.current.name}}
{{:helper.link("#", '', {'switch_camera' : value.camera}, 'selected')}}

8
nano/templates/sec_camera_map_header.tmpl
View File

@@ -14,6 +14,14 @@ Used In File(s): \code\game\machinery\computer\camera.dm
{{/if}}
</div>
</div>
{{if data.station_levels.length > 1}}
<div style="float: right;">
<span style="float: left;">Z Level:&nbsp;</span>
{{for data.station_levels }}
{{:helper.link(value, null, {'mapZLevel' : value}) }}
{{/for}}
</div>
{{/if}}
<div style="float: right; width: 240px;">
<span style="float: left;">Zoom Level:&nbsp;</span>
<div unselectable="on" class="link zoomLink" data-zoom-level="4">x1.0</div>