cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-29 15:08:02 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2684 from Tastyfish/nanomaps

Browse Source 
fixed nanoui maps positioning stuff wrong, atmos control having any alarms
This commit is contained in:
TheDZD
2015-11-30 19:19:44 -05:00
parent 4f5f3a5ec0 559491810a
commit 42845228bb
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/nano/modules/atmos_control.dm
+2 -2
View File
@@ -3,7 +3,7 @@
var/obj/access = new()
var/emagged = 0
var/ui_ref
var/list/monitored_alarms = list()
var/list/monitored_alarms = null
/datum/nano_module/atmos_control/New(atmos_computer, req_access, req_one_access, monitored_alarm_ids)
..()
@@ -23,7 +23,7 @@
if(href_list["alarm"])
if(ui_ref)
var/obj/machinery/alarm/alarm = locate(href_list["alarm"]) in (monitored_alarms.len ? monitored_alarms : machines)
var/obj/machinery/alarm/alarm = locate(href_list["alarm"]) in (monitored_alarms ? monitored_alarms : machines)
if(alarm)
var/datum/topic_state/TS = generate_state(alarm)
alarm.ui_interact(usr, master_ui = ui_ref, state = TS)
nano/css/layout_default.css
+1 -1
View File
@@ -87,7 +87,7 @@ body {
#uiMapContent {
position: absolute;
bottom: 0px;
bottom: -13.5px;
left: 0px;
width: 256px;
height: 256px;
nano/templates/atmos_control_map_content.tmpl
+1 -1
View File
@@ -1,6 +1,6 @@
{{for data.alarms}}
{{if value.z == 1}}
<div class="linkActive mapIcon mapIcon16 icon-airalarm {{:helper.dangerToClass(value.danger)}}" style="left: {{:(value.x)}}px; bottom: {{:(value.y)}}px;" unselectable="on" data-href="{{:NanoUtility.generateHref({"alarm":value.ref, "showMap":0})}}">
<div class="linkActive mapIcon mapIcon16 icon-airalarm {{:helper.dangerToClass(value.danger)}}" style="left: {{:(value.x)}}px; bottom: {{:(value.y - 1)}}px;" unselectable="on" data-href="{{:NanoUtility.generateHref({"alarm":value.ref, "showMap":0})}}">
<div class="tooltip hidden">
{{:value.name}} ({{:helper.dangerToSpan(value.danger)}}, {{:value.area}}: {{:value.x}}, {{:value.y}})
</div>